From 389500879e866f8d9dcc44aca4df7b89e77d3e5a Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 10 二月 2026 10:52:15 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java | 123 +----------------------
/dev/null | 136 ---------------------------
zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java | 4
zy-acs-cv/src/main/java/com/zy/asrs/utils/SpringContextUtil.java | 2
zy-acs-cv/src/main/java/com/zy/core/ServerBootstrap.java | 9 -
zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java | 13 +-
6 files changed, 17 insertions(+), 270 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/core/thread/SpringContextUtil.java b/zy-acs-cv/src/main/java/com/zy/asrs/utils/SpringContextUtil.java
similarity index 97%
rename from zy-acs-cv/src/main/java/com/zy/core/thread/SpringContextUtil.java
rename to zy-acs-cv/src/main/java/com/zy/asrs/utils/SpringContextUtil.java
index 45974ee..6d9553a 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/thread/SpringContextUtil.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/utils/SpringContextUtil.java
@@ -1,4 +1,4 @@
-package com.zy.core.thread;
+package com.zy.asrs.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/zy-acs-cv/src/main/java/com/zy/core/ServerBootstrap.java b/zy-acs-cv/src/main/java/com/zy/core/ServerBootstrap.java
index 341cd0d..1f9e312 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/ServerBootstrap.java
@@ -27,8 +27,6 @@
@Autowired
private SlaveProperties slaveProperties;
-// @Autowired
-// private CtuMainProcess ctuMainProcess;
/**
* PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
@@ -76,13 +74,6 @@
new Thread(barcodeThread).start();
SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
}
- // 鍒濆鍖栫绉ょ嚎绋�
-// News.info("鍒濆鍖栫绉ょ嚎绋�...................................................");
-// for (Slave scale : slaveProperties.getScale()) {
-// ScaleThread barcodeThread = new ScaleThread(scale);
-// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Scale, scale.getId(), barcodeThread);
-// }
}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
index 9149f8d..e6bfe25 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/AppleLocOperationHandler.java
@@ -1,5 +1,6 @@
package com.zy.core.operation.handler;
+import com.core.common.Cools;
import com.zy.asrs.controller.vo.ApplyInDto;
import com.zy.asrs.controller.vo.ApplyInRepsonseDto;
import com.zy.asrs.entity.Job;
@@ -62,7 +63,6 @@
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
StaProtocol staProtocol = devpThread.getStation().get(inSta.getStaNo());
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, devp.getId());
-
if (staProtocol == null) {
return;
} else {
@@ -75,13 +75,14 @@
if (staProtocol.getWorkNo() > 0 && staProtocol.isAutoing()) {
Job job = jobService.getJobByJobNoAndJobSts(staProtocol.getWorkNo(), 2);
if (job != null) {
+ String barcode = barcodeThread.getBarcode();
+ if (Cools.isEmpty(barcode)) {
+ log.info("鏈壂鍒扮爜鍊硷細{}",barcode);
+ return;
+ }
ApplyInDto applyInDto = new ApplyInDto();
applyInDto.setStaNo(inSta.getStaNo() + "");
- applyInDto.setBarcode(barcodeThread.getBarcode());
- //TODO
-// ApplyInRepsonseDto locOfWms =new ApplyInRepsonseDto();
-// locOfWms.setTaskNo(System.currentTimeMillis()+"");
-// locOfWms.setBatchNo(System.currentTimeMillis()+"");
+ applyInDto.setBarcode(barcode);
ApplyInRepsonseDto locOfWms = wmsMainService.getLocOfWms(applyInDto);
if (locOfWms != null) {
job.setLoc(locOfWms.getLocNo());
diff --git a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java
index d8d8395..0e63fa0 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/operation/handler/InOperationHandler.java
@@ -73,10 +73,6 @@
if (job != null) {
Integer workNo = staProtocol.getWorkNo();
Integer targetSta = inSta.getTargetSta();
- staProtocol.setWorkNo(0);
- staProtocol.setStaNo(0);
- MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- Thread.sleep(1500L);
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(targetSta);
boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
diff --git a/zy-acs-cv/src/main/java/com/zy/core/thread/ScaleThread.java b/zy-acs-cv/src/main/java/com/zy/core/thread/ScaleThread.java
deleted file mode 100644
index 3b7365f..0000000
--- a/zy-acs-cv/src/main/java/com/zy/core/thread/ScaleThread.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.zy.core.thread;
-
-import com.core.common.Cools;
-import com.zy.common.utils.News;
-import com.zy.core.Slave;
-import com.zy.core.ThreadHandler;
-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;
-
-/**
- * 纾呯Г绾跨▼
- * Created by vincent on 2020/8/4
- */
-@Data
-@Slf4j
-public class ScaleThread implements Runnable, ThreadHandler {
-
- private Slave slave;
- private Double scale = 0.0D;
- private Socket socket;
- private DataOutputStream dataOutputStream;
- private DataInputStream dataInputStream;
-
- public ScaleThread(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) && s.startsWith("=")) {
- scale = Double.parseDouble(s.substring(1));
- }
- }
- Thread.sleep(100);
- } catch (SocketTimeoutException ignore) {
- } catch (Exception e) {
-// e.printStackTrace();
- }
- }
- }
-
- @Override
- public boolean connect() {
- 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
- 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;
- News.error("Scale" + " - 1" + " - 鏉＄爜鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [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.isClosed()) {
-// socket.close();
-// }
- if (null != socket) {
- socket.close();
- }
- socket = null;
- } catch (IOException e) {
- News.error("Scale" + " - 2" + " - SocketClient close Exception:" + e.getMessage());
- }
- }
-
- public void write(byte[] msg, int len) throws IOException {
- if (null != dataInputStream) {
- dataOutputStream.write(msg, 0, len);
- dataOutputStream.flush();
- }
- }
-
- public byte[] read(int bufferSize, int timeOut) throws IOException {
-// if (socket == null) {
-// connect();
-// }
- connect();
- 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);
- }
- 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;
- }
-
-}
diff --git a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index fe593e3..2a65490 100644
--- a/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/zy-acs-cv/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -10,6 +10,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.Devp;
import com.zy.asrs.service.DevpService;
+import com.zy.asrs.utils.SpringContextUtil;
import com.zy.common.utils.News;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -53,17 +54,7 @@
}};
- public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(101);
- add(102);
- add(103);
- add(104);
- add(105);
- add(106);
- add(107);
- add(108);
- }};
public static final ArrayList<Integer> BarcodeList = new ArrayList<Integer>() {{
add(1);
@@ -73,7 +64,7 @@
/**
* 鏉＄爜鏁伴噺
*/
- private int barcodeSize = 2;
+ private int barcodeSize = 1;
public SiemensDevpThread(DevpSlave slave) {
@@ -108,16 +99,6 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol) task.getData());
- //log.info("杈撻�佺嚎涓嬪彂鍛戒护锛�" + ((StaProtocol) task.getData()).getWorkNo() + "," + ((StaProtocol) task.getData()).getStaNo());
- break;
- // 鍐欐暟鎹� ID+鐩爣绔�
- case 3:
- write2((StaProtocol) task.getData());
- log.info("杈撻�佺嚎涓嬪彂鍛戒护3锛�");
- break;
- case 4:
- write4((StaProtocol) task.getData());
- log.info("杈撻�佺嚎涓嬪彂鍛戒护4锛�");
break;
default:
break;
@@ -183,8 +164,6 @@
* 璇诲彇鐘舵�� ====> 鏁村潡plc
*/
private void read() throws InterruptedException {
-// // 鏇存柊鍏ュ嚭搴撴ā寮�
-// updateIoMode();
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (staNoSize * 2));
@@ -218,44 +197,7 @@
}
}
}
- ArrayList<Integer> staNosxx = staNos2;
- int size = staNosxx.size();
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.14", (short) (size * 2));
- if (result3.IsSuccess) {
- for (int i = 0; i < size; i++) {
- Integer siteId = staNosxx.get(i); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
- }
- boolean[] status = null;
- status = siemensS7Net.getByteTransform().TransBool(result3.Content, i * 2, 2);
- staProtocol.setAutoing(status[0]); // 鑷姩
- staProtocol.setLoading(status[1]); // 鏈夌墿
- staProtocol.setInEnable(status[2]); // 鍙叆,浜屽眰
- staProtocol.setOutEnable(status[3]);// 鍙嚭锛屼笁灞�
- staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
- staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]); // 楂樺簱浣�
- staProtocol.setLow(status[7]); // 浣庡簱浣�
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
- staProtocol.setPakMk(true);
- }
- }
- }
-
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.0", (short) 2);
- if (result4.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result4.Content, 0, 1);
- if (status[0] && status[1]) {
- StaProtocol staProtocol = station.get(1007);
- MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
- log.info("澶嶄綅1007");
- }
- }
//鏉＄爜鎵弿鍣�
ArrayList<Integer> barcodeList = BarcodeList;
@@ -265,15 +207,18 @@
Integer barcodeId = barcodeList.get(i);
String barcode = siemensS7Net.getByteTransform().TransString(result5.Content, i * 8, 8, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
- if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
- barcodeThread.setBarcode(barcode);
- log.info("鏂欑鐮侊細{}", barcode);
+ if (Cools.isEmpty(barcode)) {
+ barcodeThread.clearBarcode();
+ }else {
+ if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ log.info("鏂欑鐮侊細{}", barcode);
+ }
}
}
}
if (result.IsSuccess) {
-
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
@@ -284,7 +229,6 @@
devps.add(staProtocol.toSqlModel());
}
DevpService devpService = SpringContextUtil.getBean(DevpService.class);
- //BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
if (null != devpService && !devpService.updateBatchById(devps)) {
throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
}
@@ -337,56 +281,7 @@
}
}
- private void write2(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
- return;
- }
- OperateResult write = null;
- boolean[] array = new boolean[1];
- array[0] = true;
- //浠诲姟涓嬪彂娆℃暟
- int writeCount = 0;
- do {
- write = siemensS7Net.Write("DB102.0", array);
- if (write.IsSuccess) {
- log.error("鍐欏叆杈撻�佺嚎DB102.0鍛戒护鎴愬姛3銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- break;
- } else {
- writeCount++;
- log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- }
- } while (writeCount < 5);
- if (!write.IsSuccess) {
- News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
- }
- }
-
- private void write4(StaProtocol staProtocol) throws InterruptedException {
- if (null == staProtocol) {
- return;
- }
- OperateResult write = null;
- boolean[] array = new boolean[2];
- array[0] = false;
- array[1] = false;
- //浠诲姟涓嬪彂娆℃暟
- int writeCount = 0;
- do {
- write = siemensS7Net.Write("DB102.0", array);
- if (write.IsSuccess) {
- log.error("44鍐欏叆杈撻�佺嚎DB102.0鍛戒护鎴愬姛3銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- break;
- } else {
- writeCount++;
- log.error("44鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
- }
- } while (writeCount < 5);
-
- if (!write.IsSuccess) {
- News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
- }
- }
/**
--
Gitblit v1.9.1