diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml index ebb404ccf..4c3f0da34 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/DeviceMapper.xml @@ -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 diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java index 82117698d..8efd41241 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java @@ -1547,7 +1547,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple if (Objects.isNull(obj)) { throw new BusinessException(CommonResponseEnum.FAIL); } - logsList.add(obj); + LineBaseEnum lineBaseEnum = LineBaseEnum.getLineBaseEnumByCode(obj.getLevel()); // 根据层级选择删除策略 switch (lineBaseEnum) { diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java index 6d9fc8637..c1e5bc6a5 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java @@ -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 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 devList = userLineMap.get(terminalTree.getId()); terminalTrees.addAll(devList); } - terminalTree.setChildren(terminalTrees); - } else { - terminalTree.setChildren(groupLine.get(terminalTree.getId())); + terminalTree.setChildren(terminalTrees); } - }).collect(Collectors.toList()); + }); } diff --git a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/SpThroughParam.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/SpThroughParam.java similarity index 94% rename from pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/SpThroughParam.java rename to pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/SpThroughParam.java index af1584624..3cdeec4af 100644 --- a/pqs-prepare/prepare-api/src/main/java/com/njcn/prepare/harmonic/pojo/param/SpThroughParam.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/SpThroughParam.java @@ -1,4 +1,4 @@ -package com.njcn.prepare.harmonic.pojo.param; +package com.njcn.event.pojo.param; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/SpThroughServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/SpThroughServiceImpl.java index f2a1ed056..739723652 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/SpThroughServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/SpThroughServiceImpl.java @@ -9,7 +9,7 @@ import com.njcn.event.mapper.majornetwork.SpThroughMapper; import com.njcn.event.pojo.po.SpThroughPO; import com.njcn.event.pojo.vo.SpThroughVO; import com.njcn.event.service.majornetwork.SpThroughService; -import com.njcn.prepare.harmonic.pojo.param.SpThroughParam; +import com.njcn.event.pojo.param.SpThroughParam; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DictTreeFeignClient; import com.njcn.system.enums.DicDataEnum; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java index 3f0bcb930..17c3f9211 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java @@ -13,7 +13,7 @@ import com.njcn.event.pojo.vo.VoltageRideThroughVo; import com.njcn.event.service.majornetwork.EventDetailService; import com.njcn.event.service.majornetwork.SpThroughService; import com.njcn.event.service.majornetwork.VoltageRideThroughEventService; -import com.njcn.prepare.harmonic.pojo.param.SpThroughParam; +import com.njcn.event.pojo.param.SpThroughParam; import com.njcn.supervision.api.UserLedgerFeignClient; import com.njcn.supervision.pojo.vo.user.NewUserReportVO; import com.njcn.system.api.AreaFeignClient; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/SpThroughService.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/SpThroughService.java index 91ecf68f7..9ed20a185 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/SpThroughService.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/SpThroughService.java @@ -3,7 +3,7 @@ package com.njcn.event.service.majornetwork; import com.github.jeffreyning.mybatisplus.service.IMppService; import com.njcn.event.pojo.po.SpThroughPO; import com.njcn.event.pojo.vo.SpThroughVO; -import com.njcn.prepare.harmonic.pojo.param.SpThroughParam; +import com.njcn.event.pojo.param.SpThroughParam; import java.util.List;