diff --git a/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java b/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java index c54de737..4a678661 100644 --- a/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java +++ b/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java @@ -53,19 +53,11 @@ public class GatherDataTask { @Value("${collect.data.line2Port}") private int line2Port; - - private static final String BASE_NO = "last_send_time"; - @Autowired - private ICDCBaseDataService cdcBaseDataService; - @Autowired - private ICollectService collectService; @Autowired private IDeviceService deviceService; @Autowired private ICollectRecordService collectRecordService; @Autowired - private ICollectDetailService collectDetailService; - @Autowired private IMailConfigService mailConfigService; @Autowired private IMobileService mobileService; @@ -94,11 +86,11 @@ public class GatherDataTask { deviceVos.addAll(readXMZValueList); log.info("大线:{}",readXMZValueList.stream().map(DeviceVo::getValue).collect(Collectors.toList())); }else if (ip.equals(line2IP)){ - List readSLValueList = CollectUtils.getReadSLValueList(deviceList, ip, line2Port, new BigDecimal(line1Value)); + List readSLValueList = CollectUtils.getReadSLValueList(deviceList, ip, line2Port, new BigDecimal(line2Value)); deviceVos.addAll(readSLValueList); log.info("小线:{}",readSLValueList.stream().map(DeviceVo::getValue).collect(Collectors.toList())); }else if (ip.equals(line3IP)){ - List readValueList = CollectUtils.getReadValueList(deviceList, ip, new BigDecimal(line1Value)); + List readValueList = CollectUtils.getReadValueList(deviceList, ip, new BigDecimal(line3Value)); deviceVos.addAll(readValueList); log.info("配胶间:{}",readValueList.stream().map(DeviceVo::getValue).collect(Collectors.toList())); }else {