|
@@ -1,6 +1,5 @@
|
|
|
package com.uas.kanban.service.impl;
|
|
package com.uas.kanban.service.impl;
|
|
|
|
|
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
|
|
import com.uas.kanban.annotation.NotEmpty;
|
|
import com.uas.kanban.annotation.NotEmpty;
|
|
|
import com.uas.kanban.base.BaseService;
|
|
import com.uas.kanban.base.BaseService;
|
|
|
import com.uas.kanban.dao.KanbanDao;
|
|
import com.uas.kanban.dao.KanbanDao;
|
|
@@ -36,7 +35,9 @@ public class KanbanServiceImpl extends BaseService<Kanban> implements KanbanServ
|
|
|
@Override
|
|
@Override
|
|
|
public Kanban save(@NotEmpty("json") String json) {
|
|
public Kanban save(@NotEmpty("json") String json) {
|
|
|
// TODO update related Panel and PanelInstance
|
|
// 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);
|
|
return super.save(json);
|
|
|
}
|
|
}
|
|
@@ -44,7 +45,9 @@ public class KanbanServiceImpl extends BaseService<Kanban> implements KanbanServ
|
|
|
@Override
|
|
@Override
|
|
|
public Kanban savePart(@NotEmpty("json") String json) {
|
|
public Kanban savePart(@NotEmpty("json") String json) {
|
|
|
// TODO update related Panel and PanelInstance
|
|
// 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);
|
|
return super.savePart(json);
|
|
|
}
|
|
}
|
|
@@ -52,7 +55,7 @@ public class KanbanServiceImpl extends BaseService<Kanban> implements KanbanServ
|
|
|
@Override
|
|
@Override
|
|
|
public int update(@NotEmpty("json") String json) throws IllegalArgumentException, OperationException {
|
|
public int update(@NotEmpty("json") String json) throws IllegalArgumentException, OperationException {
|
|
|
// TODO update related Panel and PanelInstance (old and new)
|
|
// TODO update related Panel and PanelInstance (old and new)
|
|
|
- Kanban kanban = JSONObject.parseObject(json, Kanban.class);
|
|
|
|
|
|
|
+ Kanban kanban = kanbanDao.parse(json);
|
|
|
processPanel(kanban);
|
|
processPanel(kanban);
|
|
|
kanbanHistoryService.backup(kanban.codeNotEmpty(), null, true);
|
|
kanbanHistoryService.backup(kanban.codeNotEmpty(), null, true);
|
|
|
return super.update(json);
|
|
return super.update(json);
|
|
@@ -61,7 +64,7 @@ public class KanbanServiceImpl extends BaseService<Kanban> implements KanbanServ
|
|
|
@Override
|
|
@Override
|
|
|
public int updatePart(@NotEmpty("json") String json) throws IllegalArgumentException, OperationException {
|
|
public int updatePart(@NotEmpty("json") String json) throws IllegalArgumentException, OperationException {
|
|
|
// TODO update related Panel and PanelInstance (old and new)
|
|
// TODO update related Panel and PanelInstance (old and new)
|
|
|
- Kanban kanban = JSONObject.parseObject(json, Kanban.class);
|
|
|
|
|
|
|
+ Kanban kanban = kanbanDao.parse(json);
|
|
|
processPanel(kanban);
|
|
processPanel(kanban);
|
|
|
kanbanHistoryService.backup(kanban.codeNotEmpty(), null, true);
|
|
kanbanHistoryService.backup(kanban.codeNotEmpty(), null, true);
|
|
|
return super.updatePart(json);
|
|
return super.updatePart(json);
|