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

10
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/RStatAreaAlarmCountM.java
View File

@@ -39,7 +39,7 @@ public class RStatAreaAlarmCountM implements Serializable {
/** /**
* 电压偏差告警超标占比 * 电压偏差告警超标占比
*/ */
private Integer vdevAlarmRatio; private Double vdevAlarmRatio;
/** /**
* 频率偏差告警情况(0:否 1:是) * 频率偏差告警情况(0:否 1:是)
@@ -49,7 +49,7 @@ public class RStatAreaAlarmCountM implements Serializable {
/** /**
* 频率偏差告警超标占比 * 频率偏差告警超标占比
*/ */
private Integer freqAlarmRatio; private Double freqAlarmRatio;
/** /**
* 三相电压不平衡度告警情况(0:否 1:是) * 三相电压不平衡度告警情况(0:否 1:是)
@@ -59,7 +59,7 @@ public class RStatAreaAlarmCountM implements Serializable {
/** /**
* 三相电压不平衡度告警超标占比 * 三相电压不平衡度告警超标占比
*/ */
private Integer unbalanceAlarmRatio; private Double unbalanceAlarmRatio;
/** /**
* 谐波电压告警情况(0:否 1:是) * 谐波电压告警情况(0:否 1:是)
@@ -69,7 +69,7 @@ public class RStatAreaAlarmCountM implements Serializable {
/** /**
* 谐波电压告警超标占比 * 谐波电压告警超标占比
*/ */
private Integer vAlarmRatio; private Double vAlarmRatio;
/** /**
* 闪变告警情况(0:否 1:是) * 闪变告警情况(0:否 1:是)
@@ -79,7 +79,7 @@ public class RStatAreaAlarmCountM implements Serializable {
/** /**
* 闪变告警超标占比 * 闪变告警超标占比
*/ */
private Integer flickerAlarmRatio; private Double flickerAlarmRatio;
/** /**
* 电压暂降告警情况(0:否 1:是) * 电压暂降告警情况(0:否 1:是)

2
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/TractionStation.java
View File

@@ -67,7 +67,7 @@ public class TractionStation extends BaseEntity {
*/ */
private String railwayLineName; private String railwayLineName;
/** /**
* 铁路编号 * 铁路类型
*/ */
private String railwayType; private String railwayType;

10
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/RStatAreaAlarmCountMVO.java
View File

@@ -49,7 +49,7 @@ public class RStatAreaAlarmCountMVO implements Serializable {
* 电压偏差告警超标占比 * 电压偏差告警超标占比
*/ */
@ApiModelProperty(name = "vdevAlarmRatio", value = "电压偏差告警超标占比") @ApiModelProperty(name = "vdevAlarmRatio", value = "电压偏差告警超标占比")
private Integer vdevAlarmRatio; private Double vdevAlarmRatio;
/** /**
* 频率偏差告警情况(0:否 1:是) * 频率偏差告警情况(0:否 1:是)
@@ -61,7 +61,7 @@ public class RStatAreaAlarmCountMVO implements Serializable {
* 频率偏差告警超标占比 * 频率偏差告警超标占比
*/ */
@ApiModelProperty(name = "freqAlarmRatio", value = "频率偏差告警超标占比") @ApiModelProperty(name = "freqAlarmRatio", value = "频率偏差告警超标占比")
private Integer freqAlarmRatio; private Double freqAlarmRatio;
/** /**
* 三相电压不平衡度告警情况(0:否 1:是) * 三相电压不平衡度告警情况(0:否 1:是)
@@ -73,7 +73,7 @@ public class RStatAreaAlarmCountMVO implements Serializable {
* 三相电压不平衡度告警超标占比 * 三相电压不平衡度告警超标占比
*/ */
@ApiModelProperty(name = "unbalanceAlarmRatio", value = "三相电压不平衡度告警超标占比") @ApiModelProperty(name = "unbalanceAlarmRatio", value = "三相电压不平衡度告警超标占比")
private Integer unbalanceAlarmRatio; private Double unbalanceAlarmRatio;
/** /**
* 谐波电压告警情况(0:否 1:是) * 谐波电压告警情况(0:否 1:是)
@@ -85,7 +85,7 @@ public class RStatAreaAlarmCountMVO implements Serializable {
* 谐波电压告警超标占比 * 谐波电压告警超标占比
*/ */
@ApiModelProperty(name = "vAlarmRatio", value = "谐波电压告警超标占比") @ApiModelProperty(name = "vAlarmRatio", value = "谐波电压告警超标占比")
private Integer vAlarmRatio; private Double vAlarmRatio;
/** /**
* 闪变告警情况(0:否 1:是) * 闪变告警情况(0:否 1:是)
@@ -97,7 +97,7 @@ public class RStatAreaAlarmCountMVO implements Serializable {
* 闪变告警超标占比 * 闪变告警超标占比
*/ */
@ApiModelProperty(name = "flickerAlarmRatio", value = "闪变告警超标占比") @ApiModelProperty(name = "flickerAlarmRatio", value = "闪变告警超标占比")
private Integer flickerAlarmRatio; private Double flickerAlarmRatio;
/** /**
* 电压暂降告警情况(0:否 1:是) * 电压暂降告警情况(0:否 1:是)

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/gw/TractionStationDTO.java
View File

@@ -125,4 +125,7 @@ public class TractionStationDTO extends Unit {
@ExcelProperty(value = "更新时间") @ExcelProperty(value = "更新时间")
@JSONField(format = "yyyy-MM-dd") @JSONField(format = "yyyy-MM-dd")
private LocalDateTime updateTime; private LocalDateTime updateTime;
@ExcelProperty(value = "牵引站名称")
private String tractionName;
} }

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/gwPush/impl/MonitorSendServiceImpl.java
View File

@@ -454,7 +454,7 @@ public class MonitorSendServiceImpl implements MonitorSendService {
sendVO.setConnetGroupWay(dictData.getValue()); sendVO.setConnetGroupWay(dictData.getValue());
} }
sendVO.setIfSpecial(traction.getIfSpecial() + ""); sendVO.setIfSpecial(traction.getIfSpecial() + "");
sendVO.setTractionName(traction.getName());
sendVO.setRailwayName(traction.getRailwayLineName()); sendVO.setRailwayName(traction.getRailwayLineName());
sendVO.setRailwayType(traction.getRailwayType()); sendVO.setRailwayType(traction.getRailwayType());
sendVO.setTractionCode(traction.getId()); sendVO.setTractionCode(traction.getId());

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/SpecialAnalysisServiceImpl.java
View File

@@ -52,7 +52,7 @@ public class SpecialAnalysisServiceImpl implements SpecialAnalysisService {
switch (param.getType()) { switch (param.getType()) {
//光伏电站 //光伏电站
case 1: case 1:
data = dicDataFeignClient.getDicDataByCode(DicDataEnum.POWER_STATION.getCode()).getData(); data = dicDataFeignClient.getDicDataByCodeAndType(DicDataEnum.POWER_STATION.getCode(),DicDataTypeEnum.MONITORING_LABELS.getCode()).getData();
break; break;
//冶炼负荷 //冶炼负荷
case 2: case 2:

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; package com.njcn.event.pojo.po;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
@@ -58,5 +59,11 @@ public class RStatEventOrgM implements Serializable {
@ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）") @ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）")
private String dataType; 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; package com.njcn.event.pojo.po;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate; import java.time.LocalDate;
@@ -57,5 +58,11 @@ public class RStatEventOrgQ implements Serializable {
@ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）") @ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）")
private String dataType; 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; package com.njcn.event.pojo.po;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate; import java.time.LocalDate;
@@ -57,5 +58,12 @@ public class RStatEventOrgY implements Serializable {
@ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）") @ApiModelProperty(value = "数据类型,字典表（01：主网测点 02：配网测点）")
private String dataType; 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 SELECT
measurement_type_class, measurement_type_class,
event_type, 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_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_count) as eventCount,
sum(event_measurement_ratio_average)/count(*) as eventMeasurementRatioAverage, ROUND( sum(event_measurement_ratio_average)*100/count(*),2) as eventMeasurementRatioAverage,
sum(event_measurement_ratio_accrued) as eventMeasurementRatioAccrued ROUND( sum(event_measurement_ratio_accrued)*100,2) as eventMeasurementRatioAccrued
FROM FROM
r_stat_event_m r_stat_event_m
<where> <where>

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

@@ -20,12 +20,12 @@
SELECT SELECT
measurement_type_class, measurement_type_class,
event_type, 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_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_count) as eventCount,
sum(event_measurement_ratio_average)/count(*) as eventMeasurementRatioAverage, ROUND( sum(event_measurement_ratio_average)*100/count(*),2) as eventMeasurementRatioAverage,
sum(event_measurement_ratio_accrued) as eventMeasurementRatioAccrued ROUND( sum(event_measurement_ratio_accrued)*100,2) as eventMeasurementRatioAccrued
FROM FROM
r_stat_event_q r_stat_event_q
<where> <where>

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

@@ -20,12 +20,12 @@
SELECT SELECT
measurement_type_class, measurement_type_class,
event_type, 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_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_count) as eventCount,
sum(event_measurement_ratio_average)/count(*) as eventMeasurementRatioAverage, ROUND( sum(event_measurement_ratio_average)*100/count(*),2) as eventMeasurementRatioAverage,
sum(event_measurement_ratio_accrued) as eventMeasurementRatioAccrued ROUND( sum(event_measurement_ratio_accrued)*100,2) as eventMeasurementRatioAccrued
FROM FROM
r_stat_event_y r_stat_event_y
<where> <where>

8
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java
View File

@@ -1,5 +1,6 @@
package com.njcn.harmonic.pojo.po; package com.njcn.harmonic.pojo.po;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@@ -52,5 +53,12 @@ public class RStatHarmonicOrgM implements Serializable {
* 数据类型,字典表（01：主网测点 02：配网测点） * 数据类型,字典表（01：主网测点 02：配网测点）
*/ */
private String dataType; 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();;
}
} }

