河南郸城调度计划列表 修改UID生成方法

src/main/java/com/shkpr/service/aimodelpower/bizmgr/WODispatchPlanTmDoBizFun.java

@@ -250,7 +250,7 @@ public class WODispatchPlanTmDoBizFun {
         try{
             //TODO 根据计划类型计算计划的下次生效时间
             DispatchPlanInfoModel model = new DispatchPlanInfoModel();
-            model.setPlanId("PL"+ UUID.randomUUID());
+            model.setPlanId(CommTool.genPlanInfoId());
             model.setPlanType(oJsonParam.getPlanType());
             model.setPlanStatus(oJsonParam.getPlanStatus());
             model.setTitle(oJsonParam.getTitle());

src/main/java/com/shkpr/service/aimodelpower/commtools/CommTool.java

@@ -139,6 +139,16 @@ public class CommTool {
         return (new StringBuilder("PEQ")).append(SnowFlakeEx.getInstance().nextHexStrId(4)).toString();
     }
 
+    public static String genPlanInfoId(){
+        return (new StringBuilder("PLP")).append(SnowFlakeEx.getInstance().nextHexStrId(2)).toString();
+    }
+    public static String genPlanItemId(){
+        return (new StringBuilder("PLI")).append(SnowFlakeEx.getInstance().nextHexStrId(4)).toString();
+    }
+    public static String genPlanItemDispoalId(){
+        return (new StringBuilder("PLD")).append(SnowFlakeEx.getInstance().nextHexStrId(4)).toString();
+    }
+
     public static String genPatrolItemTypeId(String puid){
         return String.format("%s%s%s"
                 ,puid

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

@@ -207,14 +207,14 @@ public class WODispatchPlanDBServiceImpl implements WODispatchPlanDBService,WODi
         }
         for (JPDispatchCmdBatchItem jp:itemsList){
             Map<String,Object> map = FastJsonUtil.obj2Map(jp,true);
-            map.put(WODispatchCmdPatchItemTable.W_INFO.PRIMARY_KEY, "PLITEM"+UUID.randomUUID());
+            map.put(WODispatchCmdPatchItemTable.W_INFO.PRIMARY_KEY, CommTool.genPlanItemId());
             map.put(WODispatchCmdPatchItemTable.W_INFO.PLAN_ID, model.getPlanId());
             map.put(WODispatchCmdPatchItemTable.W_INFO.CREATE_TIME,TimeTool.getCurMsUTC());
             map.remove("dispoal_list");
             //添加相应的处置建议
             for (JPDispatchCmdBatchDispoal dispoal:jp.getDispoalList()) {
                 Map<String,Object> mapDispoal = FastJsonUtil.obj2Map(dispoal,true);
-                mapDispoal.put("key","PLITEMDIS"+UUID.randomUUID());
+                mapDispoal.put("key",CommTool.genPlanItemDispoalId());
                 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/JPDispatchPlanInfoSave.java

@@ -118,6 +118,11 @@ public class JPDispatchPlanInfoSave {
                     (planType != 0 && planType != 1 && planType != 2 && planType != 3 && planType != 4)) {
                 return false;
             }
+            if(!CollectionUtils.isEmpty(itemsList)){
+                if(StringUtils.isEmpty(itemsList)){
+                    return false;
+                }
+            }
             if (!StringUtils.isEmpty(casualValue)) {
                 //TODO 检查参数是否符合规格
                 if (planType == 0) {