From 4790be9d288a84a38b10e143c8433b7becc62404 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 11 十二月 2025 13:10:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 12 +++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 27 +++++++------
src/main/resources/application.yml | 13 ++++--
src/main/java/com/zy/core/ServerBootstrap.java | 30 +++++++--------
4 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
index 2eb14b7..bcd030c 100644
--- a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -326,13 +326,23 @@
OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
openBusSubmitParam.setBatch(DateUtils.convert(new Date()));
List<TaskDto> taskList = new ArrayList<>();
- TaskDto taskDto = new TaskDto();
Random rand = new Random();
+ TaskDto taskDto = new TaskDto();
taskDto.setSeqNum("SSX-CK" + rand.nextInt() * 10000);
taskDto.setOriLoc(getFLoc("1001", "16"));
taskDto.setDestSta("1001");
taskDto.setPriority(123);
taskList.add(taskDto);
+ String fLoc = getFLoc("1001", "16");
+ if (fLoc == taskDto.getOriLoc()) {
+ fLoc = getFLoc("1001", "16");
+ }
+ taskDto = new TaskDto();
+ taskDto.setSeqNum("SSX-CK" + rand.nextInt() * 10000);
+ taskDto.setOriLoc(fLoc);
+ taskDto.setDestSta("1001");
+ taskDto.setPriority(123);
+ taskList.add(taskDto);
openBusSubmitParam.setTaskList(taskList);
sendTask(openBusSubmitParam, staProtocol);
}
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 05e4a91..52b9b1d 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -4,17 +4,14 @@
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
-import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
-import com.zy.core.model.LedSlave;
-import com.zy.core.model.RgvSlave;
import com.zy.core.properties.SlaveProperties;
-import com.zy.core.thread.*;
+import com.zy.core.thread.BarcodeThread;
+import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.DependsOn;
import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -39,6 +36,7 @@
/**
* PostConstruct浼氬湪鍔犺浇servlet鐨勬椂鍊欒繍琛屼竴娆�
+ *
* @throws InterruptedException
*/
@PostConstruct
@@ -56,7 +54,7 @@
News.info("鏍稿績鎺у埗灞傚凡鍚姩...............................................");
}
- private void initMq(){
+ private void initMq() {
// 鍒濆鍖栧爢鍨涙満mq
// for (Slave crn : slaveProperties.getCrn()) {
// MessageQueue.init(SlaveType.Crn, crn);
@@ -70,9 +68,9 @@
MessageQueue.init(SlaveType.Devp, devp);
}
// 鍒濆鍖栨潯鐮佹壂鎻忎华mq
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// MessageQueue.init(SlaveType.Barcode, barcode);
-// }
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ MessageQueue.init(SlaveType.Barcode, barcode);
+ }
// 鍒濆鍖朙ed鐏痬q
// for (Slave led : slaveProperties.getLed()) {
// MessageQueue.init(SlaveType.Led, led);
@@ -87,7 +85,7 @@
// }
}
- private void initThread(){
+ private void initThread() {
// 鍒濆鍖栧爢鍨涙満绾跨▼
// News.info("鍒濆鍖栧爢鍨涙満绾跨▼...................................................");
// for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -110,12 +108,12 @@
SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
}
// 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-// News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
-// for (Slave barcode : slaveProperties.getBarcode()) {
-// BarcodeThread barcodeThread = new BarcodeThread(barcode);
-//// new Thread(barcodeThread).start();
-// SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
-// }
+ News.info("鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼...................................................");
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ BarcodeThread barcodeThread = new BarcodeThread(barcode);
+ new Thread(barcodeThread).start();
+ SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+ }
// // 鍒濆鍖朙ED绾跨▼
// News.info("鍒濆鍖朙ED绾跨▼...................................................");
// for (LedSlave led : slaveProperties.getLed()) {
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 094fd26..7c0ab41 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -5,6 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
@@ -13,6 +14,7 @@
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.IoModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.DevpSlave;
@@ -271,18 +273,19 @@
}
//鏉＄爜鎵弿鍣�
-// ArrayList<Integer> barcodeList = BarcodeList;
-// OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.1648", (short) (barcodeList.size() * 8));
-// if (result2.IsSuccess) {
-// for (int i = 0; i < barcodeList.size(); i++) {
-// Integer barcodeId = barcodeList.get(i);
-// String barcode = siemensS7Net.getByteTransform().TransString(result2.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);
-// }
-// }
-// }
+ ArrayList<Integer> barcodeList = BarcodeList;
+ OperateResultExOne<byte[]> result5 = siemensS7Net.Read("DB101.102", (short) (barcodeList.size() * 8));
+ if (result5.IsSuccess) {
+ for (int i = 0; i < barcodeList.size(); i++) {
+ 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);
+ }
+ }
+ }
//澶栧舰妫�娴�
// ArrayList<Integer> staNoErrs = staNosErrList;
// int staNoErrsSize = staNoErrs.size();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dec22c3..3d1991b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,11 +6,16 @@
spring:
application:
name: @pom.build.finalName@
+# datasource:
+# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+# url: jdbc:sqlserver://10.10.10.247:1433;databasename=whxrasrs
+# username: sa
+# password: sa@123
datasource:
- driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.247:1433;databasename=whxrasrs
- username: sa
- password: sa@123
+ driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://10.10.10.200:3306/wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: xltys1995
mvc:
static-path-pattern: /**
redis:
--
Gitblit v1.9.1