From 0f5b7603b4c736a5d470ec62d9379519846e8afd Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Tue, 19 Aug 2025 18:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/web/utils/ExcelUtil.java    | 22 +++++++++++++++++++
 .../com/njcn/web/utils/HttpResultUtil.java    |  3 ++-
 .../java/com/njcn/web/utils/RequestUtil.java  | 19 ++++++++--------
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/ExcelUtil.java b/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/ExcelUtil.java
index 53e437a..16294f8 100644
--- a/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/ExcelUtil.java
+++ b/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/ExcelUtil.java
@@ -17,8 +17,10 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.util.Collection;
 import java.util.List;
@@ -115,6 +117,26 @@ public class ExcelUtil {
         }
     }
 
+    /**
+     * 指定名称、sheet名（多个sheet）、数据（多组数据）导出数据到本地
+     *
+     * @param path       文件路径
+     * @param fileName   文件名
+     * @param sheetsList
+     */
+    public static void saveExcel(String path, String fileName, List<Map<String, Object>> sheetsList) {
+        String filePath = path + "\\" + fileName;
+        try {
+            OutputStream outputStream = new FileOutputStream(filePath);
+            Workbook workbook = ExcelExportUtil.exportExcel(sheetsList, ExcelType.XSSF);
+            workbook.write(outputStream);
+
+            outputStream.flush();
+            outputStream.close();
+        } catch (IOException e) {
+            log.error(">>> 导出数据异常：{}", e.getMessage());
+        }
+    }
 
     /**
      * 指定名称、数据下载报表(带指定标题将*显示比必填信息),带有下拉信息
diff --git a/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/HttpResultUtil.java b/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/HttpResultUtil.java
index dd0c94d..d169142 100644
--- a/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/HttpResultUtil.java
+++ b/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/HttpResultUtil.java
@@ -39,7 +39,8 @@ public class HttpResultUtil {
      * 业务异常组装结果集
      */
     public static <T> HttpResult<T> assembleBusinessExceptionResult(BusinessException businessException, T result, String methodDescribe) {
-        return assembleResult(businessException.getCode(), result, StrFormatter.format("{}{}{}", methodDescribe, StrUtil.C_COMMA, businessException.getMessage()));
+//        return assembleResult(businessException.getCode(), result, StrFormatter.format("{}{}{}", methodDescribe, StrUtil.C_COMMA, businessException.getMessage()));
+        return assembleResult(businessException.getCode(), result, businessException.getMessage());
     }
 
 }
diff --git a/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/RequestUtil.java b/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/RequestUtil.java
index ad94c65..a9f6d31 100644
--- a/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/RequestUtil.java
+++ b/njcn-springboot/spingboot2.3.12/src/main/java/com/njcn/web/utils/RequestUtil.java
@@ -65,15 +65,15 @@ public class RequestUtil {
      *
      * @return 若成功，返回当前登录用户的ID；若失败，返回null
      */
-    public static String getUserId(ServerHttpRequest serverHttpRequest) {
-        String accessToken = getAccessToken(serverHttpRequest);
-        String userId = null;
-        if (StrUtil.isNotBlank(accessToken)) {
-            Map<String, Object> map = JwtUtil.parseToken(accessToken);
-            userId = (String) map.get(SecurityConstants.USER_ID);
-        }
-        return userId;
-    }
+//    public static String getUserId(ServerHttpRequest serverHttpRequest) {
+//        String accessToken = getAccessToken(serverHttpRequest);
+//        String userId = null;
+//        if (StrUtil.isNotBlank(accessToken)) {
+//            Map<String, Object> map = JwtUtil.parseToken(accessToken);
+//            userId = (String) map.get(SecurityConstants.USER_ID);
+//        }
+//        return userId;
+//    }
 
     /**
      * 获取当前登录用户的ID
@@ -90,6 +90,7 @@ public class RequestUtil {
         return userId;
     }
 
+
     /**
      * 获取当前登录用户的ID
      *