From 3fbde4dd7e79fdb11f1fd140de0d5ada1f16d04d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 二月 2025 08:15:58 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/system/controller/ConfigController.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index 9b847be..41f2291 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -4,21 +4,21 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.common.entity.Parameter;
-import com.zy.system.entity.Config;
-import com.zy.system.service.ConfigService;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.core.controller.AbstractBaseController;
+import com.zy.common.entity.Parameter;
+import com.zy.common.web.BaseController;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@RestController
-public class ConfigController extends AbstractBaseController {
+public class ConfigController extends BaseController {
@Autowired
private ConfigService configService;
@@ -43,14 +43,15 @@
return R.ok(configService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> 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());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(entry.getKey(), val);
}
}
}
@@ -59,7 +60,7 @@
@ManagerAuth
public R edit(Config config) {
if (Cools.isEmpty(config)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
if (config.getType() == 2){
if (!checkJson(config.getValue())){
@@ -91,7 +92,7 @@
@ManagerAuth
public R update(Config config){
if (Cools.isEmpty(config) || null==config.getId()){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
if (config.getType() == 2){
if (!checkJson(config.getValue())){
@@ -107,7 +108,7 @@
@ManagerAuth
public R delete(Integer[] ids){
if (Cools.isEmpty(ids)){
- return R.error();
+ return R.error("鍙傛暟缂哄け");
}
configService.deleteBatchIds(Arrays.asList(ids));
return R.ok();
@@ -144,17 +145,17 @@
* 鍒锋柊閰嶇疆
*/
@RequestMapping(value = "/config/refresh/auth")
- @ManagerAuth
+// @ManagerAuth
public R refresh(){
Parameter parameter;
try {
parameter = Parameter.reset();
} catch (Exception e) {
e.printStackTrace();
- return R.error();
+ return R.error("鍒锋柊澶辫触");
}
if (Cools.isEmpty(parameter)){
- return R.error();
+ return R.error("鍒锋柊鍚庝负绌�");
}
return R.ok();
}
--
Gitblit v1.9.1