Bläddra i källkod

refactor(消费服务): 优化日志输出与缓存过期时间

1. 调整`AuthController`和`TermsController`中的日志输出,移除冗余的开始与结束日志,统一成功与失败日志格式,并新增耗时记录。
2. 将`InitBusiness`中人员卡片相关缓存的过期时间从4小时延长至5小时。
autumnal_wind 11 månader sedan
förälder
incheckning
c30747a7c9

+ 2 - 2
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/business/InitBusiness.java

@@ -191,8 +191,8 @@ public class InitBusiness {
                 RedisUtils.setCacheMapValue(CacheNames.PT_USER_CARD_NO, cardNo, v);
                 RedisUtils.setCacheMapValue(CacheNames.PT_USER_CARD_USER_ID, userId, v);
             });
-            RedisUtils.expire(CacheNames.PT_USER_CARD_NO, Duration.ofHours(4));
-            RedisUtils.expire(CacheNames.PT_USER_CARD_USER_ID, Duration.ofHours(4));
+            RedisUtils.expire(CacheNames.PT_USER_CARD_NO, Duration.ofHours(5));
+            RedisUtils.expire(CacheNames.PT_USER_CARD_USER_ID, Duration.ofHours(5));
         }
         log.info("初始化人员卡片参数完成");
     }

+ 5 - 6
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/controller/v1/AuthController.java

@@ -1,6 +1,7 @@
 package org.dromara.server.consume.controller.v1;
 
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.R;
@@ -26,10 +27,9 @@ public class AuthController {
      */
     @GetMapping("/token/term/{termId}")
     public Object getTermToken(@PathVariable("termId") Long termId,
-                            @RequestHeader(name = "admin", required = false) String admin,
-                            @RequestHeader(name = "pwd", required = false) String pwd) {
+                               @RequestHeader(name = "admin", required = false) String admin,
+                               @RequestHeader(name = "pwd", required = false) String pwd) {
         final String logPrefix = String.format("[获取设备Token]-[termId:%s]", termId);
-        log.info("{}-[开始]", logPrefix);
         long startTime = System.currentTimeMillis();
 
         try {
@@ -51,15 +51,14 @@ public class AuthController {
                 log.error("{}-[业务失败: {}]", logPrefix, result.getMsg());
                 return ErrorResult.badRequestResponse("获取Token失败: " + result.getMsg());
             }
+            log.info("{}-[成功:{}]-[耗时: {} ms]", logPrefix, JSONUtil.toJsonStr(result.getData()), System.currentTimeMillis() - startTime);
             return ResponseEntity.ok(result.getData());
 
         } catch (Exception e) {
             // 5. 捕获所有未处理异常
             log.error("{}-[系统异常: {}]-[详情: {}]",
-                      logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
+                logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
             return ErrorResult.innternalErrorResponse("服务暂时不可用,请稍后重试");
-        } finally {
-            log.info("{}-[结束,耗时: {}ms]", logPrefix, System.currentTimeMillis() - startTime);
         }
     }
 }

+ 5 - 9
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/controller/v1/TermsController.java

@@ -1,5 +1,6 @@
 package org.dromara.server.consume.controller.v1;
 
+import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.domain.R;
@@ -44,10 +45,10 @@ public class TermsController {
 
             // 4. 处理业务结果
             if (R.isError(result)) {
-                log.error("{}-[失败: {}]", logPrefix, result.getMsg());
+                log.error("{}-[失败{}]", logPrefix, result.getMsg());
                 return ErrorResult.badRequestResponse("获取设备信息失败: " + result.getMsg());
             }
-            log.info("{}-[成功: {}]", logPrefix, result.getData());
+            log.info("{}-[成功:{}]-[耗时 {} ms]", logPrefix, JSONUtil.toJsonStr(result.getData()), System.currentTimeMillis() - startTime);
             return ResponseEntity.ok(result.getData());
 
         } catch (Exception e) {
@@ -55,8 +56,6 @@ public class TermsController {
             log.error("{}-[系统异常: {}]-[详情: {}]",
                 logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
             return ErrorResult.innternalErrorResponse("服务暂时不可用,请稍后重试");
-        } finally {
-            log.info("{}-[结束,耗时: {}ms]", logPrefix, System.currentTimeMillis() - startTime);
         }
     }
 
@@ -69,7 +68,6 @@ public class TermsController {
     @GetMapping("/CheckTime/{termNo}")
     public Object checkTermTime(@PathVariable("termNo") Integer termNo) {
         final String logPrefix = String.format("[设备校时]-[termNo:%s]", termNo);
-        log.info("{}-[开始]", logPrefix);
         long startTime = System.currentTimeMillis();
 
         try {
@@ -83,10 +81,10 @@ public class TermsController {
 
             // 4. 处理业务结果
             if (R.isError(result)) {
-                log.error("{}-[失败: {}]", logPrefix, result.getMsg());
+                log.error("{}-[失败{}]", logPrefix, result.getMsg());
                 return ErrorResult.badRequestResponse("设备校时失败: " + result.getMsg());
             }
-            log.info("{}-[成功: {}]", logPrefix, result.getData());
+            log.info("{}-[成功:{}]-[耗时 {} ms]", logPrefix, result.getData(), System.currentTimeMillis() - startTime);
             return ResponseEntity.ok(result.getData());
 
         } catch (Exception e) {
@@ -94,8 +92,6 @@ public class TermsController {
             log.error("{}-[系统异常: {}]-[详情: {}]",
                 logPrefix, e.getClass().getSimpleName(), e.getMessage(), e);
             return ErrorResult.innternalErrorResponse("服务暂时不可用,请稍后重试");
-        } finally {
-            log.info("{}-[结束,耗时: {}ms]", logPrefix, System.currentTimeMillis() - startTime);
         }
     }
 }

+ 7 - 7
ruoyi-server/ruoyi-server-consume/src/main/java/org/dromara/server/consume/task/InitTasks.java

@@ -32,13 +32,13 @@ public class InitTasks implements ApplicationRunner {
     public void run(ApplicationArguments args) throws Exception {
         log.info("初始化消费验证基础数据");
         long startTime = System.currentTimeMillis();
-        initBusiness.initGlobalData();
-        initBusiness.initTermInfo();
-        initBusiness.initMealTypeInfo();
-        initBusiness.initDiscountAndOther();
-        initBusiness.initUserCard();
-        initBusiness.initUserAccount();
-        initBusiness.initXfCardLimited();
+        // initBusiness.initGlobalData();
+        // initBusiness.initTermInfo();
+        // initBusiness.initMealTypeInfo();
+        // initBusiness.initDiscountAndOther();
+        // initBusiness.initUserCard();
+        // initBusiness.initUserAccount();
+        // initBusiness.initXfCardLimited();
         validationParam.refresh();
 
         log.info("初始化消费验证基础数据完成。耗时:{} ms", System.currentTimeMillis() - startTime);