diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java index 1f3872335..7bf7da3ca 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java @@ -39,7 +39,7 @@ public class RStatAreaAlarmCountM implements Serializable { /** * 电压偏差告警超标占比 */ - private Integer vdevAlarmRatio; + private Double vdevAlarmRatio; /** * 频率偏差告警情况(0:否 1:是) @@ -49,7 +49,7 @@ public class RStatAreaAlarmCountM implements Serializable { /** * 频率偏差告警超标占比 */ - private Integer freqAlarmRatio; + private Double freqAlarmRatio; /** * 三相电压不平衡度告警情况(0:否 1:是) @@ -59,7 +59,7 @@ public class RStatAreaAlarmCountM implements Serializable { /** * 三相电压不平衡度告警超标占比 */ - private Integer unbalanceAlarmRatio; + private Double unbalanceAlarmRatio; /** * 谐波电压告警情况(0:否 1:是) @@ -69,7 +69,7 @@ public class RStatAreaAlarmCountM implements Serializable { /** * 谐波电压告警超标占比 */ - private Integer vAlarmRatio; + private Double vAlarmRatio; /** * 闪变告警情况(0:否 1:是) @@ -79,7 +79,7 @@ public class RStatAreaAlarmCountM implements Serializable { /** * 闪变告警超标占比 */ - private Integer flickerAlarmRatio; + private Double flickerAlarmRatio; /** * 电压暂降告警情况(0:否 1:是) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java index b9847ecbf..41ad415ed 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java @@ -67,7 +67,7 @@ public class TractionStation extends BaseEntity { */ private String railwayLineName; /** - * 铁路编号 + * 铁路类型 */ private String railwayType; diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java index 86ef168ca..8e25fb172 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java @@ -49,7 +49,7 @@ public class RStatAreaAlarmCountMVO implements Serializable { * 电压偏差告警超标占比 */ @ApiModelProperty(name = "vdevAlarmRatio", value = "电压偏差告警超标占比") - private Integer vdevAlarmRatio; + private Double vdevAlarmRatio; /** * 频率偏差告警情况(0:否 1:是) @@ -61,7 +61,7 @@ public class RStatAreaAlarmCountMVO implements Serializable { * 频率偏差告警超标占比 */ @ApiModelProperty(name = "freqAlarmRatio", value = "频率偏差告警超标占比") - private Integer freqAlarmRatio; + private Double freqAlarmRatio; /** * 三相电压不平衡度告警情况(0:否 1:是) @@ -73,7 +73,7 @@ public class RStatAreaAlarmCountMVO implements Serializable { * 三相电压不平衡度告警超标占比 */ @ApiModelProperty(name = "unbalanceAlarmRatio", value = "三相电压不平衡度告警超标占比") - private Integer unbalanceAlarmRatio; + private Double unbalanceAlarmRatio; /** * 谐波电压告警情况(0:否 1:是) @@ -85,7 +85,7 @@ public class RStatAreaAlarmCountMVO implements Serializable { * 谐波电压告警超标占比 */ @ApiModelProperty(name = "vAlarmRatio", value = "谐波电压告警超标占比") - private Integer vAlarmRatio; + private Double vAlarmRatio; /** * 闪变告警情况(0:否 1:是) @@ -97,7 +97,7 @@ public class RStatAreaAlarmCountMVO implements Serializable { * 闪变告警超标占比 */ @ApiModelProperty(name = "flickerAlarmRatio", value = "闪变告警超标占比") - private Integer flickerAlarmRatio; + private Double flickerAlarmRatio; /** * 电压暂降告警情况(0:否 1:是) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java index 244ea5c92..9967f899e 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java @@ -125,4 +125,7 @@ public class TractionStationDTO extends Unit { @ExcelProperty(value = "更新时间") @JSONField(format = "yyyy-MM-dd") private LocalDateTime updateTime; + + @ExcelProperty(value = "牵引站名称") + private String tractionName; } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java index 077bbdd7c..ebfd7e264 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java @@ -454,7 +454,7 @@ public class MonitorSendServiceImpl implements MonitorSendService { sendVO.setConnetGroupWay(dictData.getValue()); } sendVO.setIfSpecial(traction.getIfSpecial() + ""); - + sendVO.setTractionName(traction.getName()); sendVO.setRailwayName(traction.getRailwayLineName()); sendVO.setRailwayType(traction.getRailwayType()); sendVO.setTractionCode(traction.getId()); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java index 26b7e4f73..5d015831e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java @@ -52,7 +52,7 @@ public class SpecialAnalysisServiceImpl implements SpecialAnalysisService { switch (param.getType()) { //光伏电站 case 1: - data = dicDataFeignClient.getDicDataByCode(DicDataEnum.POWER_STATION.getCode()).getData(); + data = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.POWER_STATION.getCode(),DicDataTypeEnum.MONITORING_LABELS.getCode()).getData(); break; //冶炼负荷 case 2: diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java index 1ecbfcf0e..0a28f02dd 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java @@ -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();; + } } diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java index 44a727a94..55f140242 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java @@ -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();; + } } diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java index 69325f515..0c4dc871b 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java @@ -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();; + } } diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventMMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventMMapper.xml index 87200e966..bd33a3a68 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventMMapper.xml +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventMMapper.xml @@ -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 diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventQMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventQMapper.xml index 4584b9fbc..93a2718c6 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventQMapper.xml +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventQMapper.xml @@ -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 diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml index 248619921..a8f06a7cb 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventYMapper.xml @@ -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 diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java index 5af49b78e..c879a1f24 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java @@ -1,5 +1,6 @@ package com.njcn.harmonic.pojo.po; +import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -52,5 +53,12 @@ public class RStatHarmonicOrgM implements Serializable { * 数据类型,字典表（01：主网测点 02：配网测点） */ private String dataType; + public void setOverLimitMeasurementRatioAverage(Float overLimitMeasurementRatioAverage) { + this.overLimitMeasurementRatioAverage = NumberUtil.round(overLimitMeasurementRatioAverage*100,2).floatValue(); + } + + public void setOverLimitMeasurementRatioAccrued(Float overLimitMeasurementRatioAccrued) { + this.overLimitMeasurementRatioAccrued = NumberUtil.round(overLimitMeasurementRatioAccrued*100,2).floatValue();; + } } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java index 2a45f1552..06708b591 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java @@ -1,5 +1,6 @@ package com.njcn.harmonic.pojo.po; +import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -52,6 +53,12 @@ public class RStatHarmonicOrgQ implements Serializable { * 数据类型,字典表（01：主网测点 02：配网测点） */ private String dataType; + public void setOverLimitMeasurementRatioAverage(Float overLimitMeasurementRatioAverage) { + this.overLimitMeasurementRatioAverage = NumberUtil.round(overLimitMeasurementRatioAverage*100,2).floatValue(); + } + public void setOverLimitMeasurementRatioAccrued(Float overLimitMeasurementRatioAccrued) { + this.overLimitMeasurementRatioAccrued = NumberUtil.round(overLimitMeasurementRatioAccrued*100,2).floatValue();; + } } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java index ecd8e45c0..9e9cf80ca 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java @@ -1,5 +1,6 @@ package com.njcn.harmonic.pojo.po; +import cn.hutool.core.util.NumberUtil; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -53,5 +54,12 @@ public class RStatHarmonicOrgY implements Serializable { */ private String dataType; + public void setOverLimitMeasurementRatioAverage(Float overLimitMeasurementRatioAverage) { + this.overLimitMeasurementRatioAverage = NumberUtil.round(overLimitMeasurementRatioAverage*100,2).floatValue(); + } + + public void setOverLimitMeasurementRatioAccrued(Float overLimitMeasurementRatioAccrued) { + this.overLimitMeasurementRatioAccrued = NumberUtil.round(overLimitMeasurementRatioAccrued*100,2).floatValue();; + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml index fe94e6d08..146b49128 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml @@ -22,8 +22,8 @@ ROUND( sum( over_limit_measurement_average )/ count(*), 2 ) AS overLimitMeasurementAverage, sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued, ROUND( sum( average_over_day )/ count(*), 2 ) AS averageOverDay, - ROUND( sum( over_limit_measurement_ratio_average )/ count(*), 2 ) AS overLimitMeasurementRatioAverage, - sum( over_limit_measurement_ratio_accrued ) AS overLimitMeasurementRatioAccrued + ROUND( (sum( over_limit_measurement_ratio_average )/ count(*))*100, 2 ) AS overLimitMeasurementRatioAverage, + ROUND(sum( over_limit_measurement_ratio_accrued )*100,2) AS overLimitMeasurementRatioAccrued FROM r_stat_harmonic_q diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml index d55afac1c..f69ea6327 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml @@ -22,8 +22,8 @@ ROUND( sum( over_limit_measurement_average )/ count(*), 2 ) AS overLimitMeasurementAverage, sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued, ROUND( sum( average_over_day )/ count(*), 2 ) AS averageOverDay, - ROUND( sum( over_limit_measurement_ratio_average )/ count(*), 2 ) AS overLimitMeasurementRatioAverage, - sum( over_limit_measurement_ratio_accrued ) AS overLimitMeasurementRatioAccrued + ROUND( (sum( over_limit_measurement_ratio_average )/ count(*))*100, 2 ) AS overLimitMeasurementRatioAverage, + ROUND((sum( over_limit_measurement_ratio_accrued ))*100,2) AS overLimitMeasurementRatioAccrued FROM r_stat_harmonic_y diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml index eded5c2ef..025aa82c1 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgMMapper.xml @@ -35,13 +35,13 @@ rso.effective_measurement_accrued AS effectiveMeasurementAccrued, rso.harmonic_measurement_average AS harmonicMeasurementAverage, rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued, - rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage, - TRUNCATE(rso.harmonic_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued, + TRUNCATE(rso.harmonic_measurement_ratio_average,2) as harmonicMeasurementRatioAverage, + TRUNCATE(rso.harmonic_measurement_accrued*100/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued, c.harmonic_type, TRUNCATE(c.over_limit_measurement_average,2) as overLimitMeasurementAverage, c.over_limit_measurement_accrued, - TRUNCATE(c.over_limit_measurement_ratio_average,2) as overLimitMeasurementRatioAverage, - TRUNCATE(c.over_limit_measurement_ratio_accrued,2) as overLimitMeasurementRatioAccrued, + TRUNCATE(c.over_limit_measurement_ratio_average*100,2) as overLimitMeasurementRatioAverage, + TRUNCATE(c.over_limit_measurement_ratio_accrued*100,2) as overLimitMeasurementRatioAccrued, TRUNCATE( c.over_day / c.over_limit_measurement_accrued, 2)as averageOverDay FROM r_stat_harmonic_m c diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml index 3f5fbbe91..31ea3afe7 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgQMapper.xml @@ -35,13 +35,13 @@ rso.effective_measurement_accrued AS effectiveMeasurementAccrued, rso.harmonic_measurement_average AS harmonicMeasurementAverage, rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued, - rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage, - TRUNCATE(rso.harmonic_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued, + TRUNCATE(rso.harmonic_measurement_ratio_average,2) as harmonicMeasurementRatioAverage, + TRUNCATE(rso.harmonic_measurement_accrued*100/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued, c.harmonic_type, TRUNCATE(c.over_limit_measurement_average,2) as overLimitMeasurementAverage, c.over_limit_measurement_accrued, - TRUNCATE(c.over_limit_measurement_ratio_average,2) as overLimitMeasurementRatioAverage, - TRUNCATE(c.over_limit_measurement_ratio_accrued,2) as overLimitMeasurementRatioAccrued, + TRUNCATE(c.over_limit_measurement_ratio_average*100,2) as overLimitMeasurementRatioAverage, + TRUNCATE(c.over_limit_measurement_ratio_accrued*100,2) as overLimitMeasurementRatioAccrued, TRUNCATE( c.average_over_day, 2)as averageOverDay FROM r_stat_harmonic_q c diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml index 7bbbd357d..a81d0cf95 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatOrgYMapper.xml @@ -35,13 +35,13 @@ rso.effective_measurement_accrued AS effectiveMeasurementAccrued, rso.over_limit_measurement_average AS harmonicMeasurementAverage, rso.over_limit_measurement_accrued AS harmonicMeasurementAccrued, - rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage, - TRUNCATE(rso.over_limit_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued, + TRUNCATE( rso.harmonic_measurement_ratio_average,2) as harmonicMeasurementRatioAverage, + TRUNCATE((rso.over_limit_measurement_accrued/rso.effective_measurement_accrued)*100 ,2)as harmonicMeasurementRatioAccrued, c.harmonic_type, TRUNCATE(c.over_limit_measurement_average,2) as overLimitMeasurementAverage, c.over_limit_measurement_accrued, - TRUNCATE(c.over_limit_measurement_ratio_average,2) as overLimitMeasurementRatioAverage, - TRUNCATE(c.over_limit_measurement_ratio_accrued,2) as overLimitMeasurementRatioAccrued, + TRUNCATE(c.over_limit_measurement_ratio_average*100,2) as overLimitMeasurementRatioAverage, + TRUNCATE(c.over_limit_measurement_ratio_accrued*100,2) as overLimitMeasurementRatioAccrued, c.average_over_day FROM r_stat_harmonic_y c diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java index 76e9b5cca..d868a5f83 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java @@ -93,7 +93,7 @@ public class RStatOrgMServiceImpl extends ServiceImpl resultCount = new HashMap<>(); + Map resultCount = new HashMap<>(); long vdevAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getVdevAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); long freqAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getFreqAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); long unbalanceAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getUnbalanceAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); @@ -217,25 +217,25 @@ public class RAlarmCountServiceImpl implements RAlarmCountService { long sagAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getSagAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); long interruptAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getInterruptAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); if (vdevAlarmInfoCount != 0){ - resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount); + resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount*100.0); } if (freqAlarmInfoCount!=0){ - resultCount.put("freqAlarmInfo",freqAlarmInfoCount); + resultCount.put("freqAlarmInfo",freqAlarmInfoCount*100.0); } if (unbalanceAlarmInfoCount!=0){ - resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount); + resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount*100.0); } if (vAlarmInfoCount!=0){ - resultCount.put("vAlarmInfo",vAlarmInfoCount); + resultCount.put("vAlarmInfo",vAlarmInfoCount*100.0); } if (flickerAlarmInfoCount!=0){ - resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount); + resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount*100.0); } if (sagAlarmInfoCount!=0){ - resultCount.put("sagAlarmInfo",sagAlarmInfoCount); + resultCount.put("sagAlarmInfo",sagAlarmInfoCount*100.0); } if (interruptAlarmInfoCount!=0){ - resultCount.put("interruptAlarmInfo",interruptAlarmInfoCount); + resultCount.put("interruptAlarmInfo",interruptAlarmInfoCount*100.0); } @@ -380,7 +380,7 @@ public class RAlarmCountServiceImpl implements RAlarmCountService { RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper); //所有告警次数集合 - Map resultCount = new HashMap<>(); + Map resultCount = new HashMap<>(); long vdevAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getVdevAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); long freqAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getFreqAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); long unbalanceAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getUnbalanceAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); @@ -389,25 +389,25 @@ public class RAlarmCountServiceImpl implements RAlarmCountService { long sagAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getSagAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); long interruptAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getInterruptAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); if (vdevAlarmInfoCount != 0){ - resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount); + resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount*100.0); } if (freqAlarmInfoCount!=0){ - resultCount.put("freqAlarmInfo",freqAlarmInfoCount); + resultCount.put("freqAlarmInfo",freqAlarmInfoCount*100.0); } if (unbalanceAlarmInfoCount!=0){ - resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount); + resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount*100.0); } if (vAlarmInfoCount!=0){ - resultCount.put("vAlarmInfo",vAlarmInfoCount); + resultCount.put("vAlarmInfo",vAlarmInfoCount*100.0); } if (flickerAlarmInfoCount!=0){ - resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount); + resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount*100.0); } if (sagAlarmInfoCount!=0){ - resultCount.put("sagAlarmInfo",sagAlarmInfoCount); + resultCount.put("sagAlarmInfo",sagAlarmInfoCount*100.0); } if (interruptAlarmInfoCount!=0){ - resultCount.put("interruptAlarmInfo",interruptAlarmInfoCount); + resultCount.put("interruptAlarmInfo",interruptAlarmInfoCount*100.0); } //获取电压暂降告警次数 @@ -467,53 +467,53 @@ public class RAlarmCountServiceImpl implements RAlarmCountService { } if (Objects.isNull(rStatOrgMPO)) { - rStatAreaAlarmCountMPO.setVdevAlarmRatio(1.00f); - rStatAreaAlarmCountMPO.setFreqAlarmRatio(1.00f); - rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(1.00f); - rStatAreaAlarmCountMPO.setVAlarmRatio(1.00f); - rStatAreaAlarmCountMPO.setFlickerAlarmRatio(1.00f); + rStatAreaAlarmCountMPO.setVdevAlarmRatio(0.00f); + rStatAreaAlarmCountMPO.setFreqAlarmRatio(0.00f); + rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(0.00f); + rStatAreaAlarmCountMPO.setVAlarmRatio(0.00f); + rStatAreaAlarmCountMPO.setFlickerAlarmRatio(0.00f); } else { if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) { - rStatAreaAlarmCountMPO.setVdevAlarmRatio(1.00f); - rStatAreaAlarmCountMPO.setFreqAlarmRatio(1.00f); - rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(1.00f); - rStatAreaAlarmCountMPO.setVAlarmRatio(1.00f); - rStatAreaAlarmCountMPO.setFlickerAlarmRatio(1.00f); + rStatAreaAlarmCountMPO.setVdevAlarmRatio(0.00f); + rStatAreaAlarmCountMPO.setFreqAlarmRatio(0.00f); + rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(0.00f); + rStatAreaAlarmCountMPO.setVAlarmRatio(0.00f); + rStatAreaAlarmCountMPO.setFlickerAlarmRatio(0.00f); } else { //电压偏差告警占比 if (resultCount.containsKey("vdevAlarmInfo")) { String value = df.format(resultCount.get("vdevAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); rStatAreaAlarmCountMPO.setVdevAlarmRatio(Float.parseFloat(value)); } else { - rStatAreaAlarmCountMPO.setVdevAlarmRatio(1.00f); + rStatAreaAlarmCountMPO.setVdevAlarmRatio(0.00f); } //频率偏差告警占比 if (resultCount.containsKey("freqAlarmInfo")) { String value = df.format(resultCount.get("freqAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); rStatAreaAlarmCountMPO.setFreqAlarmRatio(Float.parseFloat(value)); } else { - rStatAreaAlarmCountMPO.setFreqAlarmRatio(1.00f); + rStatAreaAlarmCountMPO.setFreqAlarmRatio(0.00f); } //三项电压不平衡度告警占比 if (resultCount.containsKey("unbalanceAlarmInfo")) { String value = df.format(resultCount.get("unbalanceAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(Float.parseFloat(value)); } else { - rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(1.00f); + rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(0.00f); } //谐波电压告警占比 if (resultCount.containsKey("vAlarmInfo")) { String value = df.format(resultCount.get("vAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); rStatAreaAlarmCountMPO.setVAlarmRatio(Float.parseFloat(value)); } else { - rStatAreaAlarmCountMPO.setVAlarmRatio(1.00f); + rStatAreaAlarmCountMPO.setVAlarmRatio(0.00f); } //闪変告警占比 if (resultCount.containsKey("flickerAlarmInfo")) { String value = df.format(resultCount.get("flickerAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); rStatAreaAlarmCountMPO.setFlickerAlarmRatio(Float.parseFloat(value)); } else { - rStatAreaAlarmCountMPO.setFlickerAlarmRatio(1.00f); + rStatAreaAlarmCountMPO.setFlickerAlarmRatio(0.00f); } } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventServiceImpl.java index 721d6fe34..61255f433 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventServiceImpl.java @@ -302,6 +302,9 @@ public class RStatEventServiceImpl implements RStatEventService { } //累计发生暂态监测点数 Integer statisData = getStatisData(dictData, rMpEventDetailMPOS); + if(statisData>0){ + System.out.println("1"); + } RStatEventMPO rStatEventMPO = new RStatEventMPO(); rStatEventMPO.setOrgNo(deptGetChildrenMoreDTO.getUnitId()); @@ -311,7 +314,7 @@ public class RStatEventServiceImpl implements RStatEventService { rStatEventMPO.setEventMeasurementAverage(Float.parseFloat(df.format(avgEM.get(dictData.getId())))); rStatEventMPO.setEventMeasurementAccrued(statisData); rStatEventMPO.setEventCount(sumEC.get(dictData.getId())); - rStatEventMPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMR.get(dictData.getId())))); + rStatEventMPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMR.get(dictData.getId())*100))); rStatEventMPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()); if (sumEM.get(dictData.getId()) == 0) { @@ -401,7 +404,7 @@ public class RStatEventServiceImpl implements RStatEventService { rStatEventMPO.setEventMeasurementAverage(Float.parseFloat(df.format(avgEM.get(dictData.getId())))); rStatEventMPO.setEventMeasurementAccrued(statisData); rStatEventMPO.setEventCount(sumEC.get(dictData.getId())); - rStatEventMPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMR.get(dictData.getId())))); + rStatEventMPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMR.get(dictData.getId())*100))); rStatEventMPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId()); if (sumEM.get(dictData.getId()) == 0) { @@ -544,7 +547,7 @@ public class RStatEventServiceImpl implements RStatEventService { // todo rStatEventQPO.setEventMeasurementAccrued(statisData); rStatEventQPO.setEventCount(sumECM.get(dictData.getId())); - rStatEventQPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())))); + rStatEventQPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())*100))); rStatEventQPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()); if (sumEM.get(dictData.getId()) == 0) { @@ -648,7 +651,7 @@ public class RStatEventServiceImpl implements RStatEventService { // todo rStatEventQPO.setEventMeasurementAccrued(statisData); rStatEventQPO.setEventCount(sumECM.get(dictData.getId())); - rStatEventQPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())))); + rStatEventQPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())*100))); rStatEventQPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId()); if (sumEM.get(dictData.getId()) == 0) { @@ -791,7 +794,7 @@ public class RStatEventServiceImpl implements RStatEventService { // todo rStatEventYPO.setEventMeasurementAccrued(statisData); rStatEventYPO.setEventCount(sumECM.get(dictData.getId())); - rStatEventYPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())))); + rStatEventYPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())*100))); rStatEventYPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId()); if (sumEM.get(dictData.getId()) == 0) { @@ -896,7 +899,7 @@ public class RStatEventServiceImpl implements RStatEventService { // todo rStatEventYPO.setEventMeasurementAccrued(statisData); rStatEventYPO.setEventCount(sumECM.get(dictData.getId())); - rStatEventYPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())))); + rStatEventYPO.setEventMeasurementRatioAverage(Float.parseFloat(df.format(avgEMRM.get(dictData.getId())*100))); rStatEventYPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId()); if (sumEM.get(dictData.getId()) == 0) { @@ -1192,7 +1195,7 @@ public class RStatEventServiceImpl implements RStatEventService { if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) { rStatEventMPO.setEventMeasurementRatioAccrued(1.00f); } else { - String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue()); + String value = df.format(statisData*100 / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue()); rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); } } @@ -1282,7 +1285,7 @@ public class RStatEventServiceImpl implements RStatEventService { if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) { rStatEventMPO.setEventMeasurementRatioAccrued(1.00f); } else { - String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue()); + String value = df.format(statisData*100 / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue()); rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); } } @@ -1432,7 +1435,7 @@ public class RStatEventServiceImpl implements RStatEventService { if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) { rStatEventQPO.setEventMeasurementRatioAccrued(1.00f); } else { - String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue()); + String value = df.format(statisData*100 / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue()); rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); } } @@ -1536,7 +1539,7 @@ public class RStatEventServiceImpl implements RStatEventService { if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) { rStatEventQPO.setEventMeasurementRatioAccrued(1.00f); } else { - String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue()); + String value = df.format(statisData*100 / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue()); rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); } } @@ -1679,7 +1682,7 @@ public class RStatEventServiceImpl implements RStatEventService { if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) { rStatEventYPO.setEventMeasurementRatioAccrued(1.00f); } else { - String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue()); + String value = df.format(statisData*100 / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue()); rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); } } @@ -1784,7 +1787,7 @@ public class RStatEventServiceImpl implements RStatEventService { if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) { rStatEventYPO.setEventMeasurementRatioAccrued(1.00f); } else { - String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue()); + String value = df.format(statisData*100 / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue()); rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatLoadTypeServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatLoadTypeServiceImpl.java index ec6db58fb..6a8b2c1c0 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatLoadTypeServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatLoadTypeServiceImpl.java @@ -206,14 +206,23 @@ public class RStatLoadTypeServiceImpl implements RStatLoadTypeService { rStatLoadTypeMPO.setUnbalanceCount(0); rStatLoadTypeMPO.setFlickerCount(0); }else { - Optional vfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId())).findFirst(); + Optional vfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); rStatLoadTypeMPO.setVCount(vfirst.isPresent() ? vfirst.get().getOverLimitMeasurementAccrued(): 0); - Optional ifirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId())).findFirst(); + Optional ifirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); rStatLoadTypeMPO.setICount(ifirst.isPresent() ? ifirst.get().getOverLimitMeasurementAccrued(): 0); - Optional pfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())).findFirst(); - Optional nfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())).findFirst(); - Optional ffirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId())).findFirst(); - + Optional pfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); + Optional nfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); + Optional ffirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); rStatLoadTypeMPO.setINegCount(nfirst.isPresent() ? nfirst.get().getOverLimitMeasurementAccrued(): 0); rStatLoadTypeMPO.setUnbalanceCount(pfirst.isPresent() ? pfirst.get().getOverLimitMeasurementAccrued(): 0); rStatLoadTypeMPO.setFlickerCount(ffirst.isPresent() ? ffirst.get().getOverLimitMeasurementAccrued(): 0); @@ -308,13 +317,23 @@ public class RStatLoadTypeServiceImpl implements RStatLoadTypeService { rStatLoadTypeQPO.setUnbalanceCount(0); rStatLoadTypeQPO.setFlickerCount(0); }else { - Optional vfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId())).findFirst(); + Optional vfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); rStatLoadTypeQPO.setVCount(vfirst.isPresent() ? vfirst.get().getOverLimitMeasurementAccrued(): 0); - Optional ifirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId())).findFirst(); + Optional ifirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); rStatLoadTypeQPO.setICount(ifirst.isPresent() ? ifirst.get().getOverLimitMeasurementAccrued(): 0); - Optional pfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())).findFirst(); - Optional nfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())).findFirst(); - Optional ffirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId())).findFirst(); + Optional pfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); + Optional nfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); + Optional ffirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId()) + &&Objects.equals(temp.getMeasurementTypeClass(), m) + ).findFirst(); rStatLoadTypeQPO.setINegCount(nfirst.isPresent() ? nfirst.get().getOverLimitMeasurementAccrued(): 0); rStatLoadTypeQPO.setUnbalanceCount(pfirst.isPresent() ? pfirst.get().getOverLimitMeasurementAccrued(): 0); diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java index 21c42f76c..16a31a7aa 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java @@ -61,6 +61,17 @@ public interface DicDataFeignClient { HttpResult getDicDataByNameAndTypeName(@RequestParam("dicTypeName") String dicTypeName, @RequestParam("dicDataName") String dicDataName); + /** + * 根据数据code&&字典类型code获取字典数据 + * + * @param dicDataCode 字典数据名称 + * @param dicTypeCode 字典类型名称 + * @return 字典数据 + */ + @GetMapping("/getDicDataByCodeAndType") + HttpResult getDicDataByCodeAndType(@RequestParam("dicDataCode") String dicDataCode, @RequestParam("dicTypeCode") String dicTypeCode); + + /*** * 字典类型 */ diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java index a3a2a459c..0b38d1301 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java @@ -84,6 +84,12 @@ public class DicDataFeignClientFallbackFactory implements FallbackFactory getDicDataByCodeAndType(String dicDataCode, String dicTypeCode) { + log.error("{}异常，降级处理，异常为：{}","根据数据code&&字典类型code获取字典数据",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java index 50a1df8bc..9af23068d 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java @@ -176,6 +176,18 @@ public class DictDataController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getDicDataByCodeAndType") + @ApiOperation("根据字典Code和字典类型查询字典数据") + @ApiImplicitParams({ + @ApiImplicitParam(name = "dicDataCode", value = "查询参数", required = true), + @ApiImplicitParam(name = "dicTypeCode", value = "查询参数", required = true) + }) + public HttpResult getDicDataByCodeAndType(@RequestParam("dicDataCode") String dicCode,@RequestParam("dicTypeCode") String typeCode) { + String methodDescribe = getMethodDescribe("getDicDataByCodeAndType"); + DictData result = dictDataService.getDicDataByCodeAndType(dicCode,typeCode); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } @OperateInfo(info = LogEnum.BUSINESS_COMMON) @GetMapping("/getDicDataByCode") @ApiOperation("根据字典code查询字典数据") diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java index cab143d49..bc76b8856 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java @@ -39,6 +39,8 @@ public interface DictDataMapper extends BaseMapper { DictData getDicDataByNameAndType(@Param("dicName") String dicName, @Param("typeName") String typeName); + DictData getDicDataByCodeAndType(@Param("dicCode") String dicCode, @Param("typeCode") String typeCode); + DictData getDicDataByCode(@Param("code") String code); /** diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml index 392cb0710..649b5b5cc 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml @@ -75,4 +75,13 @@ and sys_dict_data.state = 1 order by sort + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java index a6221dff0..71e43e7a2 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java @@ -90,6 +90,12 @@ public interface IDictDataService extends IService { */ DictData getDicDataByNameAndType(String dicName,String typeName); + /** + * + * @param dicCode 字典Code,类型名称 + * @return 根据字典Code查询字典数据 + */ + DictData getDicDataByCodeAndType(String dicCode,String typeCode); /** * * @param code 字典code diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java index 68fb6cae3..2640d6b96 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java @@ -149,6 +149,11 @@ public class DictDataServiceImpl extends ServiceImpl i return this.baseMapper.getDicDataByNameAndType(dicName,typeName); } + @Override + public DictData getDicDataByCodeAndType(String dicCode, String typeCode) { + return this.baseMapper.getDicDataByCodeAndType(dicCode,typeCode); + } + @Override public DictData getDicDataByCode(String code) { return this.baseMapper.getDicDataByCode(code);