From 23e276a6e6789b38ea342ecc309b74f87344e131 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 20 十一月 2025 09:56:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 104 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 21ff1fc..654db88 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -22,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -34,6 +36,21 @@
@RequestMapping("mobile")
@Slf4j
public class MobileController extends BaseController {
+
+ private static final boolean auth = true;
+ public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
+ add("ea1f0459efc02a79f046f982767939ae");
+ }};
+
+ public static final ArrayList<String> agvSta1 = new ArrayList<String>() {{
+ add("5400101");add("5400102");add("5400103");add("5400104");add("5400105");add("5400106");add("5400107");
+ }};
+ public static final ArrayList<String> agvSta2 = new ArrayList<String>() {{
+ add("5400201");add("5400202");add("5400203");add("5400204");add("5400205");add("5400206");add("5400207");
+ }};
+ public static final ArrayList<String> agvSta3 = new ArrayList<String>() {{
+ add("5400301");add("5400302");add("5400303");add("5400304");add("5400305");add("5400306");add("5400307");
+ }};
@Autowired
private MobileService mobileService;
@@ -82,12 +99,17 @@
return R.ok();
}
+ @PostMapping("/agv/AGVDismantle")
+ @ManagerAuth
+ public R pdaAGVDismantle(@RequestBody Map<String,Object> map){
+ return mobileService.AgvDismantle(map);
+ }
@PostMapping("/agv/finishedCall")
@ManagerAuth
public R pdaAgvFinishedCall(@RequestBody Map<String,Object> map){
return mobileService.FinishedCall(map);
}
- @PostMapping("/agv/2fPack")
+ @PostMapping("/agv/agv2fPack")
@ManagerAuth
public R pdaAgv2fPack(@RequestBody Map<String,Object> map){
return mobileService.agv2fPack(map);
@@ -142,6 +164,56 @@
}
return mobileService.unbind(site);
+ }
+
+ @PostMapping("/agv/unbind2")
+ @ManagerAuth
+ public R pdaAgvUnbind2(@RequestBody Map<String,Object> map){
+
+ String site = (String) map.get("site"); // 鏆傚瓨浣�
+
+ if (Cools.isEmpty(site)) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ }
+
+ return mobileService.unbind2(site);
+ }
+
+ @PostMapping("/agv/bind")
+ @ManagerAuth
+ public R pdaAgvBind(@RequestBody Map<String,Object> map){
+
+ String site = (String) map.get("site"); // 鏆傚瓨浣�
+
+ if (Cools.isEmpty(site)) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ }
+
+ // 鍒ゆ柇site鍦ㄥ摢涓垪琛ㄤ腑锛屽苟鑾峰彇瀵瑰簲鐨勫垪琛�
+ ArrayList<String> targetList = null;
+ if (agvSta1.contains(site)) {
+ targetList = agvSta1;
+ } else if (agvSta2.contains(site)) {
+ targetList = agvSta2;
+ } else if (agvSta3.contains(site)) {
+ targetList = agvSta3;
+ }
+
+ // 濡傛灉site鍦╝gvSta1銆乤gvSta2鎴朼gvSta3涓紝寰幆璋冪敤bindPodAndBerth
+ if (targetList != null) {
+ // 寰幆璋冪敤bindPodAndBerth澶勭悊鍒楄〃涓殑鎵�鏈夋暟鎹�
+ for (String siteItem : targetList) {
+ boolean b = mobileService.bindPodAndBerth(siteItem);
+ }
+ return R.ok();
+ } else {
+ // 鍘熸湁閫昏緫锛氫笉鍦ㄦ寚瀹氱珯鐐逛腑锛屽彧澶勭悊鍗曚釜site
+ boolean b = mobileService.bindPodAndBerth(site);
+ if (b){
+ return R.ok();
+ }
+ return R.error();
+ }
}
private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
@@ -352,6 +424,37 @@
return R.ok();
}
+ @RequestMapping("/pingKu/getList/auth")
+ @ManagerAuth(memo = "骞冲簱鑾峰彇搴撳瓨鍒楄〃")
+ @AppAuth(memo = "骞冲簱鑾峰彇搴撳瓨鍒楄〃")
+ public R pingKuGetList(@RequestBody PKInventoryAdjustment combParam){
+ auth("", combParam, request);
+ if (Cools.isEmpty(combParam.getLocno())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ List<ManLocDetl> manLocDetls = mobileService.pingKuGetList(combParam);
+
+ return R.ok(manLocDetls);
+ }
+
+ @RequestMapping("/pingKu/inventoryAdjustment/auth")
+ @ManagerAuth(memo = "搴撳瓨璋冩暣")
+ @AppAuth(memo = "搴撳瓨璋冩暣")
+ public R pingKuInventoryAdjustment(@RequestBody PKInventoryAdjustment combParam, HttpServletRequest request){
+ auth("", combParam, request);
+ if (Cools.isEmpty(combParam.getLocno())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ mobileService.pingKuInventoryAdjustment(combParam);
+
+ return R.ok();
+ }
+
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+// log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ }
+
@RequestMapping("/pack/get/auth")
@ManagerAuth
public R packGet(@RequestParam String barcode){
--
Gitblit v1.9.1