diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java index 4508f5c..ff60618 100644 --- a/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java +++ b/common/common-generator/src/main/java/cn/bunny/common/generator/generator/WebGeneratorCode.java @@ -3,11 +3,11 @@ package cn.bunny.common.generator.generator; import cn.bunny.common.generator.entity.BaseField; import cn.bunny.common.generator.entity.BaseResultMap; import cn.bunny.common.generator.utils.GeneratorCodeUtils; -import cn.bunny.dao.dto.system.role.RoleAddDto; -import cn.bunny.dao.dto.system.role.RoleDto; -import cn.bunny.dao.dto.system.role.RoleUpdateDto; -import cn.bunny.dao.entity.system.Role; -import cn.bunny.dao.vo.system.rolePower.RoleVo; +import cn.bunny.dao.dto.system.rolePower.PowerAddDto; +import cn.bunny.dao.dto.system.rolePower.PowerDto; +import cn.bunny.dao.dto.system.rolePower.PowerUpdateDto; +import cn.bunny.dao.entity.system.Power; +import cn.bunny.dao.vo.system.rolePower.PowerVo; import com.baomidou.mybatisplus.annotation.TableName; import com.google.common.base.CaseFormat; import io.swagger.v3.oas.annotations.media.Schema; @@ -51,11 +51,11 @@ public class WebGeneratorCode { public static String resourceMapperPath = "D:\\Project\\web\\PC\\auth\\auth-server-java\\service\\src\\main\\resources\\mapper\\"; public static void main(String[] args) throws Exception { - Class originalClass = Role.class; - Class dtoClass = RoleDto.class; - Class addDtoClass = RoleAddDto.class; - Class updateDtoClass = RoleUpdateDto.class; - Class voClass = RoleVo.class; + Class originalClass = Power.class; + Class dtoClass = PowerDto.class; + Class addDtoClass = PowerAddDto.class; + Class updateDtoClass = PowerUpdateDto.class; + Class voClass = PowerVo.class; // 设置velocity资源加载器 Properties prop = new Properties(); @@ -109,10 +109,16 @@ public class WebGeneratorCode { // 是否必须字段设置 List baseFieldList = Arrays.stream(addDtoClass.getDeclaredFields()).map(field -> { try { + String message = ""; + boolean hasMessage = false; // 验证消息 - String message = field.getAnnotation(NotBlank.class).message(); - boolean hasMessage = StringUtils.hasText(message); - if (!hasMessage) message = field.getAnnotation(NotNull.class).message(); + NotBlank messageAnnotation = field.getAnnotation(NotBlank.class); + if (messageAnnotation != null) { + message = messageAnnotation.message(); + hasMessage = StringUtils.hasText(message); + if (!hasMessage) message = field.getAnnotation(NotNull.class).message(); + } + // 设置基础字段注解和是否必填项 BaseField baseField = new BaseField(); diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java new file mode 100644 index 0000000..5b31719 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerAddDto.java @@ -0,0 +1,33 @@ +package cn.bunny.dao.dto.system.rolePower; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "PowerAddDto对象", title = "权限", description = "权限管理") +public class PowerAddDto { + + @Schema(name = "parentId", title = "父级id") + private Long parentId; + + @Schema(name = "parentId", title = "权限编码") + @NotBlank(message = "权限编码 不能为空") + private String powerCode; + + @Schema(name = "powerName", title = "权限名称") + @NotBlank(message = "权限名称 不能为空") + private String powerName; + + @Schema(name = "requestUrl", title = "请求路径") + @NotBlank(message = "请求路径 不能为空") + private String requestUrl; + +} + diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerDto.java new file mode 100644 index 0000000..a5b998d --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerDto.java @@ -0,0 +1,31 @@ +package cn.bunny.dao.dto.system.rolePower; + +import io.swagger.annotations.ApiModelProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "PowerDto对象", title = "权限", description = "权限管理") +public class PowerDto { + + @Schema(name = "parentId", title = "父级id") + private Long parentId; + + @ApiModelProperty("权限编码") + @Schema(name = "parentId", title = "权限编码") + private String powerCode; + + @Schema(name = "powerName", title = "权限名称") + private String powerName; + + @Schema(name = "requestUrl", title = "请求路径") + private String requestUrl; + +} + diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java new file mode 100644 index 0000000..1e02b25 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/PowerUpdateDto.java @@ -0,0 +1,37 @@ +package cn.bunny.dao.dto.system.rolePower; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "PowerUpdateDto对象", title = "权限", description = "权限管理") +public class PowerUpdateDto { + + @Schema(name = "id", title = "主键") + @NotNull(message = "id不能为空") + private Long id; + + @Schema(name = "parentId", title = "父级id") + private Long parentId; + + @Schema(name = "parentId", title = "权限编码") + @NotBlank(message = "权限编码 不能为空") + private String powerCode; + + @Schema(name = "powerName", title = "权限名称") + @NotBlank(message = "权限名称 不能为空") + private String powerName; + + @Schema(name = "requestUrl", title = "请求路径") + @NotBlank(message = "请求路径 不能为空") + private String requestUrl; + +} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/role/RoleAddDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleAddDto.java similarity index 93% rename from dao/src/main/java/cn/bunny/dao/dto/system/role/RoleAddDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleAddDto.java index 0064243..7424be7 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/role/RoleAddDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleAddDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.role; +package cn.bunny.dao.dto.system.rolePower; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/role/RoleDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleDto.java similarity index 91% rename from dao/src/main/java/cn/bunny/dao/dto/system/role/RoleDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleDto.java index 04414c3..b946f8d 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/role/RoleDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.role; +package cn.bunny.dao.dto.system.rolePower; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/dao/src/main/java/cn/bunny/dao/dto/system/role/RoleUpdateDto.java b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleUpdateDto.java similarity index 94% rename from dao/src/main/java/cn/bunny/dao/dto/system/role/RoleUpdateDto.java rename to dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleUpdateDto.java index f0f1c34..8c7408d 100644 --- a/dao/src/main/java/cn/bunny/dao/dto/system/role/RoleUpdateDto.java +++ b/dao/src/main/java/cn/bunny/dao/dto/system/rolePower/RoleUpdateDto.java @@ -1,4 +1,4 @@ -package cn.bunny.dao.dto.system.role; +package cn.bunny.dao.dto.system.rolePower; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/Power.java b/dao/src/main/java/cn/bunny/dao/entity/system/Power.java index ab2f6ec..eb3f18a 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/Power.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/Power.java @@ -2,7 +2,6 @@ package cn.bunny.dao.entity.system; import cn.bunny.dao.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; @@ -16,7 +15,6 @@ public class Power extends BaseEntity { @Schema(name = "parentId", title = "父级id") private Long parentId; - @ApiModelProperty("权限编码") @Schema(name = "parentId", title = "权限编码") private String powerCode; @@ -26,4 +24,5 @@ public class Power extends BaseEntity { @Schema(name = "requestUrl", title = "请求路径") private String requestUrl; -} \ No newline at end of file +} + diff --git a/dao/src/main/java/cn/bunny/dao/entity/system/RouterPower.java b/dao/src/main/java/cn/bunny/dao/entity/system/RouterPower.java index 2a1deaa..08ae1cd 100644 --- a/dao/src/main/java/cn/bunny/dao/entity/system/RouterPower.java +++ b/dao/src/main/java/cn/bunny/dao/entity/system/RouterPower.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; @TableName("sys_router_power") @Schema(name = "RouterPower对象", title = "路由和权限关系表", description = "路由和权限关系表") public class RouterPower extends BaseEntity { - + @Schema(name = "routerId", title = "路由ID") private Long routerId; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java new file mode 100644 index 0000000..18bd86f --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/PowerVo.java @@ -0,0 +1,27 @@ +package cn.bunny.dao.vo.system.rolePower; + +import cn.bunny.dao.vo.BaseVo; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "PowerVo对象", title = "权限", description = "权限管理") +public class PowerVo extends BaseVo { + + @Schema(name = "parentId", title = "父级id") + private Long parentId; + + @Schema(name = "parentId", title = "权限编码") + private String powerCode; + + @Schema(name = "powerName", title = "权限名称") + private String powerName; + + @Schema(name = "requestUrl", title = "请求路径") + private String requestUrl; + +} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java index 3779cd2..84492ca 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/rolePower/RoleVo.java @@ -18,4 +18,6 @@ public class RoleVo extends BaseVo { @Schema(name = "description", title = "描述") private String description; -} \ No newline at end of file +} + + diff --git a/service/src/main/java/cn/bunny/services/controller/PowerController.java b/service/src/main/java/cn/bunny/services/controller/PowerController.java index 70fa073..e4787d7 100644 --- a/service/src/main/java/cn/bunny/services/controller/PowerController.java +++ b/service/src/main/java/cn/bunny/services/controller/PowerController.java @@ -1,18 +1,72 @@ package cn.bunny.services.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import cn.bunny.dao.dto.system.rolePower.PowerAddDto; +import cn.bunny.dao.dto.system.rolePower.PowerDto; +import cn.bunny.dao.dto.system.rolePower.PowerUpdateDto; +import cn.bunny.dao.entity.system.Power; +import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.pojo.result.Result; +import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.system.rolePower.PowerVo; +import cn.bunny.services.service.PowerService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import reactor.core.publisher.Mono; + +import java.util.List; /** *

- * 前端控制器 + * 权限表 前端控制器 *

* * @author Bunny - * @since 2024-09-26 + * @since 2024-10-03 16:00:52 */ +@Tag(name = "权限", description = "权限相关接口") @RestController -@RequestMapping("/power") +@RequestMapping("admin/power") public class PowerController { + @Autowired + private PowerService powerService; + + @Operation(summary = "分页查询权限", description = "分页查询权限") + @GetMapping("getPowerList/{page}/{limit}") + public Mono>> getPowerList( + @Parameter(name = "page", description = "当前页", required = true) + @PathVariable("page") Integer page, + @Parameter(name = "limit", description = "每页记录数", required = true) + @PathVariable("limit") Integer limit, + PowerDto dto) { + Page pageParams = new Page<>(page, limit); + PageResult pageResult = powerService.getPowerList(pageParams, dto); + return Mono.just(Result.success(pageResult)); + } + + @Operation(summary = "添加权限", description = "添加权限") + @PostMapping("addPower") + public Mono> addPower(@Valid @RequestBody PowerAddDto dto) { + powerService.addPower(dto); + return Mono.just(Result.success(ResultCodeEnum.ADD_SUCCESS)); + } + + @Operation(summary = "更新权限", description = "更新权限") + @PutMapping("updatePower") + public Mono> updatePower(@Valid @RequestBody PowerUpdateDto dto) { + powerService.updatePower(dto); + return Mono.just(Result.success(ResultCodeEnum.UPDATE_SUCCESS)); + } + + @Operation(summary = "删除权限", description = "删除权限") + @DeleteMapping("deletePower") + public Mono> deletePower(@RequestBody List ids) { + powerService.deletePower(ids); + return Mono.just(Result.success(ResultCodeEnum.DELETE_SUCCESS)); + } } diff --git a/service/src/main/java/cn/bunny/services/controller/RoleController.java b/service/src/main/java/cn/bunny/services/controller/RoleController.java index bf31032..737665c 100644 --- a/service/src/main/java/cn/bunny/services/controller/RoleController.java +++ b/service/src/main/java/cn/bunny/services/controller/RoleController.java @@ -1,8 +1,8 @@ package cn.bunny.services.controller; -import cn.bunny.dao.dto.system.role.RoleAddDto; -import cn.bunny.dao.dto.system.role.RoleDto; -import cn.bunny.dao.dto.system.role.RoleUpdateDto; +import cn.bunny.dao.dto.system.rolePower.RoleAddDto; +import cn.bunny.dao.dto.system.rolePower.RoleDto; +import cn.bunny.dao.dto.system.rolePower.RoleUpdateDto; import cn.bunny.dao.entity.system.Role; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; diff --git a/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java b/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java index 4e4de1c..4296fd0 100644 --- a/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/PowerMapper.java @@ -1,22 +1,43 @@ package cn.bunny.services.mapper; +import cn.bunny.dao.dto.system.rolePower.PowerDto; import cn.bunny.dao.entity.system.Power; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.jetbrains.annotations.NotNull; import java.util.List; /** *

- * Mapper 接口 + * 权限 Mapper 接口 *

* * @author Bunny - * @since 2024-09-26 + * @since 2024-10-03 16:00:52 */ @Mapper public interface PowerMapper extends BaseMapper { + + /** + * * 分页查询权限内容 + * + * @param pageParams 权限分页参数 + * @param dto 权限查询表单 + * @return 权限分页结果 + */ + IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") PowerDto dto); + + /** + * 物理删除权限 + * + * @param ids 删除 id 列表 + */ + void deleteBatchIdsWithPhysics(List ids); + /** * * 根据用户id查询当前用户所有角色 * diff --git a/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java b/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java index 3fdce06..5cbcb43 100644 --- a/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/RoleMapper.java @@ -1,6 +1,6 @@ package cn.bunny.services.mapper; -import cn.bunny.dao.dto.system.role.RoleDto; +import cn.bunny.dao.dto.system.rolePower.RoleDto; import cn.bunny.dao.entity.system.Role; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/service/src/main/java/cn/bunny/services/service/PowerService.java b/service/src/main/java/cn/bunny/services/service/PowerService.java index e5a190c..71091b0 100644 --- a/service/src/main/java/cn/bunny/services/service/PowerService.java +++ b/service/src/main/java/cn/bunny/services/service/PowerService.java @@ -1,16 +1,52 @@ package cn.bunny.services.service; +import cn.bunny.dao.dto.system.rolePower.PowerAddDto; +import cn.bunny.dao.dto.system.rolePower.PowerDto; +import cn.bunny.dao.dto.system.rolePower.PowerUpdateDto; import cn.bunny.dao.entity.system.Power; +import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.vo.system.rolePower.PowerVo; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import jakarta.validation.Valid; + +import java.util.List; /** *

- * 服务类 + * 权限 服务类 *

* * @author Bunny - * @since 2024-09-26 + * @since 2024-10-03 16:00:52 */ public interface PowerService extends IService { + /** + * * 获取权限列表 + * + * @return 权限返回列表 + */ + PageResult getPowerList(Page pageParams, PowerDto dto); + + /** + * * 添加权限 + * + * @param dto 添加表单 + */ + void addPower(@Valid PowerAddDto dto); + + /** + * * 更新权限 + * + * @param dto 更新表单 + */ + void updatePower(@Valid PowerUpdateDto dto); + + /** + * * 删除|批量删除权限类型 + * + * @param ids 删除id列表 + */ + void deletePower(List ids); } diff --git a/service/src/main/java/cn/bunny/services/service/RoleService.java b/service/src/main/java/cn/bunny/services/service/RoleService.java index cccca5a..3636d2c 100644 --- a/service/src/main/java/cn/bunny/services/service/RoleService.java +++ b/service/src/main/java/cn/bunny/services/service/RoleService.java @@ -1,8 +1,8 @@ package cn.bunny.services.service; -import cn.bunny.dao.dto.system.role.RoleAddDto; -import cn.bunny.dao.dto.system.role.RoleDto; -import cn.bunny.dao.dto.system.role.RoleUpdateDto; +import cn.bunny.dao.dto.system.rolePower.RoleAddDto; +import cn.bunny.dao.dto.system.rolePower.RoleDto; +import cn.bunny.dao.dto.system.rolePower.RoleUpdateDto; import cn.bunny.dao.entity.system.Role; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.system.rolePower.RoleVo; diff --git a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java index 9f6b475..9471773 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/PowerServiceImpl.java @@ -1,20 +1,92 @@ package cn.bunny.services.service.impl; +import cn.bunny.dao.dto.system.rolePower.PowerAddDto; +import cn.bunny.dao.dto.system.rolePower.PowerDto; +import cn.bunny.dao.dto.system.rolePower.PowerUpdateDto; import cn.bunny.dao.entity.system.Power; +import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.vo.system.rolePower.PowerVo; import cn.bunny.services.mapper.PowerMapper; import cn.bunny.services.service.PowerService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.validation.Valid; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.List; + /** *

- * 服务实现类 + * 权限 服务实现类 *

* * @author Bunny - * @since 2024-09-26 + * @since 2024-10-03 16:00:52 */ @Service public class PowerServiceImpl extends ServiceImpl implements PowerService { + /** + * * 权限 服务实现类 + * + * @param pageParams 权限分页查询page对象 + * @param dto 权限分页查询对象 + * @return 查询分页权限返回对象 + */ + @Override + public PageResult getPowerList(Page pageParams, PowerDto dto) { + // 分页查询菜单图标 + IPage page = baseMapper.selectListByPage(pageParams, dto); + + List voList = page.getRecords().stream().map(Power -> { + PowerVo PowerVo = new PowerVo(); + BeanUtils.copyProperties(Power, PowerVo); + return PowerVo; + }).toList(); + + return PageResult.builder() + .list(voList) + .pageNo(page.getCurrent()) + .pageSize(page.getSize()) + .total(page.getTotal()) + .build(); + } + + /** + * 添加权限 + * + * @param dto 权限添加 + */ + @Override + public void addPower(@Valid PowerAddDto dto) { + // 保存数据 + Power power = new Power(); + BeanUtils.copyProperties(dto, power); + save(power); + } + + /** + * 更新权限 + * + * @param dto 权限更新 + */ + @Override + public void updatePower(@Valid PowerUpdateDto dto) { + // 更新内容 + Power power = new Power(); + BeanUtils.copyProperties(dto, power); + updateById(power); + } + + /** + * 删除|批量删除权限 + * + * @param ids 删除id列表 + */ + @Override + public void deletePower(List ids) { + baseMapper.deleteBatchIdsWithPhysics(ids); + } } diff --git a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java index 785aba4..3f313bb 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RoleServiceImpl.java @@ -1,8 +1,8 @@ package cn.bunny.services.service.impl; -import cn.bunny.dao.dto.system.role.RoleAddDto; -import cn.bunny.dao.dto.system.role.RoleDto; -import cn.bunny.dao.dto.system.role.RoleUpdateDto; +import cn.bunny.dao.dto.system.rolePower.RoleAddDto; +import cn.bunny.dao.dto.system.rolePower.RoleDto; +import cn.bunny.dao.dto.system.rolePower.RoleUpdateDto; import cn.bunny.dao.entity.system.Role; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.system.rolePower.RoleVo; diff --git a/service/src/main/resources/mapper/PowerMapper.xml b/service/src/main/resources/mapper/PowerMapper.xml index 353303a..2993be5 100644 --- a/service/src/main/resources/mapper/PowerMapper.xml +++ b/service/src/main/resources/mapper/PowerMapper.xml @@ -5,22 +5,54 @@ - - - - - - - - - + + + + + + + + + - id, parent_id, power_code, power_name, request_url, create_time, update_time, create_user, update_user, is_deleted + id, create_time, update_time, create_user, update_user, is_deleted, parent_id, power_code, power_name, request_url + + + + + + delete + from sys_power + where id in + + #{id} + + + + +