From c9d011ae46f73cc87c4d6addd7d9d24d6c53bec0 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 09:55:38 +0800
Subject: [PATCH] 修复入库任务还未生成时下发出库任务会同步进行的问题
---
src/main/java/com/zy/asrs/controller/ApiLogController.java | 36 ++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 6 ++++++
src/main/resources/application-dev.yml | 2 +-
src/main/resources/license.lic | 0
4 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index 1e450a3..b2c026e 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -20,18 +20,39 @@
import java.util.List;
import java.util.Map;
+/**
+ * API鏃ュ織鎺у埗鍣�
+ * 缁ф壙鑷熀纭�鎺у埗鍣紝鎻愪緵API鏃ュ織鐨勫鍒犳敼鏌ョ瓑鎿嶄綔
+ */
@RestController
public class ApiLogController extends BaseController {
+ /**
+ * 娉ㄥ叆API鏃ュ織鏈嶅姟
+ */
@Autowired
private ApiLogService apiLogService;
+ /**
+ * 鏍规嵁ID鑾峰彇API鏃ュ織
+ * @param ID 鏃ュ織ID
+ * @return 杩斿洖API鏃ュ織淇℃伅
+ */
@RequestMapping(value = "/apiLog/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") String id) {
return R.ok(apiLogService.selectById(String.valueOf(id)));
}
+ /**
+ * 鑾峰彇API鏃ュ織鍒楄〃
+ * @param curr 褰撳墠椤电爜
+ * @param limit 姣忛〉鏉℃暟
+ * @param orderByField 鎺掑簭瀛楁
+ * @param orderByType 鎺掑簭绫诲瀷
+ * @param param 鏌ヨ鍙傛暟
+ * @return 杩斿洖鍒嗛〉鍚庣殑API鏃ュ織鍒楄〃
+ */
@RequestMapping(value = "/apiLog/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@@ -48,6 +69,11 @@
return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
}
+ /**
+ * 灏嗘煡璇㈠弬鏁拌浆鎹负鏌ヨ鏉′欢
+ * @param map 鏌ヨ鍙傛暟Map
+ * @param EntityWrapper 鏌ヨ鏉′欢鍖呰鍣�
+ */
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
@@ -61,6 +87,11 @@
}
}
+ /**
+ * 娣诲姞API鏃ュ織
+ * @param apiLog API鏃ュ織瀹炰綋
+ * @return 杩斿洖鎿嶄綔缁撴灉
+ */
@RequestMapping(value = "/apiLog/add/auth")
@ManagerAuth
public R add(ApiLog apiLog) {
@@ -68,6 +99,11 @@
return R.ok();
}
+ /**
+ * 鏇存柊API鏃ュ織
+ * @param apiLog API鏃ュ織瀹炰綋
+ * @return 杩斿洖鎿嶄綔缁撴灉
+ */
@RequestMapping(value = "/apiLog/update/auth")
@ManagerAuth
public R update(ApiLog apiLog){
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 33e977c..6d7a701 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -46,6 +46,12 @@
digitalTwinService.locNumCount();
}
+/**
+ * 瀹氭椂浠诲姟鏂规硶锛屾瘡3绉掓墽琛屼竴娆�
+ * 鐢ㄤ簬澶勭悊闇�瑕佸畬鎴愮殑宸ヤ綔妗ｆ暟鎹�
+ * 浣跨敤Spring鐨凘Scheduled娉ㄨВ瀹炵幇瀹氭椂璋冨害
+ * @param cron琛ㄨ揪寮� "0/3 * * * * ? " 琛ㄧず姣�3绉掓墽琛屼竴娆�
+ */
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index c0c75c8..0d8a057 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -50,7 +50,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: jnejc-hkwms
+ subject: license_demo
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index a6bdd04..79e2da1 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1