区域暂态指标分类统计数据修改

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgPO.java

@@ -40,7 +40,7 @@ public class RStatEventOrgPO implements Serializable {
      * 日均有效接入监测点数
      */
     @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
-    private Integer effectiveMeasurementAverage;
+    private Double effectiveMeasurementAverage;
 
     /**
      * 累计有效接入监测点数
@@ -52,7 +52,7 @@ public class RStatEventOrgPO implements Serializable {
      * 日均监测到暂态指标的监测点数
      */
     @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
-    private Integer eventMeasurementAverage;
+    private Double eventMeasurementAverage;
 
     /**
      * 累计监测到暂态指标的监测点数
@@ -81,7 +81,7 @@ public class RStatEventOrgPO implements Serializable {
      * 日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)
      */
     @ApiModelProperty(name = "eEventMeasurementAverage", value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)")
-    private Integer eEventMeasurementAverage;
+    private Double eEventMeasurementAverage;
 
     /**
      * 累计发生暂态监测点数（监测点暂态指标超标明细日表

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/PwRStatEventOrgVO.java

@@ -47,7 +47,7 @@ public class PwRStatEventOrgVO implements Serializable {
      * 日均有效接入监测点数
      */
     @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
-    private Integer effectiveMeasurementAverage;
+    private Double effectiveMeasurementAverage;
 
     /**
      * 累计有效接入监测点数
@@ -59,7 +59,7 @@ public class PwRStatEventOrgVO implements Serializable {
      * 日均监测到暂态指标的监测点数
      */
     @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
-    private Integer eventMeasurementAverage;
+    private Double eventMeasurementAverage;
 
     /**
      * 累计监测到暂态指标的监测点数
@@ -94,7 +94,7 @@ public class PwRStatEventOrgVO implements Serializable {
      * 日均短时中断
      */
     @ApiModelProperty(name = "dayShortInterruptions", value = "日均短时中断")
-    private Integer dayShortInterruptions;
+    private Double dayShortInterruptions;
     /**
      * 累计短时中断
      */
@@ -128,7 +128,7 @@ public class PwRStatEventOrgVO implements Serializable {
      * 日均电压暂升
      */
     @ApiModelProperty(name = "dayVoltageRise", value = "日均电压暂升")
-    private Integer dayVoltageRise;
+    private Double dayVoltageRise;
     /**
      * 累计电压暂升
      */
@@ -163,7 +163,7 @@ public class PwRStatEventOrgVO implements Serializable {
      * 日均电压暂降
      */
     @ApiModelProperty(name = "dayVoltageDip", value = "日均电压暂降")
-    private Integer dayVoltageDip;
+    private Double dayVoltageDip;
     /**
      * 累计电压暂降
      */

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventOrgVO.java

@@ -51,7 +51,7 @@ public class RStatEventOrgVO implements Serializable {
      * 日均有效接入监测点数
      */
     @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
-    private Integer effectiveMeasurementAverage;
+    private Double effectiveMeasurementAverage;
 
     /**
      * 累计有效接入监测点数
@@ -63,7 +63,7 @@ public class RStatEventOrgVO implements Serializable {
      * 日均监测到暂态指标的监测点数
      */
     @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
-    private Integer eventMeasurementAverage;
+    private Double eventMeasurementAverage;
 
     /**
      * 累计监测到暂态指标的监测点数
@@ -87,7 +87,7 @@ public class RStatEventOrgVO implements Serializable {
      * 日均短时中断
      */
     @ApiModelProperty(name = "dayShortInterruptions", value = "日均短时中断")
-    private Integer dayShortInterruptions;
+    private Double dayShortInterruptions;
     /**
      * 累计短时中断
      */
@@ -109,7 +109,7 @@ public class RStatEventOrgVO implements Serializable {
      * 日均电压暂升
      */
     @ApiModelProperty(name = "dayVoltageRise", value = "日均电压暂升")
-    private Integer dayVoltageRise;
+    private Double dayVoltageRise;
     /**
      * 累计电压暂升
      */
@@ -131,7 +131,7 @@ public class RStatEventOrgVO implements Serializable {
      * 日均电压暂降
      */
     @ApiModelProperty(name = "dayVoltageDip", value = "日均电压暂降")
-    private Integer dayVoltageDip;
+    private Double dayVoltageDip;
     /**
      * 累计电压暂降
      */

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgClassifiedMapper.xml

@@ -43,7 +43,7 @@
         <include refid="query_field"></include>
         FROM
         r_stat_org_y AS rso
-        LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no
+        LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
         WHERE
         <include refid="query_where"></include>
     </select>
@@ -54,7 +54,7 @@
         <include refid="query_field"></include>
         FROM
         r_stat_org_q AS rso
-        LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no
+        LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
         WHERE
         <include refid="query_where"></include>
     </select>
@@ -65,7 +65,7 @@
         <include refid="query_field"></include>
         FROM
         r_stat_org_m AS rso
-        LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no
+        LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
         WHERE
         <include refid="query_where"></include>
     </select>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventOrgMapper.xml

@@ -47,7 +47,7 @@
         <include refid="query_rStatEventOrg_field"></include>
         FROM
         r_stat_org_y AS rso
-        LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no
+        LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
         WHERE
         <include refid="query_rStatEventOrg_where"></include>
     </select>
@@ -59,7 +59,7 @@
         <include refid="query_rStatEventOrg_field"></include>
         FROM
         r_stat_org_q AS rso
-        LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no
+        LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
         WHERE
         <include refid="query_rStatEventOrg_where"></include>
     </select>
@@ -71,7 +71,7 @@
         <include refid="query_rStatEventOrg_field"></include>
         FROM
         r_stat_org_m AS rso
-        LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no
+        LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no and rso.data_date = rseo.data_date
         WHERE
         <include refid="query_rStatEventOrg_where"></include>
     </select>

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java

@@ -114,11 +114,19 @@ public class RStatSubstationOrgVO implements Serializable {
      * 累计超标监测点数占比（此表的累计超标监测点数/区域统计表中的区域分类统计月表中的累计有效接入监测点数）
      */
     private Float overLimitMeasurementRatioAccrued;
-    //同比，环比，平均天数
+
+    //同比日均
     private Integer chainAverage;
+    //同比累计
     private Integer chainAccrued;
+
+    //环比日均
     private Integer sameAverage;
+    //环比累计
     private Integer sameAccrued;
+
+
+    //平均天数
     private Float   averageOverDay;
 
 

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

@@ -125,7 +125,6 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
         List<List<String>> pendingIds = ListUtils.partition(calculatedParam.getIdList(), 100);
         for (List<String> pendingId : pendingIds) {
             List<LineDTO> lineDTOList = commLineClient.getLineDetailBatch(pendingId).getData();
-            List<RMpMonitorEvaluateDPO> rMpMonitorEvaluateDPOS = new ArrayList<>();
             for (LineDTO lineDTO : lineDTOList) {
                 ROperatingMonitorDPO rOperatingMonitorDPO = new ROperatingMonitorDPO();