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