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

问题调整

Browse Source
This commit is contained in:
chendaofei
2025-04-14 11:17:29 +08:00
parent f0ad4aa38b
commit e968e44440
7 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -283,22 +283,22 @@
CASE
device.Run_Flag
WHEN 0 THEN
"投运"
'投运'
WHEN 1 THEN
"检修"
'检修'
WHEN 2 THEN
"停运"
'停运'
WHEN 3 THEN
"调试"
'调试'
WHEN 4 THEN
"退运"
'退运'
END AS runFlag,
CASE
device.Com_Flag
WHEN 0 THEN
"中断"
'中断'
WHEN 1 THEN
"正常"
'正常'
END AS comFlag,
device.Update_Time AS updateTime
FROM

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

@@ -1547,7 +1547,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
if (Objects.isNull(obj)) {
throw new BusinessException(CommonResponseEnum.FAIL);
}
logsList.add(obj);
LineBaseEnum lineBaseEnum = LineBaseEnum.getLineBaseEnumByCode(obj.getLevel());
// 根据层级选择删除策略
switch (lineBaseEnum) {

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

@@ -265,11 +265,11 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
tree.setPid(userLedgerVO.getStationId());
tree.setId(userLedgerVO.getId());
tree.setChildren(monitorList);
int devSize = monitorList.stream().map(x -> {
int devSize = (int) monitorList.stream().map(x -> {
// 获取父id字符串，通过 逗号 分割 成一个数组
String[] pid = x.getPids().split(StrUtil.COMMA);
return pid[LineBaseEnum.DEVICE_LEVEL.getCode()];
}).distinct().collect(Collectors.toList()).size();
}).distinct().count();
tree.setName(userLedgerVO.getProjectName() + "（" + devSize + "台装置）");
temList.add(tree);
});
@@ -320,25 +320,25 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
// 通过stream流分组
groupLine = childrenData.stream().collect(Collectors.groupingBy(terminalTree -> {
// 获取父id字符串，通过 逗号 分割 成一个数组
String[] pid = terminalTree.getPids().split(",");
String[] pid = terminalTree.getPids().split(StrUtil.COMMA);
return pid[LineBaseEnum.SUB_LEVEL.getCode()];
}));
} else {
groupLine = childrenData.stream().collect(Collectors.groupingBy(TerminalTree::getPid));
}
//变电站
targetData = targetData.stream().peek(terminalTree -> {
targetData.forEach(terminalTree -> {
List<TerminalTree> terminalTrees = new ArrayList<>();
if(groupLine.containsKey(terminalTree.getId())) {
terminalTrees.addAll(groupLine.get(terminalTree.getId()).stream().sorted(Comparator.comparing(TerminalTree::getSort)).collect(Collectors.toList()));
}
if (isLine) {
//变电站集合
int size = terminalTrees.stream().map(x -> {
int size = (int) terminalTrees.stream().map(x -> {
// 获取父id字符串，通过 逗号 分割 成一个数组
String[] pid = x.getPids().split(StrUtil.COMMA);
return pid[LineBaseEnum.DEVICE_LEVEL.getCode()];
}).distinct().collect(Collectors.toList()).size();
}).distinct().count();
terminalTree.setName(terminalTree.getName() + "（" + size + "台装置）");
@@ -346,13 +346,11 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
List<TerminalTree> devList = userLineMap.get(terminalTree.getId());
terminalTrees.addAll(devList);
}
terminalTree.setChildren(terminalTrees);
} else {
terminalTree.setChildren(groupLine.get(terminalTree.getId()));
terminalTree.setChildren(terminalTrees);
}
}).collect(Collectors.toList());
});
}