From d13a01d1769f29b336e5b9f8612c6d41aaabbbb1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 22 十一月 2024 20:42:20 +0800
Subject: [PATCH] #读取地图文件优化
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 118 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 66 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 571c438..25887dc 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -3,11 +3,16 @@
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.AgvBasDevpService;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.core.News;
import com.zy.core.Slave;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.OutputQueue;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import java.io.DataInputStream;
import java.io.DataOutputStream;
@@ -27,38 +32,45 @@
public class BarcodeThread implements Runnable, ThreadHandler {
private Slave slave;
- private String barcode;
+ private StringBuffer barcode = new StringBuffer();
private Socket socket;
private DataOutputStream dataOutputStream;
private DataInputStream dataInputStream;
+ public Integer connCount = 0;
public BarcodeThread(Slave slave) {
this.slave = slave;
}
- @Override
- @SuppressWarnings("InfiniteLoopStatement")
- public void run() {
- connect();
- while (true) {
- try {
- byte[] read = read(8, 100);
- if (null != read) {
- String s = new String(read);
- if (!Cools.isEmpty(s)) {
- barcode = new String(read);
- log.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
- JSONObject jsonObject = new JSONObject();
- jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
- jsonObject.put("barcode", barcode);
- OutputQueue.BARCODE.offer(jsonObject);
- }
+ public String getBarcode() {
+ return barcode.toString();
+ }
+
+ public void setBarcode(String barcode) {
+ this.barcode.delete(0, this.barcode.length());
+ this.barcode.append(barcode);
+ if(!Cools.isEmpty(barcode)) {
+ AgvBasDevpService agvBasDevpService = SpringUtils.getBean(AgvBasDevpService.class);
+ News.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}", slave.getId(), this.barcode);
+
+ String devNo = slave.getId() == 13 ? "310-1" : slave.getId() == 15 ? "312-2" : slave.getId() == 17 ? "314-1" : slave.getId() == 19 ? "316-1" : null;
+ if(!Cools.isEmpty(devNo)){
+ barcode = barcode.substring(3,barcode.length());
+ int updateBarcode = agvBasDevpService.updateBarcode(devNo, barcode);
+ if (updateBarcode <= 0) {
+ News.info("{}鍙锋潯鐮佸櫒锛屾绱㈡暟鎹細{}锛屾洿鏂扮珯鐐规潯鐮佸け璐�", slave.getId(), this.barcode);
}
- Thread.sleep(100);
- } catch (SocketTimeoutException ignore) {
- } catch (Exception e) {
-// e.printStackTrace();
}
+ News.info("{}鍙锋潯鐮佸櫒锛屾洿鏂版垚鍔�", slave.getId());
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("time", DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F));
+ jsonObject.put("barcode", barcode);
+ jsonObject.put("id", slave.getId());
+ if (OutputQueue.BARCODE.size() >= 32) {
+ OutputQueue.BARCODE.poll();
+ }
+ OutputQueue.BARCODE.offer(jsonObject);
+
}
}
@@ -67,15 +79,14 @@
try {
close(); //1.涓诲姩閲婃斁杩炴帴 //2.鏌愪簺鏈嶅姟鍣ㄥ鎸囧畾ip鏈夐摼璺暟闄愬埗
socket = new Socket();
- //socket.setKeepAlive(true);
SocketAddress socketAddress = new InetSocketAddress(slave.getIp(), slave.getPort());
- socket.connect(socketAddress, 1000); //鏌愪簺鏈嶅姟鍣╬ing寤惰繜楂樻椂瑕佸鍔�,鍚﹀垯浼氭姤閿檆onnect timeout
+ socket.connect(socketAddress, 10000); //鏌愪簺鏈嶅姟鍣╬ing寤惰繜楂樻椂瑕佸鍔�,鍚﹀垯浼氭姤閿檆onnect timeout
dataOutputStream = new DataOutputStream(socket.getOutputStream());
dataInputStream = new DataInputStream(socket.getInputStream());
// log.info("鏉＄爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} 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());
return false;
}
return true;
@@ -90,9 +101,6 @@
if (null != dataInputStream) {
dataInputStream.close();
}
-// if (null != socket && !socket.isClosed()) {
-// socket.close();
-// }
if (null != socket){
socket.close();
}
@@ -102,19 +110,38 @@
}
}
- public void write(byte[] msg, int len) throws IOException {
- if (null != dataInputStream)
- {
- dataOutputStream.write(msg, 0, len);
- dataOutputStream.flush();
+ @Override
+ @SuppressWarnings("InfiniteLoopStatement")
+ public void run() {
+ connect();
+ while (true) {
+ try {
+ byte[] read = read(14, 3 * 60 * 1000);
+ if (null != read) {
+ String s = new String(read);
+ log.warn("ip:{},id:{},璇诲彇鍒版潯鐮侊細{}",slave.getIp(),slave.getId(),s);
+ if (!Cools.isEmpty(s)) {
+ setBarcode(new String(read));
+ }
+ }
+ Thread.sleep(50);
+ }catch (Exception e) {
+ log.warn("ip:{},id:{},璇诲彇鏉＄爜寮傚父锛歿}",slave.getIp(),slave.getId(),e);
+ setBarcode("");
+ log.error("run" + e);
+// e.printStackTrace();
+ connect();
+ }
+
}
}
public byte[] read(int bufferSize, int timeOut) throws IOException {
-// if (socket == null) {
-// connect();
-// }
- connect();
+ if (socket == null || !socket.isConnected() || socket.isClosed() || connCount > 120) {
+ connect();
+ connCount = 0;
+ return null;
+ }
socket.setSoTimeout(timeOut);
byte[] bytes = new byte[bufferSize];
int len = dataInputStream.read(bytes);
@@ -122,24 +149,11 @@
if (len > 0) {
tempBytes = new byte[len];
System.arraycopy(bytes, 0, tempBytes, 0, len);
+ } else {
+ connect();
}
return tempBytes;
}
- public boolean valid() throws Exception {
- if (null == socket || socket.isClosed() || socket.isInputShutdown() || socket.isOutputShutdown()) {
- if (dataInputStream != null) {
- dataInputStream.close();
- }
- if (dataOutputStream != null) {
- dataOutputStream.close();
- }
- if (socket != null) {
- socket.close();
- }
- return false;
- }
- return true;
- }
}
--
Gitblit v1.9.1