From 2e3716054aa57e2a41ee39c4ea0cd776fd74f260 Mon Sep 17 00:00:00 2001 From: 野心家 <1051256694@qq.com> Date: 星期四, 26 九月 2024 19:54:14 +0800 Subject: [PATCH] 第一版 --- src/main/java/com/zy/asrs/controller/OpenController.java | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index c16c8af..cb34a46 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -4,10 +4,7 @@ import com.core.annotations.AppAuth; import com.core.common.*; import com.core.exception.CoolException; -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.entity.param.PackParam; +import com.zy.asrs.entity.param.*; import com.zy.asrs.service.OpenService; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; @@ -36,30 +33,40 @@ @Autowired private OpenService openService; - + @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)) { + 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/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") public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakinParam param, HttpServletRequest request) { @@ -94,7 +101,7 @@ /** * 娣诲姞鍑哄簱鍗� */ - @PostMapping("/order/pakout/new/default/v1") + @PostMapping("/order/pakout/default/v1") @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱") public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakoutParam param, @@ -143,7 +150,6 @@ auth(appkey, null, request); return R.ok().add(openService.queryStock()); } - private void auth(String appkey, Object obj, HttpServletRequest request) { log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj)); -- Gitblit v1.9.1