From 113342593a17ecb75cd2f7f5af271a2528fd4a10 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 10:42:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 103 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 87 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 690fb42..b892ae2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -191,7 +191,19 @@
/*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+ /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
+ /**
+ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+ */
+ @PostMapping("/labeller/mat/auth/v1")
+ @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
+ public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.labellerMat(param));
+ }
/**
* 璐存爣鏈鸿创鏍囧畬鎴�
@@ -207,29 +219,46 @@
}
/**
- * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+ * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
*/
- @PostMapping("/labeller/mat/auth/v1")
- @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�")
- public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
- @RequestBody LabellerMatParam param,
+ @PostMapping("/palletizing/complete/auth/v1")
+ @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
+ public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteParam2 param,
HttpServletRequest request) {
+// appkey = "ea1f0459efc02a79f046f982767939ae";
+
auth(appkey, param, request);
- openService.labellerMat(param);
+ openService.palletizingComplete(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) {
+// appkey = "ea1f0459efc02a79f046f982767939ae";
+
+ auth(appkey, param, request);
+ openService.palletizingCompleteS(param);
return R.ok();
}
/**
- * 涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ * 涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�
*/
- @PostMapping("/palletizing/complete/auth/v1")
- @AppAuth(memo = "涓帶锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
- public synchronized R palletizingComplete(@RequestHeader(required = false) String appkey,
- @RequestBody PalletizingCompleteParam param,
- HttpServletRequest request) {
+ @PostMapping("/balcony/complete/auth/v1")
+ @AppAuth(memo = "涓帶锛氬嚭搴撳畬鎴愭湀鍙扮浉鍏�")
+ public synchronized R balconyComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
- openService.palletizingComplete(param);
- return R.ok();
+ openService.balconyComplete(param);
+ return R.ok(param);
}
@@ -241,9 +270,11 @@
public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
@RequestBody SingleUnstackingCompleteParam param,
HttpServletRequest request) {
+// appkey = "ea1f0459efc02a79f046f982767939ae";
+
auth(appkey, param, request);
openService.singleUnstackingComplete(param);
- return R.ok();
+ return R.ok(param);
}
/**
@@ -254,12 +285,52 @@
public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
@RequestBody SingleMountUnstackingCompleteParam param,
HttpServletRequest request) {
+// appkey = "ea1f0459efc02a79f046f982767939ae";
+
auth(appkey, param, request);
openService.singleMountUnstackingComplete(param);
- return R.ok();
+ 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