Replace getCode with codeNotEmpty

kanban-auth/src/main/java/com/uas/kanban/service/impl/UserServiceImpl.java

@@ -58,7 +58,7 @@ public class UserServiceImpl extends BaseService<User> implements UserService {
         String code = user.codeNotEmpty();
         User oldUser = userDao.checkExist(code);
         if (oldUser.getRole() == Role.Admin) {
-            if (!Objects.equals(code, SystemSession.checkUser().getCode())) {
+            if (!Objects.equals(code, SystemSession.checkUser().codeNotEmpty())) {
                 throw new OperationException("不允许更改其他管理员：" + oldUser.getName());
             } else if (user.getRole() != Role.Admin && countAdmin() <= 1) {
                 throw new OperationException("只有一个管理员，不可降低权限");
@@ -121,7 +121,7 @@ public class UserServiceImpl extends BaseService<User> implements UserService {
     @Override
     public boolean resetPassword(@NotEmpty("password") String password, @NotEmpty("newPassword") String newPassword) {
         User userInSession = SystemSession.checkUser();
-        String code = userInSession.getCode();
+        String code = userInSession.codeNotEmpty();
         User user = userDao.findOne(code);
         if (user == null) {
             throw new IllegalStateException("用户不存在：" + userInSession);
@@ -180,7 +180,7 @@ public class UserServiceImpl extends BaseService<User> implements UserService {
     private void checkAdmin(@NotEmpty("code") String code) throws OperationException {
         User user = userDao.checkExist(code);
         if (user.getRole() == Role.Admin) {
-            if (!Objects.equals(code, SystemSession.checkUser().getCode())) {
+            if (!Objects.equals(code, SystemSession.checkUser().codeNotEmpty())) {
                 throw new OperationException("不允许删除其他管理员：" + user.getName());
             } else {
                 // 如果自己是最后一个管理员，不可删除自己

kanban-common/src/main/java/com/uas/kanban/base/Coded.java

@@ -37,14 +37,14 @@ public abstract class Coded implements Serializable {
         code = NumberGenerator.generateId();
     }
 
-    public void setCode(String code) {
-        this.code = code;
-    }
-
     public String getCode() {
         return code;
     }
 
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     /**
      * code 是否不为空
      *
@@ -53,7 +53,7 @@ public abstract class Coded implements Serializable {
      */
     public String codeNotEmpty() throws IllegalArgumentException {
         if (StringUtils.isEmpty(code)) {
-            throw new IllegalArgumentException("未指定 code");
+            throw new IllegalArgumentException(BaseDao.getCollectionSimpleName(getClass()) + "字段为空：code");
         }
         return code;
     }

kanban-console/src/main/java/com/uas/kanban/dao/PanelInstanceDao.java

@@ -24,7 +24,7 @@ public class PanelInstanceDao extends BaseDao<PanelInstance> {
         User user = SystemSession.checkUser();
         Map<String, Object> filters = new HashMap<>();
         // 所有用户只能操作自己的实例
-        filters.put("userCode", user.getCode());
+        filters.put("userCode", user.codeNotEmpty());
         return filters;
     }
 

kanban-console/src/main/java/com/uas/kanban/model/PanelInstance.java

@@ -189,7 +189,7 @@ public class PanelInstance extends BaseEntity {
             if (kanban.getEnabled() != null && kanban.getEnabled()) {
                 BaseDao.checkFields(kanban);
                 RelatedKanban relatedKanban = new RelatedKanban();
-                relatedKanban.setCode(kanban.getCode());
+                relatedKanban.setCode(kanban.codeNotEmpty());
                 relatedKanban.setEnabled(true);
                 relatedKanban.setName(kanban.getName());
                 relatedKanbans.add(relatedKanban);

kanban-console/src/main/java/com/uas/kanban/service/impl/PanelInstanceServiceImpl.java

@@ -148,7 +148,7 @@ public class PanelInstanceServiceImpl extends BaseService<PanelInstance> impleme
         if (panelInstance == null || panel.getVersion() > panelInstance.getPanelVersion()) {
             // 如果面板有更新，先删除旧的实例
             if (panelInstance != null) {
-                deleteOne(panelInstance.getCode());
+                deleteOne(panelInstance.codeNotEmpty());
             }
             panelInstance = generateInstance(panelCode);
         }
@@ -296,7 +296,7 @@ public class PanelInstanceServiceImpl extends BaseService<PanelInstance> impleme
             // 获取 code 相同的参数，用于重置
             for (int j = references == null ? -1 : references.size() - 1; j >= 0; j--) {
                 Parameter reference = references.get(j);
-                if (Objects.equals(parameter.getCode(), reference.getCode())) {
+                if (Objects.equals(parameter.codeNotEmpty(), reference.codeNotEmpty())) {
                     parameter.setOptionalValues(reference.getOptionalValues());
                 }
             }
@@ -324,7 +324,7 @@ public class PanelInstanceServiceImpl extends BaseService<PanelInstance> impleme
             // 再去除 code 相同的参数，以找出不一样的参数
             for (int j = references == null ? -1 : references.size() - 1; j >= 0; j--) {
                 Parameter reference = references.get(j);
-                if (Objects.equals(parameter.getCode(), reference.getCode())) {
+                if (Objects.equals(parameter.codeNotEmpty(), reference.codeNotEmpty())) {
                     // 排除值的干扰
                     reference.setValue(parameter.getValue());
                     // 与参照对象不一致，说明填写的参数不规范
@@ -405,7 +405,7 @@ public class PanelInstanceServiceImpl extends BaseService<PanelInstance> impleme
     private PanelInstance generateInstance(@NotEmpty("panelCode") String panelCode) {
         Panel panel = panelDao.checkExist(panelCode);
         PanelInstance panelInstance = new PanelInstance();
-        panelInstance.setUserCode(SystemSession.getUser().getCode());
+        panelInstance.setUserCode(SystemSession.getUser().codeNotEmpty());
         panelInstance.setPanelCode(panelCode);
         panelInstance.setPanelVersion(panel.getVersion());
         initSwitchFrequence(panelInstance);

kanban-console/src/main/java/com/uas/kanban/service/impl/ParameterServiceImpl.java

@@ -5,7 +5,6 @@ import com.uas.kanban.base.BaseService;
 import com.uas.kanban.dao.PanelDao;
 import com.uas.kanban.dao.ParameterDao;
 import com.uas.kanban.exception.OperationException;
-import com.uas.kanban.model.Panel;
 import com.uas.kanban.model.Parameter;
 import com.uas.kanban.service.ParameterService;
 import com.uas.kanban.util.CollectionUtils;
@@ -34,9 +33,10 @@ public class ParameterServiceImpl extends BaseService<Parameter> implements Para
     public Parameter save(@NotEmpty("json") String json) {
         // TODO　update related Panel and PanelInstance
         Parameter parameter = parameterDao.parse(json);
-        Panel panel = panelDao.checkExist(parameter.getPanelCode());
+        String panelCode = parameter.getPanelCode();
+        panelDao.checkExist(panelCode);
         checkInputMode(parameter);
-        panelDao.incVersion(Collections.singletonList(panel.getCode()));
+        panelDao.incVersion(Collections.singletonList(panelCode));
         return parameterDao.save(parameter);
     }
 
@@ -49,9 +49,10 @@ public class ParameterServiceImpl extends BaseService<Parameter> implements Para
     public int update(@NotEmpty("json") String json) throws IllegalArgumentException, OperationException {
         // TODO　update related Panel and PanelInstance (old and new)
         Parameter parameter = parameterDao.parse(json);
-        Panel panel = panelDao.checkExist(parameter.getPanelCode());
+        String panelCode = parameter.getPanelCode();
+        panelDao.checkExist(panelCode);
         checkInputMode(parameter);
-        panelDao.incVersion(Collections.singletonList(panel.getCode()));
+        panelDao.incVersion(Collections.singletonList(panelCode));
         return parameterDao.update(parameter);
     }