7
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java
View File

@@ -1,5 +1,6 @@
package com.njcn.harmonic.pojo.po; package com.njcn.harmonic.pojo.po;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@@ -52,6 +53,12 @@ public class RStatHarmonicOrgQ implements Serializable {
* 数据类型,字典表（01：主网测点 02：配网测点） * 数据类型,字典表（01：主网测点 02：配网测点）
*/ */
private String dataType; 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();;
}
} }

8
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java
View File

@@ -1,5 +1,6 @@
package com.njcn.harmonic.pojo.po; package com.njcn.harmonic.pojo.po;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
@@ -53,5 +54,12 @@ public class RStatHarmonicOrgY implements Serializable {
*/ */
private String dataType; 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();;
}
} }

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicQMapper.xml
View File

@@ -22,8 +22,8 @@
ROUND( sum( over_limit_measurement_average )/ count(*), 2 ) AS overLimitMeasurementAverage, ROUND( sum( over_limit_measurement_average )/ count(*), 2 ) AS overLimitMeasurementAverage,
sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued, sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued,
ROUND( sum( average_over_day )/ count(*), 2 ) AS averageOverDay, ROUND( sum( average_over_day )/ count(*), 2 ) AS averageOverDay,
ROUND( sum( over_limit_measurement_ratio_average )/ count(*), 2 ) AS overLimitMeasurementRatioAverage, ROUND( (sum( over_limit_measurement_ratio_average )/ count(*))*100, 2 ) AS overLimitMeasurementRatioAverage,
sum( over_limit_measurement_ratio_accrued ) AS overLimitMeasurementRatioAccrued ROUND(sum( over_limit_measurement_ratio_accrued )*100,2) AS overLimitMeasurementRatioAccrued
FROM FROM
r_stat_harmonic_q r_stat_harmonic_q
<where> <where>

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatHarmonicYMapper.xml
View File

@@ -22,8 +22,8 @@
ROUND( sum( over_limit_measurement_average )/ count(*), 2 ) AS overLimitMeasurementAverage, ROUND( sum( over_limit_measurement_average )/ count(*), 2 ) AS overLimitMeasurementAverage,
sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued, sum( over_limit_measurement_accrued ) AS overLimitMeasurementAccrued,
ROUND( sum( average_over_day )/ count(*), 2 ) AS averageOverDay, ROUND( sum( average_over_day )/ count(*), 2 ) AS averageOverDay,
ROUND( sum( over_limit_measurement_ratio_average )/ count(*), 2 ) AS overLimitMeasurementRatioAverage, ROUND( (sum( over_limit_measurement_ratio_average )/ count(*))*100, 2 ) AS overLimitMeasurementRatioAverage,
sum( over_limit_measurement_ratio_accrued ) AS overLimitMeasurementRatioAccrued ROUND((sum( over_limit_measurement_ratio_accrued ))*100,2) AS overLimitMeasurementRatioAccrued
FROM FROM
r_stat_harmonic_y r_stat_harmonic_y
<where> <where>

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

