From 17a71449244e966206e3f24102fd9e56fa3199e4 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期四, 01 一月 2026 15:19:49 +0800
Subject: [PATCH] 路径初始化异常修复
---
src/main/java/com/zy/asrs/controller/OpenController.java | 197 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 185 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 770075a..6436d22 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,19 +1,34 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.zy.asrs.entity.AgvCallbackDto;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.param.MatSyncParam;
+import com.zy.asrs.entity.param.OpenLocDetlQueryParam;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.MesPakinParam;
+import com.zy.common.model.MesPakoutParam;
+import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -21,7 +36,7 @@
@Slf4j
@RestController
@RequestMapping("open/asrs")
-public class OpenController {
+public class OpenController extends BaseController {
private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
@@ -31,13 +46,100 @@
@Autowired
private OpenService openService;
+ @Resource
+ private LocDetlService locDetlService;
+
+ @PostMapping("/api/agv_callback")
+ @AppAuth(memo = "agv浠诲姟鍥炶皟")
+ public synchronized R agvCallback(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) AgvCallbackDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.agvCallback(param);
+ }
+
+ // 鍏ュ簱瀹屾垚涓婃姤娴嬭瘯鎺ュ彛
+ @PostMapping("/inOrderFinishReport")
+ public synchronized R inOrderFinishReport(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MesPakinParam param,
+ HttpServletRequest request) {
+ return R.ok();
+ }
+
+ // 鍑哄簱瀹屾垚涓婃姤娴嬭瘯鎺ュ彛
+ @PostMapping("/outOrderFinishReport")
+ public synchronized R outOrderFinishReport(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MesPakoutParam param,
+ HttpServletRequest request) {
+ return R.ok();
+ }
+
+ //鍛煎彨agv娴嬭瘯鎺ュ彛
+ @PostMapping("/api/entity/create/one")
+ @AppAuth(memo = "鍛煎彨agv娴嬭瘯鎺ュ彛")
+ public synchronized R create(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MesPakoutParam param,
+ HttpServletRequest request) {
+ return R.ok();
+ }
+
+ @PostMapping("/order/matSync/default/v2")
+// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam.MatParam param,
+ HttpServletRequest request) {
+
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ MatSyncParam matSyncParam = new MatSyncParam();
+ List<MatSyncParam.MatParam> objects = new ArrayList<>();
+ objects.add(param);
+ matSyncParam.matDetails = objects;
+ openService.syncMat(matSyncParam);
+ return R.ok();
+ }
+
+ @PostMapping("/order/matSync/default/v1")
+ @AppAuth(memo = "鐗╂枡淇℃伅鍚屾")
+ public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param,param.getMatDetails())) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.syncMat(param);
+ return R.ok();
+ }
+
+ /****************************************************************************/
+ /********************************* 鎵撳寘涓婄嚎 **********************************/
+ /****************************************************************************/
+
+// @PostMapping("/order/pakin/new/package/v1")
+// @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
+// public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) PackParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// openService.packageUp(param);
+// return R.ok();
+// }
+
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/new/default/v1")
+ @PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "鍏ュ簱鍗曟嵁涓嬪彂")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -50,6 +152,9 @@
if (Cools.isEmpty(param.getOrderDetails())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
openService.pakinOrderCreate(param);
return R.ok();
}
@@ -57,25 +162,93 @@
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakin/complete/default/v1")
- public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderCompleteParam param) {
- auth(appkey, param);
+// @PostMapping("/order/pakin/complete/default/v1")
+ public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakinOrderComplete(param));
}
+
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "鍑哄簱鍗曟嵁涓嬪彂")
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getOrderNo())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderType())) {
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ if (!param.getOptType().equals("delete") && Cools.isEmpty(param.getOrderDetails())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.pakoutOrderCreate(param);
+ return R.ok();
+ }
+
+ /**
+ * 鍑哄簱鍗曞洖鍐�
+ */
+// @PostMapping("/order/pakout/complete/default/v1")
+ public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok().add(openService.pakoutOrderComplete(param));
+ }
+
/**
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey) {
- auth(appkey, null);
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
return R.ok().add(openService.queryStock());
}
+ /**
+ * 搴撳瓨鏄庣粏鏌ヨ
+ */
+ @PostMapping("/locDetl/list/default/v1")
+ @AppAuth(memo = "搴撳瓨鏄庣粏鏌ヨ")
+ public R queryLocDetlList(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenLocDetlQueryParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ Map<String, Object> paramMap = param.toQueryMap();
+ excludeTrash(paramMap);
+ param.convertToWrapper(wrapper);
+ allLike(LocDetl.class, paramMap.keySet(), wrapper, param.getCondition());
+ if (!Cools.isEmpty(param.getOrderByField())) {
+ wrapper.orderBy(humpToLine(param.getOrderByField()), "asc".equals(param.getOrderByType()));
+ }
+ Integer curr = param.getCurr() != null ? param.getCurr() : 1;
+ Integer limit = param.getLimit() != null ? param.getLimit() : 10;
+ return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
- private void auth(String appkey, Object obj) {
- log.info("{}鎺ュ彛琚闂紒appkey:{},璇锋眰鏁版嵁锛歿}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
if (!auth) {
return;
}
--
Gitblit v1.9.1