From 92c572e50893a93a810bbe6adb6d3cdbfc225073 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 20 五月 2025 14:17:33 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/ScaleThread.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index ed52d03..e630268 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -57,12 +57,12 @@
// if (!Cools.isEmpty(s) && s.startsWith("=")) {
scale = Double.parseDouble(s.substring(1))/100;
- System.out.println("scale:"+scale+"ip:"+slave.getIp());
+// System.out.println("scale:"+scale+ "ip:"+slave.getIp());
// String substring = s.substring(1);
// String s1 = new StringBuilder(substring).reverse().toString();//閫嗗簭
// scale = Double.parseDouble(s1);
//灏嗙О閲嶉噸閲忓啓鍏ヨ澶囧熀纭�鏁版嵁涓殑gross_wt瀛楁
- if(scale > 20) {
+// if(scale > 20) {
try{
// 鑾峰彇绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, slave.getDevpPlcId());
@@ -80,7 +80,7 @@
OutputQueue.SCALE.offer(jsonObject);
}
} catch (Exception e){
- log.error("绉伴噸妯″潡寮傚父"+e.getMessage());
+ log.error("绉伴噸妯″潡寮傚父"+e .getMessage());
}
// BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
// BasDevp basDevp = basDevpService.selectById(slave.getStaNo());
@@ -99,7 +99,7 @@
// OutputQueue.SCALE.offer(jsonObject);
//
// }
- }
+// }
}
}
Thread.sleep(100);
@@ -122,13 +122,23 @@
dataOutputStream = new DataOutputStream(socket.getOutputStream());
dataInputStream = new DataInputStream(socket.getInputStream());
// log.info("鏉＄爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-// DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
-// deviceErrorService.deleteDeviceError("scale", slave.getId());
+ try{
+ DeviceErrorService deviceErrorService = SpringUtils.getBean(DeviceErrorService.class);
+ deviceErrorService.deleteDeviceError("devp", slave.getId());
+ } catch (Exception e){
+ log.error("e:"+e.getMessage());
+ }
} catch (Exception e) {
socket = null;
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());
+ } catch (Exception e1){
+ log.error("e:"+e1.getMessage());
+ }
return false;
}
return true;
--
Gitblit v1.9.1