From 76c86ef8166be64cb7031aa797bcdd0d67f5a83a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 23 三月 2026 14:26:18 +0800
Subject: [PATCH] fix: 日期格式化提取到工具类

---
 src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java |   40 +++++++++++-----------------------------
 1 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
index 10cc41e..7ef9feb 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
@@ -1,10 +1,13 @@
 package com.ruoyi.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.basic.mapper.BaseParamMapper;
 import com.ruoyi.basic.pojo.BaseParam;
 import com.ruoyi.basic.service.BaseParamService;
+import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
@@ -13,7 +16,6 @@
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -32,24 +34,24 @@
 public class BaseParamServiceImpl extends ServiceImpl<BaseParamMapper, BaseParam> implements BaseParamService {
 
     @Override
-    public List<BaseParam> baseParamList(BaseParam baseParam) {
+    public IPage<BaseParam> baseParamList(Page<BaseParam> page, BaseParam baseParam) {
         LambdaQueryWrapper<BaseParam> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotEmpty(baseParam.getParamName())) {
             queryWrapper.like(BaseParam::getParamName, baseParam.getParamName());
         }
-        List<BaseParam> list = list(queryWrapper);
-        if (list == null || list.isEmpty()) {
-            return new ArrayList<>(0);
+        Page<BaseParam> paramPage = page(page, queryWrapper);
+        if (paramPage == null || paramPage.getRecords().isEmpty()) {
+            return new Page<>();
         }
 
         // 澶勭悊鏃ユ湡鏍煎紡灞曠ず
-        list.forEach(item -> {
+        paramPage.getRecords().forEach(item -> {
             if (Integer.valueOf(4).equals(item.getParamType()) && StringUtils.isNotEmpty(item.getParamFormat())) {
-                item.setParamFormat(toUpperCasePattern(item.getParamFormat()));
+                item.setParamFormat(DateUtils.toUpperCasePattern(item.getParamFormat()));
             }
         });
 
-        return list;
+        return paramPage;
     }
 
     @Override
@@ -103,7 +105,7 @@
                 throw new RuntimeException("鏃ユ湡绫诲瀷蹇呴』閰嶇疆鍙傛暟鏍煎紡(濡�: yyyy-MM-dd)");
             }
             try {
-                String standardPattern = normalizePattern(baseParam.getParamFormat());
+                String standardPattern = DateUtils.normalizePattern(baseParam.getParamFormat());
                 DateTimeFormatter.ofPattern(standardPattern);
                 baseParam.setParamFormat(standardPattern);
             } catch (Exception e) {
@@ -134,26 +136,6 @@
             }
         }
         return prefix + String.format("%04d", nextNum);
-    }
-
-    /**
-     * 鏃ユ湡鏍煎紡鍖�
-     */
-    private String normalizePattern(String pattern) {
-        if (StringUtils.isEmpty(pattern)) return "yyyy-MM-dd";
-        return pattern.replace("YYYY", "yyyy")
-                .replace("DD", "dd")
-                .replace("SS", "ss");
-    }
-
-    /**
-     * 杞崲涓哄叏澶у啓鏄剧ず
-     */
-    private String toUpperCasePattern(String pattern) {
-        if (StringUtils.isEmpty(pattern)) return "";
-        return pattern.replace("yyyy", "YYYY")
-                .replace("dd", "DD")
-                .replace("ss", "SS");
     }
 
     @Override

--
Gitblit v1.9.3