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 | 142 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 112 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cb34a46..6897f42 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -33,7 +33,7 @@
@Autowired
private OpenService openService;
- @PostMapping("/order/matSync/default/v1")
+ /*@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
@@ -44,29 +44,13 @@
}
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/default/v1")
+ /*@PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param,
HttpServletRequest request) {
@@ -85,23 +69,23 @@
}
openService.pakinOrderCreate(param);
return R.ok();
- }
+ }*/
/**
* 鍏ュ簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakin/complete/default/v1")
+ /*@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")
+ /*@PostMapping("/order/pakout/default/v1")
@AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakoutParam param,
@@ -127,29 +111,29 @@
}
openService.pakoutOrderCreate(param);
return R.ok();
- }
+ }*/
/**
* 鍑哄簱鍗曞洖鍐�
*/
- @PostMapping("/order/pakout/complete/default/v1")
+ /*@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")
+ /*@RequestMapping("/stock/default/v1")
public R queryStock(@RequestHeader(required = false) String appkey,
HttpServletRequest request) {
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));
@@ -165,7 +149,7 @@
}
}
- public static void main(String[] args) {
+ /*public static void main(String[] args) {
// 1
System.out.println("======================================");
OpenOrderPakinParam param = new OpenOrderPakinParam();
@@ -202,6 +186,104 @@
OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
param1.setOrderNo("963001846497017856");
System.out.println(JSON.toJSONString(param1));
+ }*/
+
+
+
+ /*...........................寰愬伐姹変簯..............浠ヤ笅.............涓婇ザ姹熼摐...........................*/
+ /*............................Created by Monkey D. Luffy on 2023.07.19.............................*/
+
+ /**
+ * 璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�
+ */
+ @PostMapping("/labeller/mat/auth/v1")
+ @AppAuth(memo = "璐存爣鏈虹敵璇疯幏鍙栬揣鐗╀俊鎭�") //old闇�瑕佷慨鏀�
+ public synchronized R labellerMat(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerMatParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return R.ok(openService.labellerMat(param));
}
+ /**
+ * 璐存爣鏈鸿创鏍囧畬鎴�
+ */
+ @PostMapping("/labeller/complete/auth/v1")
+ @AppAuth(memo = "璐存爣鏈鸿创鏍囧畬鎴�") //old闇�瑕佷慨鏀�
+ public synchronized R labellerComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody LabellerCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.labellerComplete(param);
+ return R.ok();
+ }
+
+ /**
+ * 涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�
+ */
+ @PostMapping("/palletizing/complete/auth/v1")
+ @AppAuth(memo = "涓帶(2妤�)锛氱爜鍨涘畬鎴愪笅鍙戝叆搴撲俊鎭�")
+ public synchronized R PalletizingCompleteTwoFloorParam(@RequestHeader(required = false) String appkey,
+ @RequestBody PalletizingCompleteTwoFloorParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ 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);
+ }
+
+
+ /**
+ * 妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡
+ */
+ @PostMapping("/single/unstacking/complete/auth/v1")
+ @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟娆℃媶鍨涘畬鎴愰�氱煡")
+ public synchronized R singleUnstackingComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody SingleUnstackingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.singleUnstackingComplete(param);
+ return R.ok(param);
+ }
+
+ /**
+ * 妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡
+ */
+ @PostMapping("/single/mount/unstacking/complete/auth/v1")
+ @AppAuth(memo = "妗佹灦涓婁綅杞欢锛氬崟鎵樻媶鍨涘畬鎴愰�氱煡")
+ public synchronized R singleMountUnstackingComplete(@RequestHeader(required = false) String appkey,
+ @RequestBody SingleMountUnstackingCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ openService.singleMountUnstackingComplete(param);
+ return R.ok(param);
+ }
+
+ /*...........................涓婇ザ姹熼摐..............浠ヤ笂.............寰愬伐姹変簯...........................*/
+
}
--
Gitblit v1.9.1