diff --git a/.idea/GitCommitMessageStorage.xml b/.idea/GitCommitMessageStorage.xml index 3b56900..e4fd56a 100644 --- a/.idea/GitCommitMessageStorage.xml +++ b/.idea/GitCommitMessageStorage.xml @@ -2,19 +2,7 @@ \ No newline at end of file diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java index 6183201..f5a5aab 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java @@ -13,7 +13,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -@Tag(name = "用户接口") +@Tag(name = "用户相关接口") @RestController @RequestMapping("/admin/system/index") public class IndexController { diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java new file mode 100644 index 0000000..50f6950 --- /dev/null +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleController.java @@ -0,0 +1,28 @@ +package com.atguigu.spzx.manger.controller; + +import com.atguigu.spzx.manger.service.SysRoleService; +import com.atguigu.spzx.model.dto.system.SysRoleDto; +import com.atguigu.spzx.model.entity.system.SysRole; +import com.atguigu.spzx.model.vo.result.Result; +import com.github.pagehelper.PageInfo; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "角色相关接口") +@RestController +@RequestMapping(value = "/admin/system/sysRole") +public class SysRoleController { + @Autowired + private SysRoleService sysRoleService; + + @Operation(summary = "查询角色分页", description = "查询角色信息返回分页") + @PostMapping("/findByPage/{pageNum}/{pageSize}") + public Result> findByPage(@RequestBody SysRoleDto sysRoleDto, + @PathVariable(value = "pageNum") Integer pageNum, + @PathVariable(value = "pageSize") Integer pageSize) { + PageInfo pageInfo = sysRoleService.findByPage(sysRoleDto, pageNum, pageSize); + return Result.success(pageInfo); + } +} \ No newline at end of file diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleMapper.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleMapper.java new file mode 100644 index 0000000..0f35325 --- /dev/null +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/mapper/SysRoleMapper.java @@ -0,0 +1,18 @@ +package com.atguigu.spzx.manger.mapper; + +import com.atguigu.spzx.model.dto.system.SysRoleDto; +import com.atguigu.spzx.model.entity.system.SysRole; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SysRoleMapper { + /** + * 查询角色信息 + * + * @param sysRoleDto 请求参数实体类 + * @return List findByPage(SysRoleDto sysRoleDto); +} diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java new file mode 100644 index 0000000..2b0a041 --- /dev/null +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleService.java @@ -0,0 +1,17 @@ +package com.atguigu.spzx.manger.service; + +import com.atguigu.spzx.model.dto.system.SysRoleDto; +import com.atguigu.spzx.model.entity.system.SysRole; +import com.github.pagehelper.PageInfo; + +public interface SysRoleService { + /** + * 查询角色信息返回分页 + * + * @param sysRoleDto 请求参数实体类 + * @param pageNum 当前也 + * @param pageSize 分页大小 + * @return 返回分页结果 + */ + PageInfo findByPage(SysRoleDto sysRoleDto, Integer pageNum, Integer pageSize); +} diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java new file mode 100644 index 0000000..0cc8f4d --- /dev/null +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleServiceImpl.java @@ -0,0 +1,36 @@ +package com.atguigu.spzx.manger.service.impl; + +import com.atguigu.spzx.manger.mapper.SysRoleMapper; +import com.atguigu.spzx.manger.service.SysRoleService; +import com.atguigu.spzx.model.dto.system.SysRoleDto; +import com.atguigu.spzx.model.entity.system.SysRole; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SysRoleServiceImpl implements SysRoleService { + @Autowired + private SysRoleMapper sysRoleMapper; + + /** + * 查询角色信息返回分页 + * + * @param sysRoleDto 请求参数实体类 + * @param pageNum 当前也 + * @param pageSize 分页大小 + * @return 返回分页结果 + */ + @Override + public PageInfo findByPage(SysRoleDto sysRoleDto, Integer pageNum, Integer pageSize) { + Page startedPage = PageHelper.startPage(pageNum, pageSize); + List sysRoles = sysRoleMapper.findByPage(sysRoleDto); + PageInfo pageInfo = new PageInfo<>(sysRoles); + startedPage.close(); + return pageInfo; + } +} diff --git a/spzx-manager/src/main/resources/mapper/SysRoleMapper.xml b/spzx-manager/src/main/resources/mapper/SysRoleMapper.xml new file mode 100644 index 0000000..de53ab5 --- /dev/null +++ b/spzx-manager/src/main/resources/mapper/SysRoleMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + id,role_name,role_code,description,create_time,update_time,is_deleted + + + + + diff --git a/spzx-manager/target/classes/com/atguigu/spzx/manger/controller/IndexController.class b/spzx-manager/target/classes/com/atguigu/spzx/manger/controller/IndexController.class index f4806d7..b9aa94d 100644 Binary files a/spzx-manager/target/classes/com/atguigu/spzx/manger/controller/IndexController.class and b/spzx-manager/target/classes/com/atguigu/spzx/manger/controller/IndexController.class differ diff --git a/spzx-model/src/main/java/com/atguigu/spzx/model/dto/system/SysRoleDto.java b/spzx-model/src/main/java/com/atguigu/spzx/model/dto/system/SysRoleDto.java index b9ac148..473b8d2 100644 --- a/spzx-model/src/main/java/com/atguigu/spzx/model/dto/system/SysRoleDto.java +++ b/spzx-model/src/main/java/com/atguigu/spzx/model/dto/system/SysRoleDto.java @@ -6,8 +6,6 @@ import lombok.Data; @Data @Schema(description = "请求参数实体类") public class SysRoleDto { - @Schema(description = "角色名称") - private String roleName ; - + private String roleName; } diff --git a/spzx-model/src/main/java/com/atguigu/spzx/model/entity/system/SysRole.java b/spzx-model/src/main/java/com/atguigu/spzx/model/entity/system/SysRole.java index a1c523f..b0b0940 100644 --- a/spzx-model/src/main/java/com/atguigu/spzx/model/entity/system/SysRole.java +++ b/spzx-model/src/main/java/com/atguigu/spzx/model/entity/system/SysRole.java @@ -2,9 +2,13 @@ package com.atguigu.spzx.model.entity.system; import com.atguigu.spzx.model.entity.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; +import lombok.*; +@EqualsAndHashCode(callSuper = true) @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor @Schema(description = "角色实体类") public class SysRole extends BaseEntity { diff --git a/spzx-model/target/classes/com/atguigu/spzx/model/entity/system/SysRole.class b/spzx-model/target/classes/com/atguigu/spzx/model/entity/system/SysRole.class index 01e3a9f..e5e7640 100644 Binary files a/spzx-model/target/classes/com/atguigu/spzx/model/entity/system/SysRole.class and b/spzx-model/target/classes/com/atguigu/spzx/model/entity/system/SysRole.class differ