From 07203f095c7b2ddcef65aeb8d6ca43a30ed66050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 23 Jun 2025 18:04:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bug-369=20=E6=B7=BB=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=BA=BF=E5=92=8C=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/AdminUserController.java | 2 + .../admin/controller/DataRoleController.java | 96 +++++++++++++++++++ .../ProductionLinePermissionType.java | 27 ++++++ .../pojo/request/AccountAddRequest.java | 5 + .../pojo/request/DataRoleAddRequest.java | 21 ++++ .../pojo/request/DataRoleItemRequest.java | 22 +++++ .../pojo/request/DataRoleUpdateRequest.java | 18 ++++ .../common/pojo/vo/AdminUserVO.java | 12 +++ .../common/pojo/vo/DataRoleVO.java | 46 +++++++++ .../repository/entity/AdminUser.java | 10 ++ .../repository/entity/DataRole.java | 66 +++++++++++++ .../repository/mapper/DataRoleMapper.java | 26 +++++ .../repository/service/IDataRoleService.java | 35 +++++++ .../service/impl/AdminUserServiceImpl.java | 16 ++++ .../service/impl/DataRoleServiceImpl.java | 78 +++++++++++++++ .../main/resources/mapper/DataRoleMapper.xml | 18 ++++ .../repository/CodeGenerator.java | 2 +- 17 files changed, 499 insertions(+), 1 deletion(-) create mode 100644 nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DataRoleController.java create mode 100644 nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/ProductionLinePermissionType.java create mode 100644 nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleAddRequest.java create mode 100644 nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleItemRequest.java create mode 100644 nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleUpdateRequest.java create mode 100644 nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DataRoleVO.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DataRole.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DataRoleMapper.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDataRoleService.java create mode 100644 nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DataRoleServiceImpl.java create mode 100644 nflg-mobilebroken-repository/src/main/resources/mapper/DataRoleMapper.xml diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdminUserController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdminUserController.java index c0de1864..b22557dc 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdminUserController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AdminUserController.java @@ -174,6 +174,8 @@ public class AdminUserController extends ControllerBase { .setDepartmentId(request.getDepartmentId()) .setPhone(request.getPhone()) .setTitleId(request.getTitleId()) + .setProductionLineId(request.getProductionLineId()) + .setDataRoleId(request.getDataRoleId()) .setUpdateBy(AdminUserUtil.getUserId()) .setUpdateTime(LocalDateTime.now()); if (!Objects.equals(user.getState(), UserState.ToBeActivated.getState()) && Objects.nonNull(request.getEnable())) { diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DataRoleController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DataRoleController.java new file mode 100644 index 00000000..7822d697 --- /dev/null +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DataRoleController.java @@ -0,0 +1,96 @@ +package com.nflg.mobilebroken.admin.controller; + +import com.nflg.mobilebroken.admin.annotation.ApiMark; +import com.nflg.mobilebroken.common.pojo.ApiResult; +import com.nflg.mobilebroken.common.pojo.PageData; +import com.nflg.mobilebroken.common.pojo.request.DataRoleAddRequest; +import com.nflg.mobilebroken.common.pojo.request.DataRoleUpdateRequest; +import com.nflg.mobilebroken.common.pojo.request.EnableRoleRequest; +import com.nflg.mobilebroken.common.pojo.request.RoleSearchRequest; +import com.nflg.mobilebroken.common.pojo.vo.DataRoleVO; +import com.nflg.mobilebroken.common.pojo.vo.SimpleVO; +import com.nflg.mobilebroken.repository.service.IDataRoleService; +import com.nflg.mobilebroken.starter.annotation.MethodInfoMark; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.Valid; +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * 数据权限角色管理 + * @author 曹鹏飞 + */ +@RestController +@RequestMapping("/datarole") +public class DataRoleController { + + @Resource + private IDataRoleService dataRoleService; + + /** + * 新增角色 + * @param request 请求参数 + */ + @PostMapping("addRole") + @MethodInfoMark(value = "新增角色", menuName = "数据权限角色管理") + @ApiMark(moduleName = "数据权限角色管理", apiName = "新增角色") + public ApiResult addRole(@Valid @RequestBody DataRoleAddRequest request) { + dataRoleService.add(request); + return ApiResult.success(); + } + + /** + * 修改角色 + * @param request 请求参数 + */ + @PostMapping("updateRole") + @MethodInfoMark(value = "修改角色", menuName = "数据权限角色管理") + @ApiMark(moduleName = "数据权限角色管理", apiName = "修改角色") + public ApiResult updateRole(@Valid @RequestBody DataRoleUpdateRequest request) { + dataRoleService.update(request); + return ApiResult.success(); + } + + /** + * 启用/禁用角色 + * @param request 请求参数 + */ + @PostMapping("enableRole") + @ApiMark(moduleName = "数据权限角色管理", apiName = "启用/禁用角色") + public ApiResult enableRole(@Valid @RequestBody EnableRoleRequest request) { + dataRoleService.enable(request); + return ApiResult.success(); + } + + /** + * 删除角色 + * @param ids 角色id列表 + */ + @PostMapping("deleteRole") + @ApiMark(moduleName = "数据权限角色管理", apiName = "删除角色") + public ApiResult deleteRole(@Valid @RequestBody @NotEmpty List ids) { + dataRoleService.removeByIds(ids); + return ApiResult.success(); + } + + /** + * 搜索角色 + * @param request 请求参数 + */ + @PostMapping("searchRoles") + @ApiMark(moduleName = "数据权限角色管理", apiName = "搜索角色") + public ApiResult> searchRoles(@Valid @RequestBody RoleSearchRequest request) { + return ApiResult.success(dataRoleService.search(request)); + } + + /** + * 获取角色下拉列表 + */ + @GetMapping("getSimpleRoles") + @ApiMark(moduleName = "数据权限角色管理", apiName = "获取角色下拉列表",isPublic = true) + public ApiResult> getSimpleRoles(){ + return ApiResult.success(dataRoleService.getSimpleRoles()); + } +} diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/ProductionLinePermissionType.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/ProductionLinePermissionType.java new file mode 100644 index 00000000..26356508 --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/constant/ProductionLinePermissionType.java @@ -0,0 +1,27 @@ +package com.nflg.mobilebroken.common.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Objects; + +@Getter +@AllArgsConstructor +public enum ProductionLinePermissionType { + + ShowMe(0, "只看自己"), + ShowOwned(1, "只看本产品线"), + Customize(2, "自定义产品线"); + + private final int type; + private final String description; + + public static ProductionLinePermissionType findByValue(int value) { + for (ProductionLinePermissionType valueEnum : ProductionLinePermissionType.values()) { + if (Objects.equals(valueEnum.getType(), value)) { + return valueEnum; + } + } + return null; + } +} diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AccountAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AccountAddRequest.java index 2c5b86c8..86a5d7b3 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AccountAddRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AccountAddRequest.java @@ -48,4 +48,9 @@ public class AccountAddRequest { */ @NotNull private Integer productionLineId; + + /** + * 数据权限角色id + */ + private Integer dataRoleId; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleAddRequest.java new file mode 100644 index 00000000..30b2b9b3 --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleAddRequest.java @@ -0,0 +1,21 @@ +package com.nflg.mobilebroken.common.pojo.request; + +import lombok.Data; +import lombok.experimental.Accessors; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.util.List; + +@Data +@Accessors(chain = true) +public class DataRoleAddRequest { + + @NotBlank + private String name; + + @NotEmpty + @Valid + private List configs; +} diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleItemRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleItemRequest.java new file mode 100644 index 00000000..d37f8bdf --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleItemRequest.java @@ -0,0 +1,22 @@ +package com.nflg.mobilebroken.common.pojo.request; + +import com.nflg.mobilebroken.common.constant.ProductionLinePermissionType; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class DataRoleItemRequest { + + /** + * 模块ID，字典项id + */ + @NotNull + private Integer moduleId; + + /** + * 产品线权限类型 + */ + @NotNull + private ProductionLinePermissionType type; +} diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleUpdateRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleUpdateRequest.java new file mode 100644 index 00000000..4499d45f --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/DataRoleUpdateRequest.java @@ -0,0 +1,18 @@ +package com.nflg.mobilebroken.common.pojo.request; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class DataRoleUpdateRequest extends DataRoleAddRequest { + + @NotNull + private Integer id; + + /** + * 是否启用 + */ + @NotNull + private Boolean enable; +} diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminUserVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminUserVO.java index 3f68b318..ce23d3b4 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminUserVO.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AdminUserVO.java @@ -63,4 +63,16 @@ public class AdminUserVO { //微信openid private String openId; + + //产品线id + private Integer productionLineId; + + //产品线名称 + private String productionLineName; + + //数据权限角色id + private Integer dataRoleId; + + //数据权限角色名称 + private String dataRoleName; } diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DataRoleVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DataRoleVO.java new file mode 100644 index 00000000..24daf26c --- /dev/null +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/DataRoleVO.java @@ -0,0 +1,46 @@ +package com.nflg.mobilebroken.common.pojo.vo; + +import cn.hutool.json.JSONUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.nflg.mobilebroken.common.pojo.request.DataRoleItemRequest; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class DataRoleVO { + + private Integer id; + + private String name; + + @JsonIgnore + private String config; + + private List configs; + /** + * 是否启用 + */ + private Boolean enable; + /** + * 创建人 + */ + private String createBy; + /** + * 创建时间 + */ + private LocalDateTime createTime; + /** + * 最后更新人 + */ + private String updateBy; + /** + * 最后更新时间 + */ + private LocalDateTime updateTime; + + public List getConfigs() { + return JSONUtil.toList(config, DataRoleItemRequest.class); + } +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java index 606e2561..1e6b0a26 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AdminUser.java @@ -84,6 +84,16 @@ public class AdminUser implements Serializable { */ private byte state; + /** + * 产品线id + */ + private Integer productionLineId; + + /** + * 数据权限id + */ + private Integer dataRoleId; + /** * 创建人id */ diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DataRole.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DataRole.java new file mode 100644 index 00000000..e8e4ab23 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/DataRole.java @@ -0,0 +1,66 @@ +package com.nflg.mobilebroken.repository.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + *

+ * 数据权限角色 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Getter +@Setter +@Accessors(chain = true) +@TableName("data_role") +public class DataRole implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(value = "id", type = IdType.AUTO) + private Integer id; + + /** + * 名称 + */ + private String name; + + /** + * 配置信息 + */ + private String config; + + /** + * 是否启用 + */ + private Boolean enable; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 最后更新人 + */ + private String updateBy; + + /** + * 最后更新时间 + */ + private LocalDateTime updateTime; +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DataRoleMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DataRoleMapper.java new file mode 100644 index 00000000..611b921e --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/DataRoleMapper.java @@ -0,0 +1,26 @@ +package com.nflg.mobilebroken.repository.mapper; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.mobilebroken.common.pojo.PageData; +import com.nflg.mobilebroken.common.pojo.request.RoleSearchRequest; +import com.nflg.mobilebroken.common.pojo.vo.DataRoleVO; +import com.nflg.mobilebroken.common.pojo.vo.SimpleVO; +import com.nflg.mobilebroken.repository.entity.DataRole; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 数据权限角色 Mapper 接口 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface DataRoleMapper extends BaseMapper { + + PageData search(RoleSearchRequest request, Page page); + + List getSimpleRoles(); +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDataRoleService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDataRoleService.java new file mode 100644 index 00000000..4cf15c2d --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDataRoleService.java @@ -0,0 +1,35 @@ +package com.nflg.mobilebroken.repository.service; + +import com.nflg.mobilebroken.common.pojo.PageData; +import com.nflg.mobilebroken.common.pojo.request.DataRoleAddRequest; +import com.nflg.mobilebroken.common.pojo.request.DataRoleUpdateRequest; +import com.nflg.mobilebroken.common.pojo.request.EnableRoleRequest; +import com.nflg.mobilebroken.common.pojo.request.RoleSearchRequest; +import com.nflg.mobilebroken.common.pojo.vo.DataRoleVO; +import com.nflg.mobilebroken.common.pojo.vo.SimpleVO; +import com.nflg.mobilebroken.repository.entity.DataRole; +import com.baomidou.mybatisplus.extension.service.IService; + +import javax.validation.Valid; +import java.util.List; + +/** + *

+ * 数据权限角色 服务类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +public interface IDataRoleService extends IService { + + void add(@Valid DataRoleAddRequest request); + + void update(@Valid DataRoleUpdateRequest request); + + void enable(@Valid EnableRoleRequest request); + + PageData search(@Valid RoleSearchRequest request); + + List getSimpleRoles(); +} diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java index 5a1b362d..88016861 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java @@ -64,6 +64,12 @@ public class AdminUserServiceImpl extends ServiceImpl productionLines=productionLineService.list(); + List dataRoles=dataRoleService.list(); pageData.setItems(page.getRecords().stream().map(u ->{ AdminUser userCreate=getById(u.getCreateBy()); return new AdminUserVO() @@ -151,6 +163,10 @@ public class AdminUserServiceImpl extends ServiceImplObjects.equals(p.getId(),u.getProductionLineId())).findFirst().map(ProductionLine::getName).orElse("")) + .setDataRoleId(u.getDataRoleId()) + .setDataRoleName(dataRoles.stream().filter(p->Objects.equals(p.getId(),u.getDataRoleId())).findFirst().map(DataRole::getName).orElse("")) .setDepartmentName(getDepartmentName(u.getDepartmentId())) .setRoles(getRoles(u.getId())); }).collect(Collectors.toList())); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DataRoleServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DataRoleServiceImpl.java new file mode 100644 index 00000000..407fd193 --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DataRoleServiceImpl.java @@ -0,0 +1,78 @@ +package com.nflg.mobilebroken.repository.service.impl; + +import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.mobilebroken.common.pojo.PageData; +import com.nflg.mobilebroken.common.pojo.request.DataRoleAddRequest; +import com.nflg.mobilebroken.common.pojo.request.DataRoleUpdateRequest; +import com.nflg.mobilebroken.common.pojo.request.EnableRoleRequest; +import com.nflg.mobilebroken.common.pojo.request.RoleSearchRequest; +import com.nflg.mobilebroken.common.pojo.vo.DataRoleVO; +import com.nflg.mobilebroken.common.pojo.vo.SimpleVO; +import com.nflg.mobilebroken.common.util.AdminUserUtil; +import com.nflg.mobilebroken.common.util.VUtils; +import com.nflg.mobilebroken.repository.entity.DataRole; +import com.nflg.mobilebroken.repository.mapper.DataRoleMapper; +import com.nflg.mobilebroken.repository.service.IDataRoleService; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +/** + *

+ * 数据权限角色 服务实现类 + *

+ * + * @author 代码生成器生成 + * @since 2025 + */ +@Service +public class DataRoleServiceImpl extends ServiceImpl implements IDataRoleService { + + @Override + public void add(DataRoleAddRequest request) { + VUtils.trueThrowBusinessError(lambdaQuery().eq(DataRole::getName, request.getName()).exists()) + .throwMessage("角色已存在，请勿重复添加"); + save(new DataRole() + .setName(request.getName()) + .setConfig(JSONUtil.toJsonStr(request.getConfigs())) + .setCreateBy(AdminUserUtil.getUserName()) + .setCreateTime(LocalDateTime.now())); + } + + @Override + public void update(DataRoleUpdateRequest request) { + VUtils.trueThrowBusinessError(lambdaQuery().eq(DataRole::getName, request.getName()).ne(DataRole::getId, request.getId()).exists()) + .throwMessage("角色已存在"); + lambdaUpdate() + .set(DataRole::getName, request.getName()) + .set(DataRole::getEnable, request.getEnable()) + .set(DataRole::getConfig, JSONUtil.toJsonStr(request.getConfigs())) + .set(DataRole::getUpdateBy, AdminUserUtil.getUserName()) + .set(DataRole::getUpdateTime, LocalDateTime.now()) + .eq(DataRole::getId, request.getId()) + .update(); + } + + @Override + public void enable(EnableRoleRequest request) { + lambdaUpdate() + .set(DataRole::getEnable, request.getEnable()) + .set(DataRole::getUpdateBy, AdminUserUtil.getUserName()) + .set(DataRole::getUpdateTime, LocalDateTime.now()) + .eq(DataRole::getId, request.getRoleId()) + .update(); + } + + @Override + public PageData search(RoleSearchRequest request) { + return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize())); + } + + @Override + public List getSimpleRoles() { + return baseMapper.getSimpleRoles(); + } +} diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DataRoleMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DataRoleMapper.xml new file mode 100644 index 00000000..a54c36de --- /dev/null +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DataRoleMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java index 6b09091e..005db7e1 100644 --- a/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java +++ b/nflg-mobilebroken-repository/src/test/java/com/nflg/mobilebroken/repository/CodeGenerator.java @@ -34,7 +34,7 @@ public class CodeGenerator { ) .strategyConfig(builder -> { builder - .addInclude("^production_line*") //只生成指定表 + .addInclude("admin_user_data_role_map") //只生成指定表 .entityBuilder() .enableLombok() .enableChainModel()