@@ -35,13 +35,13 @@
rso.effective_measurement_accrued AS effectiveMeasurementAccrued, rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
rso.harmonic_measurement_average AS harmonicMeasurementAverage, rso.harmonic_measurement_average AS harmonicMeasurementAverage,
rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued, rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued,
rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage, TRUNCATE(rso.harmonic_measurement_ratio_average,2) as harmonicMeasurementRatioAverage,
TRUNCATE(rso.harmonic_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued, TRUNCATE(rso.harmonic_measurement_accrued*100/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
c.harmonic_type, c.harmonic_type,
TRUNCATE(c.over_limit_measurement_average,2) as overLimitMeasurementAverage, TRUNCATE(c.over_limit_measurement_average,2) as overLimitMeasurementAverage,
c.over_limit_measurement_accrued, c.over_limit_measurement_accrued,
TRUNCATE(c.over_limit_measurement_ratio_average,2) as overLimitMeasurementRatioAverage, TRUNCATE(c.over_limit_measurement_ratio_average*100,2) as overLimitMeasurementRatioAverage,
TRUNCATE(c.over_limit_measurement_ratio_accrued,2) as overLimitMeasurementRatioAccrued, TRUNCATE(c.over_limit_measurement_ratio_accrued*100,2) as overLimitMeasurementRatioAccrued,
TRUNCATE( c.over_day / c.over_limit_measurement_accrued, 2)as averageOverDay TRUNCATE( c.over_day / c.over_limit_measurement_accrued, 2)as averageOverDay
FROM FROM
r_stat_harmonic_m c r_stat_harmonic_m c

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

@@ -35,13 +35,13 @@
rso.effective_measurement_accrued AS effectiveMeasurementAccrued, rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
rso.harmonic_measurement_average AS harmonicMeasurementAverage, rso.harmonic_measurement_average AS harmonicMeasurementAverage,
rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued, rso.harmonic_measurement_accrued AS harmonicMeasurementAccrued,
rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage, TRUNCATE(rso.harmonic_measurement_ratio_average,2) as harmonicMeasurementRatioAverage,
TRUNCATE(rso.harmonic_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued, TRUNCATE(rso.harmonic_measurement_accrued*100/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued,
c.harmonic_type, c.harmonic_type,
TRUNCATE(c.over_limit_measurement_average,2) as overLimitMeasurementAverage, TRUNCATE(c.over_limit_measurement_average,2) as overLimitMeasurementAverage,
c.over_limit_measurement_accrued, c.over_limit_measurement_accrued,
TRUNCATE(c.over_limit_measurement_ratio_average,2) as overLimitMeasurementRatioAverage, TRUNCATE(c.over_limit_measurement_ratio_average*100,2) as overLimitMeasurementRatioAverage,
TRUNCATE(c.over_limit_measurement_ratio_accrued,2) as overLimitMeasurementRatioAccrued, TRUNCATE(c.over_limit_measurement_ratio_accrued*100,2) as overLimitMeasurementRatioAccrued,
TRUNCATE( c.average_over_day, 2)as averageOverDay TRUNCATE( c.average_over_day, 2)as averageOverDay
FROM FROM
r_stat_harmonic_q c r_stat_harmonic_q c

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

@@ -35,13 +35,13 @@
rso.effective_measurement_accrued AS effectiveMeasurementAccrued, rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
rso.over_limit_measurement_average AS harmonicMeasurementAverage, rso.over_limit_measurement_average AS harmonicMeasurementAverage,
rso.over_limit_measurement_accrued AS harmonicMeasurementAccrued, rso.over_limit_measurement_accrued AS harmonicMeasurementAccrued,
rso.harmonic_measurement_ratio_average as harmonicMeasurementRatioAverage, TRUNCATE( rso.harmonic_measurement_ratio_average,2) as harmonicMeasurementRatioAverage,
TRUNCATE(rso.over_limit_measurement_accrued/rso.effective_measurement_accrued ,2)as harmonicMeasurementRatioAccrued, TRUNCATE((rso.over_limit_measurement_accrued/rso.effective_measurement_accrued)*100 ,2)as harmonicMeasurementRatioAccrued,
c.harmonic_type, c.harmonic_type,
TRUNCATE(c.over_limit_measurement_average,2) as overLimitMeasurementAverage, TRUNCATE(c.over_limit_measurement_average,2) as overLimitMeasurementAverage,
c.over_limit_measurement_accrued, c.over_limit_measurement_accrued,
TRUNCATE(c.over_limit_measurement_ratio_average,2) as overLimitMeasurementRatioAverage, TRUNCATE(c.over_limit_measurement_ratio_average*100,2) as overLimitMeasurementRatioAverage,
TRUNCATE(c.over_limit_measurement_ratio_accrued,2) as overLimitMeasurementRatioAccrued, TRUNCATE(c.over_limit_measurement_ratio_accrued*100,2) as overLimitMeasurementRatioAccrued,
c.average_over_day c.average_over_day
FROM FROM
r_stat_harmonic_y c r_stat_harmonic_y c

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgMServiceImpl.java
View File

@@ -93,7 +93,7 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
if(rStatOrgM.getHarmonicMeasurementAverage()!=null&&rStatOrgM.getEffectiveMeasurementAverage()!=null&& if(rStatOrgM.getHarmonicMeasurementAverage()!=null&&rStatOrgM.getEffectiveMeasurementAverage()!=null&&
rStatOrgM.getHarmonicMeasurementAverage()!=0&&rStatOrgM.getEffectiveMeasurementAverage()!=0){ rStatOrgM.getHarmonicMeasurementAverage()!=0&&rStatOrgM.getEffectiveMeasurementAverage()!=0){
Float harmonicMeasurementRatioAverage = Float.parseFloat( Float harmonicMeasurementRatioAverage = Float.parseFloat(
df.format(rStatOrgM.getHarmonicMeasurementAverage() / (rStatOrgM.getEffectiveMeasurementAverage() * 1.0))); df.format(rStatOrgM.getHarmonicMeasurementAverage()*100.0 / rStatOrgM.getEffectiveMeasurementAverage()));
rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage); rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
}else{ }else{
rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f); rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
@@ -101,7 +101,7 @@ public class RStatOrgMServiceImpl extends ServiceImpl<RStatOrgMMapper, RStatOrgM
if(rStatOrgM.getHarmonicMeasurementAccrued()!=null&&rStatOrgM.getEffectiveMeasurementAccrued()!=null&& if(rStatOrgM.getHarmonicMeasurementAccrued()!=null&&rStatOrgM.getEffectiveMeasurementAccrued()!=null&&
rStatOrgM.getHarmonicMeasurementAccrued()!=0&&rStatOrgM.getEffectiveMeasurementAccrued()!=0){ rStatOrgM.getHarmonicMeasurementAccrued()!=0&&rStatOrgM.getEffectiveMeasurementAccrued()!=0){
Float harmonicMeasurementRatioAccrued = Float.parseFloat( Float harmonicMeasurementRatioAccrued = Float.parseFloat(
df.format(rStatOrgM.getHarmonicMeasurementAccrued() / (rStatOrgM.getEffectiveMeasurementAccrued() * 1.0))); df.format(rStatOrgM.getHarmonicMeasurementAccrued()*100.0 / rStatOrgM.getEffectiveMeasurementAccrued() ));
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued); rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
}else{ }else{
rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f); rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgQServiceImpl.java
View File

@@ -83,7 +83,7 @@ public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ
if(rStatOrgQ.getHarmonicMeasurementAverage()!=null&&rStatOrgQ.getEffectiveMeasurementAverage()!=null&& if(rStatOrgQ.getHarmonicMeasurementAverage()!=null&&rStatOrgQ.getEffectiveMeasurementAverage()!=null&&
rStatOrgQ.getHarmonicMeasurementAverage()!=0&&rStatOrgQ.getEffectiveMeasurementAverage()!=0){ rStatOrgQ.getHarmonicMeasurementAverage()!=0&&rStatOrgQ.getEffectiveMeasurementAverage()!=0){
Float harmonicMeasurementRatioAverage = Float.parseFloat( Float harmonicMeasurementRatioAverage = Float.parseFloat(
df.format(rStatOrgQ.getHarmonicMeasurementAverage() / (rStatOrgQ.getEffectiveMeasurementAverage() * 1.0))); df.format(rStatOrgQ.getHarmonicMeasurementAverage()*100.0 / rStatOrgQ.getEffectiveMeasurementAverage() ));
rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage); rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
}else{ }else{
rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f); rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
@@ -91,7 +91,7 @@ public class RStatOrgQServiceImpl extends ServiceImpl<RStatOrgQMapper, RStatOrgQ
if(rStatOrgQ.getHarmonicMeasurementAccrued()!=null&&rStatOrgQ.getEffectiveMeasurementAccrued()!=null&& if(rStatOrgQ.getHarmonicMeasurementAccrued()!=null&&rStatOrgQ.getEffectiveMeasurementAccrued()!=null&&
rStatOrgQ.getHarmonicMeasurementAccrued()!=0&&rStatOrgQ.getEffectiveMeasurementAccrued()!=0){ rStatOrgQ.getHarmonicMeasurementAccrued()!=0&&rStatOrgQ.getEffectiveMeasurementAccrued()!=0){
Float harmonicMeasurementRatioAccrued = Float.parseFloat( Float harmonicMeasurementRatioAccrued = Float.parseFloat(
df.format(rStatOrgQ.getHarmonicMeasurementAccrued() / (rStatOrgQ.getEffectiveMeasurementAccrued() * 1.0))); df.format(rStatOrgQ.getHarmonicMeasurementAccrued()*100.0 / rStatOrgQ.getEffectiveMeasurementAccrued()));
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued); rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
}else{ }else{
rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f); rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatOrgYServiceImpl.java
View File

@@ -105,7 +105,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
if(rStatOrgY.getOverLimitMeasurementAverage()!=null&&rStatOrgY.getEffectiveMeasurementAverage()!=null&& if(rStatOrgY.getOverLimitMeasurementAverage()!=null&&rStatOrgY.getEffectiveMeasurementAverage()!=null&&
rStatOrgY.getOverLimitMeasurementAverage()!=0&&rStatOrgY.getEffectiveMeasurementAverage()!=0){ rStatOrgY.getOverLimitMeasurementAverage()!=0&&rStatOrgY.getEffectiveMeasurementAverage()!=0){
Float harmonicMeasurementRatioAverage = Float.parseFloat( Float harmonicMeasurementRatioAverage = Float.parseFloat(
df.format(rStatOrgY.getOverLimitMeasurementAverage() / (rStatOrgY.getEffectiveMeasurementAverage() * 1.0))); df.format(rStatOrgY.getOverLimitMeasurementAverage()*100.0 / rStatOrgY.getEffectiveMeasurementAverage() ));
rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage); rStatOrgVO.setHarmonicMeasurementRatioAverage(harmonicMeasurementRatioAverage);
}else{ }else{
rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f); rStatOrgVO.setHarmonicMeasurementRatioAverage(0.0f);
@@ -113,7 +113,7 @@ public class RStatOrgYServiceImpl extends ServiceImpl<RStatOrgYMapper, RStatOrgY
if(rStatOrgY.getOverLimitMeasurementAccrued()!=null&&rStatOrgY.getEffectiveMeasurementAccrued()!=null&& if(rStatOrgY.getOverLimitMeasurementAccrued()!=null&&rStatOrgY.getEffectiveMeasurementAccrued()!=null&&
rStatOrgY.getOverLimitMeasurementAccrued()!=0&&rStatOrgY.getEffectiveMeasurementAccrued()!=0){ rStatOrgY.getOverLimitMeasurementAccrued()!=0&&rStatOrgY.getEffectiveMeasurementAccrued()!=0){
Float harmonicMeasurementRatioAccrued = Float.parseFloat( Float harmonicMeasurementRatioAccrued = Float.parseFloat(
df.format(rStatOrgY.getOverLimitMeasurementAccrued() / (rStatOrgY.getEffectiveMeasurementAccrued() * 1.0))); df.format(rStatOrgY.getOverLimitMeasurementAccrued()*100.0 / rStatOrgY.getEffectiveMeasurementAccrued()));
rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued); rStatOrgVO.setHarmonicMeasurementRatioAccrued(harmonicMeasurementRatioAccrued);
}else{ }else{
rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f); rStatOrgVO.setHarmonicMeasurementRatioAccrued(0.0f);

44
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java
View File

@@ -309,7 +309,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued() / rStatOrgMPO.getAllCount()); String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/ /*7、累计超标天数*/
@@ -345,7 +345,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgMPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgMPO.getEventMeasurementAverage() / rStatOrgMPO.getAllCount()); String value4 = df.format(rStatOrgMPO.getEventMeasurementAverage()*100 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgMPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -421,7 +421,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued() / rStatOrgMPO.getAllCount()); String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/ /*7、累计超标天数*/
@@ -456,7 +456,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgMPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgMPO.getEventMeasurementAverage() / rStatOrgMPO.getAllCount()); String value4 = df.format(rStatOrgMPO.getEventMeasurementAverage() *100/ rStatOrgMPO.getAllCount());
rStatOrgMPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgMPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -568,7 +568,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued() / rStatOrgQPO.getAllCount()); String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/ /*7、累计超标天数*/
@@ -611,7 +611,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage() / rStatOrgQPO.getAllCount()); String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -689,7 +689,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued() / rStatOrgQPO.getAllCount()); String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/ /*7、累计超标天数*/
@@ -732,7 +732,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage() / rStatOrgQPO.getAllCount()); String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -848,7 +848,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued() / rStatOrgYPO.getAllCount()); String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、稳态指标平均超标天数*/ /*7、稳态指标平均超标天数*/
@@ -891,7 +891,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage() / rStatOrgYPO.getAllCount()); String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -968,7 +968,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setOverLimitMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgYPO.setOverLimitMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued() / rStatOrgYPO.getAllCount()); String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、稳态指标平均超标天数*/ /*7、稳态指标平均超标天数*/
@@ -1011,7 +1011,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage() / rStatOrgYPO.getAllCount()); String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -1126,7 +1126,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued() / rStatOrgYPO.getAllCount()); String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、稳态指标平均超标天数*/ /*7、稳态指标平均超标天数*/
@@ -1169,7 +1169,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage() / rStatOrgYPO.getAllCount()); String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -1246,7 +1246,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setOverLimitMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgYPO.setOverLimitMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued() / rStatOrgYPO.getAllCount()); String value2 = df.format(rStatOrgYPO.getOverLimitMeasurementAccrued()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgYPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、稳态指标平均超标天数*/ /*7、稳态指标平均超标天数*/
@@ -1289,7 +1289,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgYPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage() / rStatOrgYPO.getAllCount()); String value4 = df.format(rStatOrgYPO.getEventMeasurementAverage()*100.0 / rStatOrgYPO.getAllCount());
rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgYPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -1404,7 +1404,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued() / rStatOrgQPO.getAllCount()); String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/ /*7、累计超标天数*/
@@ -1447,7 +1447,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage() / rStatOrgQPO.getAllCount()); String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -1525,7 +1525,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgQPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued() / rStatOrgQPO.getAllCount()); String value2 = df.format(rStatOrgQPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgQPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/ /*7、累计超标天数*/
@@ -1568,7 +1568,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+"")); rStatOrgQPO.setEventMeasurementAccrued(Integer.valueOf(count2+""));
/*13、日均暂态超标监测点数占比*/ /*13、日均暂态超标监测点数占比*/
String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage() / rStatOrgQPO.getAllCount()); String value4 = df.format(rStatOrgQPO.getEventMeasurementAverage()*100.0 / rStatOrgQPO.getAllCount());
rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4)); rStatOrgQPO.setEventMeasurementRatioAverage(Double.valueOf(value4));
/*15、暂态指标发生频次*/ /*15、暂态指标发生频次*/
@@ -1684,7 +1684,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued() / rStatOrgMPO.getAllCount()); String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/ /*7、累计超标天数*/
@@ -1797,7 +1797,7 @@ public class RStatOrgServiceImpl implements RStatOrgService {
rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+"")); rStatOrgMPO.setHarmonicMeasurementAccrued(Integer.valueOf(count1+""));
/*6、日均稳态超标监测点数占比*/ /*6、日均稳态超标监测点数占比*/
String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued() / rStatOrgMPO.getAllCount()); String value2 = df.format(rStatOrgMPO.getHarmonicMeasurementAccrued()*100.0 / rStatOrgMPO.getAllCount());
rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2)); rStatOrgMPO.setHarmonicMeasurementRatioAverage(Double.parseDouble(value2));
/*7、累计超标天数*/ /*7、累计超标天数*/

