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

bug修改

Browse Source
This commit is contained in:
chendaofei
2025-05-20 15:25:46 +08:00
parent 89f075f395
commit fedc457da0
4 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetailVO.java
View File

@@ -23,6 +23,9 @@ public class DevDetailVO {
@ApiModelProperty(name = "devName",value = "终端名称") @ApiModelProperty(name = "devName",value = "终端名称")
private String devName; private String devName;
@ApiModelProperty(name = "ip",value = "ip")
private String ip;
@ApiModelProperty(name = "subName",value = "变电站名称") @ApiModelProperty(name = "subName",value = "变电站名称")
private String subName; private String subName;

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunEvaluateVO.java
View File

@@ -20,6 +20,9 @@ public class DeviceRunEvaluateVO {
@ApiModelProperty("变电站名称") @ApiModelProperty("变电站名称")
private String subName; private String subName;
@ApiModelProperty("ip")
private String ip;
@ApiModelProperty("评价") @ApiModelProperty("评价")
private BigDecimal evaluate; private BigDecimal evaluate;

35
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
View File

@@ -1835,24 +1835,27 @@
where t1.state = 1 where t1.state = 1
</select> </select>
<select id="getLineDeviceByDevIds" resultType="com.njcn.device.pq.pojo.vo.DevDetailVO"> <select id="getLineDeviceByDevIds" resultType="com.njcn.device.pq.pojo.vo.DevDetailVO">
SELECT SELECT distinct
t.id lineId, t.id lineId,
t.NAME lineName, t.NAME lineName,
dev.id devId, dev.id devId,
dev.NAME devName, dev.NAME devName,
sub.NAME subName, sub.NAME subName,
td.Obj_Id objId td.Obj_Id objId,
device.ip
FROM FROM
pq_line t, pq_line t,
pq_line_detail td, pq_line_detail td,
pq_line subv, pq_line subv,
pq_line dev, pq_line dev,
pq_line sub pq_device device,
pq_line sub
WHERE WHERE
subv.id = t.pid t.id = td.id
AND t.id = td.id AND subv.id = t.pid
AND dev.id = subv.pid AND dev.id = subv.pid
AND sub.id = dev.pid AND dev.id = device.id
AND sub.id = dev.pid
<if test="powerFlag!=null and powerFlag!=2"> <if test="powerFlag!=null and powerFlag!=2">
AND td.Power_Flag =#{powerFlag} AND td.Power_Flag =#{powerFlag}
</if> </if>

7
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java
View File

@@ -195,6 +195,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
DeviceRunEvaluateVO vo = new DeviceRunEvaluateVO(); DeviceRunEvaluateVO vo = new DeviceRunEvaluateVO();
vo.setName(split[1]); vo.setName(split[1]);
vo.setSubName(split[2]); vo.setSubName(split[2]);
vo.setIp(value.get(0).getIp());
setEvaluate(Arrays.asList(split[0]), setEvaluate(Arrays.asList(split[0]),
value.stream().map(DevDetailVO::getLineId).distinct().collect(Collectors.toList()), value.stream().map(DevDetailVO::getLineId).distinct().collect(Collectors.toList()),
onIntegrityList, vo, onlineRateList, limitRateList); onIntegrityList, vo, onlineRateList, limitRateList);
@@ -244,6 +245,9 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
} }
} else { } else {
for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
if(CollUtil.isEmpty(generalDeviceDTO.getDeviceIndexes())){
continue;
}
List<RStatIntegrityD> rStatIntegrityDList = new ArrayList<>(); List<RStatIntegrityD> rStatIntegrityDList = new ArrayList<>();
List<RStatOnlinerateD> rStatOnlinerateDList = new ArrayList<>(); List<RStatOnlinerateD> rStatOnlinerateDList = new ArrayList<>();
List<RStatLimitRateDPO> rStatLimitRateDPOList = new ArrayList<>(); List<RStatLimitRateDPO> rStatLimitRateDPOList = new ArrayList<>();
@@ -252,7 +256,8 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
} }
} }
} }
return result;
return result.stream().sorted(Comparator.comparing(TerminalEvaluateAreaVO::getScore, Comparator.reverseOrder())).collect(Collectors.toList());
} }
@Override @Override