From 334caa4ba8b118453a0227374d2feca7d850d44d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 15 八月 2020 14:03:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 20 ++++++++------------
src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java | 20 ++++----------------
2 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 1b7ef38..992970b 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -12,6 +12,7 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
+import com.zy.core.Slave;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnModeType;
import com.zy.core.enums.SlaveType;
@@ -21,6 +22,7 @@
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.properties.SystemProperties;
+import com.zy.core.thread.BarcodeThread;
import com.zy.core.thread.CrnThread;
import com.zy.core.thread.DevpThread;
import lombok.extern.slf4j.Slf4j;
@@ -31,7 +33,6 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* 涓绘帶鍥炬帴鍙�
@@ -48,8 +49,6 @@
private WrkMastService wrkMastService;
@Autowired
private BasDevpService basDevpService;
-
- public static AtomicInteger integer = new AtomicInteger();
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -141,16 +140,12 @@
@PostMapping("/latest/data/barcode")
@ManagerAuth(memo = "鏉＄爜鎵弿浠疄鏃舵暟鎹�")
public R barcodeLatestData(){
- integer.getAndIncrement();
List<BarcodeDataVo> list = new ArrayList<>();
- for (int i=1;i<=1;i++){
+ for (Slave barcode : slaveProperties.getBarcode()) {
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
BarcodeDataVo vo = new BarcodeDataVo();
- vo.setBarcodeId("1");
- if (integer.get()%5 != 0) {
- vo.setCodeValue("0");
- } else {
- vo.setCodeValue(String.valueOf(new Random().nextInt(5000)));
- }
+ vo.setBarcodeId(barcode.getId());
+ vo.setCodeValue(barcodeThread.getBarcode());
list.add(vo);
}
return R.ok().add(list);
@@ -229,11 +224,12 @@
vo.setLocNo(wrkMast.getLocNo$());
vo.setCrnStatus(crnProtocol.getStatusType().desc);
vo.setError(""); // todo
+ return R.ok().add(vo);
}
}
}
}
- return R.ok().add(vo);
+ return R.error();
}
@Deprecated
diff --git a/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java b/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
index c6bbc0b..acfc261 100644
--- a/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/BarcodeDataVo.java
@@ -1,30 +1,18 @@
package com.zy.asrs.domain.vo;
+import lombok.Data;
+
/**
* 鎵爜鍣ㄥ疄鏃舵暟鎹鍥惧璞�
* Created by vincent on 2020-06-03
*/
+@Data
public class BarcodeDataVo {
// 鎵爜鍣ㄧ紪鍙�
- private String barcodeId;
+ private Integer barcodeId;
// 鎵爜鍣ㄥ唴瀹�
private String codeValue;
- public String getBarcodeId() {
- return barcodeId;
- }
-
- public void setBarcodeId(String barcodeId) {
- this.barcodeId = barcodeId;
- }
-
- public String getCodeValue() {
- return codeValue;
- }
-
- public void setCodeValue(String codeValue) {
- this.codeValue = codeValue;
- }
}
--
Gitblit v1.9.1