62
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RAlarmCountServiceImpl.java
View File

@@ -208,7 +208,7 @@ public class RAlarmCountServiceImpl implements RAlarmCountService {
RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper); RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper);
//所有告警次数集合 //所有告警次数集合
Map<String, Long> resultCount = new HashMap<>(); Map<String, Double> resultCount = new HashMap<>();
long vdevAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getVdevAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); 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 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(); 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 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(); long interruptAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getInterruptAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
if (vdevAlarmInfoCount != 0){ if (vdevAlarmInfoCount != 0){
resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount); resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount*100.0);
} }
if (freqAlarmInfoCount!=0){ if (freqAlarmInfoCount!=0){
resultCount.put("freqAlarmInfo",freqAlarmInfoCount); resultCount.put("freqAlarmInfo",freqAlarmInfoCount*100.0);
} }
if (unbalanceAlarmInfoCount!=0){ if (unbalanceAlarmInfoCount!=0){
resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount); resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount*100.0);
} }
if (vAlarmInfoCount!=0){ if (vAlarmInfoCount!=0){
resultCount.put("vAlarmInfo",vAlarmInfoCount); resultCount.put("vAlarmInfo",vAlarmInfoCount*100.0);
} }
if (flickerAlarmInfoCount!=0){ if (flickerAlarmInfoCount!=0){
resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount); resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount*100.0);
} }
if (sagAlarmInfoCount!=0){ if (sagAlarmInfoCount!=0){
resultCount.put("sagAlarmInfo",sagAlarmInfoCount); resultCount.put("sagAlarmInfo",sagAlarmInfoCount*100.0);
} }
if (interruptAlarmInfoCount!=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); RStatOrgMPO rStatOrgMPO = rStatOrgMMapper.selectOne(rStatOrgMPOQueryWrapper);
//所有告警次数集合 //所有告警次数集合
Map<String, Long> resultCount = new HashMap<>(); Map<String, Double> resultCount = new HashMap<>();
long vdevAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getVdevAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count(); 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 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(); 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 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(); long interruptAlarmInfoCount = rMpMonitorAlarmCountMPOS.stream().filter(obj ->obj.getInterruptAlarmInfo() == 1).map(RMpMonitorAlarmCountMPO::getMeasurementPointId).distinct().count();
if (vdevAlarmInfoCount != 0){ if (vdevAlarmInfoCount != 0){
resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount); resultCount.put("vdevAlarmInfo",vdevAlarmInfoCount*100.0);
} }
if (freqAlarmInfoCount!=0){ if (freqAlarmInfoCount!=0){
resultCount.put("freqAlarmInfo",freqAlarmInfoCount); resultCount.put("freqAlarmInfo",freqAlarmInfoCount*100.0);
} }
if (unbalanceAlarmInfoCount!=0){ if (unbalanceAlarmInfoCount!=0){
resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount); resultCount.put("unbalanceAlarmInfo",unbalanceAlarmInfoCount*100.0);
} }
if (vAlarmInfoCount!=0){ if (vAlarmInfoCount!=0){
resultCount.put("vAlarmInfo",vAlarmInfoCount); resultCount.put("vAlarmInfo",vAlarmInfoCount*100.0);
} }
if (flickerAlarmInfoCount!=0){ if (flickerAlarmInfoCount!=0){
resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount); resultCount.put("flickerAlarmInfo",flickerAlarmInfoCount*100.0);
} }
if (sagAlarmInfoCount!=0){ if (sagAlarmInfoCount!=0){
resultCount.put("sagAlarmInfo",sagAlarmInfoCount); resultCount.put("sagAlarmInfo",sagAlarmInfoCount*100.0);
} }
if (interruptAlarmInfoCount!=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)) { if (Objects.isNull(rStatOrgMPO)) {
rStatAreaAlarmCountMPO.setVdevAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setVdevAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setFreqAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setFreqAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setVAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setVAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setFlickerAlarmRatio(0.00f);
} else { } else {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) { if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatAreaAlarmCountMPO.setVdevAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setVdevAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setFreqAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setFreqAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setVAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setVAlarmRatio(0.00f);
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setFlickerAlarmRatio(0.00f);
} else { } else {
//电压偏差告警占比 //电压偏差告警占比
if (resultCount.containsKey("vdevAlarmInfo")) { if (resultCount.containsKey("vdevAlarmInfo")) {
String value = df.format(resultCount.get("vdevAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); String value = df.format(resultCount.get("vdevAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setVdevAlarmRatio(Float.parseFloat(value)); rStatAreaAlarmCountMPO.setVdevAlarmRatio(Float.parseFloat(value));
} else { } else {
rStatAreaAlarmCountMPO.setVdevAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setVdevAlarmRatio(0.00f);
} }
//频率偏差告警占比 //频率偏差告警占比
if (resultCount.containsKey("freqAlarmInfo")) { if (resultCount.containsKey("freqAlarmInfo")) {
String value = df.format(resultCount.get("freqAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); String value = df.format(resultCount.get("freqAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setFreqAlarmRatio(Float.parseFloat(value)); rStatAreaAlarmCountMPO.setFreqAlarmRatio(Float.parseFloat(value));
} else { } else {
rStatAreaAlarmCountMPO.setFreqAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setFreqAlarmRatio(0.00f);
} }
//三项电压不平衡度告警占比 //三项电压不平衡度告警占比
if (resultCount.containsKey("unbalanceAlarmInfo")) { if (resultCount.containsKey("unbalanceAlarmInfo")) {
String value = df.format(resultCount.get("unbalanceAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); String value = df.format(resultCount.get("unbalanceAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(Float.parseFloat(value)); rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(Float.parseFloat(value));
} else { } else {
rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setUnbalanceAlarmRatio(0.00f);
} }
//谐波电压告警占比 //谐波电压告警占比
if (resultCount.containsKey("vAlarmInfo")) { if (resultCount.containsKey("vAlarmInfo")) {
String value = df.format(resultCount.get("vAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); String value = df.format(resultCount.get("vAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setVAlarmRatio(Float.parseFloat(value)); rStatAreaAlarmCountMPO.setVAlarmRatio(Float.parseFloat(value));
} else { } else {
rStatAreaAlarmCountMPO.setVAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setVAlarmRatio(0.00f);
} }
//闪変告警占比 //闪変告警占比
if (resultCount.containsKey("flickerAlarmInfo")) { if (resultCount.containsKey("flickerAlarmInfo")) {
String value = df.format(resultCount.get("flickerAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued()); String value = df.format(resultCount.get("flickerAlarmInfo") / rStatOrgMPO.getEffectiveMeasurementAccrued());
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(Float.parseFloat(value)); rStatAreaAlarmCountMPO.setFlickerAlarmRatio(Float.parseFloat(value));
} else { } else {
rStatAreaAlarmCountMPO.setFlickerAlarmRatio(1.00f); rStatAreaAlarmCountMPO.setFlickerAlarmRatio(0.00f);
} }
} }
} }

27
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatEventServiceImpl.java
View File

@@ -302,6 +302,9 @@ public class RStatEventServiceImpl implements RStatEventService {
} }
//累计发生暂态监测点数 //累计发生暂态监测点数
Integer statisData = getStatisData(dictData, rMpEventDetailMPOS); Integer statisData = getStatisData(dictData, rMpEventDetailMPOS);
if(statisData>0){
System.out.println("1");
}
RStatEventMPO rStatEventMPO = new RStatEventMPO(); RStatEventMPO rStatEventMPO = new RStatEventMPO();
rStatEventMPO.setOrgNo(deptGetChildrenMoreDTO.getUnitId()); rStatEventMPO.setOrgNo(deptGetChildrenMoreDTO.getUnitId());
@@ -311,7 +314,7 @@ public class RStatEventServiceImpl implements RStatEventService {
rStatEventMPO.setEventMeasurementAverage(Float.parseFloat(df.format(avgEM.get(dictData.getId())))); rStatEventMPO.setEventMeasurementAverage(Float.parseFloat(df.format(avgEM.get(dictData.getId()))));
rStatEventMPO.setEventMeasurementAccrued(statisData); rStatEventMPO.setEventMeasurementAccrued(statisData);
rStatEventMPO.setEventCount(sumEC.get(dictData.getId())); 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()); rStatEventMPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) { 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.setEventMeasurementAverage(Float.parseFloat(df.format(avgEM.get(dictData.getId()))));
rStatEventMPO.setEventMeasurementAccrued(statisData); rStatEventMPO.setEventMeasurementAccrued(statisData);
rStatEventMPO.setEventCount(sumEC.get(dictData.getId())); 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()); rStatEventMPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) { if (sumEM.get(dictData.getId()) == 0) {
@@ -544,7 +547,7 @@ public class RStatEventServiceImpl implements RStatEventService {
// todo // todo
rStatEventQPO.setEventMeasurementAccrued(statisData); rStatEventQPO.setEventMeasurementAccrued(statisData);
rStatEventQPO.setEventCount(sumECM.get(dictData.getId())); 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()); rStatEventQPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) { if (sumEM.get(dictData.getId()) == 0) {
@@ -648,7 +651,7 @@ public class RStatEventServiceImpl implements RStatEventService {
// todo // todo
rStatEventQPO.setEventMeasurementAccrued(statisData); rStatEventQPO.setEventMeasurementAccrued(statisData);
rStatEventQPO.setEventCount(sumECM.get(dictData.getId())); 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()); rStatEventQPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) { if (sumEM.get(dictData.getId()) == 0) {
@@ -791,7 +794,7 @@ public class RStatEventServiceImpl implements RStatEventService {
// todo // todo
rStatEventYPO.setEventMeasurementAccrued(statisData); rStatEventYPO.setEventMeasurementAccrued(statisData);
rStatEventYPO.setEventCount(sumECM.get(dictData.getId())); 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()); rStatEventYPO.setDataType(dataTypeMap.get(DicDataEnum.MAINNET_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) { if (sumEM.get(dictData.getId()) == 0) {
@@ -896,7 +899,7 @@ public class RStatEventServiceImpl implements RStatEventService {
// todo // todo
rStatEventYPO.setEventMeasurementAccrued(statisData); rStatEventYPO.setEventMeasurementAccrued(statisData);
rStatEventYPO.setEventCount(sumECM.get(dictData.getId())); 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()); rStatEventYPO.setDataType(dataTypeMap.get(DicDataEnum.DISTRIBUTION_POINT.getCode()).getId());
if (sumEM.get(dictData.getId()) == 0) { if (sumEM.get(dictData.getId()) == 0) {
@@ -1192,7 +1195,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) { if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventMPO.setEventMeasurementRatioAccrued(1.00f); rStatEventMPO.setEventMeasurementRatioAccrued(1.00f);
} else { } else {
String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue()); String value = df.format(statisData*100 / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
} }
} }
@@ -1282,7 +1285,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) { if (rStatOrgMPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventMPO.setEventMeasurementRatioAccrued(1.00f); rStatEventMPO.setEventMeasurementRatioAccrued(1.00f);
} else { } else {
String value = df.format(statisData / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue()); String value = df.format(statisData*100 / rStatOrgMPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); rStatEventMPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
} }
} }
@@ -1432,7 +1435,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) { if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventQPO.setEventMeasurementRatioAccrued(1.00f); rStatEventQPO.setEventMeasurementRatioAccrued(1.00f);
} else { } else {
String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue()); String value = df.format(statisData*100 / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
} }
} }
@@ -1536,7 +1539,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) { if (rStatOrgQPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventQPO.setEventMeasurementRatioAccrued(1.00f); rStatEventQPO.setEventMeasurementRatioAccrued(1.00f);
} else { } else {
String value = df.format(statisData / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue()); String value = df.format(statisData*100 / rStatOrgQPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); rStatEventQPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
} }
} }
@@ -1679,7 +1682,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) { if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventYPO.setEventMeasurementRatioAccrued(1.00f); rStatEventYPO.setEventMeasurementRatioAccrued(1.00f);
} else { } else {
String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue()); String value = df.format(statisData*100 / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
} }
} }
@@ -1784,7 +1787,7 @@ public class RStatEventServiceImpl implements RStatEventService {
if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) { if (rStatOrgYPO.getEffectiveMeasurementAccrued() == 0) {
rStatEventYPO.setEventMeasurementRatioAccrued(1.00f); rStatEventYPO.setEventMeasurementRatioAccrued(1.00f);
} else { } else {
String value = df.format(statisData / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue()); String value = df.format(statisData*100 / rStatOrgYPO.getEffectiveMeasurementAccrued().floatValue());
rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value)); rStatEventYPO.setEventMeasurementRatioAccrued(Float.parseFloat(value));
} }
} }

