修改bug

pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/mysql/ROperatingMonitorMPO.java

@@ -38,17 +38,6 @@ public class ROperatingMonitorMPO {
     @TableField(value = "dev_id")
     private String devId;
 
-    /**
-     * 监测点状态（算法1）
-     */
-    @TableField(value = "monitor_state")
-    private String monitorState;
-
-    /**
-     * 有效接入分钟数
-     */
-    @TableField(value = "effective_minute_count")
-    private Long effectiveMinuteCount;
 
     /**
      * 数据完整率（算法2）

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java

@@ -116,7 +116,11 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
         Integer vThdCount = 0;
         Integer effectiveMinuteCount = 0;
 
-
+        PmsAbnormalRules freqLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_FREQ)).collect (Collectors.toList ( )).get (0);
+        PmsAbnormalRules rmsLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_RMS)).collect (Collectors.toList ( )).get (0);
+        PmsAbnormalRules rms_lvrLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_RMS_LVR)).collect (Collectors.toList ( )).get (0);
+        PmsAbnormalRules v_thdLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_V_THD)).collect (Collectors.toList ( )).get (0);
+        PmsAbnormalRules v_unbalanceLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_V_UNBALANCE)).collect (Collectors.toList ( )).get (0);
         for (DataVFiveItemDTO fiveItem : fiveItems) {
             Double freqMax = fiveItem.getFreqMax ();
             Double freqMin = fiveItem.getFreqMin ();
@@ -132,11 +136,7 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
             Double rmsLvrMin = fiveItem.getRmsLvrMin ();
 
 
-            PmsAbnormalRules freqLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_FREQ)).collect (Collectors.toList ( )).get (0);
+
-            PmsAbnormalRules rmsLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_RMS)).collect (Collectors.toList ( )).get (0);
-            PmsAbnormalRules rms_lvrLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_RMS_LVR)).collect (Collectors.toList ( )).get (0);
-            PmsAbnormalRules v_thdLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_V_THD)).collect (Collectors.toList ( )).get (0);
-            PmsAbnormalRules v_unbalanceLimit = pmsAbnormalRules.stream ( ).filter (temp -> Objects.equals (temp.getTarget ( ), Param.TARGET_V_UNBALANCE)).collect (Collectors.toList ( )).get (0);
             if(freqLimit.getLowerLimit ( ) <= freqMin&&freqMax <= freqLimit.getUpperLimit ( )){
                 freqCount++;
             }

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java

@@ -68,7 +68,7 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
             /*todo 统计间隔，电压等级取值方式,devid后期提供融合版本接口获取不然pms，pqs系统取值方式不一样*/
             /*统计间隔*/
             Integer statisticalInterval = data.getTimeInterval ();
-            String devid = "待获取";
+            String devid = lineFeignClient.getLineIdByDevId(temp).getData();
 
             RMpMonitorEvaluateDPO rMpMonitorEvaluateDPO = new RMpMonitorEvaluateDPO();
             rMpMonitorEvaluateDPO.setMeasurementPointId (temp);
@@ -108,7 +108,7 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
                     )
             );
             rOperatingMonitorDPO.setDevId (devid);
-            rOperatingMonitorDPO.setMonitorState ("待获取");
+            rOperatingMonitorDPO.setMonitorState (data.getRunFlag());
             rOperatingMonitorDPOList.add (rOperatingMonitorDPO);
         });
         this.saveOrUpdateBatchByMultiId (rOperatingMonitorDPOList,500);

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorMServiceImpl.java

@@ -1,6 +1,7 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.jeffreyning.mybatisplus.service.MppServiceImpl;
 import com.njcn.prepare.harmonic.mapper.mysql.line.ROperatingMonitorMMapper;
@@ -46,6 +47,10 @@ public class ROperatingMonitorMServiceImpl extends MppServiceImpl<ROperatingMoni
             queryWrapper.eq ("measurement_point_id", temp).
                     eq ("DATE_FORMAT( data_date ,'%Y-%m')", dataDate.substring (0, 7));
             List<ROperatingMonitorDPO> list = rOperatingMonitorService.list (queryWrapper);
+
+            if(CollectionUtils.isEmpty(list)) {
+                return;
+            }
             ROperatingMonitorMPO rOperatingMonitorMPO = new ROperatingMonitorMPO ( );
             BigDecimal dataIntegrityRate = BigDecimal.valueOf (
                     list.stream ( ).