From c2be773489f4541daba9650c24df5b8dadcf33a3 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 06 十二月 2024 15:15:01 +0800
Subject: [PATCH] agv站点修改
---
src/main/java/com/zy/asrs/controller/WorkController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 63b8369..5123cc4 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.WorkService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.StartupDto;
import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
@@ -22,10 +23,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.*;
import java.util.stream.Collectors;
/**
@@ -64,7 +62,7 @@
@RequestMapping("/available/take/site")
@ManagerAuth()
public R availableTakeSite(){
- List<Map<String, Object>> result = new ArrayList<>();
+ Set<Map<String, Object>> result = new HashSet<>();
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
@@ -75,7 +73,7 @@
for (Integer siteId : outSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
- map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ map.put("desc","["+ Utils.getStaName(siteId)+"]");
result.add(map);
}
@@ -90,7 +88,7 @@
for (Integer siteId : pickOutSite) {
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
- map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+ map.put("desc","["+ Utils.getStaName(siteId)+"]");
result.add(map);
}
return R.ok().add(result);
--
Gitblit v1.9.1