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:
雨木c
2023-11-02 08:47:34 +08:00
parent 4caac7535e
commit a74e9ab915
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -410,7 +410,7 @@ public interface LineMapper extends BaseMapper<Line> {
"\t\tFROM\n", "\t\tFROM\n",
"\t\t\tpq_line a\n", "\t\t\tpq_line a\n",
"\t\tINNER JOIN pq_device b ON a.id = b.id\n", "\t\tINNER JOIN pq_device b ON a.id = b.id\n",
"where b.Run_Flag = 0 and a.Pid in", "where b.com_flag = 0 and a.Pid in",
"<foreach item='item' index='index' collection='items' open='(' separator=',' close=')'>", "<foreach item='item' index='index' collection='items' open='(' separator=',' close=')'>",
"#{item}", "#{item}",
"</foreach>", "</foreach>",

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

@@ -712,10 +712,10 @@ public class GeneralDeviceService {
List<GeneralDeviceDTO> deptDeviceInfos = this.getDeviceInfoAsDept(deviceInfoParam, Stream.of(0, 1).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList())); List<GeneralDeviceDTO> deptDeviceInfos = this.getDeviceInfoAsDept(deviceInfoParam, Stream.of(0, 1).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
List<String> DeviceIds = deptDeviceInfos.stream().map(GeneralDeviceDTO::getSubIndexes).flatMap(Collection::stream).collect(Collectors.toList()); List<String> subIds = deptDeviceInfos.stream().map(GeneralDeviceDTO::getSubIndexes).flatMap(Collection::stream).collect(Collectors.toList());
Integer substationCount = DeviceIds.size(); Integer substationCount = subIds.size();
Integer count = lineMapper.queryOnlineSubstaion(DeviceIds); Integer count = lineMapper.queryOnlineSubstaion(subIds);
deptSubstationDetailVO.setSubstationCount(substationCount); deptSubstationDetailVO.setSubstationCount(substationCount);
deptSubstationDetailVO.setRunsubstationCount(count); deptSubstationDetailVO.setRunsubstationCount(count);
BigDecimal rate = BigDecimal.valueOf(count).divide(BigDecimal.valueOf(substationCount), 4, BigDecimal.ROUND_HALF_UP); BigDecimal rate = BigDecimal.valueOf(count).divide(BigDecimal.valueOf(substationCount), 4, BigDecimal.ROUND_HALF_UP);