From c9b270dae703ee077a4e41013d7662c5e61afd29 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 26 五月 2025 23:02:15 +0800
Subject: [PATCH] #ZH
---
src/main/java/com/zy/asrs/controller/OpenController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 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 1abf6c2..43f1159 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -13,6 +13,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.List;
/**
* Created by vincent on 2024/10/16
@@ -20,7 +21,7 @@
@Slf4j
@RestController
@RequestMapping("open/rcs")
-public class OpenController extends BaseController {
+public class OpenController extends BaseController {
private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
@@ -51,25 +52,59 @@
if (Cools.isEmpty(param.getEndSta()) || param.getEndSta$()==0) {
return R.error("缁堢偣[endSta]涓嶈兘涓虹┖");
}
- openService.wcsTaskDistribution(param);
+// openService.wcsTaskDistribution(param);
+ return openService.wcsTaskDistribution(param);
+ }
+
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/task/cs/down/default/v2")
+ @AppAuth(memo = "WCS浠诲姟涓嬪彂")
+ public synchronized R wcsTaskDistribution2(@RequestHeader(required = false) String appkey,
+ @RequestBody List<WcsTaskDistributionParam> param1,
+ HttpServletRequest request) {
+ auth(appkey, param1, request);
+ for (WcsTaskDistributionParam param:param1){
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("宸ヤ綔鍙穂taskNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getStartSta()) || param.getStartSta$()==0) {
+ return R.error("璧风偣[startSta]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getEndSta()) || param.getEndSta$()==0) {
+ return R.error("缁堢偣[endSta]涓嶈兘涓虹┖");
+ }
+// openService.wcsTaskDistribution(param);
+
+ openService.wcsTaskDistribution(param);
+ }
return R.ok();
}
-
/**
- * 搴撳瓨缁熻
+ * 鏁版嵁鍚屾
*/
- @RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey,
- HttpServletRequest request) {
- auth(appkey, null, request);
- return R.ok().add(openService.queryStock());
+ @PostMapping("/status/cs/default/v1")
+ @AppAuth(memo = "WCS鏁版嵁鍚屾")
+ public synchronized R wcsTaskStatus(@RequestHeader(required = false) String appkey,
+ @RequestBody Long timestamp,
+ HttpServletRequest request) {
+ auth(appkey, timestamp, request);
+ if (Cools.isEmpty(timestamp)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ return openService.wcsTaskStatus(timestamp);
}
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+// log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
--
Gitblit v1.9.1