From 4f820b52d558f74d31e3e86264b9e0e97c25f8ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?HUOJIN=5C=E9=9C=8D=E5=85=88=E6=A3=AE?= <shanghai>
Date: Sat, 10 May 2025 14:44:24 +0800
Subject: [PATCH] no message

---
 .../wms/base/item/controller/ItemController.java         | 9 ---------
 .../sa-admin/src/main/resources/prod/log4j2-spring.xml   | 2 +-
 .../net/lab1024/sa/base/common/util/SmartExcelUtil.java  | 8 ++++++++
 nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml | 2 +-
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java
index 39d3824..34501c1 100644
--- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java
+++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java
@@ -117,16 +117,7 @@ public class ItemController {
     @SaCheckPermission("item:exportItems")
     @OperateLog
     public void exportItems(@PathVariable String taskId, HttpServletResponse response){
-        long startTime = System.currentTimeMillis();
         itemQueryService.exportItem(taskId, response);
-        log.info("导出物料数据完成，耗时：{}ms", System.currentTimeMillis() - startTime);
-        if (System.currentTimeMillis() - startTime <= 1000) {
-            try {
-                Thread.sleep(2000);
-            } catch (InterruptedException e) {
-                log.error("异常", e);
-            }
-        }
         exportTaskService.cleanupTask(taskId);
     }
 }
diff --git a/nc_wms_java/sa-admin/src/main/resources/prod/log4j2-spring.xml b/nc_wms_java/sa-admin/src/main/resources/prod/log4j2-spring.xml
index efb5e7d..d03ceca 100644
--- a/nc_wms_java/sa-admin/src/main/resources/prod/log4j2-spring.xml
+++ b/nc_wms_java/sa-admin/src/main/resources/prod/log4j2-spring.xml
@@ -106,7 +106,7 @@
             <AppenderRef ref="druidSlowSqlLog"/>
         </logger>
 
-        <Root level="error">
+        <Root level="info">
             <AppenderRef ref="Console"/>
             <AppenderRef ref="debug"/>
             <AppenderRef ref="info"/>
diff --git a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java
index 57544fb..68debe0 100644
--- a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java
+++ b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/common/util/SmartExcelUtil.java
@@ -81,6 +81,7 @@ public final class SmartExcelUtil {
     }
 
     public static <T, E> void batchExportExcel(HttpServletResponse response, String fileName, String sheetName, Class head, String taskId, long total, BiFunction<Long, Integer, List<T>> pageQueryFunction, Function<T, E> convertFunction, ToLongFunction<T> idExtractor, int pageSize, BiConsumer<String, Long> progressUpdater) throws IOException {
+        long startTime = System.currentTimeMillis();
         SmartResponseUtil.setDownloadFileHeader(response, fileName, null);
         HorizontalCellStyleStrategy horizontalCellStyleStrategy = getHorizontalCellStyleStrategy();
         try (ExcelWriter excelWriter = FastExcel.write(response.getOutputStream(), head).registerWriteHandler(horizontalCellStyleStrategy).build()) {
@@ -108,6 +109,13 @@ public final class SmartExcelUtil {
                 long progress = processed * 100 / total;
                 progressUpdater.accept(taskId, progress);
             }
+            if (System.currentTimeMillis() - startTime <= 1000) {
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException e) {
+                    System.out.println("异常" + e.getMessage());
+                }
+            }
             excelWriter.finish();
         } catch (Exception e) {
             throw new BusinessException("导出失败");
diff --git a/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml b/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml
index 1b2c820..623c25f 100644
--- a/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml
+++ b/nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml
@@ -16,7 +16,7 @@ spring:
       username: druid
       password: 1024
       login:
-        enabled: false
+        enabled: true
       method:
         pointcut: net.lab1024.sa..*Service.*