From a40971b7b06d8a92107407829ce611aedca331f2 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期一, 30 三月 2026 09:57:01 +0800
Subject: [PATCH] 修复入库任务还未生成时下发出库任务会同步进行的问题

---
 src/main/java/com/zy/asrs/controller/ApiLogController.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index 9f0a8df..b2c026e 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -1,35 +1,58 @@
 package com.zy.asrs.controller;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.ApiLog;
-import com.zy.asrs.service.ApiLogService;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
+import com.core.common.DateUtils;
 import com.core.common.R;
+import com.zy.asrs.entity.ApiLog;
+import com.zy.asrs.service.ApiLogService;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+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,
@@ -40,10 +63,17 @@
         EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
         excludeTrash(param);
         convert(param, wrapper);
-        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+            wrapper.orderBy("create_time", false);
+        }
         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());
@@ -57,6 +87,11 @@
         }
     }
 
+    /**
+     * 娣诲姞API鏃ュ織
+     * @param apiLog API鏃ュ織瀹炰綋
+     * @return 杩斿洖鎿嶄綔缁撴灉
+     */
     @RequestMapping(value = "/apiLog/add/auth")
     @ManagerAuth
     public R add(ApiLog apiLog) {
@@ -64,6 +99,11 @@
         return R.ok();
     }
 
+    /**
+     * 鏇存柊API鏃ュ織
+     * @param apiLog API鏃ュ織瀹炰綋
+     * @return 杩斿洖鎿嶄綔缁撴灉
+     */
 	@RequestMapping(value = "/apiLog/update/auth")
 	@ManagerAuth
     public R update(ApiLog apiLog){

--
Gitblit v1.9.1