From 4fb7e0400fcd65efb71e96d010efea286bf3e37c Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 21 五月 2024 15:43:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/ConfigController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 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..6358332 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -2,8 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -26,7 +26,7 @@
@RequestMapping(value = "/config/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(configService.selectById(String.valueOf(id)));
+ return R.ok(configService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/config/list/auth")
@@ -37,13 +37,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(configService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(configService.page(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
+ 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())));
@@ -67,7 +67,7 @@
}
}
if (null == config.getId()){
- configService.insert(config);
+ configService.save(config);
} else {
configService.updateById(config);
Parameter.reset();
@@ -83,7 +83,7 @@
return R.error("json瑙ｆ瀽澶辫触");
}
}
- configService.insert(config);
+ configService.save(config);
return R.ok();
}
@@ -109,7 +109,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- configService.deleteBatchIds(Arrays.asList(ids));
+ configService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -117,19 +117,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("config"));
convert(map, wrapper);
- List<Config> list = configService.selectList(wrapper);
+ List<Config> list = configService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/configQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Config> wrapper = new EntityWrapper<>();
+ QueryWrapper<Config> wrapper = new QueryWrapper<>();
wrapper.like("id", condition);
- Page<Config> page = configService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Config> page = configService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Config config : page.getRecords()){
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.9.1