41
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/newalgorithm/impl/RStatLoadTypeServiceImpl.java
View File

@@ -206,14 +206,23 @@ public class RStatLoadTypeServiceImpl implements RStatLoadTypeService {
rStatLoadTypeMPO.setUnbalanceCount(0); rStatLoadTypeMPO.setUnbalanceCount(0);
rStatLoadTypeMPO.setFlickerCount(0); rStatLoadTypeMPO.setFlickerCount(0);
}else { }else {
Optional<RStatHarmonicMPO> vfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId())).findFirst(); Optional<RStatHarmonicMPO> 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); rStatLoadTypeMPO.setVCount(vfirst.isPresent() ? vfirst.get().getOverLimitMeasurementAccrued(): 0);
Optional<RStatHarmonicMPO> ifirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId())).findFirst(); Optional<RStatHarmonicMPO> 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); rStatLoadTypeMPO.setICount(ifirst.isPresent() ? ifirst.get().getOverLimitMeasurementAccrued(): 0);
Optional<RStatHarmonicMPO> pfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())).findFirst(); Optional<RStatHarmonicMPO> pfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())
Optional<RStatHarmonicMPO> nfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())).findFirst(); &&Objects.equals(temp.getMeasurementTypeClass(), m)
Optional<RStatHarmonicMPO> ffirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId())).findFirst(); ).findFirst();
Optional<RStatHarmonicMPO> nfirst = rStatHarmonicMPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
Optional<RStatHarmonicMPO> 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.setINegCount(nfirst.isPresent() ? nfirst.get().getOverLimitMeasurementAccrued(): 0);
rStatLoadTypeMPO.setUnbalanceCount(pfirst.isPresent() ? pfirst.get().getOverLimitMeasurementAccrued(): 0); rStatLoadTypeMPO.setUnbalanceCount(pfirst.isPresent() ? pfirst.get().getOverLimitMeasurementAccrued(): 0);
rStatLoadTypeMPO.setFlickerCount(ffirst.isPresent() ? ffirst.get().getOverLimitMeasurementAccrued(): 0); rStatLoadTypeMPO.setFlickerCount(ffirst.isPresent() ? ffirst.get().getOverLimitMeasurementAccrued(): 0);
@@ -308,13 +317,23 @@ public class RStatLoadTypeServiceImpl implements RStatLoadTypeService {
rStatLoadTypeQPO.setUnbalanceCount(0); rStatLoadTypeQPO.setUnbalanceCount(0);
rStatLoadTypeQPO.setFlickerCount(0); rStatLoadTypeQPO.setFlickerCount(0);
}else { }else {
Optional<RStatHarmonicQPO> vfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_VOLTAGE.getCode()).getId())).findFirst(); Optional<RStatHarmonicQPO> 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); rStatLoadTypeQPO.setVCount(vfirst.isPresent() ? vfirst.get().getOverLimitMeasurementAccrued(): 0);
Optional<RStatHarmonicQPO> ifirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.HARMONIC_CURRENT.getCode()).getId())).findFirst(); Optional<RStatHarmonicQPO> 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); rStatLoadTypeQPO.setICount(ifirst.isPresent() ? ifirst.get().getOverLimitMeasurementAccrued(): 0);
Optional<RStatHarmonicQPO> pfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())).findFirst(); Optional<RStatHarmonicQPO> pfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.PHASE_VOLTAGE.getCode()).getId())
Optional<RStatHarmonicQPO> nfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())).findFirst(); &&Objects.equals(temp.getMeasurementTypeClass(), m)
Optional<RStatHarmonicQPO> ffirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.FLICKER.getCode()).getId())).findFirst(); ).findFirst();
Optional<RStatHarmonicQPO> nfirst = rStatHarmonicQPOS.stream().filter(temp -> Objects.equals(temp.getHarmonicType(), steadyStatisMap.get(DicDataEnum.NEG_CURRENT.getCode()).getId())
&&Objects.equals(temp.getMeasurementTypeClass(), m)
).findFirst();
Optional<RStatHarmonicQPO> 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.setINegCount(nfirst.isPresent() ? nfirst.get().getOverLimitMeasurementAccrued(): 0);
rStatLoadTypeQPO.setUnbalanceCount(pfirst.isPresent() ? pfirst.get().getOverLimitMeasurementAccrued(): 0); rStatLoadTypeQPO.setUnbalanceCount(pfirst.isPresent() ? pfirst.get().getOverLimitMeasurementAccrued(): 0);

