From b141c90208b6a82504680d35eacdaecff1cb7e40 Mon Sep 17 00:00:00 2001 From: lsh <lsh123456> Date: 星期日, 14 四月 2024 10:39:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/OpenController.java | 43 +++++++++++++++++++++++++++++++++---------- 1 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index b81ae14..6897f42 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -197,7 +197,7 @@ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭� */ @PostMapping("/labeller/mat/auth/v1") - @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") + @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") //old闇�瑕佷慨鏀� public synchronized R labellerMat(@RequestHeader(required = false) String appkey, @RequestBody LabellerMatParam param, HttpServletRequest request) { @@ -209,7 +209,7 @@ * 璐存爣鏈鸿创鏍囧畬鎴� */ @PostMapping("/labeller/complete/auth/v1") - @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") + @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀� public synchronized R labellerComplete(@RequestHeader(required = false) String appkey, @RequestBody LabellerCompleteParam param, HttpServletRequest request) { @@ -219,16 +219,42 @@ } /** - * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� + * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� */ @PostMapping("/palletizing/complete/auth/v1") - @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�") - public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey, - @RequestBody PalletizingCompleteParam param, + @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�") + public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey, + @RequestBody PalletizingCompleteTwoFloorParam param, HttpServletRequest request) { auth(appkey, param, request); - openService.palletizingComplete(param); + openService.PalletizingCompleteTwoFloorParam(param); + return R.ok(param); + } + + /** + * 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭� + */ + @PostMapping("/palletizing/complete/auth/v2") + @AppAuth(memo = "鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戠‘璁や俊鍙�") + public synchronized R palletizingCompleteS(@RequestHeader(required = false) String appkey, + @RequestBody PalletizingCompleteParam param, + HttpServletRequest request) { + auth(appkey, param, request); + openService.palletizingCompleteS(param); return R.ok(); + } + + /** + * 涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏� + */ + @PostMapping("/balcony/complete/auth/v1") + @AppAuth(memo = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�") //old闇�瑕佷慨鏀� + public synchronized R balconyComplete(@RequestHeader(required = false) String appkey, + @RequestBody LabellerMatParam param, + HttpServletRequest request) { + auth(appkey, param, request); + openService.balconyComplete(param); + return R.ok(param); } @@ -257,9 +283,6 @@ openService.singleMountUnstackingComplete(param); return R.ok(param); } - - - /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/ -- Gitblit v1.9.1