From c9d334e61ff33aa2f90b71e34d5a7a0340765bfe Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 27 五月 2025 18:44:37 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/core/thread/RgvThread.java | 39 +++++++++----------
src/main/java/com/zy/core/thread/LedThread.java | 2
src/main/java/com/zy/core/cache/RgvStatusCache.java | 19 +++++++++
src/main/java/com/zy/core/thread/ScaleThread.java | 12 +++---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 +-
5 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/core/cache/RgvStatusCache.java b/src/main/java/com/zy/core/cache/RgvStatusCache.java
index 73a8cb5..313b420 100644
--- a/src/main/java/com/zy/core/cache/RgvStatusCache.java
+++ b/src/main/java/com/zy/core/cache/RgvStatusCache.java
@@ -2,6 +2,7 @@
import com.zy.core.model.protocol.RgvProtocol;
+import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -16,6 +17,9 @@
*/
public static void updateRgvStatus(RgvProtocol status) {
try {
+ if (status.getRgvNo()!=1 && status.getRgvNo() != 2){
+ return;
+ }
cache.put(status.getRgvNo(), status);
} finally {
}
@@ -41,4 +45,19 @@
}
}
+ /**
+ * 鑾峰彇鎵�鏈夎澶囩姸鎬�
+ */
+ public static void removeAll() {
+ try {
+ ConcurrentHashMap<Integer, RgvProtocol> integerRgvProtocolConcurrentHashMap = new ConcurrentHashMap<>(cache);
+ if (integerRgvProtocolConcurrentHashMap.values().size()>2){
+ for (RgvProtocol rgvProtocol : integerRgvProtocolConcurrentHashMap.values()){
+ cache.remove(rgvProtocol.getRgvNo());
+ }
+ }
+ } finally {
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/core/thread/LedThread.java b/src/main/java/com/zy/core/thread/LedThread.java
index eb46bc6..1c33808 100644
--- a/src/main/java/com/zy/core/thread/LedThread.java
+++ b/src/main/java/com/zy/core/thread/LedThread.java
@@ -212,7 +212,7 @@
deviceErrorService.addDeviceError("led", slave.getId(), "led杩炴帴澶辫触");
}
} catch (Exception e){
- log.error("e:"+e.getMessage());
+// log.error("e:"+e.getMessage());
}
return connRes;
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 54adad5..b755b34 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -118,7 +118,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "rgv杩炴帴澶辫触"+e.getMessage());
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
initRgv();
// e.printStackTrace();
@@ -140,7 +140,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV鏁版嵁璇诲彇绾跨▼寮傚父"+e.getMessage());
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
initRgv();
// e.printStackTrace();
@@ -173,7 +173,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV鏁版嵁浠诲姟涓嬪彂澶嶄綅绾跨▼寮傚父"+e.getMessage());
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
initRgv();
// e.printStackTrace();
@@ -291,7 +291,6 @@
while (true) {
RgvRunProtocol rgvRun = RgvRunCache.getRgvRun();
if (!rgvRun.getRgvNo().equals(slave.getId())){
-
continue;
}
try {
@@ -445,7 +444,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV浠诲姟涓嬪彂绾跨▼寮傚父"+e.getMessage());
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
rgvRun = RgvRunCache.getRgvRun();
rgvRun.currentTimeMilliOld = System.currentTimeMillis()+50;
@@ -574,7 +573,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
return false;
}
@@ -606,7 +605,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
return false;
}
@@ -634,7 +633,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
return false;
}
@@ -663,7 +662,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
return false;
}
@@ -720,7 +719,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
return false;
}
@@ -752,7 +751,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
return false;
}
@@ -780,7 +779,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
return false;
}
@@ -810,7 +809,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV琛岃蛋瓒呭嚭鑼冨洿");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
return false;
}
@@ -872,7 +871,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV寮傚父"+e.getMessage());
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
rgvProtocol.setStatusEnable(true);
}
@@ -910,7 +909,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGVplc杩炴帴澶辫触");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
}
initRgv();
@@ -996,7 +995,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV plc鏁版嵁搴撴洿鏂板け璐�");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
}
} catch (Exception ignore) {
@@ -1017,7 +1016,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "璇诲彇RGV plc鐘舵�佷俊鎭け璐�");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
}
} catch (Exception e) {
@@ -1029,7 +1028,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "璇诲彇RGV plc鐘舵�佷俊鎭け璐�");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
initRgv();
}
@@ -1046,7 +1045,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV鍐欏叆鍛戒护涓虹┖");
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
return false;
}
@@ -1105,7 +1104,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.addDeviceError("rgv", slave.getId(), "RGV 鍛戒护涓嬪彂"+JSON.toJSON(taskProtocol));
} catch (Exception e2){
- log.error("e2:"+e2.getMessage());
+// log.error("e2:"+e2.getMessage());
}
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(taskProtocol)));
return true;
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index e630268..614dd85 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -55,7 +55,7 @@
String s = new String(read);
if (!Cools.isEmpty(s) && s.startsWith("\u0002+")) {
// if (!Cools.isEmpty(s) && s.startsWith("=")) {
- scale = Double.parseDouble(s.substring(1))/100;
+ scale = Double.parseDouble(s.substring(1));
// System.out.println("scale:"+scale+ "ip:"+slave.getIp());
// String substring = s.substring(1);
@@ -124,20 +124,20 @@
// log.info("鏉＄爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.deleteDeviceError("devp", slave.getId());
+ deviceErrorService.deleteDeviceError("Scale", slave.getId());
} catch (Exception e){
- log.error("e:"+e.getMessage());
+// log.error("e:"+e.getMessage());
}
} catch (Exception e) {
socket = null;
- log.error("纾呯Г杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// log.error("纾呯Г杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
// deviceErrorService.addDeviceError("scale", slave.getId(), "纾呯Г杩炴帴澶辫触");
try{
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
- deviceErrorService.deleteDeviceError("devp", slave.getId());
+ deviceErrorService.deleteDeviceError("Scale", slave.getId());
} catch (Exception e1){
- log.error("e:"+e1.getMessage());
+// log.error("e:"+e1.getMessage());
}
return false;
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index eb6e729..11ccf15 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -264,7 +264,7 @@
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
} catch (Exception e){
- log.error("e:"+e.getMessage());
+// log.error("e:"+e.getMessage());
}
} catch (Exception e) {
@@ -277,7 +277,7 @@
DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
deviceErrorService.deleteDeviceError("devp", slave.getId());
} catch (Exception e){
- log.error("e:"+e.getMessage());
+// log.error("e:"+e.getMessage());
}
} 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()));
--
Gitblit v1.9.1