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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhuxinyu
2023-03-09 15:47:44 +08:00
parent 484b5dc2e5 f1f1d523e0
commit 2e6ae8857c
5 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,16 +126,16 @@ public class SpecialAnalysisMonitorVO implements Serializable {
private String name; private String name;
@ApiModelProperty(name = "tractionStation", value = "牵引站数量") @ApiModelProperty(name = "tractionStation", value = "牵引站数量")
private String tractionStation; private Integer tractionStation;
@ApiModelProperty(name = "num", value = "监测点数量") @ApiModelProperty(name = "num", value = "监测点数量")
private String num; private Integer num;
@ApiModelProperty(name = "ytbSumNum", value = "同比数量") @ApiModelProperty(name = "ytbSumNum", value = "同比数量")
private String ytbSumNum; private Integer ytbSumNum;
@ApiModelProperty(name = "yhbSumNum", value = "环比数量") @ApiModelProperty(name = "yhbSumNum", value = "环比数量")
private String yhbSumNum; private Integer yhbSumNum;
@ApiModelProperty(name = "sameNum", value = "监测点数量同比") @ApiModelProperty(name = "sameNum", value = "监测点数量同比")
private String sameNum; private String sameNum;
@@ -157,16 +157,16 @@ public class SpecialAnalysisMonitorVO implements Serializable {
private String connetGroupWay; private String connetGroupWay;
@ApiModelProperty(name = "num", value = "牵引站数量") @ApiModelProperty(name = "num", value = "牵引站数量")
private String num; private Integer num;
@ApiModelProperty(name = "rateAvg", value = "负载量（平均值）") @ApiModelProperty(name = "rateAvg", value = "负载量（平均值）")
private String rateAvg; private Integer rateAvg;
@ApiModelProperty(name = "rate95", value = "负载量（95值）") @ApiModelProperty(name = "rate95", value = "负载量（95值）")
private String rate95; private Integer rate95;
@ApiModelProperty(name = "rate99", value = "负载量（99值）") @ApiModelProperty(name = "rate99", value = "负载量（99值）")
private String rate99; private Integer rate99;
} }

32
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/OverviewMapper.xml
View File

@@ -32,7 +32,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user
@@ -42,7 +42,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea
@@ -52,7 +52,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
@@ -63,7 +63,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) )
@@ -95,7 +95,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user
@@ -105,7 +105,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea
@@ -115,7 +115,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
@@ -126,7 +126,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) )
@@ -160,7 +160,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user
@@ -170,7 +170,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea ( SELECT id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea
@@ -180,7 +180,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
@@ -191,7 +191,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) )
@@ -236,7 +236,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
( SELECT id,org_id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user ( SELECT id,org_id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_generation_user
@@ -246,7 +246,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
( SELECT id,org_id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea ( SELECT id,org_id, Operation_Id, Power_Station_Id, Line_Id FROM pms_power_distributionarea
@@ -256,7 +256,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) UNION ALL ) UNION ALL
@@ -267,7 +267,7 @@
<foreach collection="orgIds" item="item" open="(" close=")" separator=","> <foreach collection="orgIds" item="item" open="(" close=")" separator=",">
#{item} #{item}
</foreach> </foreach>
AND Is_Up_To_Grid = 1 AND STATUS = 1 AND STATUS = 1
</where> </where>
) )

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/SpecialAnalysisMapper.xml
View File

@@ -12,7 +12,7 @@
pm.Powerr_Id, pm.Powerr_Id,
pm.Terminal_Id, pm.Terminal_Id,
pm.Voltage_Level, pm.Voltage_Level,
psm.capacity, IFNULL(psm.capacity,0) as capacity,
ps.Longitude, ps.Longitude,
ps.Latitude ps.Latitude
FROM FROM

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

@@ -57,7 +57,8 @@ public class OverviewServiceImpl implements OverviewService {
DicDataTypeEnum.LINE_SORT.getCode()).getData(); DicDataTypeEnum.LINE_SORT.getCode()).getData();
//获取部门数据 //获取部门数据
List<String> deptListCode = getDeptListCode(param.getId()); List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<String> deptListCode = data.stream().map(DeptDTO::getCode).collect(Collectors.toList());
if(CollectionUtil.isNotEmpty(deptListCode)){ if(CollectionUtil.isNotEmpty(deptListCode)){
List<OverviewVO.MonitorObject> overviewVOS = overviewMapper.selectYoY(deptListCode, param); List<OverviewVO.MonitorObject> overviewVOS = overviewMapper.selectYoY(deptListCode, param);
@@ -125,7 +126,8 @@ public class OverviewServiceImpl implements OverviewService {
public List<OverviewVO.AlarmVO> getAlarmProportion(OverviewParam.OverviewDateParam param) { public List<OverviewVO.AlarmVO> getAlarmProportion(OverviewParam.OverviewDateParam param) {
List<OverviewVO.AlarmVO> alarmVOS=new ArrayList<>(); List<OverviewVO.AlarmVO> alarmVOS=new ArrayList<>();
//获取部门数据 //获取部门数据
List<String> deptListCode = getDeptListCode(param.getId()); List<DeptDTO> deptDTOS = deptFeignClient.getDeptDescendantIndexes(param.getId(), WebUtil.filterDeptType()).getData();
List<String> deptListCode = deptDTOS.stream().map(DeptDTO::getCode).collect(Collectors.toList());
DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData(); DictData data = dicDataFeignClient.getDicDataByCode(DicDataEnum.DISTRIBUTION_POINT.getCode()).getData();
//获取监测点类别集合（配网1-2-3类监测点） //获取监测点类别集合（配网1-2-3类监测点）

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

@@ -167,10 +167,10 @@ public class SpecialAnalysisServiceImpl implements SpecialAnalysisService {
for (DictData notData : notMeasurementList) { for (DictData notData : notMeasurementList) {
wiringTypeDetail = new SpecialAnalysisMonitorVO.WiringTypeDetail(); wiringTypeDetail = new SpecialAnalysisMonitorVO.WiringTypeDetail();
wiringTypeDetail.setConnetGroupWay(notData.getId()); wiringTypeDetail.setConnetGroupWay(notData.getId());
wiringTypeDetail.setNum("0"); wiringTypeDetail.setNum(0);
wiringTypeDetail.setRateAvg("0"); wiringTypeDetail.setRateAvg(0);
wiringTypeDetail.setRate95("0"); wiringTypeDetail.setRate95(0);
wiringTypeDetail.setRate99("0"); wiringTypeDetail.setRate99(0);
wiringTypeRailway.add(wiringTypeDetail); wiringTypeRailway.add(wiringTypeDetail);
} }
if (CollUtil.isNotEmpty(wiringTypeRailway)) { if (CollUtil.isNotEmpty(wiringTypeRailway)) {