From 056cf9d0311e1345017ab4c52c5946144fb4ccb8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 14 十月 2024 15:03:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 27 +++++++++++++++++++++------
1 files changed, 21 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 dd56b27..cbf90f9 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.Cools;
@@ -13,28 +14,33 @@
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasCrnError;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasRgvService;
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.RgvThread2;
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.DevpType.DevpStateType;
+import com.zy.core.enums.DevpType.DevpWorkType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.DevpSlave;
+import com.zy.core.model.RgvSlave;
import com.zy.core.model.protocol.CrnProtocol;
+import com.zy.core.model.protocol.RgvProtocol;
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.MelsecCrnThread;
-import com.zy.core.thread.ScaleThread;
+import com.zy.core.thread.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -60,6 +66,8 @@
private LocMastMapper locMastMapper;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private BasRgvService basRgvService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -101,12 +109,19 @@
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.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
+// vo.setNearbySta(staProtocol.getNearbySta());
vos.add(vo);
}
return R.ok().add(vos);
@@ -225,8 +240,8 @@
}
}
- vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); // 鑷姩
- vo.setLoading(staProtocol.isLoading()?"Y":"N"); // 鏈夌墿
+ vo.setAutoing(staProtocol.stateType == DevpStateType.AUTO?"Y":"N"); // 鑷姩
+ vo.setLoading(staProtocol.workType == DevpWorkType.BUSY?"Y":"N"); // 鏈夌墿
vo.setCanining(basDevp.getCanining()); // 鑳藉叆
vo.setCanouting(basDevp.getCanouting()); // 鑳藉嚭
@@ -248,7 +263,7 @@
CrnDetailVo vo = new CrnDetailVo();
for (CrnSlave crnSlave : slaveProperties.getCrn()) {
if (crnSlave.getId().equals(crnNo)) {
- MelsecCrnThread crnThread = (MelsecCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
+ SiemensCrnThread crnThread = (SiemensCrnThread) SlaveConnection.get(SlaveType.Crn, crnSlave.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
vo.setCrnNo(crnNo);
vo.setWorkNo(crnProtocol.getTaskNo());
--
Gitblit v1.9.1