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

代码调整

Browse Source
This commit is contained in:
雨木c
2022-12-12 15:18:48 +08:00
parent 9b8af7945a
commit d043ab478b
10 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -275,7 +275,11 @@ public class RunManageServiceImpl implements RunManageService {
private GeneralDeviceDTO assembleDataByLine(SimpleDTO simpleDTO, List<Line> lines, List<String> keyIds, Integer level) {
GeneralDeviceDTO generalDeviceDTO = new GeneralDeviceDTO();
generalDeviceDTO.setName(simpleDTO.getName());
if(LineBaseEnum.SUB_V_LEVEL.getCode().equals(level)){
generalDeviceDTO.setName(simpleDTO.getValue());
}else {
generalDeviceDTO.setName(simpleDTO.getName());
}
generalDeviceDTO.setIndex(simpleDTO.getId());
if (CollectionUtil.isNotEmpty(keyIds)) {
List<Line> tempLines = lines.stream().filter(line -> {
@@ -309,7 +313,7 @@ public class RunManageServiceImpl implements RunManageService {
TerminalLedgerVO.ItemData itemData = new TerminalLedgerVO.ItemData();
if (type == 1) {
//电压时候进行排序处理
itemData.setVoltage(Float.parseFloat(general.getName().substring(0, general.getName().indexOf("k"))));
itemData.setVoltage(Float.parseFloat(general.getName()));
}
itemData.setLineCount(general.getLineIndexes().size());
itemData.setDevCount(general.getDeviceIndexes().size());