From fc9d08ef427c4fce72f469edbbb193c92249fd01 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期二, 27 六月 2023 18:43:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index b5792d8..1bfdeab 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
@@ -15,7 +16,9 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.CrnThread;
+import com.zy.core.DevpThread;
import com.zy.core.Slave;
+import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
@@ -28,13 +31,9 @@
import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.ScaleThread;
import com.zy.core.thread.SiemensCrnThread;
-import com.zy.core.DevpThread;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-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.util.*;
@@ -131,7 +130,7 @@
/**
* 鍫嗗灈鏈虹姸鎬佸垽鏂�
*/
- if (crn.getId() == 1 && crnProtocol.getAlarm1() > 0) {
+ if (crn.getId() == 1 && crnProtocol.getAlarm() > 0) {
vo.setCrnStatus(CrnStatusType.MACHINE_ERROR);
} else {
if (crnProtocol.getTaskNo()>0) {
@@ -166,6 +165,19 @@
list.add(vo);
}
return R.ok().add(list);
+ }
+
+ @PostMapping("/latest/inSta/data/barcode")
+ @ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
+ public R barcodeData(Integer barcodeId){
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
+ if (null == barcodeThread) {
+ return R.ok();
+ }
+ BarcodeDataVo vo = new BarcodeDataVo();
+ vo.setBarcodeId(barcodeId);
+ vo.setCodeValue(barcodeThread.getBarcode());
+ return R.ok().add(vo);
}
@PostMapping("/latest/data/scale")
@@ -280,4 +292,17 @@
return R.ok();
}
+ @GetMapping("/barcode/output/site")
+ public R crnOutput(){
+// StringBuilder str = new StringBuilder();
+// String s;
+// int i = 0;
+// while((s = OutputQueue.CRN.poll()) != null && i <=32) {
+// str.append("\n").append(s);
+// i++;
+// }
+// return R.ok().add(str.toString());
+ return R.ok().add(JSON.toJSONString(new ArrayList<>(OutputQueue.BARCODE)));
+ }
+
}
--
Gitblit v1.9.1