From c49760bdbfa8d1f3ea17fb9f0b59a557ab38a0f9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 13 十一月 2023 20:28:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 83 ++++++++++++++++++++++++++++++++++++++++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 27 +++++++++++++
src/main/java/com/zy/core/MainProcess.java | 2 +
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 ++
src/main/java/com/zy/core/ServerBootstrap.java | 4 +
5 files changed, 116 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 052cbf3..668749f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2287,6 +2287,33 @@
return false;
}
+ /**
+ * AGV琛ヨ揣(鎮寕绾块�氱煡AGV鍙栬揣)
+ */
+ public void agvRestockIntoByHangingWire() {
+ //妫�娴�350鍜�351鎵爜鍣�
+ int[] barcodeStaNo = {10, 11};//10 => 350绔欐壂鐮佸櫒,11 => 351绔欐壂鐮佸櫒
+ for (int staNo : barcodeStaNo) {
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, staNo);
+ if (barcodeThread == null) {
+ continue;
+ }
+ String barcode = barcodeThread.getBarcode();
+ if(!Cools.isEmpty(barcode)) {
+ String agvStaNo = null;
+ if (staNo == 10) {
+ agvStaNo = "303-1";
+ }else {
+ agvStaNo = "304-1";
+ }
+ //閫氱煡AGV鍙栬揣
+ agvRestockCall(agvStaNo, barcode);
+ log.info(staNo + "鍙锋壂鐮佸櫒锛岄�氱煡AGV鍙栬揣锛屾潯鐮佸彿锛�" + barcode);
+ }
+ }
+ }
+
// 300绔欐嫞鏂�
public void pick300() {
//妫�娴�300绔欐槸鍚﹁嚜鍔ㄣ�佹湁鐗┿�佸伐浣滃彿
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 68a118a..4a88cb3 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -76,6 +76,8 @@
mainService.agvRestockByRobot();
// AGV琛ヨ揣(閫氱煡AGV鍙栬揣)
mainService.agvRestockInto();
+ // AGV琛ヨ揣(鎮寕绾块�氱煡AGV鍙栬揣)
+ mainService.agvRestockIntoByHangingWire();
// 300绔欐嫞鏂�
mainService.pick300();
// 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index ba0b431..b419fc6 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -109,7 +109,9 @@
News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
for (Slave barcode : slaveProperties.getBarcode()) {
BarcodeThread barcodeThread = new BarcodeThread(barcode);
- new Thread(barcodeThread).start();
+ if (barcode.getId() >= 11) {
+ new Thread(barcodeThread).start();
+ }
SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
}
// 鍒濆鍖朙ED绾跨▼
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index 39bed10..3a81562 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -10,6 +10,13 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketTimeoutException;
import java.util.Date;
/**
@@ -22,6 +29,10 @@
private Slave slave;
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;
@@ -48,17 +59,83 @@
@Override
public boolean connect() {
- return false;
+ try {
+ close(); //1.涓诲姩閲婃斁杩炴帴 //2.鏌愪簺鏈嶅姟鍣ㄥ鎸囧畾ip鏈夐摼璺暟闄愬埗
+ socket = new Socket();
+ SocketAddress socketAddress = new InetSocketAddress(slave.getIp(), slave.getPort());
+ socket.connect(socketAddress, 1000); //鏌愪簺鏈嶅姟鍣╬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());
+ return false;
+ }
+ return true;
}
@Override
public void close() {
-
+ try {
+ if (null != dataOutputStream) {
+ dataOutputStream.close();
+ }
+ if (null != dataInputStream) {
+ dataInputStream.close();
+ }
+ if (null != socket){
+ socket.close();
+ }
+ socket = null;
+ } catch (IOException e) {
+ log.error("SocketClient close Exception:" + e.getMessage());
+ }
}
@Override
+ @SuppressWarnings("InfiniteLoopStatement")
public void run() {
-
+ connect();
+ while (true) {
+ try {
+ byte[] read = read(14, 5000);
+ if (null != read) {
+ String s = new String(read);
+ if (!Cools.isEmpty(s)) {
+ setBarcode(new String(read));
+ }
+ }else{
+ setBarcode("");
+ }
+ Thread.sleep(50);
+ } catch (SocketTimeoutException ignore) {
+ connCount++;
+ } catch (Exception e) {
+ setBarcode("");
+ e.printStackTrace();
+ }
+ }
}
+ public byte[] read(int bufferSize, int timeOut) throws IOException {
+ 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);
+ byte[] tempBytes = null;
+ if (len > 0) {
+ tempBytes = new byte[len];
+ System.arraycopy(bytes, 0, tempBytes, 0, len);
+ } else {
+ connect();
+ }
+ return tempBytes;
+ }
+
+
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 3d874c8..916e57b 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -180,6 +180,10 @@
OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 98);
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
+ if (i >= 10) {
+ continue;
+ }
+
String barcode = null;
if (i == 8) {
barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,13, "UTF-8");
--
Gitblit v1.9.1