Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

暂态指标bug修改

Browse Source
This commit is contained in:
hzj
2023-12-15 14:49:28 +08:00
parent c08e745286
commit a1b669264a
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatOrgVO.java
View File

@@ -1,5 +1,6 @@
package com.njcn.event.pojo.vo; package com.njcn.event.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@@ -49,11 +50,17 @@ public class RStatOrgVO implements Serializable {
@ApiModelProperty(name = "dataDate", value = "生成数据的时间") @ApiModelProperty(name = "dataDate", value = "生成数据的时间")
private Date dataDate; private Date dataDate;
/**
* 总监测点数
*/
@TableField(value = "all_count")
private Integer allCount;
/** /**
* 日均有效接入监测点数 * 日均有效接入监测点数
*/ */
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数") @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage; private Double effectiveMeasurementAverage;
/** /**
* 累计有效接入监测点数 * 累计有效接入监测点数
@@ -65,7 +72,7 @@ public class RStatOrgVO implements Serializable {
* 日均监测到暂态指标的监测点数 * 日均监测到暂态指标的监测点数
*/ */
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数") @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage; private Double eventMeasurementAverage;
/** /**
* 累计监测到暂态指标的监测点数 * 累计监测到暂态指标的监测点数

18
pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatOrgMapper.xml
View File

@@ -4,14 +4,15 @@
<sql id="query_field"> <sql id="query_field">
org_no AS orgNo, org_no AS orgNo,
data_date AS dataDate, <!-- data_date AS dataDate,-->
effective_measurement_average AS effectiveMeasurementAverage, sum(all_count) AS allCount,
effective_measurement_accrued AS effectiveMeasurementAccrued, sum(effective_measurement_average) AS effectiveMeasurementAverage,
event_measurement_average AS eventMeasurementAverage, sum(effective_measurement_accrued) AS effectiveMeasurementAccrued,
event_measurement_accrued AS eventMeasurementAccrued, sum(event_measurement_average) AS eventMeasurementAverage,
event_count AS eventCount, sum(event_measurement_accrued) AS eventMeasurementAccrued,
event_freq AS eventFreq, sum(event_count) AS eventCount,
data_type AS dataType sum(event_freq) AS eventFreq
<!-- ,data_type AS dataType-->
</sql> </sql>
<sql id="query_where"> <sql id="query_where">
data_type = #{mainnetPointId} data_type = #{mainnetPointId}
@@ -56,6 +57,7 @@
r_stat_org_m r_stat_org_m
WHERE WHERE
<include refid="query_where"></include> <include refid="query_where"></include>
group by orgNo
</select> </select>
</mapper> </mapper>

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/StatisticsOfTransientIndicatorssServiceImpl.java
View File

@@ -110,13 +110,13 @@ public class StatisticsOfTransientIndicatorssServiceImpl implements StatisticsOf
for (RStatOrgVO rStatOrgVO : result) { for (RStatOrgVO rStatOrgVO : result) {
if(rStatOrgVO.getEventMeasurementAverage()!=0&&rStatOrgVO.getEffectiveMeasurementAverage()!=0){ if(rStatOrgVO.getEventMeasurementAverage()!=0&&rStatOrgVO.getEffectiveMeasurementAverage()!=0){
rStatOrgVO.setEventMeasurementRatioAverage(String.valueOf(Double.parseDouble( 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{ }else{
rStatOrgVO.setEventMeasurementRatioAverage("0"); rStatOrgVO.setEventMeasurementRatioAverage("0");
} }
if(rStatOrgVO.getEventMeasurementAccrued()!=0&&rStatOrgVO.getEffectiveMeasurementAccrued()!=0){ if(rStatOrgVO.getEventMeasurementAccrued()!=0&&rStatOrgVO.getEffectiveMeasurementAccrued()!=0){
rStatOrgVO.setEventMeasurementRatioAccrued(String.valueOf(Double.parseDouble( 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{ }else{
rStatOrgVO.setEventMeasurementRatioAccrued("0"); rStatOrgVO.setEventMeasurementRatioAccrued("0");
} }