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 | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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..f2d16d8 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -12,13 +12,11 @@
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.BasRgv;
-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;
@@ -66,6 +64,8 @@
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private BasRgvService basRgvService;
+ @Autowired
+ private BasRgvMapService basRgvMapService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -113,8 +113,31 @@
StaProtocol staProtocol = entry.getValue();
vo.setSiteId(String.valueOf(entry.getKey())); // 绔欑偣缂栧彿
for (BasRgv basRgv: basRgvs){
- if (basRgv.getRgvNo().equals(entry.getKey()) ){
- staProtocol.setWorkNo(basRgv.getWrkNo1());
+ 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()); // 宸ヤ綔鍙�
@@ -203,7 +226,14 @@
return R.ok().add(list);
}
- /****************************************************************/
+// @PostMapping("/latest/data/rgv")
+// @ManagerAuth(memo = "RGV瀹炴椂鏁版嵁")
+// public R rgvLatestData(){
+// return R.ok().add(list);
+// }
+
+
+ /****************************************************************/
/************************** 璇︽儏鎿嶄綔 ******************************/
/****************************************************************/
--
Gitblit v1.9.1