From d7586e563701a4cb65065be3c4c3e4e66220222d Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 25 九月 2025 10:00:38 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OpenController.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6541e1c..ef22698 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -26,7 +26,8 @@
public class OpenController extends BaseController {
private static final boolean auth = true;
- private static final String sign_arm = "|s|LABEL_0";
+ private static final String sign_arm_order = "|s|LABEL_";
+ private static final String sign_arm_sku = "|sku|LABEL_";
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
@@ -222,6 +223,7 @@
* 鍒嗘嫞绾夸笂鎶ユ帴鏀�
*/
@PostMapping("/arm/task/v1")
+ @AppAuth(memo = "鍒嗘嫞绾夸笂鎶ユ帴鏀�")
public synchronized R TaskArmReport(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmReportParam param,
HttpServletRequest request) {
@@ -256,12 +258,16 @@
* 鍗曠爜瀹屾垚
*/
@PostMapping("/arm/task/cycle_result")
+ @AppAuth(memo = "鍗曠爜瀹屾垚")
public synchronized R TaskArmCycleResult(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmCycleResultParam param,
HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getArm_no())) {
+ return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getOrder_id())) {
return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
@@ -270,9 +276,9 @@
return R.error("瀹汉鍨嬪彿[pick_num]涓嶈兘涓虹┖");
}
try{
- param.OrderIdTwo(sign_arm);
+ param.OrderIdTwo(sign_arm_order,sign_arm_sku);
} catch (Exception e){
- return R.error("鍗曟嵁缂栧彿[order_id]浠�"+sign_arm+"浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
+ return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
}
openService.taskArmCycleResult(param);
@@ -284,12 +290,16 @@
* 鎵樼洏瀹屾垚
*/
@PostMapping("/arm/task/workspace_status")
+ @AppAuth(memo = "鎵樼洏瀹屾垚")
public synchronized R TaskArmWorkspaceStatus(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmWorkspaceStatusParam param,
HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getArm_no())) {
+ return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param.getId())) {
return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
@@ -310,10 +320,14 @@
* 寮傚父涓婃姤
*/
@PostMapping("/armAbnormalOperation")
+ @AppAuth(memo = "寮傚父涓婃姤")
public synchronized R ArmAbnormalOperation(@RequestHeader(required = false) String appkey,
@RequestBody TaskArmErrorParam param,
HttpServletRequest request) {
auth(appkey, param, request);
+ if (Cools.isEmpty(param.getArm_no())) {
+ return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -321,4 +335,33 @@
return R.ok().add(param);
}
+
+ /**
+ * 璁㈠崟瀹屾垚涓婃姤
+ */
+ @PostMapping("/arm/task/order_result")
+ @AppAuth(memo = "璁㈠崟瀹屾垚涓婃姤")
+ public synchronized R TaskArmWorkOrderStatus(@RequestHeader(required = false) String appkey,
+ @RequestBody OrderArmEndParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getArm_no())) {
+ return R.error("鏈烘鑷傜紪鍙穂Arm_no]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getOrder_id())) {
+ return R.error("鍗曟嵁缂栧彿[order_id]涓嶈兘涓虹┖");
+ }
+ try{
+ param.OrderIdTwo(sign_arm_order,sign_arm_sku);
+ } catch (Exception e){
+ return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
+ }
+
+ openService.taskArmWorkOrderStatus(param);
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1