From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/system/controller/ConfigController.java | 67 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index a005512..5bea2f9 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -23,6 +23,15 @@
@Autowired
private ConfigService configService;
+ private static boolean checkJson(String val) {
+ Object parse = null;
+ try {
+ parse = JSON.parse(val);
+ } catch (Exception ignore) {
+ }
+ return parse != null;
+ }
+
@RequestMapping(value = "/config/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
@@ -31,11 +40,11 @@
@RequestMapping(value = "/config/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Config> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -43,8 +52,8 @@
return R.ok(configService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper 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("<")) {
@@ -58,15 +67,15 @@
@RequestMapping(value = "/config/edit/auth")
@ManagerAuth
public R edit(Config config) {
- if (Cools.isEmpty(config)){
+ if (Cools.isEmpty(config)) {
return R.error();
}
- if (config.getType() == 2){
- if (!checkJson(config.getValue())){
+ if (config.getType() == 2) {
+ if (!checkJson(config.getValue())) {
return R.error("json瑙ｆ瀽澶辫触");
}
}
- if (null == config.getId()){
+ if (null == config.getId()) {
configService.insert(config);
} else {
configService.updateById(config);
@@ -78,8 +87,8 @@
@RequestMapping(value = "/config/add/auth")
@ManagerAuth
public R add(Config config) {
- if (config.getType() == 2){
- if (!checkJson(config.getValue())){
+ if (config.getType() == 2) {
+ if (!checkJson(config.getValue())) {
return R.error("json瑙ｆ瀽澶辫触");
}
}
@@ -87,14 +96,14 @@
return R.ok();
}
- @RequestMapping(value = "/config/update/auth")
+ @RequestMapping(value = "/config/update/auth")
@ManagerAuth
- public R update(Config config){
- if (Cools.isEmpty(config) || null==config.getId()){
+ public R update(Config config) {
+ if (Cools.isEmpty(config) || null == config.getId()) {
return R.error();
}
- if (config.getType() == 2){
- if (!checkJson(config.getValue())){
+ if (config.getType() == 2) {
+ if (!checkJson(config.getValue())) {
return R.error("json瑙ｆ瀽澶辫触");
}
}
@@ -105,8 +114,8 @@
@RequestMapping(value = "/config/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
configService.deleteBatchIds(Arrays.asList(ids));
@@ -115,7 +124,7 @@
@RequestMapping(value = "/config/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Config> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("config"));
@@ -131,7 +140,7 @@
wrapper.like("id", condition);
Page<Config> page = configService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Config config : page.getRecords()){
+ for (Config config : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", config.getId());
map.put("value", config.getId());
@@ -145,7 +154,7 @@
*/
@RequestMapping(value = "/config/refresh/auth")
@ManagerAuth
- public R refresh(){
+ public R refresh() {
Parameter parameter;
try {
parameter = Parameter.reset();
@@ -153,20 +162,10 @@
e.printStackTrace();
return R.error();
}
- if (Cools.isEmpty(parameter)){
+ if (Cools.isEmpty(parameter)) {
return R.error();
}
return R.ok();
- }
-
-
- private static boolean checkJson(String val){
- Object parse = null;
- try {
- parse = JSON.parse(val);
- } catch (Exception ignore){
- }
- return parse != null;
}
}
--
Gitblit v1.9.1