正式检测-左侧检测项、检测详情弹窗-表单内容

device/src/main/java/com/njcn/gather/device/pojo/constant/DevValidMessage.java

@@ -138,9 +138,9 @@ public interface DevValidMessage {
 
     String PQ_SOURCE_PARAMETER_VALUE_NOT_BLANK = "参数值不能为空，请检查pqSourceParameterValue参数";
 
-    String DEV_ID_NOT_BLANK = "所属设备ID不能为空";
+    String DEV_ID_NOT_BLANK = "设备ID不能为空";
 
-    String DEV_ID_FORMAT_ERROR = "所属设备ID格式错误";
+    String DEV_ID_FORMAT_ERROR = "设备ID格式错误";
 
     String BELONG_LINE_NOT_BLANK = "所属母线不能为空";
 

device/src/main/java/com/njcn/gather/device/script/pojo/po/PqScriptDtls.java

@@ -23,6 +23,7 @@ public class PqScriptDtls implements Serializable {
     /**
      * 检测脚本ID
      */
+    @TableField("Script_Id")
     private String scriptId;
 
     /**
@@ -34,6 +35,7 @@ public class PqScriptDtls implements Serializable {
     /**
      * 检测脚本类型
      */
+    @TableField("Script_Type")
     private String scriptType;
 
     /**
@@ -51,6 +53,7 @@ public class PqScriptDtls implements Serializable {
     /**
      * 表明指标类型（例如：VOL电压、CUR电流、Freq频率...）
      */
+    @TableField("Value_Type")
     private String valueType;
 
     /**

device/src/main/java/com/njcn/gather/device/script/service/IPqScriptDtlsService.java

@@ -55,8 +55,18 @@ public interface IPqScriptDtlsService extends IService<PqScriptDtls> {
 
     /**
      * 根据计划绑定检测脚本id获取全部检测脚本
+     *
      * @param param
      * @return
      */
     List<SourceIssue> listSourceIssue(PqScriptIssueParam param);
+
+    /**
+     * 根据脚本类型、脚本id获取index列表
+     *
+     * @param scriptType 脚本类型
+     * @param scriptId   脚本id
+     * @return index列表
+     */
+    List<Integer> getIndexList(String scriptType, String scriptId);
 }

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

@@ -197,6 +197,16 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
         return sourceIssues;
     }
 
+    @Override
+    public List<Integer> getIndexList(String scriptType, String scriptId) {
+        MPJLambdaWrapper<PqScriptDtls> wrapper = new MPJLambdaWrapper<>();
+        wrapper.select(PqScriptDtls::getIndex)
+                .distinct()
+                .eq(PqScriptDtls::getScriptType, scriptType)
+                .eq(PqScriptDtls::getScriptId, scriptId);
+        return this.getBaseMapper().selectJoinList(PqScriptDtls.class, wrapper).stream().map(PqScriptDtls::getIndex).collect(Collectors.toList());
+    }
+
     private List<PqScriptDtls> pqScriptDtls(String scriptId, Boolean isPhaseSequence, Double volt, Double curr) {
         List<PqScriptDtls> pqScriptDtls;
         MPJLambdaWrapper<PqScriptDtls> queryWrapper = new MPJLambdaWrapper<>();