From ef7c01de9d4fdc7229cc2a92b8e48d9f60cad44a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 22 十月 2024 16:47:02 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/RgvController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 033d277..9820ee0 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -6,13 +6,11 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.RgvStatusType;
-import com.zy.asrs.domain.param.EnergyGatheringRingParam;
-import com.zy.asrs.domain.param.RgvOperatorParam;
-import com.zy.asrs.domain.param.RgvWrkMastParam;
-import com.zy.asrs.domain.param.RingThroughParam;
+import com.zy.asrs.domain.param.*;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasRgvErrMapper;
+import com.zy.asrs.service.BasCircularShuttleService;
import com.zy.asrs.service.BasDevpPositionService;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.WrkMastService;
@@ -66,6 +64,8 @@
private MainServiceImpl mainService;
@Autowired
private BasDevpPositionService basDevpPositionService;
+ @Autowired
+ private BasCircularShuttleService basCircularShuttleService;
@PostMapping("/table/rgv/state")
@ManagerAuth(memo = "RGV淇℃伅琛�")
@@ -416,7 +416,7 @@
}
@PostMapping("/ring/through/task/wrk/mast/position/data")
-// @ManagerAuth(memo = "绔欑偣淇℃伅")
+// @ManagerAuth(memo = "浣滀笟淇℃伅")
public R ringThroughTaskWrkMast(){
List<RgvWrkMastParam> result = new ArrayList<>();
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<>());
@@ -442,4 +442,25 @@
return R.ok().add(result);
}
+ @PostMapping("/task/rgv/circular/shuttle/mast/position/data")
+// @ManagerAuth(memo = "浣滀笟淇℃伅")
+ public R rgvCircularShuttle(){
+ List<RgvCircularShuttleParam> result = new ArrayList<>();
+ List<BasCircularShuttle> basCircularShuttleList = basCircularShuttleService.selectList(new EntityWrapper<>());
+ for (BasCircularShuttle basCircularShuttle : basCircularShuttleList){
+ RgvCircularShuttleParam rgvCircularShuttleParam = new RgvCircularShuttleParam(basCircularShuttle);
+ if (!Cools.isEmpty(rgvCircularShuttleParam.getRgvNo())){
+ RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, rgvCircularShuttleParam.getRgvNo());
+ if (rgvThread != null) {
+ RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol != null) {
+ rgvCircularShuttleParam.setPosition(rgvProtocol.getRgvPos());
+ }
+ }
+ }
+ result.add(rgvCircularShuttleParam);
+ }
+ return R.ok().add(result);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.1