From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix:请求头带token, SecurityUtils 获取用户id 一直为0 #1195

---
 src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
old mode 100644
new mode 100755
index 3cabb99..937bc08
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/log/LogController.java
@@ -42,7 +42,7 @@
      * @return
      */
     @GetMapping("/all")
-    @Operation(summary = "鍒嗛〉鏌ヨ鎶ヨ")
+    @Operation(summary = "鍒嗛〉鏌ヨ鏃ュ織")
     @Parameter(name = "query", description = "鏌ヨ鍐呭", required = true)
     @Parameter(name = "page", description = "褰撳墠椤�", required = true)
     @Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
@@ -60,18 +60,21 @@
         if (ObjectUtils.isEmpty(query)) {
             query = null;
         }
-        if (ObjectUtils.isEmpty(startTime)) {
-            startTime = null;
-        }
-        if (ObjectUtils.isEmpty(endTime)) {
-            endTime = null;
-        }
-        if (!userSetting.getLogInDatebase()) {
+
+        if (!userSetting.getLogInDatabase()) {
             logger.warn("鑷姩璁板綍鏃ュ織鍔熻兘宸插叧闂紝鏌ヨ缁撴灉鍙兘涓嶅畬鏁淬��");
         }
 
-        if (!DateUtil.verification(startTime, DateUtil.formatter) || !DateUtil.verification(endTime, DateUtil.formatter)){
-            throw new ControllerException(ErrorCode.ERROR400);
+        if (ObjectUtils.isEmpty(startTime)) {
+            startTime = null;
+        }else if (!DateUtil.verification(startTime, DateUtil.formatter) ){
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "startTime鏍煎紡涓�" + DateUtil.PATTERN);
+        }
+
+        if (ObjectUtils.isEmpty(endTime)) {
+            endTime = null;
+        }else if (!DateUtil.verification(endTime, DateUtil.formatter) ){
+            throw new ControllerException(ErrorCode.ERROR400.getCode(), "endTime鏍煎紡涓�" + DateUtil.PATTERN);
         }
 
         return logService.getAll(page, count, query, type, startTime, endTime);
@@ -81,7 +84,7 @@
      *  娓呯┖鏃ュ織
      *
      */
-    @Operation(summary = "鍋滄瑙嗛鍥炴斁")
+    @Operation(summary = "娓呯┖鏃ュ織")
     @DeleteMapping("/clear")
     public void clear() {
         logService.clear();

--
Gitblit v1.8.0