新增部门主管优化其它代码

src/main/java/com/aizuda/boot/modules/flw/FlowTaskActorProvider.java

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Component
@@ -16,12 +17,25 @@ public class FlowTaskActorProvider implements TaskActorProvider {
 
     @Override
     public List<FlwTaskActor> getTaskActors(NodeModel nodeModel, Execution execution) {
-        if(nodeModel.getType() == 0) {
+        if (nodeModel.getType() == 0) {
             // 发起人审批，经过 isAllowed 验证合法，直接返回当前执行人
             return Collections.singletonList(FlwTaskActor.ofFlowCreator(execution.getFlowCreator()));
         }
-        if (nodeModel.getType() == 1 && nodeModel.getSetType() == 7) {
+        if (nodeModel.getType() == 1) {
+            /*
+             * 审核人类型
+             * <p>
+             * 1，指定成员
+             * 2，主管
+             * 3，角色
+             * 4，发起人自选
+             * 5，发起人自己
+             * 7，连续多级主管
+             * </p>
+             */
+            if (Objects.equals(nodeModel.getSetType(), 2)) {
 
+            }
             return null;
         }
         if (ObjectUtils.isNotEmpty(nodeModel.getNodeUserList())) {

src/main/java/com/aizuda/boot/modules/flw/service/IFlwProcessConfigureService.java

@@ -19,7 +19,6 @@ public interface IFlwProcessConfigureService extends IBaseService<FlwProcessConf
      *
      * @param processId 流程定义ID
      * @param dto       流程定义DTO
-     * @return
      */
     boolean saveByDto(Long processId, FlwProcessDTO dto);
 
@@ -27,7 +26,6 @@ public interface IFlwProcessConfigureService extends IBaseService<FlwProcessConf
      * 根据流程定义ID删除流程定义配置
      *
      * @param processId 流程定义ID
-     * @return
      */
     boolean removeByProcessId(Long processId);
 
@@ -35,7 +33,6 @@ public interface IFlwProcessConfigureService extends IBaseService<FlwProcessConf
      * 查询是否存在指定分类ID流程定义信息
      *
      * @param categoryIdList 流程分类ID列表
-     * @return
      */
     boolean existByCategoryIds(List<Long> categoryIdList);
 
@@ -43,7 +40,6 @@ public interface IFlwProcessConfigureService extends IBaseService<FlwProcessConf
      * 根据流程定义ID流程定义配置
      *
      * @param processId 流程定义ID
-     * @return
      */
     FlwProcessConfigure getByProcessId(Long processId);
 }

src/main/java/com/aizuda/boot/modules/flw/service/IFlwProcessPermissionService.java

@@ -19,7 +19,6 @@ public interface IFlwProcessPermissionService extends IBaseService<FlwProcessPer
      *
      * @param processId 流程定义ID
      * @param dtoList   流程定义权限列表
-     * @return
      */
     boolean saveProcessPermissions(Long processId, List<FlwProcessPermissionDTO> dtoList);
 
@@ -27,7 +26,6 @@ public interface IFlwProcessPermissionService extends IBaseService<FlwProcessPer
      * 根据流程定义ID删除流程定义权限
      *
      * @param processId 流程定义ID
-     * @return
      */
     boolean removeByProcessId(Long processId);
 
@@ -35,7 +33,6 @@ public interface IFlwProcessPermissionService extends IBaseService<FlwProcessPer
      * 根据流程定义ID查询流程定义权限列表
      *
      * @param processId 流程定义ID
-     * @return
      */
     List<FlwProcessPermission> getByProcessId(Long processId);
 
@@ -44,7 +41,6 @@ public interface IFlwProcessPermissionService extends IBaseService<FlwProcessPer
      *
      * @param userId    用户ID
      * @param processId 流程定义ID
-     * @return
      */
     FlwProcessPermission getByUserIdAndProcessId(Long userId, Long processId);
 }

src/main/java/com/aizuda/boot/modules/system/controller/SysResourceController.java

@@ -7,7 +7,7 @@ package com.aizuda.boot.modules.system.controller;
 
 import com.aizuda.boot.modules.system.entity.SysResource;
 import com.aizuda.boot.modules.system.entity.SysResourceApi;
-import com.aizuda.boot.modules.system.entity.param.ResourceParam;
+import com.aizuda.boot.modules.system.entity.dto.ResourceDTO;
 import com.aizuda.boot.modules.system.entity.vo.ResourceTreeVO;
 import com.aizuda.boot.modules.system.service.ISysResourceApiService;
 import com.aizuda.boot.modules.system.service.ISysResourceService;
@@ -80,8 +80,8 @@ public class SysResourceController extends ApiController {
     @Operation(summary = "根据 id 修改信息")
     @Permission("sys:resource:update")
     @PostMapping("/update")
-    public boolean update(@Validated(Update.class) @RequestBody ResourceParam param) {
-        return sysResourceService.updateByResourceParam(param);
+    public boolean update(@Validated(Update.class) @RequestBody ResourceDTO dto) {
+        return sysResourceService.updateByResourceParam(dto);
     }
 
     @Operation(summary = "创建添加")

src/main/java/com/aizuda/boot/modules/system/controller/SysRoleController.java

@@ -6,7 +6,7 @@
 package com.aizuda.boot.modules.system.controller;
 
 import com.aizuda.boot.modules.system.entity.SysRole;
-import com.aizuda.boot.modules.system.entity.param.RoleResourceParam;
+import com.aizuda.boot.modules.system.entity.dto.RoleResourceDTO;
 import com.aizuda.boot.modules.system.service.ISysRoleResourceService;
 import com.aizuda.boot.modules.system.service.ISysRoleService;
 import com.aizuda.core.api.ApiController;
@@ -91,8 +91,8 @@ public class SysRoleController extends ApiController {
     @Operation(summary = "设置角色资源权限")
     @Permission("sys:role:resourceSet")
     @PostMapping("/resource-set")
-    public boolean resourceSet(@Validated @RequestBody RoleResourceParam param) {
-        return sysRoleResourceService.saveByRoleResourceParam(param);
+    public boolean resourceSet(@Validated @RequestBody RoleResourceDTO dto) {
+        return sysRoleResourceService.saveByRoleResourceParam(dto);
     }
 
     @Operation(summary = "查询角色资源权限ID列表")

src/main/java/com/aizuda/boot/modules/system/controller/SysUserController.java

@@ -6,10 +6,10 @@
 package com.aizuda.boot.modules.system.controller;
 
 import com.aizuda.boot.modules.system.entity.SysUser;
-import com.aizuda.boot.modules.system.entity.param.AssignDepartmentsParam;
-import com.aizuda.boot.modules.system.entity.param.AssignRolesParam;
-import com.aizuda.boot.modules.system.entity.param.ResetPasswordParam;
-import com.aizuda.boot.modules.system.entity.param.SysUserParam;
+import com.aizuda.boot.modules.system.entity.dto.AssignDepartmentsDTO;
+import com.aizuda.boot.modules.system.entity.dto.AssignRolesDTO;
+import com.aizuda.boot.modules.system.entity.dto.ResetPasswordDTO;
+import com.aizuda.boot.modules.system.entity.dto.SysUserDTO;
 import com.aizuda.boot.modules.system.entity.vo.SysUserRelIdsVO;
 import com.aizuda.boot.modules.system.entity.vo.SysUserVO;
 import com.aizuda.boot.modules.system.service.ISysUserDepartmentService;
@@ -69,15 +69,15 @@ public class SysUserController extends ApiController {
     @Operation(summary = "根据 id 修改信息")
     @Permission("sys:user:update")
     @PostMapping("/update")
-    public boolean update(@Validated(Update.class) @RequestBody SysUserParam param) {
-        return sysUserService.updateById(param);
+    public boolean update(@Validated(Update.class) @RequestBody SysUserDTO dto) {
+        return sysUserService.updateById(dto);
     }
 
     @Operation(summary = "创建添加")
     @Permission("sys:user:create")
     @PostMapping("/create")
-    public boolean create(@Validated(Create.class) @RequestBody SysUserParam param) {
-        return sysUserService.save(param);
+    public boolean create(@Validated(Create.class) @RequestBody SysUserDTO dto) {
+        return sysUserService.save(dto);
     }
 
     @Operation(summary = "根据 ids 删除")
@@ -90,15 +90,15 @@ public class SysUserController extends ApiController {
     @Operation(summary = "分配角色")
     @Permission("sys:user:assignRoles")
     @PostMapping("/assign-roles")
-    public boolean assignRoles(@Validated @RequestBody AssignRolesParam assignRoleParam) {
-        return sysUserRoleService.assignRoles(assignRoleParam);
+    public boolean assignRoles(@Validated @RequestBody AssignRolesDTO dto) {
+        return sysUserRoleService.assignRoles(dto);
     }
 
     @Operation(summary = "分配部门")
     @Permission("sys:user:assignDepartments")
     @PostMapping("/assign-departments")
-    public boolean assignDepartments(@Validated @RequestBody AssignDepartmentsParam assignDepartmentsParam) {
-        return sysUserDepartmentService.assignDepartments(assignDepartmentsParam);
+    public boolean assignDepartments(@Validated @RequestBody AssignDepartmentsDTO dto) {
+        return sysUserDepartmentService.assignDepartments(dto);
     }
 
     @Operation(summary = "根据用户ID查询关联角色部门ID列表")
@@ -111,7 +111,7 @@ public class SysUserController extends ApiController {
     @Operation(summary = "重置密码")
     @Permission("sys:user:resetPassword")
     @PostMapping("/reset-password")
-    public boolean resetPassword(@Validated @RequestBody ResetPasswordParam param) {
+    public boolean resetPassword(@Validated @RequestBody ResetPasswordDTO param) {
         return sysUserService.resetPassword(param);
     }
 }

src/main/java/com/aizuda/boot/modules/system/entity/SysDepartmentHead.java

@@ -0,0 +1,37 @@
+/*
+ * 爱组搭，低代码组件化开发平台
+ * ------------------------------------------
+ * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
+ */
+package com.aizuda.boot.modules.system.entity;
+
+import com.aizuda.core.bean.SuperEntity;
+import com.aizuda.core.validation.Create;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 系统部门主管
+ *
+ * @author 青苗
+ * @since 2024-03-22
+ */
+@Getter
+@Setter
+@Schema(name = "SysDepartmentHead", description = "系统部门主管")
+public class SysDepartmentHead extends SuperEntity {
+
+    @Schema(description = "部门ID")
+    @NotNull(groups = Create.class)
+    @PositiveOrZero
+    private Long departmentId;
+
+    @Schema(description = "主管ID")
+    @NotNull(groups = Create.class)
+    @PositiveOrZero
+    private Long headId;
+
+}

src/main/java/com/aizuda/boot/modules/system/entity/param/AssignDepartmentsParam.java → src/main/java/com/aizuda/boot/modules/system/entity/dto/AssignDepartmentsDTO.java

@@ -3,7 +3,7 @@
  * ------------------------------------------
  * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
  */
-package com.aizuda.boot.modules.system.entity.param;
+package com.aizuda.boot.modules.system.entity.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
@@ -20,7 +20,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class AssignDepartmentsParam {
+public class AssignDepartmentsDTO {
 
     @Schema(description = "用户ID列表")
     @NotEmpty

src/main/java/com/aizuda/boot/modules/system/entity/param/AssignRolesParam.java → src/main/java/com/aizuda/boot/modules/system/entity/dto/AssignRolesDTO.java

@@ -3,7 +3,7 @@
  * ------------------------------------------
  * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
  */
-package com.aizuda.boot.modules.system.entity.param;
+package com.aizuda.boot.modules.system.entity.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
@@ -20,7 +20,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class AssignRolesParam {
+public class AssignRolesDTO {
 
     @Schema(description = "用户ID列表")
     @NotEmpty

src/main/java/com/aizuda/boot/modules/system/entity/param/ResetPasswordParam.java → src/main/java/com/aizuda/boot/modules/system/entity/dto/ResetPasswordDTO.java

@@ -3,7 +3,7 @@
  * ------------------------------------------
  * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
  */
-package com.aizuda.boot.modules.system.entity.param;
+package com.aizuda.boot.modules.system.entity.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
@@ -21,7 +21,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class ResetPasswordParam {
+public class ResetPasswordDTO {
 
     @Schema(description = "用户ID列表")
     @NotEmpty

src/main/java/com/aizuda/boot/modules/system/entity/param/ResourceParam.java → src/main/java/com/aizuda/boot/modules/system/entity/dto/ResourceDTO.java

@@ -3,7 +3,7 @@
  * ------------------------------------------
  * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
  */
-package com.aizuda.boot.modules.system.entity.param;
+package com.aizuda.boot.modules.system.entity.dto;
 
 import com.aizuda.boot.modules.system.entity.SysResource;
 import com.aizuda.boot.modules.system.entity.SysResourceApi;
@@ -21,7 +21,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class ResourceParam extends SysResource {
+public class ResourceDTO extends SysResource {
 
     @Schema(description = "接口权限")
     private List<SysResourceApi> apiList;

src/main/java/com/aizuda/boot/modules/system/entity/param/RoleResourceParam.java → src/main/java/com/aizuda/boot/modules/system/entity/dto/RoleResourceDTO.java

@@ -3,7 +3,7 @@
  * ------------------------------------------
  * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
  */
-package com.aizuda.boot.modules.system.entity.param;
+package com.aizuda.boot.modules.system.entity.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
@@ -20,7 +20,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class RoleResourceParam {
+public class RoleResourceDTO {
 
     @Schema(description = "角色ID")
     @NotNull

src/main/java/com/aizuda/boot/modules/system/entity/param/SysUserParam.java → src/main/java/com/aizuda/boot/modules/system/entity/dto/SysUserDTO.java

@@ -3,7 +3,7 @@
  * ------------------------------------------
  * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
  */
-package com.aizuda.boot.modules.system.entity.param;
+package com.aizuda.boot.modules.system.entity.dto;
 
 import com.aizuda.boot.modules.system.entity.SysUser;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,7 +20,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class SysUserParam extends SysUser {
+public class SysUserDTO extends SysUser {
 
     @Schema(description = "角色ID列表")
     private List<Long> roleIds;

src/main/java/com/aizuda/boot/modules/system/mapper/SysDepartmentHeadMapper.java

@@ -0,0 +1,21 @@
+/*
+ * 爱组搭，低代码组件化开发平台
+ * ------------------------------------------
+ * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
+ */
+package com.aizuda.boot.modules.system.mapper;
+
+import com.aizuda.boot.modules.system.entity.SysDepartmentHead;
+import com.aizuda.service.mapper.CrudMapper;
+
+/**
+ * <p>
+ * 系统部门主管 Mapper 接口
+ * </p>
+ *
+ * @author 青苗
+ * @since 2024-03-22
+ */
+public interface SysDepartmentHeadMapper extends CrudMapper<SysDepartmentHead> {
+
+}

src/main/java/com/aizuda/boot/modules/system/service/ISysDepartmentHeadService.java

@@ -0,0 +1,19 @@
+/*
+ * 爱组搭，低代码组件化开发平台
+ * ------------------------------------------
+ * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
+ */
+package com.aizuda.boot.modules.system.service;
+
+import com.aizuda.boot.modules.system.entity.SysDepartmentHead;
+import com.aizuda.service.service.IBaseService;
+
+/**
+ * 系统部门主管 服务类
+ *
+ * @author 青苗
+ * @since 2024-03-22
+ */
+public interface ISysDepartmentHeadService extends IBaseService<SysDepartmentHead> {
+
+}

src/main/java/com/aizuda/boot/modules/system/service/ISysResourceApiService.java

@@ -22,7 +22,6 @@ public interface ISysResourceApiService extends IBaseService<SysResourceApi> {
      * 根据资源ID查询接口权限列表
      *
      * @param resourceId 资源ID
-     * @return
      */
     List<SysResourceApi> listByResourceId(Long resourceId);
 
@@ -30,7 +29,6 @@ public interface ISysResourceApiService extends IBaseService<SysResourceApi> {
      * 根据用户ID查询权限编码列表
      *
      * @param userId 用户ID
-     * @return
      */
     List<String> listCodesByUserId(Long userId);
 

src/main/java/com/aizuda/boot/modules/system/service/ISysResourceService.java

@@ -6,7 +6,7 @@
 package com.aizuda.boot.modules.system.service;
 
 import com.aizuda.boot.modules.system.entity.SysResource;
-import com.aizuda.boot.modules.system.entity.param.ResourceParam;
+import com.aizuda.boot.modules.system.entity.dto.ResourceDTO;
 import com.aizuda.boot.modules.system.entity.vo.ResourceTreeVO;
 import com.aizuda.service.service.IBaseService;
 import com.aizuda.service.web.UserSession;
@@ -34,15 +34,13 @@ public interface ISysResourceService extends IBaseService<SysResource> {
      * 权限菜单列表
      *
      * @param userSession {@link UserSession}
-     * @return
      */
     Map<String, Object> listMenuPermissions(UserSession userSession);
 
     /**
      * 更新菜单
      *
-     * @param param {@link ResourceParam}
-     * @return
+     * @param dto {@link ResourceDTO}
      */
-    boolean updateByResourceParam(ResourceParam param);
+    boolean updateByResourceParam(ResourceDTO dto);
 }

src/main/java/com/aizuda/boot/modules/system/service/ISysRoleResourceService.java

@@ -6,7 +6,7 @@
 package com.aizuda.boot.modules.system.service;
 
 import com.aizuda.boot.modules.system.entity.SysRoleResource;
-import com.aizuda.boot.modules.system.entity.param.RoleResourceParam;
+import com.aizuda.boot.modules.system.entity.dto.RoleResourceDTO;
 import com.aizuda.service.service.IBaseService;
 
 import java.util.List;
@@ -22,16 +22,14 @@ public interface ISysRoleResourceService extends IBaseService<SysRoleResource> {
     /**
      * 保存角色资源菜单ID关联信息
      *
-     * @param param {@link RoleResourceParam}
-     * @return
+     * @param dto {@link RoleResourceDTO}
      */
-    boolean saveByRoleResourceParam(RoleResourceParam param);
+    boolean saveByRoleResourceParam(RoleResourceDTO dto);
 
     /**
      * 查询指定角色ID列表
      *
      * @param roleId 角色ID
-     * @return
      */
     List<Long> listByRoleId(Long roleId);
 
@@ -39,7 +37,6 @@ public interface ISysRoleResourceService extends IBaseService<SysRoleResource> {
      * 判断是否存在关联角色
      *
      * @param roleId 角色ID
-     * @return
      */
     boolean existRelByRoleId(Long roleId);
 }

src/main/java/com/aizuda/boot/modules/system/service/ISysRoleService.java

@@ -39,7 +39,6 @@ public interface ISysRoleService extends IBaseService<SysRole> {
      * 删除并检测是否允许操作
      *
      * @param ids 主键ID列表
-     * @return
      */
     boolean removeCheckByIds(List<Long> ids);
 }

src/main/java/com/aizuda/boot/modules/system/service/ISysUserDepartmentService.java

@@ -6,7 +6,7 @@
 package com.aizuda.boot.modules.system.service;
 
 import com.aizuda.boot.modules.system.entity.SysUserDepartment;
-import com.aizuda.boot.modules.system.entity.param.AssignDepartmentsParam;
+import com.aizuda.boot.modules.system.entity.dto.AssignDepartmentsDTO;
 import com.aizuda.service.service.IBaseService;
 
 import java.util.List;
@@ -22,16 +22,14 @@ public interface ISysUserDepartmentService extends IBaseService<SysUserDepartmen
     /**
      * 用户部门分配
      *
-     * @param assignDepartmentsParam 分配部门参数对象
-     * @return
+     * @param dto 分配部门参数对象
      */
-    boolean assignDepartments(AssignDepartmentsParam assignDepartmentsParam);
+    boolean assignDepartments(AssignDepartmentsDTO dto);
 
     /**
      * 根据用户ID查询关联部门ID列表
      *
      * @param userId 用户ID
-     * @return
      */
     List<Long> listDepartmentIdsByUserId(Long userId);
 
@@ -39,7 +37,6 @@ public interface ISysUserDepartmentService extends IBaseService<SysUserDepartmen
      * 判断是否存在关联部门
      *
      * @param DepartmentId 部门ID
-     * @return
      */
     boolean existRelByDepartmentId(Long DepartmentId);
 }

src/main/java/com/aizuda/boot/modules/system/service/ISysUserRoleService.java

@@ -6,7 +6,7 @@
 package com.aizuda.boot.modules.system.service;
 
 import com.aizuda.boot.modules.system.entity.SysUserRole;
-import com.aizuda.boot.modules.system.entity.param.AssignRolesParam;
+import com.aizuda.boot.modules.system.entity.dto.AssignRolesDTO;
 import com.aizuda.service.service.IBaseService;
 
 import java.util.List;
@@ -22,16 +22,14 @@ public interface ISysUserRoleService extends IBaseService<SysUserRole> {
     /**
      * 用户角色分配
      *
-     * @param assignRolesParam 分配角色参数对象
-     * @return
+     * @param dto 分配角色参数对象
      */
-    boolean assignRoles(AssignRolesParam assignRolesParam);
+    boolean assignRoles(AssignRolesDTO dto);
 
     /**
      * 根据用户ID查询关联角色ID列表
      *
      * @param userId 用户ID
-     * @return
      */
     List<Long> listRoleIdsByUserId(Long userId);
 
@@ -39,7 +37,6 @@ public interface ISysUserRoleService extends IBaseService<SysUserRole> {
      * 判断是否存在关联角色
      *
      * @param roleId 角色ID
-     * @return
      */
     boolean existRelByRoleId(Long roleId);
 }

src/main/java/com/aizuda/boot/modules/system/service/ISysUserService.java

@@ -6,8 +6,8 @@
 package com.aizuda.boot.modules.system.service;
 
 import com.aizuda.boot.modules.system.entity.SysUser;
-import com.aizuda.boot.modules.system.entity.param.ResetPasswordParam;
-import com.aizuda.boot.modules.system.entity.param.SysUserParam;
+import com.aizuda.boot.modules.system.entity.dto.ResetPasswordDTO;
+import com.aizuda.boot.modules.system.entity.dto.SysUserDTO;
 import com.aizuda.boot.modules.system.entity.vo.SysUserRelIdsVO;
 import com.aizuda.boot.modules.system.entity.vo.SysUserVO;
 import com.aizuda.service.service.IBaseService;
@@ -30,11 +30,11 @@ public interface ISysUserService extends IBaseService<SysUser> {
      */
     List<SysUser> list20ByUsername(String username);
 
-    boolean save(SysUserParam param);
+    boolean save(SysUserDTO dto);
 
-    boolean updateById(SysUserParam param);
+    boolean updateById(SysUserDTO dto);
 
-    boolean resetPassword(ResetPasswordParam param);
+    boolean resetPassword(ResetPasswordDTO dto);
 
     /**
      * 根据 ID 获取关联角色部门ID列表

src/main/java/com/aizuda/boot/modules/system/service/impl/SysDepartmentHeadServiceImpl.java

@@ -0,0 +1,23 @@
+/*
+ * 爱组搭，低代码组件化开发平台
+ * ------------------------------------------
+ * 受知识产权保护，请勿删除版权申明，开发平台不允许做非法网站，后果自负
+ */
+package com.aizuda.boot.modules.system.service.impl;
+
+import com.aizuda.boot.modules.system.entity.SysDepartmentHead;
+import com.aizuda.boot.modules.system.mapper.SysDepartmentHeadMapper;
+import com.aizuda.boot.modules.system.service.ISysDepartmentHeadService;
+import com.aizuda.service.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 系统部门主管 服务实现类
+ *
+ * @author 青苗
+ * @since 2024-03-22
+ */
+@Service
+public class SysDepartmentHeadServiceImpl extends BaseServiceImpl<SysDepartmentHeadMapper, SysDepartmentHead> implements ISysDepartmentHeadService {
+
+}

src/main/java/com/aizuda/boot/modules/system/service/impl/SysResourceServiceImpl.java

@@ -8,7 +8,7 @@ package com.aizuda.boot.modules.system.service.impl;
 import com.aizuda.boot.modules.system.entity.SysResource;
 import com.aizuda.boot.modules.system.entity.SysResourceApi;
 import com.aizuda.boot.modules.system.entity.enums.ResourceType;
-import com.aizuda.boot.modules.system.entity.param.ResourceParam;
+import com.aizuda.boot.modules.system.entity.dto.ResourceDTO;
 import com.aizuda.boot.modules.system.entity.vo.MenuVO;
 import com.aizuda.boot.modules.system.entity.vo.ResourceTreeVO;
 import com.aizuda.boot.modules.system.mapper.SysResourceMapper;
@@ -151,19 +151,19 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean updateByResourceParam(ResourceParam param) {
-        ApiAssert.isEmpty(param.getId(), "主键不存在无法更新");
-        SysResource sysResource = param.convert(SysResource.class);
+    public boolean updateByResourceParam(ResourceDTO dto) {
+        ApiAssert.isEmpty(dto.getId(), "主键不存在无法更新");
+        SysResource sysResource = dto.convert(SysResource.class);
         ApiAssert.fail(!super.updateById(sysResource), "更新失败");
         // 保存资源接口
-        List<SysResourceApi> apiList = param.getApiList();
+        List<SysResourceApi> apiList = dto.getApiList();
         if (CollectionUtils.isNotEmpty(apiList)) {
             // 移除空字符串
             apiList = apiList.stream().filter(t -> StringUtils.isNoneBlank(t.getUrl()) && StringUtils.isNoneBlank(t.getCode())).toList();
             if (CollectionUtils.isNotEmpty(apiList)) {
-                sysResourceApiService.removeByResourceId(param.getId());
+                sysResourceApiService.removeByResourceId(dto.getId());
                 apiList.forEach(t -> {
-                    t.setResourceId(param.getId());
+                    t.setResourceId(dto.getId());
                     t.setUrl(t.getUrl().trim());
                     t.setCode(t.getCode().trim());
                 });

src/main/java/com/aizuda/boot/modules/system/service/impl/SysRoleResourceServiceImpl.java

@@ -6,7 +6,7 @@
 package com.aizuda.boot.modules.system.service.impl;
 
 import com.aizuda.boot.modules.system.entity.SysRoleResource;
-import com.aizuda.boot.modules.system.entity.param.RoleResourceParam;
+import com.aizuda.boot.modules.system.entity.dto.RoleResourceDTO;
 import com.aizuda.boot.modules.system.mapper.SysRoleResourceMapper;
 import com.aizuda.boot.modules.system.service.ISysRoleResourceService;
 import com.aizuda.core.api.ApiAssert;
@@ -35,18 +35,18 @@ public class SysRoleResourceServiceImpl extends BaseServiceImpl<SysRoleResourceM
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean saveByRoleResourceParam(RoleResourceParam param) {
-        if (null == param || null == param.getRoleId()) {
+    public boolean saveByRoleResourceParam(RoleResourceDTO dto) {
+        if (null == dto || null == dto.getRoleId()) {
             return false;
         }
-        super.remove(Wrappers.<SysRoleResource>lambdaQuery().eq(SysRoleResource::getRoleId, param.getRoleId()));
-        if (CollectionUtils.isEmpty(param.getResourceIds())) {
+        super.remove(Wrappers.<SysRoleResource>lambdaQuery().eq(SysRoleResource::getRoleId, dto.getRoleId()));
+        if (CollectionUtils.isEmpty(dto.getResourceIds())) {
             // 执行角色权限清空操作，逻辑上返回成功
             return true;
         }
-        return super.saveBatch(param.getResourceIds().stream().map(resourceId -> {
+        return super.saveBatch(dto.getResourceIds().stream().map(resourceId -> {
             SysRoleResource srr = new SysRoleResource();
-            srr.setRoleId(param.getRoleId());
+            srr.setRoleId(dto.getRoleId());
             srr.setResourceId(resourceId);
             return srr;
         }).toList());

src/main/java/com/aizuda/boot/modules/system/service/impl/SysUserDepartmentServiceImpl.java

@@ -6,7 +6,7 @@
 package com.aizuda.boot.modules.system.service.impl;
 
 import com.aizuda.boot.modules.system.entity.SysUserDepartment;
-import com.aizuda.boot.modules.system.entity.param.AssignDepartmentsParam;
+import com.aizuda.boot.modules.system.entity.dto.AssignDepartmentsDTO;
 import com.aizuda.boot.modules.system.mapper.SysUserDepartmentMapper;
 import com.aizuda.boot.modules.system.service.ISysUserDepartmentService;
 import com.aizuda.core.api.ApiAssert;
@@ -30,18 +30,18 @@ public class SysUserDepartmentServiceImpl extends BaseServiceImpl<SysUserDepartm
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean assignDepartments(AssignDepartmentsParam assignDepartmentsParam) {
+    public boolean assignDepartments(AssignDepartmentsDTO dto) {
         // 删除历史
-        List<Long> userIds = assignDepartmentsParam.getUserIds();
+        List<Long> userIds = dto.getUserIds();
         this.removeByUserIds(userIds);
-        if (CollectionUtils.isEmpty(assignDepartmentsParam.getDepartmentIds())) {
+        if (CollectionUtils.isEmpty(dto.getDepartmentIds())) {
             // 无需分配部门
             return true;
         }
 
         // 批量新增
         List<SysUserDepartment> sysUserDepartmentList = new ArrayList<>();
-        userIds.forEach(userId -> sysUserDepartmentList.addAll(assignDepartmentsParam.getDepartmentIds().stream()
+        userIds.forEach(userId -> sysUserDepartmentList.addAll(dto.getDepartmentIds().stream()
                 .map(DepartmentId -> {
                     SysUserDepartment sysUserDepartment = new SysUserDepartment();
                     sysUserDepartment.setUserId(userId);

src/main/java/com/aizuda/boot/modules/system/service/impl/SysUserRoleServiceImpl.java

@@ -6,7 +6,7 @@
 package com.aizuda.boot.modules.system.service.impl;
 
 import com.aizuda.boot.modules.system.entity.SysUserRole;
-import com.aizuda.boot.modules.system.entity.param.AssignRolesParam;
+import com.aizuda.boot.modules.system.entity.dto.AssignRolesDTO;
 import com.aizuda.boot.modules.system.mapper.SysUserRoleMapper;
 import com.aizuda.boot.modules.system.service.ISysUserRoleService;
 import com.aizuda.core.api.ApiAssert;
@@ -30,18 +30,18 @@ public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRoleMapper, S
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean assignRoles(AssignRolesParam assignRolesParam) {
+    public boolean assignRoles(AssignRolesDTO dto) {
         // 删除历史
-        List<Long> userIds = assignRolesParam.getUserIds();
+        List<Long> userIds = dto.getUserIds();
         this.removeByUserIds(userIds);
-        if (CollectionUtils.isEmpty(assignRolesParam.getRoleIds())) {
+        if (CollectionUtils.isEmpty(dto.getRoleIds())) {
             // 无需分配角色
             return true;
         }
 
         // 批量新增
         List<SysUserRole> sysUserRoleList = new ArrayList<>();
-        userIds.forEach(userId -> sysUserRoleList.addAll(assignRolesParam.getRoleIds().stream()
+        userIds.forEach(userId -> sysUserRoleList.addAll(dto.getRoleIds().stream()
                 .map(roleId -> {
                     SysUserRole sysUserRole = new SysUserRole();
                     sysUserRole.setUserId(userId);

src/main/java/com/aizuda/boot/modules/system/service/impl/SysUserServiceImpl.java

@@ -6,10 +6,10 @@
 package com.aizuda.boot.modules.system.service.impl;
 
 import com.aizuda.boot.modules.system.entity.SysUser;
-import com.aizuda.boot.modules.system.entity.param.AssignDepartmentsParam;
-import com.aizuda.boot.modules.system.entity.param.AssignRolesParam;
-import com.aizuda.boot.modules.system.entity.param.ResetPasswordParam;
-import com.aizuda.boot.modules.system.entity.param.SysUserParam;
+import com.aizuda.boot.modules.system.entity.dto.AssignDepartmentsDTO;
+import com.aizuda.boot.modules.system.entity.dto.AssignRolesDTO;
+import com.aizuda.boot.modules.system.entity.dto.ResetPasswordDTO;
+import com.aizuda.boot.modules.system.entity.dto.SysUserDTO;
 import com.aizuda.boot.modules.system.entity.vo.SysUserRelIdsVO;
 import com.aizuda.boot.modules.system.entity.vo.SysUserVO;
 import com.aizuda.boot.modules.system.mapper.SysUserMapper;
@@ -80,20 +80,20 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean save(SysUserParam param) {
-        ApiAssert.fail(!RegexUtils.matches("(^[A-Za-z]{6,50}$)|(^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,50}$)", param.getUsername()),
+    public boolean save(SysUserDTO dto) {
+        ApiAssert.fail(!RegexUtils.matches("(^[A-Za-z]{6,50}$)|(^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,50}$)", dto.getUsername()),
                 "用户名，必须是 6 到 50 位 字母 或者 字母数字混合 字符串");
-        this.checkPassword(param.getPassword());
+        this.checkPassword(dto.getPassword());
         // 检查登录账号是否存在
-        this.checkExists(Wrappers.<SysUser>lambdaQuery().select(SysUser::getId).eq(SysUser::getUsername, param.getUsername()), "登录账号已存在");
-        param.setSalt(RandomUtil.getCharacterAndNumber(8));
-        param.setPassword(this.encodePassword(param.getUsername(), param.getSalt(), param.getPassword()));
-        ApiAssert.fail(!super.save(param), "用户信息保存失败");
-        if (CollectionUtils.isNotEmpty(param.getRoleIds())) {
-            ApiAssert.fail(!this.assignRoles(param), "角色分配保存失败");
+        this.checkExists(Wrappers.<SysUser>lambdaQuery().select(SysUser::getId).eq(SysUser::getUsername, dto.getUsername()), "登录账号已存在");
+        dto.setSalt(RandomUtil.getCharacterAndNumber(8));
+        dto.setPassword(this.encodePassword(dto.getUsername(), dto.getSalt(), dto.getPassword()));
+        ApiAssert.fail(!super.save(dto), "用户信息保存失败");
+        if (CollectionUtils.isNotEmpty(dto.getRoleIds())) {
+            ApiAssert.fail(!this.assignRoles(dto), "角色分配保存失败");
         }
-        if (CollectionUtils.isNotEmpty(param.getDepartmentIds())) {
-            ApiAssert.fail(!this.assignDepartments(param), "部门分配保存失败");
+        if (CollectionUtils.isNotEmpty(dto.getDepartmentIds())) {
+            ApiAssert.fail(!this.assignDepartments(dto), "部门分配保存失败");
         }
         return true;
     }
@@ -106,39 +106,39 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
         return MD5Salt.encode(username + salt, MD5.toMD5(password));
     }
 
-    protected boolean assignRoles(SysUserParam param) {
+    protected boolean assignRoles(SysUserDTO dto) {
         // 分配角色
-        AssignRolesParam assignRolesParam = new AssignRolesParam();
-        assignRolesParam.setRoleIds(param.getRoleIds());
-        assignRolesParam.setUserIds(Collections.singletonList(param.getId()));
-        return sysUserRoleService.assignRoles(assignRolesParam);
+        AssignRolesDTO ard = new AssignRolesDTO();
+        ard.setRoleIds(dto.getRoleIds());
+        ard.setUserIds(Collections.singletonList(dto.getId()));
+        return sysUserRoleService.assignRoles(ard);
     }
 
-    protected boolean assignDepartments(SysUserParam param) {
+    protected boolean assignDepartments(SysUserDTO sud) {
         // 分配部门
-        AssignDepartmentsParam assignDepartmentsParam = new AssignDepartmentsParam();
-        assignDepartmentsParam.setDepartmentIds(param.getDepartmentIds());
-        assignDepartmentsParam.setUserIds(Collections.singletonList(param.getId()));
-        return sysUserDepartmentService.assignDepartments(assignDepartmentsParam);
+        AssignDepartmentsDTO dto = new AssignDepartmentsDTO();
+        dto.setDepartmentIds(sud.getDepartmentIds());
+        dto.setUserIds(Collections.singletonList(sud.getId()));
+        return sysUserDepartmentService.assignDepartments(dto);
     }
 
     @Override
-    public boolean updateById(SysUserParam param) {
-        ApiAssert.fail(!super.updateById(param), "用户信息保存失败");
+    public boolean updateById(SysUserDTO dto) {
+        ApiAssert.fail(!super.updateById(dto), "用户信息保存失败");
         // 登录账号，密码，盐不允许更新
-        param.setUsername(null);
-        param.setPassword(null);
-        param.setSalt(null);
-        ApiAssert.fail(!this.assignRoles(param), "角色分配保存失败");
-        ApiAssert.fail(!this.assignDepartments(param), "部门分配保存失败");
+        dto.setUsername(null);
+        dto.setPassword(null);
+        dto.setSalt(null);
+        ApiAssert.fail(!this.assignRoles(dto), "角色分配保存失败");
+        ApiAssert.fail(!this.assignDepartments(dto), "部门分配保存失败");
         return true;
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public boolean resetPassword(ResetPasswordParam param) {
-        this.checkPassword(param.getPassword());
-        List<Long> ids = param.getIds();
+    public boolean resetPassword(ResetPasswordDTO dto) {
+        this.checkPassword(dto.getPassword());
+        List<Long> ids = dto.getIds();
         for (Long id : ids) {
             SysUser sysUser = super.getOne(Wrappers.<SysUser>lambdaQuery()
                     .select(SysUser::getUsername, SysUser::getSalt)
@@ -148,7 +148,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser>
             }
             SysUser temp = new SysUser();
             temp.setId(id);
-            temp.setPassword(this.encodePassword(sysUser.getUsername(), sysUser.getSalt(), param.getPassword()));
+            temp.setPassword(this.encodePassword(sysUser.getUsername(), sysUser.getSalt(), dto.getPassword()));
             super.updateById(temp);
         }
         return true;

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ spring:
     username: postgres
     password: 123456
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    url: jdbc:p6spy:postgresql://127.0.0.1:5432/aizuda
+    url: jdbc:p6spy:postgresql://127.0.0.1:5432/aizuda-boot
   # spring boot admin client config
   boot:
     admin:

src/main/resources/mapper/SysUserMapper.xml

@@ -22,5 +22,6 @@
                 AND u.job_num LIKE CONCAT(CONCAT('%',#{vo.jobNum}),'%')
             </if>
         </if>
+        ORDER BY u.update_time DESC
     </select>
 </mapper>