河南郸城调度计划 修改接口更改部分验证逻辑

src/main/java/com/shkpr/service/aimodelpower/dbdao/services/WODispatchPlanDBServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -209,7 +210,7 @@ public class WODispatchPlanDBServiceImpl implements WODispatchPlanDBService,WODi
 
     //TODO 事务控制多对象添加
     @Override
-    @Transactional(transactionManager = "mainDbTransactionManager")
+    @Transactional(transactionManager = "mainDbTransactionManager",rollbackFor = Exception.class)
     public ResponseCode insertPlanInfoByCount(DispatchPlanInfoModel model, List<JPDispatchPlanInfoRuleSave> rulesList
             , List<JPDispatchPlanInfoTagsSave> tagsList, List<JPDispatchCmdBatchItem> itemsList) {
         woDispatchPlanMapper.inserts(FastJsonUtil.obj2Map(model,true));
@@ -235,7 +236,7 @@ public class WODispatchPlanDBServiceImpl implements WODispatchPlanDBService,WODi
             //添加相应的处置建议
             for (JPDispatchCmdBatchDispoal dispoal:jp.getDispoalList()) {
                 Map<String,Object> mapDispoal = FastJsonUtil.obj2Map(dispoal,true);
-                mapDispoal.put("key",CommTool.genPlanItemDispoalId());
+                mapDispoal.put("key",StringUtils.isEmpty(dispoal.getKey())?CommTool.genPlanItemDispoalId():dispoal.getKey());
                 mapDispoal.put("create_time",TimeTool.getCurMsUTC());
                 mapDispoal.put(WODispatchCmdPatchDisposalTable.W_INFO.BATCH_ITEM_ID,map.get(WODispatchCmdPatchItemTable.W_INFO.PRIMARY_KEY));
                 woDispatchCmdPatchDisposalMapper.inserts(mapDispoal);
@@ -247,7 +248,7 @@ public class WODispatchPlanDBServiceImpl implements WODispatchPlanDBService,WODi
 
 
     @Override
-    @Transactional(transactionManager = "mainDbTransactionManager")
+    @Transactional(transactionManager = "mainDbTransactionManager",rollbackFor = Exception.class)
     public ResponseCode updatePlanInfoByCount(JPDispatchPlanInfoUpdate model,Long nextTakeTime, List<JPDispatchPlanInfoRuleSave> rulesList, List<JPDispatchPlanInfoTagsSave> tagsList, List<JPDispatchCmdBatchItem> itemsList) {
         //TODO 修改计划
         Map<String,Object> andWhereUp = new HashMap<>();
@@ -307,7 +308,7 @@ public class WODispatchPlanDBServiceImpl implements WODispatchPlanDBService,WODi
                 //添加相应的处置建议
                 for (JPDispatchCmdBatchDispoal dispoal : jp.getDispoalList()) {
                     Map<String, Object> mapDispoal = FastJsonUtil.obj2Map(dispoal, true);
-                    mapDispoal.put("key", CommTool.genPlanItemDispoalId());
+                    mapDispoal.put("key", StringUtils.isEmpty(dispoal.getKey())?CommTool.genPlanItemDispoalId():dispoal.getKey());
                     mapDispoal.put("create_time", TimeTool.getCurMsUTC());
                     mapDispoal.put(WODispatchCmdPatchDisposalTable.W_INFO.BATCH_ITEM_ID, map.get(WODispatchCmdPatchItemTable.W_INFO.PRIMARY_KEY));
                     woDispatchCmdPatchDisposalMapper.inserts(mapDispoal);

src/main/java/com/shkpr/service/aimodelpower/jsonbean/woDispatchPlan/JPDispatchPlanInfoUpdate.java

@@ -48,9 +48,8 @@ public class JPDispatchPlanInfoUpdate {
     @IntInitOrRange(init = -1, groups = {CommonParamValidReset.class})
     private Integer planStatus = -1;//状态：-1--注销；0--停用；1--启用
 
-    @NotBlank(groups = { CommonParamValidReset.class})
-    @Size(min = 1,max = 255, groups = { CommonParamValidReset.class})
-    private String title;//计划标题
+    @StrNullOrSize(min = 1,max = 255,groups = {CommonParamValidReset.class})
+    private String title=null;//计划标题
 
     @IntInitOrRange(init = -1, groups = {CommonParamValidReset.class})
     private Integer urgentLevel=-1;//紧急程度（优先级）紧急级别：1 -- 一般；2 --重要；4 -- 紧急
@@ -65,15 +64,14 @@ public class JPDispatchPlanInfoUpdate {
                                     //*) >0则推迟触发
                                     //*) <0则提前触发
 
-    //TODO 创建人ID
+    //TODO 修改ID
     @NotBlank(groups = { CommonParamValidReset.class})
     @Size(min = 1,max = 255, groups = { CommonParamValidReset.class})
     private String updaterId;
 
     //TODO 监测分区id
-    @NotBlank(groups = { CommonParamValidReset.class})
-    @Size(min = 1,max = 255, groups = { CommonParamValidReset.class})
-    private String zoneId;
+    @StrNullOrSize(min = 1,max = 255,groups = {CommonParamValidReset.class})
+    private String zoneId=null;
 
     @IntInitOrRange(init = -1, groups = {CommonParamValidReset.class})
     private Integer sendway = -1;//派单提醒方式：1--app通知；2--短信通知；3--app&短信通知