From 15154033d40f857f61760f137ca59eaf29908aa3 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期三, 02 七月 2025 10:03:57 +0800
Subject: [PATCH] #改造
---
src/main/java/com/zy/core/thread/ScaleThread.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index 95a298b..e71448c 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);
@@ -68,6 +68,9 @@
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, slave.getDevpPlcId());
StaProtocol staProtocol = devpThread.getStation().get(slave.getStaNo());
if (staProtocol != null) {
+ if (scale>10000){
+ scale = scale-10000;
+ }
devpThread.setGrossWt(staProtocol.getSiteId(), scale);
JSONObject jsonObject = new JSONObject();
@@ -80,7 +83,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());
@@ -122,13 +125,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("Scale", 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());
+// 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("Scale", slave.getId());
+ } catch (Exception e1){
+// log.error("e:"+e1.getMessage());
+ }
return false;
}
return true;
@@ -195,4 +208,12 @@
return true;
}
+
+ /**
+ * 娓呴櫎浣滀笟鍚姩涓�
+ */
+ @Override
+ public void setWrkSign() {
+ }
+
}
--
Gitblit v1.9.1