From 22a8757b3184ce4ad949957f5ee207caffaf600a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 12 一月 2025 14:30:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
src/main/resources/application.yml | 4 ++--
2 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index c769b5e..0a845fc 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -13,16 +13,15 @@
import com.zy.core.CrnThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.DevpSlave;
import com.zy.core.model.LedSlave;
import com.zy.core.model.command.LedCommand;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.properties.SlaveProperties;
+import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.LedThread;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -46,6 +45,46 @@
/**
* 鑾峰彇褰撳墠鏃堕棿
*/
+ @PostMapping("/barcode/two")
+ public R barcodeTwo(@RequestParam Integer palletizingNo) {
+
+ String barcode = "";
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getDriveSta()) {
+ if (inSta.getStaNo().equals(palletizingNo)){
+ // 鑾峰彇鏉＄爜鎵弿浠俊鎭�
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
+ barcode = barcodeThread.getBarcode();
+
+ if (!Cools.isEmpty(barcode)) {
+// log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
+ if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
+ barcode = "";
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ }
+
+
+
+ Date now = new Date();
+// Calendar calendar = Calendar.getInstance();
+// calendar.setTime(now);
+ return R.ok(
+ Cools.add("barcode", barcode).add("Date",now)
+ );
+ }
+
+ /**
+ * 鑾峰彇褰撳墠鏃堕棿
+ */
@GetMapping("/date")
public R monitorDate() {
Date now = new Date();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 76704df..ca31462 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,10 +8,10 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs
+# url: jdbc:sqlserver://192.168.18.4:49977;databasename=srjtasrs
username: sa
password: sa@123
-# url: jdbc:sqlserver://127.0.0.1:49977;databasename=srjtasrs
+ url: jdbc:sqlserver://127.0.0.1:50948;databasename=srjtasrs
# username: sa
# password: sa@123
# url: jdbc:sqlserver://127.0.0.1:1433;databasename=srjtasrs
--
Gitblit v1.9.1