From 364b9ccc44bc6863280c5cc00aa8512cfff548d4 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 25 四月 2025 15:27:18 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/controller/OpenController.java | 242 ++++++++++++++++++++++++------------------------
1 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 3f21178..a508bdb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,9 +8,11 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.param.CrnStatusParam;
+import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.entity.param.TaskOverParam;
+import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -168,125 +170,6 @@
}
- //鍙栨斁璐х敵璇�
- @PostMapping("/pick/and/place/v1")
- @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
- public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getStartPoint())) {
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())) {
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV1(param);
- }
-
- //鍙栨斁璐у畬鎴愬弽棣�
- @PostMapping("/pick/and/place/v2")
- @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
- public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getStartPoint())) {
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())) {
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV2(param);
- }
-
-
- private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
- request.setAttribute("cache", obj);
- if (Cools.isEmpty(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
- if (!APP_KEY_LIST.contains(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
- }
-
-
- //浠诲姟涓嬪彂鎺ュ彛
- @PostMapping("/outboundTaskSend")
- @Transactional
- public HashMap<String, Object> outboundTaskSend(@RequestBody List<CarryParam> params) {
- HashMap<String, Object> map = new HashMap<>();
- for (CarryParam param : params) {
- if (Cools.isEmpty(param)) {
- map.put("Code", "0");
- map.put("Msg", "鍙傛暟涓虹┖锛�");
- return map;
- } else if (Cools.isEmpty(param.getTaskNo())) {
- map.put("Code", "0");
- map.put("Msg", "浠诲姟鍙蜂负绌猴紒");
- return map;
- } else if (Cools.isEmpty(param.getStereoscopicTaskType())) {
- map.put("Code", "0");
- map.put("Msg", "浠诲姟绫诲瀷涓虹┖锛�");
- return map;
- }
- String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
- param.setStartPoint(fusion);
- LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
- if (Cools.isEmpty(locMast)) {
- map.put("Code", "0");
- map.put("Msg", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
- return map;
- }
-
- HashMap<String, Object> r = new HashMap<>();
-
- if (param.getStereoscopicTaskType() == 2) {
- //鍑哄簱浠诲姟鍒涘缓
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("type_no", 2)
- .eq("crn_no", locMast.getCrnNo())
- .eq("stn_no", param.getTerminalNo()));
- if (Cools.isEmpty(staDesc)) {
- map.put("Code", "0");
- map.put("Msg", "鍑哄簱璺緞涓嶅瓨鍦紒");
- return map;
- }
- r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
- if (r.get("Code").equals("0")) {
- return r;
- }
- } else if (param.getStereoscopicTaskType() == 3) {
- String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
- param.setTerminalNo(fusion1);
- //绉诲簱浠诲姟鍒涘缓
- r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
- if (r.get("Code").equals("0")) {
- return r;
- }
- }
- apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
- , request.getRemoteAddr() + request.getRequestURI()
- , ""
- , request.getRemoteAddr()
- , JSON.toJSONString(param)
- , r.toString()
- , true
- );
- }
- map.put("Code", "1");
- map.put("Msg", "ok");
- return map;
- }
-
//浠诲姟鍙栨秷鎺ュ彛
@PostMapping("/taskCancel")
public R taskCancel(@RequestHeader String appkey,
@@ -364,6 +247,55 @@
return R.ok(crnStatusParams);
}
+ //鍙栨斁璐х敵璇�
+ @PostMapping("/pick/and/place/v1")
+ @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
+ public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getStartPoint())) {
+ return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getType())) {
+ return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+ }
+ return openService.getAgvPickAndPlaceV1(param);
+ }
+
+ //鍙栨斁璐у畬鎴愬弽棣�
+ @PostMapping("/pick/and/place/v2")
+ @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
+ public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
+ @RequestBody TaskOverParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getStartPoint())) {
+ return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getType())) {
+ return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
+ }
+ return openService.getAgvPickAndPlaceV2(param);
+ }
+
+
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ if (Cools.isEmpty(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ }
//鏌ヨ浠诲姟璇︽儏
@GetMapping("/queryTask")
@@ -394,6 +326,74 @@
}
+ //浠诲姟涓嬪彂鎺ュ彛
+// @PostMapping("/outboundTaskSend")
+// @Transactional
+// public HashMap<String, Object> outboundTaskSend(@RequestBody List<CarryParam> params) {
+// HashMap<String, Object> map = new HashMap<>();
+// for (CarryParam param : params) {
+// if (Cools.isEmpty(param)) {
+// map.put("Code", "0");
+// map.put("Msg", "鍙傛暟涓虹┖锛�");
+// return map;
+// } else if (Cools.isEmpty(param.getTaskNo())) {
+// map.put("Code", "0");
+// map.put("Msg", "浠诲姟鍙蜂负绌猴紒");
+// return map;
+// } else if (Cools.isEmpty(param.getStereoscopicTaskType())) {
+// map.put("Code", "0");
+// map.put("Msg", "浠诲姟绫诲瀷涓虹┖锛�");
+// return map;
+// }
+// String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
+// param.setStartPoint(fusion);
+// LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
+// if (Cools.isEmpty(locMast)) {
+// map.put("Code", "0");
+// map.put("Msg", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
+// return map;
+// }
+//
+// HashMap<String, Object> r = new HashMap<>();
+//
+// if (param.getStereoscopicTaskType() == 2) {
+// //鍑哄簱浠诲姟鍒涘缓
+// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+// .eq("type_no", 2)
+// .eq("crn_no", locMast.getCrnNo())
+// .eq("stn_no", param.getTerminalNo()));
+// if (Cools.isEmpty(staDesc)) {
+// map.put("Code", "0");
+// map.put("Msg", "鍑哄簱璺緞涓嶅瓨鍦紒");
+// return map;
+// }
+// r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
+// if (r.get("Code").equals("0")) {
+// return r;
+// }
+// } else if (param.getStereoscopicTaskType() == 3) {
+// String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
+// param.setTerminalNo(fusion1);
+// //绉诲簱浠诲姟鍒涘缓
+// r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
+// if (r.get("Code").equals("0")) {
+// return r;
+// }
+// }
+// apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
+// , request.getRemoteAddr() + request.getRequestURI()
+// , ""
+// , request.getRemoteAddr()
+// , JSON.toJSONString(param)
+// , r.toString()
+// , true
+// );
+// }
+// map.put("Code", "1");
+// map.put("Msg", "ok");
+// return map;
+// }
+
//AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
// @PostMapping("/targetWharfApply")
// @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
--
Gitblit v1.9.1