|
|
|
@ -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<Device> 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); |
|
|
|
|