From a84e04a54fa499bcff8c9806df5c15e09ce3c504 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 31 十月 2025 11:34:22 +0800
Subject: [PATCH] #小车地图bug修复，小车动画
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 7dbab85..f2d16d8 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;
@@ -11,16 +12,17 @@
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.BasCrnError;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasRgvMapService;
+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;
@@ -28,13 +30,13 @@
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 +62,10 @@
private LocMastMapper locMastMapper;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private BasRgvService basRgvService;
+ @Autowired
+ private BasRgvMapService basRgvMapService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -101,10 +107,39 @@
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){
+ BasRgvMap basRgvMap = basRgvMapService.selectByRgvNo(basRgv.getRgvNo());
+ if(basRgv.getRgvNo() == 1 ){
+ if(entry.getKey() == 1){
+ staProtocol.setWorkNo(basRgv.getWrkNo1());
+ staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
+ staProtocol.setAutoing(basRgv.getStatus() == 1);
+ staProtocol.setLoading(staProtocol.getWorkNo()>0);
+ }else if(entry.getKey() == 2){
+ staProtocol.setWorkNo(basRgv.getWrkNo2());
+ staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
+ staProtocol.setAutoing(basRgv.getStatus() == 1);
+ staProtocol.setLoading(staProtocol.getWorkNo()>0);
+ }
+ }else if(basRgv.getRgvNo() == 2){
+ if(entry.getKey() == 3){
+ staProtocol.setWorkNo(basRgv.getWrkNo1());
+ staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
+ staProtocol.setAutoing(basRgv.getStatus() == 1);
+ staProtocol.setLoading(staProtocol.getWorkNo()>0);
+ }else if(entry.getKey() == 4){
+ staProtocol.setWorkNo(basRgv.getWrkNo2());
+ staProtocol.setNearbySta(String.valueOf(basRgvMap.getNowRoute()));
+ staProtocol.setAutoing(basRgv.getStatus() == 1);
+ staProtocol.setLoading(staProtocol.getWorkNo()>0);
+ }
+ }
+ }
vo.setWorkNo(staProtocol.getWorkNo()); // 宸ヤ綔鍙�
vo.setSiteStatus(SiteStatusType.process(staProtocol)); // 鐘舵��
vo.setNearbySta(staProtocol.getNearbySta());
@@ -191,7 +226,14 @@
return R.ok().add(list);
}
- /****************************************************************/
+// @PostMapping("/latest/data/rgv")
+// @ManagerAuth(memo = "RGV瀹炴椂鏁版嵁")
+// public R rgvLatestData(){
+// return R.ok().add(list);
+// }
+
+
+ /****************************************************************/
/************************** 璇︽儏鎿嶄綔 ******************************/
/****************************************************************/
@@ -249,7 +291,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