From 1d802b852c023933b5ea3ed5b24810583e02b27f Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 30 八月 2024 09:42:12 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/system/controller/PermissionController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/system/controller/PermissionController.java b/src/main/java/com/zy/system/controller/PermissionController.java
index c943808..7365510 100644
--- a/src/main/java/com/zy/system/controller/PermissionController.java
+++ b/src/main/java/com/zy/system/controller/PermissionController.java
@@ -1,8 +1,8 @@
package com.zy.system.controller;
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;
@@ -24,7 +24,7 @@
@RequestMapping(value = "/permission/{id}/auth")
@ManagerAuth
public R get(@PathVariable("id") Long id) {
- return R.ok(permissionService.selectById(String.valueOf(id)));
+ return R.ok(permissionService.getById(String.valueOf(id)));
}
@RequestMapping(value = "/permission/list/auth")
@@ -35,13 +35,13 @@
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
excludeTrash(param);
- EntityWrapper<Permission> wrapper = new EntityWrapper<>();
+ QueryWrapper<Permission> wrapper = new QueryWrapper<>();
convert(param, wrapper);
- wrapper.orderBy("id", false);
- return R.ok(permissionService.selectPage(new Page<>(curr, limit), wrapper));
+ wrapper.orderByDesc("id");
+ return R.ok(permissionService.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())));
@@ -60,7 +60,7 @@
return R.error();
}
if (null == permission.getId()){
- permissionService.insert(permission);
+ permissionService.save(permission);
} else {
permissionService.updateById(permission);
}
@@ -70,7 +70,7 @@
@RequestMapping(value = "/permission/add/auth")
@ManagerAuth
public R add(Permission permission) {
- permissionService.insert(permission);
+ permissionService.save(permission);
return R.ok();
}
@@ -90,7 +90,7 @@
if (Cools.isEmpty(ids)){
return R.error();
}
- permissionService.deleteBatchIds(Arrays.asList(ids));
+ permissionService.removeByIds(Arrays.asList(ids));
return R.ok();
}
@@ -98,19 +98,19 @@
@ManagerAuth
public R export(@RequestBody JSONObject param){
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<Permission> wrapper = new EntityWrapper<>();
+ QueryWrapper<Permission> wrapper = new QueryWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("permission"));
convert(map, wrapper);
- List<Permission> list = permissionService.selectList(wrapper);
+ List<Permission> list = permissionService.list(wrapper);
return R.ok(exportSupport(list, fields));
}
@RequestMapping(value = "/permissionQuery/auth")
@ManagerAuth
public R query(String condition) {
- EntityWrapper<Permission> wrapper = new EntityWrapper<>();
+ QueryWrapper<Permission> wrapper = new QueryWrapper<>();
wrapper.like("name", condition);
- Page<Permission> page = permissionService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Permission> page = permissionService.page(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Permission permission : page.getRecords()){
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.9.1