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

1.算法bug修改，部分占比*100，计算展示

Browse Source 
2.pmsbug解决
3.增加根据字典类型code和字典数据code接口
This commit is contained in:
wr
2024-02-26 18:08:09 +08:00
parent 5577757d2e
commit c682b7f198
34 changed files with 244 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java
View File

@@ -1,5 +1,6 @@
package com.njcn.event.pojo.po;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -58,5 +59,11 @@ public class RStatEventOrgM implements Serializable {
@ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）")
private String dataType;
public void setEventMeasurementRatioAverage(Float eventMeasurementRatioAverage) {
this.eventMeasurementRatioAverage = NumberUtil.round(eventMeasurementRatioAverage*100,2).floatValue();;
}
public void setEventMeasurementRatioAccrued(Float eventMeasurementRatioAccrued) {
this.eventMeasurementRatioAccrued = NumberUtil.round(eventMeasurementRatioAccrued*100,2).floatValue();;
}
}

7
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java
View File

@@ -1,5 +1,6 @@
package com.njcn.event.pojo.po;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
@@ -57,5 +58,11 @@ public class RStatEventOrgQ implements Serializable {
@ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）")
private String dataType;
public void setEventMeasurementRatioAverage(Float eventMeasurementRatioAverage) {
this.eventMeasurementRatioAverage = NumberUtil.round(eventMeasurementRatioAverage*100,2).floatValue();;
}
public void setEventMeasurementRatioAccrued(Float eventMeasurementRatioAccrued) {
this.eventMeasurementRatioAccrued = NumberUtil.round(eventMeasurementRatioAccrued*100,2).floatValue();;
}
}

8
pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java
View File

@@ -1,5 +1,6 @@
package com.njcn.event.pojo.po;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
@@ -57,5 +58,12 @@ public class RStatEventOrgY implements Serializable {
@ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）")
private String dataType;
public void setEventMeasurementRatioAverage(Float eventMeasurementRatioAverage) {
this.eventMeasurementRatioAverage = NumberUtil.round(eventMeasurementRatioAverage*100,2).floatValue();;
}
public void setEventMeasurementRatioAccrued(Float eventMeasurementRatioAccrued) {
this.eventMeasurementRatioAccrued = NumberUtil.round(eventMeasurementRatioAccrued*100,2).floatValue();;
}
}

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

@@ -20,12 +20,12 @@
SELECT
measurement_type_class,
event_type,
sum(event_measurement_average)/count(*) as eventMeasurementAverage ,
ROUND( sum(event_measurement_average)/count(*),2) as eventMeasurementAverage ,
sum(event_measurement_accrued) as eventMeasurementAccrued,
sum(event_freq)/count(*) as eventFreq,
ROUND( sum(event_freq)/count(*),2)as eventFreq,
sum(event_count) as eventCount,
sum(event_measurement_ratio_average)/count(*) as eventMeasurementRatioAverage,
sum(event_measurement_ratio_accrued) as eventMeasurementRatioAccrued
ROUND( sum(event_measurement_ratio_average)*100/count(*),2) as eventMeasurementRatioAverage,
ROUND( sum(event_measurement_ratio_accrued)*100,2) as eventMeasurementRatioAccrued
FROM
r_stat_event_m
<where>

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

@@ -20,12 +20,12 @@
SELECT
measurement_type_class,
event_type,
sum(event_measurement_average)/count(*) as eventMeasurementAverage ,
ROUND( sum(event_measurement_average)/count(*),2) as eventMeasurementAverage ,
sum(event_measurement_accrued) as eventMeasurementAccrued,
sum(event_freq)/count(*) as eventFreq,
ROUND( sum(event_freq)/count(*),2) as eventFreq,
sum(event_count) as eventCount,
sum(event_measurement_ratio_average)/count(*) as eventMeasurementRatioAverage,
sum(event_measurement_ratio_accrued) as eventMeasurementRatioAccrued
ROUND( sum(event_measurement_ratio_average)*100/count(*),2) as eventMeasurementRatioAverage,
ROUND( sum(event_measurement_ratio_accrued)*100,2) as eventMeasurementRatioAccrued
FROM
r_stat_event_q
<where>

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

@@ -20,12 +20,12 @@
SELECT
measurement_type_class,
event_type,
sum(event_measurement_average)/count(*) as eventMeasurementAverage ,
ROUND( sum(event_measurement_average)/count(*),2) as eventMeasurementAverage ,
sum(event_measurement_accrued) as eventMeasurementAccrued,
sum(event_freq)/count(*) as eventFreq,
ROUND( sum(event_freq)/count(*),2) as eventFreq,
sum(event_count) as eventCount,
sum(event_measurement_ratio_average)/count(*) as eventMeasurementRatioAverage,
sum(event_measurement_ratio_accrued) as eventMeasurementRatioAccrued
ROUND( sum(event_measurement_ratio_average)*100/count(*),2) as eventMeasurementRatioAverage,
ROUND( sum(event_measurement_ratio_accrued)*100,2) as eventMeasurementRatioAccrued
FROM
r_stat_event_y
<where>