From 656429e94f5989911bdf07848ef44b1cc71dfaf1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 19 三月 2026 12:55:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/ConfigController.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index 8eb9f90..6bf27b8 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -31,12 +31,7 @@
@RequestMapping(value = "/config/refreshCache")
@ManagerAuth
public R refreshCache(){
- HashMap<String, String> systemConfigMap = new HashMap<>();
- List<Config> configList = configService.list(new QueryWrapper<>());
- for (Config config : configList) {
- systemConfigMap.put(config.getCode(), config.getValue());
- }
- redisUtil.set(RedisKeyType.SYSTEM_CONFIG_MAP.key, systemConfigMap);
+ refreshCacheData();
return R.ok();
}
@@ -70,12 +65,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
@@ -83,6 +80,7 @@
@RequestMapping(value = "/config/updateBatch")
@ManagerAuth
public R updateBatch(@RequestBody List<ConfigUpdateBatchParam> params){
+ boolean updated = false;
for (ConfigUpdateBatchParam param : params) {
String code = param.getCode();
String value = param.getValue();
@@ -90,9 +88,20 @@
if (config == null) {
continue;
}
+ if (Short.valueOf((short) 2).equals(config.getType()) && !checkJson(value)) {
+ return R.error(config.getCode() + " json瑙ｆ瀽澶辫触");
+ }
+ if (Objects.equals(config.getValue(), value)) {
+ continue;
+ }
config.setValue(value);
configService.updateById(config);
+ updated = true;
+ }
+ if (updated) {
+ Parameter.reset();
+ refreshCacheData();
}
return R.ok();
}
@@ -227,4 +236,13 @@
return parse != null;
}
+ private void refreshCacheData() {
+ HashMap<String, String> systemConfigMap = new HashMap<>();
+ List<Config> configList = configService.list(new QueryWrapper<>());
+ for (Config config : configList) {
+ systemConfigMap.put(config.getCode(), config.getValue());
+ }
+ redisUtil.set(RedisKeyType.SYSTEM_CONFIG_MAP.key, systemConfigMap);
+ }
+
}
--
Gitblit v1.9.1