长时闪变越限兼容判断

algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java

@@ -123,7 +123,7 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
          */
         Map<String, List<DataHarmDto>> harmRateV = dataVHarmList.stream()
                 .filter(x -> phase.contains(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType()))
+                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
                 .collect(Collectors.groupingBy(DataHarmDto::getLineId));
 
         /**
@@ -131,7 +131,7 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
          */
         Map<String, List<DataIDto>> dataI = dataIList.stream()
                 .filter(x -> phase.contains(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType()))
+                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
                 .collect(Collectors.groupingBy(DataIDto::getLineId));
 
 
@@ -140,7 +140,7 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
          */
         Map<String, List<DataHarmDto>> inHarmV = dataVInHarmList.stream()
                 .filter(x -> phase.contains(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType()))
+                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
                 .collect(Collectors.groupingBy(DataHarmDto::getLineId));
 
         /**
@@ -148,49 +148,57 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
          */
         Map<String, List<DataVDto>> dataVThd = dataVAllTime.stream()
                 .filter(x -> phase.contains(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType()))
+                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()))
                 .collect(Collectors.groupingBy(DataVDto::getLineId));
 
         /**
          * 功能描述:获取influxDB -> data_v -> 负序电压不平衡度 -> 最大值 && 日95%概率值
          */
         Map<String, List<DataVDto>> dataVUnbalance = dataVAllTime.stream()
-                .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equals(x.getPhasicType()))
+                .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType()) ||
+                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()) ||
-                        InfluxDBTableConstant.MAX.equals(x.getValueType()))
+                        InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
                 .collect(Collectors.groupingBy(DataVDto::getLineId));
 
         /**
          * 功能描述:获取influxDB -> data_i -> 负序电流 -> 最大值 && 日95%概率值
          */
         Map<String, List<DataIDto>> dataINeg = dataIList.stream()
-                .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equals(x.getPhasicType()))
+                .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType()) ||
+                .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()) ||
-                        InfluxDBTableConstant.MAX.equals(x.getValueType()))
+                        InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
                 .collect(Collectors.groupingBy(DataIDto::getLineId));
 
         /**
          * 功能描述:获取influxDB -> data_v -> 频率偏差 -> 最大值 && 最小值
          */
         Map<String, List<DataVDto>> dataVFreq = dataVAllTime.stream()
-                .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equals(x.getPhasicType()))
+                .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.MIN.equals(x.getValueType()) ||
+                .filter(x -> InfluxDBTableConstant.MIN.equalsIgnoreCase(x.getValueType()) ||
-                        InfluxDBTableConstant.MAX.equals(x.getValueType()))
+                        InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
                 .collect(Collectors.groupingBy(DataVDto::getLineId));
         /**
          * 功能描述:获取influxDB -> data_v -> 电压偏差 -> 最大值
          */
         Map<String, List<DataVDto>> dataVDev = dataVAllTime.stream()
                 .filter(x -> phase.contains(x.getPhasicType()))
-                .filter(x -> InfluxDBTableConstant.MAX.equals(x.getValueType()))
+                .filter(x -> InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
                 .collect(Collectors.groupingBy(DataVDto::getLineId));
 
         /**
          * 功能描述:获取influxDB -> data_plt -> 长时间闪变 -> 注(取最大值原始算法去掉了，现没有根据最大值比较)
          */
-        Map<String, List<DataPltDto>> dataPlt = dataPltAllTime.stream()
+        Map<String, List<DataPltDto>> dataPlt;
-                .filter(x -> phase.contains(x.getPhasicType()))
+        if (type == 2) {
-                .collect(Collectors.groupingBy(DataPltDto::getLineId));
+            dataPlt = dataPltAllTime.stream()
+                    .filter(x -> phase.contains(x.getPhasicType()))
+                    .filter(x -> InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType()))
+                    .collect(Collectors.groupingBy(DataPltDto::getLineId));
+        } else {
+            dataPlt = dataPltAllTime.stream()
+                    .filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType()))
+                    .collect(Collectors.groupingBy(DataPltDto::getLineId));
+        }
 
         for (String item : list) {
             if (ObjectUtil.isNotNull(overLimitMap.get(item))) {

data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/dto/PqsCommunicateDto.java

@@ -18,6 +18,8 @@ public class PqsCommunicateDto {
     private String description;
 
     private Integer type;
+    //是否更新updateTime标志；数据上送更新1，状态翻转不更新0
+    private Integer flag=0;
 
 
 }

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/LnDataDealServiceImpl.java

@@ -97,7 +97,7 @@ public class LnDataDealServiceImpl implements LnDataDealService {
                 pqsCommunicateDto.setTime(LocalDateTimeUtil.format(dataVDTO.getTimeid(), DatePattern.NORM_DATETIME_PATTERN));
                 pqsCommunicateDto.setDevId(temp);
                 pqsCommunicateDto.setType(1);
-
+                pqsCommunicateDto.setFlag(1);
 
                 iPqsCommunicate.insertion(pqsCommunicateDto);
             });

data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbPqsCommunicateImpl.java

@@ -129,7 +129,9 @@ public class InfluxdbPqsCommunicateImpl implements IPqsCommunicate {
         //更新mysql数据
         DevComFlagDTO devComFlagDTO = new DevComFlagDTO();
         devComFlagDTO.setId(pqsCommunicateDto.getDevId());
-        devComFlagDTO.setDate(LocalDateTime.parse(pqsCommunicateDto.getTime(), DATE_TIME_FORMATTER));
+        if(Objects.equals(pqsCommunicateDto.getFlag(),1)){
+            devComFlagDTO.setDate(LocalDateTime.parse(pqsCommunicateDto.getTime(), DATE_TIME_FORMATTER));
+        }
         devComFlagDTO.setStatus(pqsCommunicateDto.getType());
 
         deviceFeignClient.updateDevComFlag(devComFlagDTO);