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:是)
@@ -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:是)

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 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 = "电压偏差告警超标占比")
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:是)

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 = "更新时间")
@JSONField(format = "yyyy-MM-dd")
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.setIfSpecial(traction.getIfSpecial() + "");
sendVO.setTractionName(traction.getName());
sendVO.setRailwayName(traction.getRailwayLineName());
sendVO.setRailwayType(traction.getRailwayType());
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()) {
//光伏电站
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: