diff --git a/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java b/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java index 63ea6a7..4c5fcca 100644 --- a/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java +++ b/analysis/stat/stat-boot/src/main/java/com/njcn/stat/service/impl/MessageAnalysisServiceImpl.java @@ -68,22 +68,22 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService { List dataFlucDTOList = new ArrayList<>(); List dataPltDTOList = new ArrayList<>(); List dataFlickerDTOList = new ArrayList<>(); - - //新增冗余,装置收到数据,判断装置当前的状态,如果为离线,则应该置为在线 - List lineList = messageList.stream().map(MessageDataDTO::getMonitor).distinct().collect(Collectors.toList()); - //装置集合 - Set devList = lineFeignClient.getDevListByLineIdList(lineList).getData(); - //获取装置详细信息 - devList.forEach(dev->{ - DeviceDTO dto = deviceFeignClient.getDeviceInfo(dev).getData(); - //判断装置通讯状态 如果装置还处于离线,则要反转装置的状态 - if (Objects.equals(dto.getComFlag(),0)) { - com.njcn.device.pq.pojo.dto.DevComFlagDTO dto1 = new com.njcn.device.pq.pojo.dto.DevComFlagDTO(); - dto1.setId(dev); - dto1.setStatus(1); - deviceFeignClient.updateDevComFlag(dto1); - } - }); + //移动到入库阶段做处理 +// //新增冗余,装置收到数据,判断装置当前的状态,如果为离线,则应该置为在线 +// List lineList = messageList.stream().map(MessageDataDTO::getMonitor).distinct().collect(Collectors.toList()); +// //装置集合 +// Set devList = lineFeignClient.getDevListByLineIdList(lineList).getData(); +// //获取装置详细信息 +// devList.forEach(dev->{ +// DeviceDTO dto = deviceFeignClient.getDeviceInfo(dev).getData(); +// //判断装置通讯状态 如果装置还处于离线,则要反转装置的状态 +// if (Objects.equals(dto.getComFlag(),0)) { +// com.njcn.device.pq.pojo.dto.DevComFlagDTO dto1 = new com.njcn.device.pq.pojo.dto.DevComFlagDTO(); +// dto1.setId(dev); +// dto1.setStatus(1); +// deviceFeignClient.updateDevComFlag(dto1); +// } +// }); messageList.forEach(messageDataDTO->{ Integer dataType = messageDataDTO.getDataType(); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/LnDataDealServiceImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/LnDataDealServiceImpl.java index 0e4abcf..4015234 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/LnDataDealServiceImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/LnDataDealServiceImpl.java @@ -90,6 +90,7 @@ public class LnDataDealServiceImpl implements LnDataDealService { devIds.forEach(temp->{ DevComFlagDTO devComFlagDTO = new DevComFlagDTO(); devComFlagDTO.setId(temp); + devComFlagDTO.setStatus(1); devComFlagDTO.setDate(dataVDTO.getTimeid()); deviceFeignClient.updateDevComFlag(devComFlagDTO); });