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 797df6a..0e4abcf 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 @@ -1,10 +1,22 @@ package com.njcn.dataProcess.service.impl; import com.njcn.dataProcess.annotation.QueryBean; +import com.njcn.dataProcess.dto.DataVDTO; import com.njcn.dataProcess.dto.LnDataDTO; import com.njcn.dataProcess.annotation.InsertBean; import com.njcn.dataProcess.service.*; +import com.njcn.device.pq.api.DeviceFeignClient; +import com.njcn.device.pq.api.LineFeignClient; +import com.njcn.device.pq.pojo.dto.DevComFlagDTO; +import com.njcn.device.pq.pojo.vo.LineDeviceStateVO; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.time.LocalDateTime; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; /** * Description: @@ -43,6 +55,12 @@ public class LnDataDealServiceImpl implements LnDataDealService { @QueryBean private IDataV dataVService; + @Autowired + private DeviceFeignClient deviceFeignClient; + + @Autowired + private LineFeignClient lineFeignClient; + @Override public void batchInsertion(LnDataDTO lnDataDTO) { dataVService.batchInsertion(lnDataDTO.getDataVList()); @@ -58,6 +76,27 @@ public class LnDataDealServiceImpl implements LnDataDealService { dataInharmIService.batchInsertion(lnDataDTO.getDataInharmIDTOList()); dataInharmVService.batchInsertion(lnDataDTO.getDataInharmVDTOList()); dataPltService.batchInsertion(lnDataDTO.getDataPltDTOList()); + //更新mysqldevice表最新数据时间 + + if(!CollectionUtils.isEmpty(lnDataDTO.getDataVList())){ + DataVDTO dataVDTO =lnDataDTO.getDataVList().stream().max(Comparator.comparing(DataVDTO::getTimeid)).get(); + List lineIdList = lnDataDTO.getDataVList().stream().map(DataVDTO::getLineid).distinct().collect(Collectors.toList()); + List data = lineFeignClient.getAllLine(lineIdList).getData(); + //获取所有设备id并去重 + List devIds = data.stream().map(temp -> { + return temp.getPids().split(",")[4]; + }).distinct().collect(Collectors.toList()); + + devIds.forEach(temp->{ + DevComFlagDTO devComFlagDTO = new DevComFlagDTO(); + devComFlagDTO.setId(temp); + devComFlagDTO.setDate(dataVDTO.getTimeid()); + deviceFeignClient.updateDevComFlag(devComFlagDTO); + }); + + + + } } }