1.正式检测-检测树

device/src/main/java/com/njcn/gather/device/err/service/impl/PqErrSysDtlsServiceImpl.java

@@ -78,6 +78,7 @@ public class PqErrSysDtlsServiceImpl extends ServiceImpl<PqErrSysDtlsMapper, PqE
         List<String> valueType = pqScriptCheckDataService.getValueType(script);
         //根据检测脚本id和检测序号，查询出检测子项目
         return this.list(new MPJLambdaWrapper<PqErrSysDtls>()
+                .selectAll(PqErrSysDtls.class)
                 .selectAs(DictTree::getCode, PqErrSysDtls::getScriptCode)
                 .leftJoin(DictTree.class, DictTree::getId, PqErrSysDtls::getScriptType)
                 .eq(PqErrSysDtls::getErrorSysId, param.getErrorSysId())

device/src/main/java/com/njcn/gather/device/script/mapper/PqScriptMapper.java

@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Param;
 public interface PqScriptMapper extends MPJBaseMapper<PqScript> {
 
     /**
-     * 获取检测脚本信息
+     * 获取检测脚本信息(先获取检测脚本类型是否相对值  true相对值 false绝对值（相对值要乘额定值,绝对值不需要处理))
      * @param scriptId
      * @return: com.njcn.gather.device.script.pojo.po.PqScript
      * @Author: wr

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

@@ -178,9 +178,7 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
                                 .collect(Collectors.toList());
                         //谐波电流,间谐波电流
                         List<PqScriptDtls> dtlsIList = value.stream().filter(x -> HARM_I.equals(x.getValueType()) ||
-                                        INHARM_I.equals(x.getValueType()) ||
-                                        DIP.equals(x.getValueType()) ||
-                                        FLICKER.equals(x.getValueType())
+                                        INHARM_I.equals(x.getValueType())
                                 )
                                 .sorted(Comparator.comparing(PqScriptDtls::getPhase))
                                 .collect(Collectors.toList());