From 87aabba0ef4cbbe6fc778d5623043bc0b301cb42 Mon Sep 17 00:00:00 2001 From: zelian_wu Date: Fri, 14 Jun 2024 16:32:18 +0800 Subject: [PATCH] 2024-06-14 --- .../java/com/spring/modules/cdc/task/GatherDataTask.java | 5 ++++- src/main/resources/application-dev.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) 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 963e953b..208b878c 100644 --- a/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java +++ b/src/main/java/com/spring/modules/cdc/task/GatherDataTask.java @@ -52,6 +52,9 @@ public class GatherDataTask { @Value("${task.flag}") private boolean flag; + @Value("${collect.data.line2Port}") + private int line2Port; + private static final String BASE_NO = "last_send_time"; @Autowired private ICDCBaseDataService cdcBaseDataService; @@ -111,7 +114,7 @@ public class GatherDataTask { } }else if (ip.equals(line2IP)){ List deviceList = map.get(ip); - MelsecMcNet melsecMcNet = new MelsecMcNet(ip, 1010); + MelsecMcNet melsecMcNet = new MelsecMcNet(ip, line2Port); OperateResult connect = melsecMcNet.ConnectServer(); if (connect.IsSuccess) { log.info("IP:{} 连ζŽ₯成功!!!",ip); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2c823fcc..d315163c 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -86,6 +86,7 @@ collect: data: line1: 192.168.3.2 line2: 192.168.3.39 + line2Port: 1020 line3: 1 line1Value: 0 line2Value: 0