From 6584906ccc07f317f7944a92ef79f2aa9b4f495a Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期四, 29 八月 2024 17:34:45 +0800
Subject: [PATCH] 配置

---
 src/main/java/com/zy/system/controller/RoleController.java |   38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index ef9d380..ccea140 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.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 = "/role/{id}/auth")
     @ManagerAuth
     public R get(@PathVariable("id") Long id) {
-        return R.ok(roleService.selectById(String.valueOf(id)));
+        return R.ok(roleService.getById(String.valueOf(id)));
     }
 
     @RequestMapping(value = "/role/list/auth")
@@ -35,21 +35,21 @@
                   @RequestParam(required = false)String orderByType,
                   @RequestParam Map<String, Object> param){
         excludeTrash(param);
-        EntityWrapper<Role> wrapper = new EntityWrapper<>();
+        QueryWrapper<Role> wrapper = new QueryWrapper<>();
         convert(param, wrapper);
-        wrapper.orderBy("id", false);
+        wrapper.orderByDesc("id");
 
         if (9527 == getUserId()) {
-            return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+            return R.ok(roleService.page(new Page<>(curr, limit), wrapper));
         }
         Long roleId = getUser().getRoleId();
-        Role role = roleService.selectById(roleId);
+        Role role = roleService.getById(roleId);
         Long leaderId = role.getLeader();
         if (null != leaderId) {
             List<Long> leaderIds = new ArrayList<>();
             leaderIds.add(roleId);
             while (leaderId != null) {
-                Role leader = roleService.selectById(leaderId);
+                Role leader = roleService.getById(leaderId);
                 leaderIds.add(leader.getId());
                 leaderId = leader.getLeader();
             }
@@ -58,10 +58,10 @@
 //        if (null != role.getLevel()) {
 //            wrapper.gt("level", role.getLevel());
 //        }
-        return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
+        return R.ok(roleService.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())));
@@ -80,7 +80,7 @@
             return R.error();
         }
         if (null == role.getId()){
-            roleService.insert(role);
+            roleService.save(role);
         } else {
             roleService.updateById(role);
         }
@@ -90,7 +90,7 @@
     @RequestMapping(value = "/role/add/auth")
     @ManagerAuth(memo = "瑙掕壊娣诲姞")
     public R add(Role role) {
-        roleService.insert(role);
+        roleService.save(role);
         return R.ok();
     }
 
@@ -110,7 +110,7 @@
         if (Cools.isEmpty(ids)){
             return R.error();
         }
-        roleService.deleteBatchIds(Arrays.asList(ids));
+        roleService.removeByIds(Arrays.asList(ids));
         return R.ok();
     }
 
@@ -118,27 +118,27 @@
     @ManagerAuth(memo = "瑙掕壊瀵煎嚭")
     public R export(@RequestBody JSONObject param){
         List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
-        EntityWrapper<Role> wrapper = new EntityWrapper<>();
+        QueryWrapper<Role> wrapper = new QueryWrapper<>();
         Map<String, Object> map = excludeTrash(param.getJSONObject("role"));
         convert(map, wrapper);
-        List<Role> list = roleService.selectList(wrapper);
+        List<Role> list = roleService.list(wrapper);
         return R.ok(exportSupport(list, fields));
     }
 
     @RequestMapping(value = "/roleQuery/auth")
     @ManagerAuth
     public R query(String condition) {
-        EntityWrapper<Role> wrapper = new EntityWrapper<>();
+        QueryWrapper<Role> wrapper = new QueryWrapper<>();
         wrapper.like("name", condition);
         // 涓婁笅绾х鐞�
         if (9527 != getUserId()) {
             Long roleId = getUser().getRoleId();
-            Role role = roleService.selectById(roleId);
+            Role role = roleService.getById(roleId);
             Long leaderId = role.getLeader();
             if (null != leaderId) {
                 List<Long> leaderIds = new ArrayList<>();
                 while (leaderId != null) {
-                    Role leader = roleService.selectById(leaderId);
+                    Role leader = roleService.getById(leaderId);
                     leaderIds.add(leader.getId());
                     leaderId = leader.getLeader();
                 }
@@ -149,7 +149,7 @@
 //            }
         }
 
-        Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
+        Page<Role> page = roleService.page(new Page<>(0, 10), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (Role role : page.getRecords()){
             Map<String, Object> map = new HashMap<>();

--
Gitblit v1.9.1