#MOD api移除mp包

authorize-api-service/pom.xml

@@ -35,6 +35,13 @@
             <artifactId>xy-satoken</artifactId>
             <version>1.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.xy</groupId>
+            <artifactId>xy-mp</artifactId>
+            <version>1.0</version>
+        </dependency>
+
         <!-- web页面 -->
         <dependency>
             <groupId>com.xy</groupId>

authorize-api-service/src/main/java/com/xy/service/impl/SysRoleServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.dto.BatchDeleteDto;
 import com.xy.dto.SysRoleDto;
@@ -12,6 +11,7 @@ import com.xy.entity.SysRole;
 import com.xy.mapper.SysRoleMapper;
 import com.xy.service.SysRoleMenuService;
 import com.xy.service.SysRoleService;
+import com.xy.utils.PageBean;
 import com.xy.utils.R;
 import com.xy.utils.SaTokenUtils;
 import com.xy.vo.RoleMenuVo;
@@ -21,6 +21,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import static com.xy.utils.Beans.copy;
+import static com.xy.utils.PlusBeans.toIPage;
+import static com.xy.utils.PlusBeans.toPageBean;
 
 /***
  * 角色服务实现类
@@ -73,13 +75,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    public R<IPage<SysRoleVo>> getRolePage(Page page, SysRoleDto sysRoleDto) {
-
-        Page pageResult = this.page(page, Wrappers.<SysRole>lambdaQuery()
+    public R<PageBean<SysRoleVo>> getRolePage(PageBean pageBean, SysRoleDto sysRoleDto) {
+        IPage<SysRole> page = page(toIPage(pageBean), Wrappers.<SysRole>lambdaQuery()
                 .like(StrUtil.isNotBlank(sysRoleDto.getName()), SysRole::getName, sysRoleDto.getName())
-                .like(StrUtil.isNotBlank(sysRoleDto.getCode()), SysRole::getCode, sysRoleDto.getCode())
-        );
-        return R.ok(pageResult);
+                .like(StrUtil.isNotBlank(sysRoleDto.getCode()), SysRole::getCode, sysRoleDto.getCode()));
+        return R.ok(toPageBean(SysRoleVo.class, page));
 
     }
 

authorize-api/pom.xml

@@ -24,11 +24,5 @@
             <version>1.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.xy</groupId>
-            <artifactId>xy-mp</artifactId>
-            <version>1.0</version>
-        </dependency>
-
     </dependencies>
 </project>

authorize-api/src/main/java/com/xy/service/SysRoleService.java

@@ -1,10 +1,9 @@
 package com.xy.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xy.annotate.RestMappingController;
 import com.xy.dto.BatchDeleteDto;
 import com.xy.dto.SysRoleDto;
+import com.xy.utils.PageBean;
 import com.xy.utils.R;
 import com.xy.vo.RoleMenuVo;
 import com.xy.vo.SysRoleVo;
@@ -60,7 +59,7 @@ public interface SysRoleService {
      */
     @ApiOperation(value = "分页获取角色信息", notes = "分页获取角色信息")
     @GetMapping("page")
-    R<IPage<SysRoleVo>> getRolePage(Page page, SysRoleDto sysRoleDto);
+    R<PageBean<SysRoleVo>> getRolePage(PageBean page, SysRoleDto sysRoleDto);
 
 
     /**

authorize-api/src/main/java/com/xy/vo/SysDeptVo.java

@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 @Data
 @ApiModel("部门信息")
 @Accessors(chain = true)
-public class SysDeptVo {
+public class SysDeptVo extends BaseVo {
 
     /**
      * id

authorize-api/src/main/java/com/xy/vo/SysRoleVo.java

@@ -10,7 +10,7 @@ import java.util.List;
 @Data
 @ApiModel("角色表信息")
 @Accessors(chain = true)
-public class SysRoleVo {
+public class SysRoleVo extends BaseVo {
 
     @ApiModelProperty("角色ID")
     private Long id;