From 9bb292da94b9ae4450588ca570ce9b00f0316e1b Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 10 七月 2025 15:24:56 +0800
Subject: [PATCH] 完善三号堆垛机采集不到数据BUG
---
src/main/java/com/zy/core/thread/ScaleThread.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index 30d695a..b8e0dd2 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -1,11 +1,15 @@
package com.zy.core.thread;
+import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.DeviceErrorService;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
+import com.zy.core.cache.OutputQueue;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -16,6 +20,7 @@
import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketTimeoutException;
+import java.util.Date;
/**
* 纾呯Г绾跨▼
@@ -44,7 +49,8 @@
byte[] read = read(8, 100);
if (null != read) {
String s = new String(read);
- if (!Cools.isEmpty(s) && s.startsWith("=")) {
+ s=s.substring(1);
+ if (!Cools.isEmpty(s) && s.startsWith("+")) {
scale = Double.parseDouble(s.substring(1));
//灏嗙О閲嶉噸閲忓啓鍏ヨ澶囧熀纭�鏁版嵁涓殑gross_wt瀛楁
@@ -57,6 +63,14 @@
if (null != basDevpService && !basDevpService.updateById(basDevp)) {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
+ jsonObject.put("id", staNo);
+ jsonObject.put("scale", scale);
+ if (OutputQueue.SCALE.size() >= 32) {
+ OutputQueue.SCALE.poll();
+ }
+ OutputQueue.SCALE.offer(jsonObject);
}
}
}
@@ -71,6 +85,7 @@
@Override
public boolean connect() {
+
try {
close(); //1.涓诲姩閲婃斁杩炴帴 //2.鏌愪簺鏈嶅姟鍣ㄥ鎸囧畾ip鏈夐摼璺暟闄愬埗
socket = new Socket();
--
Gitblit v1.9.1