计划名称去重、计划倒序排列

detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java

@@ -8,7 +8,9 @@ import lombok.Getter;
  */
 @Getter
 public enum PlanResponseEnum {
-    PLAN_REPEATED("A003014", "当前模式下，该计划已存在");
+    PLAN_REPEATED("A003014", "当前模式下，该计划已存在"),
+    PLAN_NOT_EXIST("A003015", "该计划不存在"),
+    SCRIPT_RELATE_DICT_NOT_EXIST("A003016","脚本关联的字典不存在");
 
     private final String message;
     private final String code;

detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanVO.java

@@ -92,4 +92,9 @@ public class AdPlanVO {
      * 自动生成，用于生成数据表后缀
      */
     private Integer code;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
 }

detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java

@@ -73,6 +73,7 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
         List<AdPlanVO> adPlanVOList = adPlans.stream().map(adPlan -> {
             AdPlanVO adPlanVO = new AdPlanVO();
             BeanUtil.copyProperties(adPlan, adPlanVO);
+            adPlanVO.setCreateTime(adPlanVO.getCreateTime().replace("T", " "));
             adPlanVO.setDatasourceIds(Arrays.asList(adPlan.getDatasourceId().split(StrUtil.COMMA)));
             return adPlanVO;
         }).collect(Collectors.toList());
@@ -320,6 +321,9 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
     public List<Map<String, String>> getBigTestItem(String planId) {
         List<Map<String, String>> result = new ArrayList<>();
         AdPlan adPlan = this.getById(planId);
+        if (ObjectUtil.isNull(adPlan)) {
+            throw new BusinessException(PlanResponseEnum.PLAN_NOT_EXIST);
+        }
         String scriptId = adPlan.getScriptId();
 
         List<PqScriptDtls> scriptDtlsList = pqScriptDtlsService.listPqScriptDtlByScriptId(scriptId);
@@ -332,8 +336,12 @@ public class AdPlanServiceImpl extends ServiceImpl<AdPlanMapper, AdPlan> impleme
             Map<String, String> map = new HashMap<>();
             map.put("id", key);
             DictTree dictTree = dictTreeService.getById(key);
+            if(ObjectUtil.isNotNull(dictTree)){
                 map.put("code", dictTree.getCode());
                 map.put("scriptName", dictTree.getName());
+            }else{
+                throw new BusinessException(PlanResponseEnum.SCRIPT_RELATE_DICT_NOT_EXIST);
+            }
             result.add(map);
         });
 

device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java

@@ -105,7 +105,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
         queryWrapper.selectAll(PqScriptDtls.class)
                 .leftJoin(PqScript.class, PqScript::getId, PqScriptDtls::getScriptId)
                 .eq(PqScript::getState, DataStateEnum.ENABLE.getCode())
-                .eq(PqScriptDtls::getScriptId, scriptId);
+                .eq(StrUtil.isNotBlank(scriptId), PqScriptDtls::getScriptId, scriptId);
         return this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper);
     }
 
@@ -204,8 +204,6 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
     }
 
 
-
-
     @Override
     public List<Integer> getIndexList(String scriptType, String scriptId) {
         MPJLambdaWrapper<PqScriptDtls> wrapper = new MPJLambdaWrapper<>();