From 5e38c75bc9c609d5e41bf817756ef8ed7a0f4851 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 21 八月 2025 15:28:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 79 +++++++++------------------------------
1 files changed, 19 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e1b4b0f..94e66a4 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,17 +219,15 @@
}
/**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
*/
@PostMapping("/palletizing/complete/auth/v1")
@AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
- public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam2 param,
+ public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteTwoFloorParam param,
HttpServletRequest request) {
-// appkey = "ea1f0459efc02a79f046f982767939ae";
-
auth(appkey, param, request);
- openService.palletizingComplete(param);
+ openService.PalletizingCompleteTwoFloorParam(param);
return R.ok(param);
}
@@ -237,22 +235,20 @@
* 鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
*/
@PostMapping("/palletizing/complete/auth/v2")
- @AppAuth(memo = "鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
+ @AppAuth(memo = "鏉剧洓(1妤�)锛氱爜鍨涘畬鎴愪笅鍙戠‘璁や俊鍙�")
public synchronized R palletizingCompleteS(@RequestHeader(required = false) String appkey,
@RequestBody PalletizingCompleteParam param,
HttpServletRequest request) {
-// appkey = "ea1f0459efc02a79f046f982767939ae";
-
auth(appkey, param, request);
openService.palletizingCompleteS(param);
- return R.ok(param);
+ return R.ok();
}
/**
* 涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�
*/
@PostMapping("/balcony/complete/auth/v1")
- @AppAuth(memo = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�")
+ @AppAuth(memo = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�") //old闇�瑕佷慨鏀�
public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
@RequestBody LabellerMatParam param,
HttpServletRequest request) {
@@ -270,10 +266,12 @@
public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
@RequestBody SingleUnstackingCompleteParam param,
HttpServletRequest request) {
-// appkey = "ea1f0459efc02a79f046f982767939ae";
-
auth(appkey, param, request);
- openService.singleUnstackingComplete(param);
+ try{
+ openService.singleUnstackingComplete(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok(param);
}
@@ -285,53 +283,14 @@
public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
@RequestBody SingleMountUnstackingCompleteParam param,
HttpServletRequest request) {
-// appkey = "ea1f0459efc02a79f046f982767939ae";
-
auth(appkey, param, request);
- openService.singleMountUnstackingComplete(param);
+ try{
+ openService.singleMountUnstackingComplete(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok(param);
}
-
-
- /**
- * 娴嬭瘯1 鍏ュ簱鍓嶈緭閫佺嚎鍐欏叆鎵樼洏鐮侊紝216绔欐祴璇曠敤
- */
- @PostMapping("/cs1/auth/v1")
- @AppAuth(memo = "")
- public synchronized R cs1(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.cs1(param.getBarcode());
- return R.ok(param);
- }
-
- /**
- * 娴嬭瘯2 娓呴櫎鎵樼洏鐮侊紝216绔欐祴璇曠敤 Copy
- */
- @PostMapping("/cs2/auth/v1")
- @AppAuth(memo = "")
- public synchronized R cs2(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.cs2();
- return R.ok(param);
- }
-
- /**
- * 娴嬭瘯3
- */
- @PostMapping("/cs3/auth/v1")
-// @AppAuth(memo = "")
- public synchronized R cs3(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- openService.cs3();
- return R.ok(param);
- }
-
/*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
--
Gitblit v1.9.1