From 5d2d9dbe286f6e079232e68d30bbd0530ccecaef Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 17:59:57 +0800
Subject: [PATCH] #v2.0
---
src/main/java/com/zy/asrs/controller/WorkController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index ef1e032..6627272 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -15,6 +15,11 @@
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;
+
/**
* 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
* Created by vincent on 2020/6/10
@@ -42,7 +47,28 @@
@RequestMapping("/available/take/site")
@ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableOutSite());
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+ for (Integer siteId : outSite) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ result.add(map);
+ }
+ List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+ for (Integer siteId : pickOutSite) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", siteId);
+ map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ result.add(map);
+ }
+ return R.ok().add(result);
+ }
+
+ @RequestMapping("/available/take/check/site")
+ @ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
+ public R availableTakeCheckSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite(103));
}
@RequestMapping("/available/empty/take/site")
--
Gitblit v1.9.1