From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 15:02:52 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index bd02abc..878e2d5 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -51,6 +51,7 @@
add(1016);add(1017);add(1018);add(1019);add(1020);add(1021);add(1022);add(1023);
}};
private boolean connectDev = false;
+ public Long currentTimeMilliConnectDev= 0L;
/**
@@ -84,6 +85,12 @@
@Override
@SuppressWarnings("InfiniteLoopStatement")
public void run() {
+ initSite();
+ try{
+ Thread.sleep(2000);
+ } catch (Exception e){
+
+ }
connectDev = connect();
while(!connectDev){
try {
@@ -172,8 +179,22 @@
} else {
OutputQueue.DEVP.offer(MessageFormat.format( "銆恵0}銆戣緭閫佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
log.error("杈撻�佺嚎plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-// deviceErrorService.addDeviceError("devp", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触");
+
+
+ if (System.currentTimeMillis()-currentTimeMilliConnectDev>1000*60*10){
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.addDeviceError("devp", slave.getId(), "杈撻�佺嚎plc杩炴帴澶辫触");
+ } catch (Exception e2){
+// log.error("e2:"+e2.getMessage());
+ }
+ if (currentTimeMilliConnectDev == 0){
+ currentTimeMilliConnectDev = System.currentTimeMillis()-1000*60*10-1;
+ } else {
+ currentTimeMilliConnectDev = System.currentTimeMillis();
+
+ }
+ }
initSite();
}
siemensS7Net.ConnectClose();
@@ -237,6 +258,7 @@
read();
} catch (Exception e) {
+ connectDev = false;
log.error("RGV鏁版嵁璇诲彇绾跨▼寮傚父锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
--
Gitblit v1.9.1