diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatOrgVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatOrgVO.java
index 4acb6175a..d49d1de7d 100644
--- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatOrgVO.java
+++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatOrgVO.java
@@ -1,5 +1,6 @@
package com.njcn.event.pojo.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -49,11 +50,17 @@ public class RStatOrgVO implements Serializable {
@ApiModelProperty(name = "dataDate", value = "生成数据的时间")
private Date dataDate;
+ /**
+ * 总监测点数
+ */
+ @TableField(value = "all_count")
+ private Integer allCount;
+
/**
* 日均有效接入监测点数
*/
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
- private Integer effectiveMeasurementAverage;
+ private Double effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -65,7 +72,7 @@ public class RStatOrgVO implements Serializable {
* 日均监测到暂态指标的监测点数
*/
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
- private Integer eventMeasurementAverage;
+ private Double eventMeasurementAverage;
/**
* 累计监测到暂态指标的监测点数
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatOrgMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatOrgMapper.xml
index 0143ac671..7989b7fba 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatOrgMapper.xml
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatOrgMapper.xml
@@ -4,14 +4,15 @@
org_no AS orgNo,
- data_date AS dataDate,
- effective_measurement_average AS effectiveMeasurementAverage,
- effective_measurement_accrued AS effectiveMeasurementAccrued,
- event_measurement_average AS eventMeasurementAverage,
- event_measurement_accrued AS eventMeasurementAccrued,
- event_count AS eventCount,
- event_freq AS eventFreq,
- data_type AS dataType
+
+ sum(all_count) AS allCount,
+ sum(effective_measurement_average) AS effectiveMeasurementAverage,
+ sum(effective_measurement_accrued) AS effectiveMeasurementAccrued,
+ sum(event_measurement_average) AS eventMeasurementAverage,
+ sum(event_measurement_accrued) AS eventMeasurementAccrued,
+ sum(event_count) AS eventCount,
+ sum(event_freq) AS eventFreq
+
data_type = #{mainnetPointId}
@@ -56,6 +57,7 @@
r_stat_org_m
WHERE
+ group by orgNo
\ No newline at end of file
diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java
index 4bf8ea911..5a552eba2 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java
@@ -110,13 +110,13 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
for (RStatOrgVO rStatOrgVO : result) {
if(rStatOrgVO.getEventMeasurementAverage()!=0&&rStatOrgVO.getEffectiveMeasurementAverage()!=0){
rStatOrgVO.setEventMeasurementRatioAverage(String.valueOf(Double.parseDouble(
- df.format(((rStatOrgVO.getEventMeasurementAverage() * 1.0) / (rStatOrgVO.getEffectiveMeasurementAverage() * 1.0)) * 100))));
+ df.format(((rStatOrgVO.getEventMeasurementAverage() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100))));
}else{
rStatOrgVO.setEventMeasurementRatioAverage("0");
}
if(rStatOrgVO.getEventMeasurementAccrued()!=0&&rStatOrgVO.getEffectiveMeasurementAccrued()!=0){
rStatOrgVO.setEventMeasurementRatioAccrued(String.valueOf(Double.parseDouble(
- df.format(((rStatOrgVO.getEventMeasurementAccrued() * 1.0) / (rStatOrgVO.getEffectiveMeasurementAccrued() * 1.0)) * 100))));
+ df.format(((rStatOrgVO.getEventMeasurementAccrued() * 1.0) / (rStatOrgVO.getAllCount() * 1.0)) * 100))));
}else{
rStatOrgVO.setEventMeasurementRatioAccrued("0");
}