From 15c8f00ab3a1e3d2d96b56bae0ec11efedd60231 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 29 九月 2021 11:14:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index ec04118..074d0d8 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -12,10 +12,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -24,10 +21,20 @@
@RestController
public class WorkController extends BaseController {
+ public static final ArrayList<Integer> AGV_EMPTY_AREA = new ArrayList<Integer>() {{
+ add(1061);add(1062);add(1063);add(1064);add(1065);add(1066);add(1067);add(1068);
+ }};
+
@Autowired
private WorkService workService;
@Autowired
private BasDevpService basDevpService;
+
+ @RequestMapping("/agv/put/site")
+ @ManagerAuth(memo = "鑾峰彇AGV宸ヤ綔鍖�")
+ public R availableAgvSite(){
+ return R.ok().add(basDevpService.getAgvAvailableInSite());
+ }
@RequestMapping("/available/put/site")
@ManagerAuth(memo = "鑾峰彇鍏ュ簱绔欑偣")
@@ -38,7 +45,16 @@
@RequestMapping("/available/empty/put/site")
@ManagerAuth(memo = "鑾峰彇绌烘澘鍏ュ簱绔欑偣")
public R availableEmptyPutSite(){
- return R.ok().add(basDevpService.getAvailableEmptyInSite());
+ List<Integer> availableEmptyInSite = basDevpService.getAvailableEmptyInSite();
+ List<Integer> agvSite = new ArrayList<>();
+ List<Integer> availableEmptyInSite1 = basDevpService.getAgvAvailableInSite();
+ for (Integer integer : availableEmptyInSite1) {
+ if (AGV_EMPTY_AREA.contains(integer)) {
+ agvSite.add(integer);
+ }
+ }
+ availableEmptyInSite.addAll(agvSite);
+ return R.ok().add(availableEmptyInSite);
}
@RequestMapping("/available/take/site")
@@ -59,6 +75,13 @@
map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
result.add(map);
}
+ List<Integer> agvAvailableInSite = basDevpService.getAgvAvailableInSite();
+ for (Integer siteId : agvAvailableInSite) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝皬杞﹀伐浣滃尯锛�");
+ result.add(map);
+ }
return R.ok().add(result);
}
@@ -71,7 +94,16 @@
@RequestMapping("/available/empty/take/site")
@ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
public R availableEmptyTakeSite(){
- return R.ok().add(basDevpService.getAvailableEmptyOutSite());
+ List<Integer> availableEmptyOutSite = basDevpService.getAvailableEmptyOutSite();
+ List<Integer> agvSite = new ArrayList<>();
+ List<Integer> availableEmptyInSite1 = basDevpService.getAgvAvailableInSite();
+ for (Integer integer : availableEmptyInSite1) {
+ if (AGV_EMPTY_AREA.contains(integer)) {
+ agvSite.add(integer);
+ }
+ }
+ availableEmptyOutSite.addAll(agvSite);
+ return R.ok().add(availableEmptyOutSite);
}
@RequestMapping("/full/store/put/start")
--
Gitblit v1.9.1