修复保存企业管理员UU号的Bug

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -29,8 +29,6 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
     private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
-
     @Override
     public void update(UserSpace userSpace, UserSpaceDetail userSpaceDetail) {
         Enterprise enterprise = new Enterprise();
@@ -51,9 +49,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
         enterprise.setUu(Long.valueOf(userSpace.getDialectUID()));
         enterpriseDao.save(enterprise);
         if(null != oldenterprise) {
-            logger.log("更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
+            logger.log("更新企业信息", userSpace.getDialectUID());
         } else {
-            logger.log("新增企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()), enterprise.getUu(), 0L);
+            logger.log("新增企业信息", userSpace.getDialectUID());
         }
     }
 
@@ -66,7 +64,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
                 if(!CollectionUtils.isEmpty(users)) {
                     enterprise.setEnAdminuu(users.get(0).getUserUU());
                     enterpriseDao.save(enterprise);
-                    logger.log("更换管理员", enterprise.getEnName()+"," +users.get(0).getUserName() + "time:" + sdf.format(new Date()), enterprise.getUu(), enterprise.getEnAdminuu());
+                    logger.log("更换管理员", enterprise.getEnName() + ":" + enterprise.getUu() + ";" + enterprise.getEnAdminuu());
                 }
             }
         }

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -27,12 +27,10 @@ public class UserServiceImpl implements UserService {
 
     private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
-
     @Override
     public void save(User user) {
         com.uas.platform.b2c.common.account.model.User u = userDao.findOne(Long.parseLong(user.getDialectUID()));
-        if (null == u){
+        if (null == u) {
             u =  new com.uas.platform.b2c.common.account.model.User();
         }
         u.setUserPwd(user.getPassword());
@@ -43,18 +41,18 @@ public class UserServiceImpl implements UserService {
         Enterprise enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));
         if(null != enterprise) {
             u.setEnterprise(enterprise);
+            if(null == enterprise.getEnAdminuu()) {
+                enterprise.setEnAdminuu(u.getUserUU());
+                enterpriseDao.save(enterprise);
+                logger.log("设置管理员", enterprise.getEnName() + ":" + enterprise.getUu() + ";" + u.getUserName() + ":" + u.getUserUU());
+            }
         }
         List<com.uas.platform.b2c.common.account.model.User> oldUsers = userDao.findUserByUserUU(u.getUserUU());
         userDao.save(u);
         if(oldUsers.size() > 0) {
-            logger.log("更新用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
+            logger.log("更新用户信息", user.getDialectUID() + "" + enterprise.getUu());
         } else {
-            if(null != enterprise && null == enterprise.getEnAdminuu()) {
-                enterprise.setEnAdminuu(u.getUserUU());
-                enterpriseDao.save(enterprise);
-                logger.log("设置管理员", enterprise.getEnName() + "," + u.getUserName() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
-            }
-            logger.log("新增用户信息", user.getDialectUID() + "time: " + sdf.format(new Date()), enterprise.getUu(), u.getUserUU());
+            logger.log("新增用户信息", user.getDialectUID() + ", " + enterprise.getUu());
         }
     }
 
@@ -68,12 +66,12 @@ public class UserServiceImpl implements UserService {
                 user.removeEnterprise(enterprise);
                 if (user.getEnterprises().size() != 0) {
                     user.setEnable((short) Status.DISABLED.value());
-                    logger.log("删除用户", "禁用" + user.getUserUU(), 0L, 0L);
+                    logger.log("删除用户", "禁用" + user.getUserUU(), enuu, uu);
                     userDao.save(user);
                 }
                 if (user.getEnterprises().size() == 0) {
                     userDao.delete(user);
-                    logger.log("删除用户", "删除" + user.getUserUU(), 0L, 0L);
+                    logger.log("删除用户", "删除" + user.getUserUU(), enuu, uu);
                 }
             }
         }