Эх сурвалжийг харах

increase Panel's version when saving Kanban

sunyj 8 жил өмнө
parent
commit
2f87bd787f

+ 8 - 5
kanban-console/src/main/java/com/uas/kanban/service/impl/KanbanServiceImpl.java

@@ -1,6 +1,5 @@
 package com.uas.kanban.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.uas.kanban.annotation.NotEmpty;
 import com.uas.kanban.base.BaseService;
 import com.uas.kanban.dao.KanbanDao;
@@ -36,7 +35,9 @@ public class KanbanServiceImpl extends BaseService<Kanban> implements KanbanServ
     @Override
     public Kanban save(@NotEmpty("json") String json) {
         // TODO update related Panel and PanelInstance
-        panelDao.checkExist(kanbanDao.parse(json).getPanelCode());
+        String panelCode = kanbanDao.parse(json).getPanelCode();
+        panelDao.checkExist(panelCode);
+        panelDao.incVersion(Collections.singletonList(panelCode));
         // 新增时,默认不启用,因此不更新面板的版本
         return super.save(json);
     }
@@ -44,7 +45,9 @@ public class KanbanServiceImpl extends BaseService<Kanban> implements KanbanServ
     @Override
     public Kanban savePart(@NotEmpty("json") String json) {
         // TODO update related Panel and PanelInstance
-        panelDao.checkExist(kanbanDao.parse(json).getPanelCode());
+        String panelCode = kanbanDao.parse(json).getPanelCode();
+        panelDao.checkExist(panelCode);
+        panelDao.incVersion(Collections.singletonList(panelCode));
         // 新增时,默认不启用,因此不更新面板的版本
         return super.savePart(json);
     }
@@ -52,7 +55,7 @@ public class KanbanServiceImpl extends BaseService<Kanban> implements KanbanServ
     @Override
     public int update(@NotEmpty("json") String json) throws IllegalArgumentException, OperationException {
         // TODO update related Panel and PanelInstance (old and new)
-        Kanban kanban = JSONObject.parseObject(json, Kanban.class);
+        Kanban kanban = kanbanDao.parse(json);
         processPanel(kanban);
         kanbanHistoryService.backup(kanban.codeNotEmpty(), null, true);
         return super.update(json);
@@ -61,7 +64,7 @@ public class KanbanServiceImpl extends BaseService<Kanban> implements KanbanServ
     @Override
     public int updatePart(@NotEmpty("json") String json) throws IllegalArgumentException, OperationException {
         // TODO update related Panel and PanelInstance (old and new)
-        Kanban kanban = JSONObject.parseObject(json, Kanban.class);
+        Kanban kanban = kanbanDao.parse(json);
         processPanel(kanban);
         kanbanHistoryService.backup(kanban.codeNotEmpty(), null, true);
         return super.updatePart(json);