bug优化
This commit is contained in:
@@ -9,6 +9,9 @@ import com.njcn.dataProcess.api.PqsCommunicateFeignClient;
|
||||
import com.njcn.dataProcess.api.RmpEventDetailFeignClient;
|
||||
import com.njcn.dataProcess.dto.*;
|
||||
import com.njcn.dataProcess.pojo.dto.PqsCommunicateDto;
|
||||
import com.njcn.device.pq.api.DeviceFeignClient;
|
||||
import com.njcn.device.pq.api.LineFeignClient;
|
||||
import com.njcn.device.pq.pojo.dto.DeviceDTO;
|
||||
import com.njcn.message.enums.DataTypeEnum;
|
||||
import com.njcn.message.messagedto.DevComFlagDTO;
|
||||
import com.njcn.message.messagedto.MessageDataDTO;
|
||||
@@ -17,6 +20,7 @@ import com.njcn.stat.service.MessageAnalysisService;
|
||||
import com.njcn.stat.utils.BeanIConverter;
|
||||
import com.njcn.stat.utils.BeanPConverter;
|
||||
import com.njcn.stat.utils.BeanVConverter;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -24,6 +28,8 @@ import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
@@ -33,8 +39,12 @@ import java.util.Objects;
|
||||
* @version V1.0.0
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class MessageAnalysisServiceImpl implements MessageAnalysisService {
|
||||
|
||||
private final LineFeignClient lineFeignClient;
|
||||
private final DeviceFeignClient deviceFeignClient;
|
||||
|
||||
@Autowired
|
||||
private LnDataDealFeignClient lnDataDealFeignClient;
|
||||
|
||||
@@ -59,6 +69,21 @@ public class MessageAnalysisServiceImpl implements MessageAnalysisService {
|
||||
List<DataPltDTO> dataPltDTOList = new ArrayList<>();
|
||||
List<DataFlickerDTO> dataFlickerDTOList = new ArrayList<>();
|
||||
|
||||
//新增冗余,装置收到数据,判断装置当前的状态,如果为离线,则应该置为在线
|
||||
List<String> lineList = messageList.stream().map(MessageDataDTO::getMonitor).distinct().collect(Collectors.toList());
|
||||
//装置集合
|
||||
Set<String> 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();
|
||||
|
||||
Reference in New Issue
Block a user