11
pqs-system/system-api/src/main/java/com/njcn/system/api/DicDataFeignClient.java
View File

@@ -61,6 +61,17 @@ public interface DicDataFeignClient {
HttpResult<DictData> getDicDataByNameAndTypeName(@RequestParam("dicTypeName") String dicTypeName, @RequestParam("dicDataName") String dicDataName); HttpResult<DictData> getDicDataByNameAndTypeName(@RequestParam("dicTypeName") String dicTypeName, @RequestParam("dicDataName") String dicDataName);
/**
* 根据数据code&&字典类型code获取字典数据
*
* @param dicDataCode 字典数据名称
* @param dicTypeCode 字典类型名称
* @return 字典数据
*/
@GetMapping("/getDicDataByCodeAndType")
HttpResult<DictData> getDicDataByCodeAndType(@RequestParam("dicDataCode") String dicDataCode, @RequestParam("dicTypeCode") String dicTypeCode);
/*** /***
* 字典类型 * 字典类型
*/ */

6
pqs-system/system-api/src/main/java/com/njcn/system/api/fallback/DicDataFeignClientFallbackFactory.java
View File

@@ -84,6 +84,12 @@ public class DicDataFeignClientFallbackFactory implements FallbackFactory<DicDat
log.error("{}异常，降级处理，异常为：{}","根据字典类型名称&数据名称获取字典数据",cause.toString()); log.error("{}异常，降级处理，异常为：{}","根据字典类型名称&数据名称获取字典数据",cause.toString());
throw new BusinessException(finalExceptionEnum); throw new BusinessException(finalExceptionEnum);
} }
@Override
public HttpResult<DictData> getDicDataByCodeAndType(String dicDataCode, String dicTypeCode) {
log.error("{}异常，降级处理，异常为：{}","根据数据code&&字典类型code获取字典数据",cause.toString());
throw new BusinessException(finalExceptionEnum);
}
}; };
} }
} }

