From 1d87a607df201e027d65f1c2726729bb1b802ffd Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Fri, 17 Jan 2025 14:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=90=8D=E7=A7=B0=E5=8E=BB?=
 =?UTF-8?q?=E9=87=8D=E3=80=81=E8=AE=A1=E5=88=92=E5=80=92=E5=BA=8F=E6=8E=92?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gather/plan/pojo/enums/PlanResponseEnum.java     |  4 +++-
 .../java/com/njcn/gather/plan/pojo/vo/AdPlanVO.java  |  5 +++++
 .../gather/plan/service/impl/AdPlanServiceImpl.java  | 12 ++++++++++--
 .../script/service/impl/PqScriptDtlsServiceImpl.java | 12 +++++-------
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java b/detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java
index 4190741e..5353a260 100644
--- a/detection/src/main/java/com/njcn/gather/plan/pojo/enums/PlanResponseEnum.java
+++ b/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;
diff --git a/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanVO.java b/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanVO.java
index cb4cdaeb..d00897d4 100644
--- a/detection/src/main/java/com/njcn/gather/plan/pojo/vo/AdPlanVO.java
+++ b/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;
 }
diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
index 3aa5f98f..095037bc 100644
--- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java
+++ b/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);
-            map.put("code", dictTree.getCode());
-            map.put("scriptName", dictTree.getName());
+            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);
         });
 
diff --git a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java b/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java
index 7dde3659..51148063 100644
--- a/device/src/main/java/com/njcn/gather/device/script/service/impl/PqScriptDtlsServiceImpl.java
+++ b/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);
     }
 
@@ -125,7 +125,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
         if (voltSet.size() == 1 && currSet.size() == 1) {
             Double volt = voltSet.stream().collect(Collectors.toList()).stream().findFirst().get();
             Double curr = currSet.stream().collect(Collectors.toList()).stream().findFirst().get();
-            List<PqScriptDtls> pqScriptDtls = this.pqScriptDtls(param.getScriptId(), param.getIsPhaseSequence(), volt, curr,param.getIndexList());
+            List<PqScriptDtls> pqScriptDtls = this.pqScriptDtls(param.getScriptId(), param.getIsPhaseSequence(), volt, curr, param.getIndexList());
             Boolean isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId());
             if (CollUtil.isNotEmpty(pqScriptDtls)) {
                 /**
@@ -159,7 +159,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                         checkDataParam.setIndex(freqDtls.getIndex());
                         checkDataParam.setIsValueTypeName(true);
                         issue.setDevValueTypeList(pqScriptCheckDataService.getValueType(checkDataParam));
-                        issue.setDesc(ScriptDtlsDesc.getStringBuffer(value,isValueType).toString());
+                        issue.setDesc(ScriptDtlsDesc.getStringBuffer(value, isValueType).toString());
                         issue.setScriptId(freqDtls.getScriptId());
                         issue.setFUn(volt);
                         issue.setFIn(curr);
@@ -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<>();
@@ -216,7 +214,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
         return this.getBaseMapper().selectJoinList(PqScriptDtls.class, wrapper).stream().map(PqScriptDtls::getIndex).collect(Collectors.toList());
     }
 
-    public List<PqScriptDtls> pqScriptDtls(String scriptId, String isPhaseSequence, Double volt, Double curr,List<Integer> indexList) {
+    public List<PqScriptDtls> pqScriptDtls(String scriptId, String isPhaseSequence, Double volt, Double curr, List<Integer> indexList) {
         List<PqScriptDtls> pqScriptDtls;
         MPJLambdaWrapper<PqScriptDtls> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.selectAll(PqScriptDtls.class)
@@ -232,7 +230,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             queryWrapper.eq(PqScriptDtls::getIndex, -1)
                     .eq(PqScriptDtls::getEnable, 1);
             pqScriptDtls = this.list(queryWrapper);
-        }else if(isPhaseSequence.equals(CommonEnum.COEFFICIENT_TEST.getValue())){
+        } else if (isPhaseSequence.equals(CommonEnum.COEFFICIENT_TEST.getValue())) {
             //系数
             queryWrapper.in(PqScriptDtls::getIndex, indexList)
                     .eq(PqScriptDtls::getEnable, 1);