From 1a13af7ff90e306b10f6cd002e90f279331a763d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 27 八月 2020 13:47:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 97 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 70 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index f04eeb6..ef9a2c0 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -3,21 +3,30 @@
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.domain.enums.CrnStatusType;
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.LocMastMapper;
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;
+import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.protocol.CrnProtocol;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,12 +34,12 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* 涓绘帶鍥炬帴鍙�
* Created by vincent on 2020-06-01
*/
+@Slf4j
@RestController
@RequestMapping("/console")
public class ConsoleController {
@@ -41,8 +50,8 @@
private WrkMastService wrkMastService;
@Autowired
private BasDevpService basDevpService;
-
- public static AtomicInteger integer = new AtomicInteger();
+ @Autowired
+ private LocMastMapper locMastMapper;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -99,11 +108,38 @@
@ManagerAuth(memo = "鍫嗗灈鏈哄疄鏃舵暟鎹�")
public R crnLatestData(){
List<CrnLatestDataVo> vos = new ArrayList<>();
- for (int i =1; i<=2; i++){
+ for (CrnSlave crn : slaveProperties.getCrn()) {
+ // 鑾峰彇鍫嗗灈鏈轰俊鎭�
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
+ if (crnThread == null) {
+ log.error("{}鍙峰爢鍨涙満杩炴帴澶辫触", crn.getId());
+ continue;
+ }
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ if (crnProtocol == null) {
+ log.error("{}鍙峰爢鍨涙満杩炴帴澶辫触", crn.getId());
+ continue;
+ }
CrnLatestDataVo vo = new CrnLatestDataVo();
- vo.setCrnId(i);
- vo.setOffset((double) new Random().nextInt(560));
+ vo.setCrnId(crn.getId()); // 鍫嗗灈鏈虹紪鍙�
+
+// Short totalBay = locMastMapper.selectTotalBay();
+
+ vo.setOffset((double) new Random().nextInt(560)); // 鍫嗗灈鏈哄亸绉婚噺
+ vo.setBay(crnProtocol.getBay()); // 褰撳墠鍒�
+ /**
+ * 鍫嗗灈鏈虹姸鎬佸垽鏂�
+ */
+ if (crnProtocol.getTaskNo()>0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setCrnStatus(CrnStatusType.process(wrkMast.getIoType()));
+ }
+ } else {
+ vo.setCrnStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO: CrnStatusType.MACHINE_UN_AUTO);
+ }
vos.add(vo);
+
}
return R.ok().add(vos);
}
@@ -111,16 +147,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);
@@ -146,7 +178,6 @@
if (basDevp == null) {
return R.error("鏁版嵁搴撶淮鎶ゅ紓甯�");
}
-
vo.setSiteId(siteId); // 绔欑偣缂栧彿
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
@@ -178,22 +209,34 @@
@PostMapping("/crn/detail")
@ManagerAuth(memo = "鍫嗗灈鏈鸿澶囨暟鎹鎯�")
- public R crnDetail(@RequestParam String crnNo){
+ public R crnDetail(@RequestParam Integer crnNo){
if (Cools.isEmpty(crnNo)){
return R.parse(CodeRes.EMPTY);
}
CrnDetailVo vo = new CrnDetailVo();
- vo.setCrnNo(crnNo);
- vo.setWorkNo("3387");
- vo.setSourceStaNo("2303");
- vo.setStaNo("2410");
- vo.setWorkStatus("3.鍚婅溅鍏ュ簱涓�");
- vo.setIoType("1.鍏ュ簱");
- vo.setSourceStock("");
- vo.setStock("05050040");
- vo.setCrnStatus("鍙栬揣涓�");
- vo.setError("0");
- return R.ok().add(vo);
+ for (CrnSlave crnSlave : slaveProperties.getCrn()) {
+ if (crnSlave.getId().equals(crnNo)) {
+ CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ CrnProtocol crnProtocol = crnThread.getCrnProtocol();
+ vo.setCrnNo(crnNo);
+ vo.setWorkNo(crnProtocol.getTaskNo());
+ if (crnProtocol.getTaskNo() > 0) {
+ WrkMast wrkMast = wrkMastService.selectById(crnProtocol.getTaskNo());
+ if (wrkMast != null) {
+ vo.setSourceStaNo(wrkMast.getSourceStaNo$());
+ vo.setStaNo(wrkMast.getStaNo$());
+ vo.setWrkSts(wrkMast.getWrkSts$()); // 宸ヤ綔鐘舵��
+ vo.setIoType(wrkMast.getIoType$()); // 鍏ュ嚭搴撶被鍨�
+ vo.setSourceLocNo(wrkMast.getSourceLocNo$());
+ vo.setLocNo(wrkMast.getLocNo$());
+ vo.setCrnStatus(crnProtocol.getStatusType().desc);
+ vo.setError(""); // todo
+ }
+ }
+ return R.ok().add(vo);
+ }
+ }
+ return R.error();
}
@Deprecated
--
Gitblit v1.9.1