|
|
|
@ -92,15 +92,15 @@ public class GatherDataTask { |
|
|
|
if (ip.equals(line1IP)){ |
|
|
|
List<DeviceVo> readXMZValueList = CollectUtils.getReadXMZValueList(deviceList, ip, new BigDecimal(line1Value)); |
|
|
|
deviceVos.addAll(readXMZValueList); |
|
|
|
log.info("大线:{}",readXMZValueList.stream().map(DeviceVo::getValue)); |
|
|
|
log.info("大线:{}",readXMZValueList.stream().map(DeviceVo::getValue).collect(Collectors.toList())); |
|
|
|
}else if (ip.equals(line2IP)){ |
|
|
|
List<DeviceVo> readSLValueList = CollectUtils.getReadSLValueList(deviceList, ip, line2Port, new BigDecimal(line1Value)); |
|
|
|
deviceVos.addAll(readSLValueList); |
|
|
|
log.info("小线:{}",readSLValueList.stream().map(DeviceVo::getValue)); |
|
|
|
log.info("小线:{}",readSLValueList.stream().map(DeviceVo::getValue).collect(Collectors.toList())); |
|
|
|
}else if (ip.equals(line3IP)){ |
|
|
|
List<DeviceVo> readValueList = CollectUtils.getReadValueList(deviceList, ip, new BigDecimal(line1Value)); |
|
|
|
deviceVos.addAll(readValueList); |
|
|
|
log.info("配胶间:{}",readValueList.stream().map(DeviceVo::getValue)); |
|
|
|
log.info("配胶间:{}",readValueList.stream().map(DeviceVo::getValue).collect(Collectors.toList())); |
|
|
|
}else { |
|
|
|
log.info("数据有误!!!"); |
|
|
|
} |
|
|
|
|