From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/common/utils/DateUtils.java | 19 +++++++++++++++++++
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java | 9 ++-------
src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java | 25 +++----------------------
3 files changed, 24 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 f17b568..7ef9feb 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
@@ -7,6 +7,7 @@
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;
@@ -15,7 +16,6 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -47,7 +47,7 @@
// 澶勭悊鏃ユ湡鏍煎紡灞曠ず
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()));
}
});
@@ -105,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) {
@@ -136,25 +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");
}
@Override
diff --git a/src/main/java/com/ruoyi/common/utils/DateUtils.java b/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 0fa7e5a..cab055a 100644
--- a/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -197,4 +197,23 @@
ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
return Date.from(zdt.toInstant());
}
+
+ /**
+ * 鏃ユ湡鏍煎紡鍖�
+ */
+ public static String normalizePattern(String pattern) {
+ if (StringUtils.isEmpty(pattern)) return "yyyy-MM-dd";
+ return pattern.replace("YYYY", "yyyy")
+ .replace("DD", "dd")
+ .replace("SS", "ss");
+ }
+
+ /**
+ * 杞崲涓哄叏澶у啓鏄剧ず
+ */
+ public static String toUpperCasePattern(String pattern) {
+ if (StringUtils.isEmpty(pattern)) return "";
+ return pattern.replace("yyyy", "YYYY")
+ .replace("dd", "DD");
+ }
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java
index d93e298..15b0a85 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java
@@ -5,8 +5,8 @@
import com.ruoyi.basic.pojo.BaseParam;
import com.ruoyi.basic.service.BaseParamService;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.dto.ProductionOrderRouteItemParamDto;
import com.ruoyi.production.mapper.ProductionOrderRouteItemParamMapper;
import com.ruoyi.production.pojo.ProductionOrderRouteItemParam;
@@ -47,16 +47,11 @@
return list.stream().map(item -> {
ProductionOrderRouteItemParamDto dto = new ProductionOrderRouteItemParamDto();
BeanUtils.copyProperties(item, dto);
- dto.setParamFormat(toUpperCasePattern(dto.getParamFormat()));
+ dto.setParamFormat(DateUtils.toUpperCasePattern(dto.getParamFormat()));
return dto;
}).collect(Collectors.toList());
}
- private String toUpperCasePattern(String pattern) {
- if (StringUtils.isEmpty(pattern)) return "";
- return pattern.replace("yyyy", "YYYY")
- .replace("dd", "DD");
- }
@Override
@Transactional(rollbackFor = Exception.class)
--
Gitblit v1.9.3