From 0e50e2cfbb4d79e5b71b1ae5346a33f01cfeabe2 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 03 四月 2025 14:30:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 208b218..97501e2 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -67,6 +67,11 @@
@Autowired
private BasRgvService basRgvService;
+ public static final ArrayList<Integer> barcodeNos = new ArrayList<Integer>() {{
+ add(1112);add(1114);add(1122);add(1124);
+
+ }};
+
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
public R systemRunningStatus(){
@@ -107,17 +112,12 @@
stations.putAll(devpThread.getStation());
}
}
- List<BasRgv> basRgvs = basRgvService.selectList(new EntityWrapper<BasRgv>());
+
for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
SiteLatestDataVo vo = new SiteLatestDataVo();
StaProtocol staProtocol = entry.getValue();
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
- for (BasRgv basRgv: basRgvs){
- if (basRgv.getRgvNo().equals(entry.getKey()) ){
- staProtocol.setWorkNo(basRgv.getWrkNo1());
- }
- }
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ vo.setWorkNo(staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
vo.setNearbySta(staProtocol.getNearbySta());
vos.add(vo);
@@ -173,16 +173,26 @@
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
public R barcodeLatestData(){
List<BarcodeDataVo> list = new ArrayList<>();
- for (Slave barcode : slaveProperties.getBarcode()) {
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
- if (null == barcodeThread) {
+ List<SiteLatestDataVo> vos = new ArrayList<>();
+ Map<Integer, StaProtocol> stations = new HashMap<>();
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ if (null != devpThread) {
+ stations.putAll(devpThread.getStation());
+ }
+ }
+
+ for (Map.Entry<Integer, StaProtocol> entry : stations.entrySet()) {
+ int index = barcodeNos.indexOf(entry.getValue().getSiteId());
+ if (index == -1) {
continue;
}
BarcodeDataVo vo = new BarcodeDataVo();
- vo.setBarcodeId(barcode.getId());
- vo.setCodeValue(barcodeThread.getBarcode());
+ vo.setBarcodeId(index);
+ vo.setCodeValue(entry.getValue().getBarcode());
list.add(vo);
}
+
return R.ok().add(list);
}
@@ -224,7 +234,7 @@
return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
}
vo.setSiteId(siteId); // 绔欑偣缂栧彿
- vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ vo.setWorkNo(staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
if (staProtocol.getWorkNo() > 0) {
WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
--
Gitblit v1.9.1