12
pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java
View File

@@ -176,6 +176,18 @@ public class DictDataController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); 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<DictData> 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) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/getDicDataByCode") @GetMapping("/getDicDataByCode")
@ApiOperation("根据字典code查询字典数据") @ApiOperation("根据字典code查询字典数据")

2
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DictDataMapper.java
View File

@@ -39,6 +39,8 @@ public interface DictDataMapper extends BaseMapper<DictData> {
DictData getDicDataByNameAndType(@Param("dicName") String dicName, @Param("typeName") String typeName); 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); DictData getDicDataByCode(@Param("code") String code);
/** /**

9
pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml
View File

@@ -75,4 +75,13 @@
and sys_dict_data.state = 1 and sys_dict_data.state = 1
order by sort order by sort
</select> </select>
<select id="getDicDataByCodeAndType" resultType="com.njcn.system.pojo.po.DictData">
SELECT sys_dict_data.*
FROM sys_dict_data sys_dict_data
LEFT JOIN sys_dict_type sdt ON sdt.Id = sys_dict_data.Type_Id
WHERE sys_dict_data.code = #{dicCode}
and sys_dict_data.state = 1
and sdt.`code`= #{typeCode}
order by sys_dict_data.sort
</select>
</mapper> </mapper>

6
pqs-system/system-boot/src/main/java/com/njcn/system/service/IDictDataService.java
View File

@@ -90,6 +90,12 @@ public interface IDictDataService extends IService<DictData> {
*/ */
DictData getDicDataByNameAndType(String dicName,String typeName); DictData getDicDataByNameAndType(String dicName,String typeName);
/**
*
* @param dicCode 字典Code,类型名称
* @return 根据字典Code查询字典数据
*/
DictData getDicDataByCodeAndType(String dicCode,String typeCode);
/** /**
* *
* @param code 字典code * @param code 字典code

5
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/DictDataServiceImpl.java
View File

@@ -149,6 +149,11 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
return this.baseMapper.getDicDataByNameAndType(dicName,typeName); return this.baseMapper.getDicDataByNameAndType(dicName,typeName);
} }
@Override
public DictData getDicDataByCodeAndType(String dicCode, String typeCode) {
return this.baseMapper.getDicDataByCodeAndType(dicCode,typeCode);
}
@Override @Override
public DictData getDicDataByCode(String code) { public DictData getDicDataByCode(String code) {
return this.baseMapper.getDicDataByCode(code); return this.baseMapper.getDicDataByCode(code);