mapper 修改为扫描方式注入

src/main/java/com/aizuda/boot/config/BlockMethodHandlerInterceptor.java

@@ -1,11 +1,10 @@
 package com.aizuda.boot.config;
 
 import com.aizuda.core.api.ApiAssert;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.servlet.AsyncHandlerInterceptor;
-
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.servlet.AsyncHandlerInterceptor;
+
 import java.util.Objects;
 
 /**

src/main/java/com/aizuda/boot/config/BootAutoConfiguration.java

@@ -7,11 +7,13 @@ package com.aizuda.boot.config;
 
 import com.baomidou.kisso.captcha.ImageCaptcha;
 import com.flowlong.bpm.spring.event.TaskEvent;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.EventListener;
 
 @Configuration
+@MapperScan("com.aizuda.boot.modules.*.mapper")
 public class BootAutoConfiguration {
 
     /**

src/main/java/com/aizuda/boot/modules/auth/service/impl/AuthServiceImpl.java

@@ -7,9 +7,9 @@ package com.aizuda.boot.modules.auth.service.impl;
 
 import com.aizuda.boot.modules.auth.param.LoginParam;
 import com.aizuda.boot.modules.auth.service.IAuthService;
-import com.aizuda.core.api.ApiAssert;
 import com.aizuda.boot.modules.system.entity.SysUser;
 import com.aizuda.boot.modules.system.service.ISysUserService;
+import com.aizuda.core.api.ApiAssert;
 import com.baomidou.kisso.common.encrypt.MD5Salt;
 import com.baomidou.kisso.enums.TokenOrigin;
 import com.baomidou.kisso.security.token.SSOToken;

src/main/java/com/aizuda/boot/modules/common/controller/CaptchaController.java

@@ -15,12 +15,12 @@ import com.baomidou.kisso.annotation.LoginIgnore;
 import com.baomidou.kisso.annotation.Permission;
 import com.baomidou.kisso.captcha.ICaptcha;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import jakarta.annotation.Resource;
 import java.io.IOException;
 
 /**

src/main/java/com/aizuda/boot/modules/common/controller/MonitorController.java

@@ -17,6 +17,7 @@ import com.baomidou.kisso.annotation.LoginIgnore;
 import com.baomidou.kisso.annotation.Permission;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -24,7 +25,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import jakarta.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/aizuda/boot/modules/flw/entity/FlwProcessForm.java

@@ -1,17 +1,14 @@
 package com.aizuda.boot.modules.flw.entity;
 
-import com.aizuda.core.bean.BaseEntity;
 import com.aizuda.core.bean.SuperEntity;
 import com.aizuda.core.validation.Create;
 import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.PositiveOrZero;
-import jakarta.validation.constraints.Size;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Setter;
 import lombok.Getter;
+import lombok.Setter;
 
 /**
  * 流程定义表单

src/main/java/com/aizuda/boot/modules/flw/entity/vo/FlwHisTaskVO.java

@@ -1,7 +1,6 @@
 package com.aizuda.boot.modules.flw.entity.vo;
 
 import com.flowlong.bpm.engine.entity.FlwHisTask;
-import com.flowlong.bpm.engine.entity.FlwHisTaskActor;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/com/aizuda/boot/modules/flw/mapper/FlowlongMapper.java

@@ -3,12 +3,10 @@ package com.aizuda.boot.modules.flw.mapper;
 import com.aizuda.boot.modules.flw.entity.dto.ProcessTaskDTO;
 import com.aizuda.boot.modules.flw.entity.vo.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-@Mapper
 public interface FlowlongMapper {
 
     List<FlwProcessVO> selectFlwProcessList();

src/main/java/com/aizuda/boot/modules/flw/mapper/FlwProcessActorMapper.java

@@ -2,7 +2,6 @@ package com.aizuda.boot.modules.flw.mapper;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessActor;
 import com.aizuda.service.mapper.CrudMapper;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2023-09-07
  */
-@Mapper
 public interface FlwProcessActorMapper extends CrudMapper<FlwProcessActor> {
 
 }

src/main/java/com/aizuda/boot/modules/flw/mapper/FlwProcessCategoryMapper.java

@@ -2,7 +2,6 @@ package com.aizuda.boot.modules.flw.mapper;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessCategory;
 import com.aizuda.service.mapper.CrudMapper;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2023-09-07
  */
-@Mapper
 public interface FlwProcessCategoryMapper extends CrudMapper<FlwProcessCategory> {
 
 }

src/main/java/com/aizuda/boot/modules/flw/mapper/FlwProcessConfigureMapper.java

@@ -2,7 +2,6 @@ package com.aizuda.boot.modules.flw.mapper;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessConfigure;
 import com.aizuda.service.mapper.CrudMapper;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2023-09-07
  */
-@Mapper
 public interface FlwProcessConfigureMapper extends CrudMapper<FlwProcessConfigure> {
 
 }

src/main/java/com/aizuda/boot/modules/flw/mapper/FlwProcessFormMapper.java

@@ -2,7 +2,6 @@ package com.aizuda.boot.modules.flw.mapper;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessForm;
 import com.aizuda.service.mapper.CrudMapper;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author hubin
  * @since 2024-02-29
  */
-@Mapper
 public interface FlwProcessFormMapper extends CrudMapper<FlwProcessForm> {
 
 }

src/main/java/com/aizuda/boot/modules/flw/mapper/FlwProcessPermissionMapper.java

@@ -2,7 +2,6 @@ package com.aizuda.boot.modules.flw.mapper;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessPermission;
 import com.aizuda.service.mapper.CrudMapper;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2023-09-07
  */
-@Mapper
 public interface FlwProcessPermissionMapper extends CrudMapper<FlwProcessPermission> {
 
 }

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

@@ -1,8 +1,8 @@
 package com.aizuda.boot.modules.flw.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.flw.entity.FlwProcessApproval;
+import com.aizuda.service.service.IBaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 /**
  * 流程审批记录 服务类

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

@@ -1,8 +1,7 @@
 package com.aizuda.boot.modules.flw.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.flw.entity.FlwProcessForm;
+import com.aizuda.service.service.IBaseService;
 
 /**
  * 流程定义表单 服务类

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

@@ -11,7 +11,6 @@ import com.aizuda.boot.modules.flw.entity.vo.ProcessTaskVO;
 import com.aizuda.core.api.PageParam;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.flowlong.bpm.engine.core.FlowCreator;
-import com.flowlong.bpm.engine.entity.FlwTaskActor;
 
 import java.util.List;
 

src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessApprovalServiceImpl.java

@@ -1,9 +1,9 @@
 package com.aizuda.boot.modules.flw.service.impl;
 
-import com.aizuda.core.api.ApiAssert;
 import com.aizuda.boot.modules.flw.entity.FlwProcessApproval;
 import com.aizuda.boot.modules.flw.mapper.FlwProcessApprovalMapper;
 import com.aizuda.boot.modules.flw.service.IFlwProcessApprovalService;
+import com.aizuda.core.api.ApiAssert;
 import com.aizuda.service.service.BaseServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

src/main/java/com/aizuda/boot/modules/flw/service/impl/ProcessTaskServiceImpl.java

@@ -10,12 +10,10 @@ import com.aizuda.boot.modules.flw.service.IProcessTaskService;
 import com.aizuda.core.api.ApiAssert;
 import com.aizuda.core.api.PageParam;
 import com.aizuda.service.web.UserSession;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.flowlong.bpm.engine.FlowLongEngine;
 import com.flowlong.bpm.engine.TaskService;
 import com.flowlong.bpm.engine.core.FlowCreator;
-import com.flowlong.bpm.engine.entity.FlwHisTaskActor;
 import com.flowlong.bpm.engine.entity.FlwTask;
 import com.flowlong.bpm.engine.entity.FlwTaskActor;
 import com.flowlong.bpm.mybatisplus.mapper.FlwHisTaskActorMapper;

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

@@ -5,12 +5,12 @@
  */
 package com.aizuda.boot.modules.system.controller;
 
+import com.aizuda.boot.modules.system.entity.SysApp;
 import com.aizuda.boot.modules.system.service.ISysAppService;
 import com.aizuda.core.api.ApiController;
 import com.aizuda.core.api.PageParam;
 import com.aizuda.core.validation.Create;
 import com.aizuda.core.validation.Update;
-import com.aizuda.boot.modules.system.entity.SysApp;
 import com.baomidou.kisso.annotation.Permission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;

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

@@ -5,12 +5,12 @@
  */
 package com.aizuda.boot.modules.system.controller;
 
+import com.aizuda.boot.modules.system.entity.SysConfigure;
 import com.aizuda.boot.modules.system.service.ISysConfigureService;
 import com.aizuda.core.api.ApiController;
 import com.aizuda.core.api.PageParam;
 import com.aizuda.core.validation.Create;
 import com.aizuda.core.validation.Update;
-import com.aizuda.boot.modules.system.entity.SysConfigure;
 import com.baomidou.kisso.annotation.Permission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;

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

@@ -5,12 +5,12 @@
  */
 package com.aizuda.boot.modules.system.controller;
 
+import com.aizuda.boot.modules.system.entity.SysDict;
 import com.aizuda.boot.modules.system.service.ISysDictService;
 import com.aizuda.core.api.ApiController;
 import com.aizuda.core.api.PageParam;
 import com.aizuda.core.validation.Create;
 import com.aizuda.core.validation.Update;
-import com.aizuda.boot.modules.system.entity.SysDict;
 import com.baomidou.kisso.annotation.Permission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;

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

@@ -5,12 +5,12 @@
  */
 package com.aizuda.boot.modules.system.controller;
 
+import com.aizuda.boot.modules.system.entity.SysPost;
 import com.aizuda.boot.modules.system.service.ISysPostService;
 import com.aizuda.core.api.ApiController;
 import com.aizuda.core.api.PageParam;
 import com.aizuda.core.validation.Create;
 import com.aizuda.core.validation.Update;
-import com.aizuda.boot.modules.system.entity.SysPost;
 import com.baomidou.kisso.annotation.Permission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;

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

@@ -8,13 +8,13 @@ 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.vo.ResourceTreeVO;
 import com.aizuda.boot.modules.system.service.ISysResourceApiService;
 import com.aizuda.boot.modules.system.service.ISysResourceService;
 import com.aizuda.core.api.ApiController;
 import com.aizuda.core.api.PageParam;
 import com.aizuda.core.validation.Create;
 import com.aizuda.core.validation.Update;
-import com.aizuda.boot.modules.system.entity.vo.ResourceTreeVO;
 import com.aizuda.service.web.UserSession;
 import com.baomidou.kisso.annotation.Permission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -5,6 +5,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.service.ISysRoleResourceService;
 import com.aizuda.boot.modules.system.service.ISysRoleService;
@@ -12,7 +13,6 @@ import com.aizuda.core.api.ApiController;
 import com.aizuda.core.api.PageParam;
 import com.aizuda.core.validation.Create;
 import com.aizuda.core.validation.Update;
-import com.aizuda.boot.modules.system.entity.SysRole;
 import com.aizuda.service.vo.TreeVO;
 import com.baomidou.kisso.annotation.Permission;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -1,21 +1,20 @@
 package com.aizuda.boot.modules.system.entity;
 
 import com.aizuda.core.ApiConstants;
-import com.aizuda.core.bean.BaseEntity;
 import com.aizuda.core.bean.SuperEntity;
 import com.aizuda.core.validation.Create;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.PositiveOrZero;
 import jakarta.validation.constraints.Size;
-import java.util.Date;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Setter;
 import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
 
 /**
  * 系统消息表

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysApp;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 
 /**
  * <p>
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2022-02-19
  */
-@Mapper
 public interface SysAppMapper extends CrudMapper<SysApp> {
 
 }

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysConfigure;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 
 /**
  * <p>
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2022-02-19
  */
-@Mapper
 public interface SysConfigureMapper extends CrudMapper<SysConfigure> {
 
 }

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysDepartment;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -21,7 +20,6 @@ import java.util.List;
  * @author 青苗
  * @since 2021-11-07
  */
-@Mapper
 public interface SysDepartmentMapper extends CrudMapper<SysDepartment> {
 
     /**

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysDict;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 
 /**
  * <p>
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2021-11-07
  */
-@Mapper
 public interface SysDictMapper extends CrudMapper<SysDict> {
 
 }

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

@@ -2,7 +2,6 @@ package com.aizuda.boot.modules.system.mapper;
 
 import com.aizuda.boot.modules.system.entity.SysMessage;
 import com.aizuda.service.mapper.CrudMapper;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,7 +11,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2023-10-03
  */
-@Mapper
 public interface SysMessageMapper extends CrudMapper<SysMessage> {
 
 }

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysPost;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 
 /**
  * <p>
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2022-02-18
  */
-@Mapper
 public interface SysPostMapper extends CrudMapper<SysPost> {
 
 }

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysRegion;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 
 /**
  * <p>
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2022-02-22
  */
-@Mapper
 public interface SysRegionMapper extends CrudMapper<SysRegion> {
 
 }

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysResourceApi;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -20,7 +19,6 @@ import java.util.List;
  * @author 青苗
  * @since 2022-02-26
  */
-@Mapper
 public interface SysResourceApiMapper extends CrudMapper<SysResourceApi> {
 
     @Select("SELECT DISTINCT a.code FROM sys_resource_api a JOIN sys_role_resource s ON a.resource_id=s.resource_id JOIN sys_user_role r ON s.role_id=r.role_id WHERE r.user_id=#{userId}")

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysResource;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -20,14 +19,12 @@ import java.util.List;
  * @author 青苗
  * @since 2021-11-07
  */
-@Mapper
 public interface SysResourceMapper extends CrudMapper<SysResource> {
 
     /**
      * 根据用户ID查询权限列表
      *
      * @param userId 用户ID
-     * @return
      */
     @Select("SELECT r.* FROM sys_resource r WHERE EXISTS (SELECT 1 FROM sys_role_resource s JOIN sys_user_role t ON s.role_id=t.role_id WHERE t.user_id=#{userId} AND r.id=s.resource_id) AND type<3 AND r.deleted=0 AND r.status=1 ORDER BY sort DESC")
     List<SysResource> selectMenuByUserId(Long userId);

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysRole;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 
 /**
  * <p>
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2021-11-03
  */
-@Mapper
 public interface SysRoleMapper extends CrudMapper<SysRole> {
 
 }

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysRoleResource;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 
 /**
  * <p>
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2021-11-07
  */
-@Mapper
 public interface SysRoleResourceMapper extends CrudMapper<SysRoleResource> {
 
 }

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

@@ -7,7 +7,6 @@ package com.aizuda.boot.modules.system.mapper;
 
 import com.aizuda.boot.modules.system.entity.SysUserDepartment;
 import com.aizuda.service.mapper.CrudMapper;
-import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2023-10-08
  */
-@Mapper
 public interface SysUserDepartmentMapper extends CrudMapper<SysUserDepartment> {
 
 }

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

@@ -5,15 +5,11 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysUser;
 import com.aizuda.boot.modules.system.entity.vo.SysUserVO;
+import com.aizuda.service.mapper.CrudMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
 
 /**
  * <p>
@@ -23,7 +19,6 @@ import java.util.List;
  * @author 青苗
  * @since 2021-11-03
  */
-@Mapper
 public interface SysUserMapper extends CrudMapper<SysUser> {
 
     Page<SysUser> selectPageByVO(Page page, @Param("vo") SysUserVO vo);

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

@@ -5,9 +5,8 @@
  */
 package com.aizuda.boot.modules.system.mapper;
 
-import com.aizuda.service.mapper.CrudMapper;
 import com.aizuda.boot.modules.system.entity.SysUserRole;
-import org.apache.ibatis.annotations.Mapper;
+import com.aizuda.service.mapper.CrudMapper;
 
 /**
  * <p>
@@ -17,7 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author 青苗
  * @since 2021-11-03
  */
-@Mapper
 public interface SysUserRoleMapper extends CrudMapper<SysUserRole> {
 
 }

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

@@ -5,8 +5,8 @@
  */
 package com.aizuda.boot.modules.system.service;
 
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.system.entity.SysApp;
+import com.aizuda.service.service.IBaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 /**

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

@@ -5,8 +5,8 @@
  */
 package com.aizuda.boot.modules.system.service;
 
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.system.entity.SysConfigure;
+import com.aizuda.service.service.IBaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 /**

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

@@ -5,8 +5,8 @@
  */
 package com.aizuda.boot.modules.system.service;
 
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.system.entity.SysDict;
+import com.aizuda.service.service.IBaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;

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

@@ -1,10 +1,10 @@
 package com.aizuda.boot.modules.system.service;
 
+import com.aizuda.boot.modules.system.entity.SysMessage;
 import com.aizuda.boot.modules.system.entity.vo.InformMessageVO;
+import com.aizuda.service.service.IBaseService;
 import com.aizuda.service.web.UserSession;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.aizuda.service.service.IBaseService;
-import com.aizuda.boot.modules.system.entity.SysMessage;
 
 /**
  * 系统消息表 服务类

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

@@ -5,8 +5,8 @@
  */
 package com.aizuda.boot.modules.system.service;
 
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.system.entity.SysPost;
+import com.aizuda.service.service.IBaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 /**

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

@@ -5,9 +5,9 @@
  */
 package com.aizuda.boot.modules.system.service;
 
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.system.entity.SysRegion;
 import com.aizuda.boot.modules.system.entity.vo.SysRegionVO;
+import com.aizuda.service.service.IBaseService;
 
 import java.util.List;
 

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

@@ -5,8 +5,8 @@
  */
 package com.aizuda.boot.modules.system.service;
 
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.system.entity.SysResourceApi;
+import com.aizuda.service.service.IBaseService;
 
 import java.util.List;
 

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

@@ -5,10 +5,10 @@
  */
 package com.aizuda.boot.modules.system.service;
 
-import com.aizuda.boot.modules.system.entity.param.ResourceParam;
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.system.entity.SysResource;
+import com.aizuda.boot.modules.system.entity.param.ResourceParam;
 import com.aizuda.boot.modules.system.entity.vo.ResourceTreeVO;
+import com.aizuda.service.service.IBaseService;
 import com.aizuda.service.web.UserSession;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 

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

@@ -5,9 +5,9 @@
  */
 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.service.service.IBaseService;
-import com.aizuda.boot.modules.system.entity.SysRoleResource;
 
 import java.util.List;
 

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

@@ -5,8 +5,8 @@
  */
 package com.aizuda.boot.modules.system.service;
 
-import com.aizuda.service.service.IBaseService;
 import com.aizuda.boot.modules.system.entity.SysRole;
+import com.aizuda.service.service.IBaseService;
 import com.aizuda.service.vo.TreeVO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 

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

@@ -5,7 +5,6 @@
  */
 package com.aizuda.boot.modules.system.service;
 
-import com.aizuda.boot.modules.system.entity.SysUserDepartment;
 import com.aizuda.boot.modules.system.entity.SysUserDepartment;
 import com.aizuda.boot.modules.system.entity.param.AssignDepartmentsParam;
 import com.aizuda.service.service.IBaseService;

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

@@ -5,9 +5,9 @@
  */
 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.service.service.IBaseService;
-import com.aizuda.boot.modules.system.entity.SysUserRole;
 
 import java.util.List;
 

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

@@ -5,12 +5,12 @@
  */
 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.vo.SysUserRelIdsVO;
-import com.aizuda.service.service.IBaseService;
-import com.aizuda.boot.modules.system.entity.SysUser;
 import com.aizuda.boot.modules.system.entity.vo.SysUserVO;
+import com.aizuda.service.service.IBaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;

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

@@ -5,10 +5,10 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
+import com.aizuda.boot.modules.system.entity.SysApp;
 import com.aizuda.boot.modules.system.mapper.SysAppMapper;
 import com.aizuda.boot.modules.system.service.ISysAppService;
 import com.aizuda.service.service.BaseServiceImpl;
-import com.aizuda.boot.modules.system.entity.SysApp;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -5,10 +5,10 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
+import com.aizuda.boot.modules.system.entity.SysConfigure;
 import com.aizuda.boot.modules.system.mapper.SysConfigureMapper;
 import com.aizuda.boot.modules.system.service.ISysConfigureService;
 import com.aizuda.service.service.BaseServiceImpl;
-import com.aizuda.boot.modules.system.entity.SysConfigure;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -5,11 +5,11 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
+import com.aizuda.boot.modules.system.entity.SysDict;
 import com.aizuda.boot.modules.system.mapper.SysDictMapper;
 import com.aizuda.boot.modules.system.service.ISysDictService;
 import com.aizuda.core.api.ApiAssert;
 import com.aizuda.service.service.BaseServiceImpl;
-import com.aizuda.boot.modules.system.entity.SysDict;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -5,10 +5,10 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
+import com.aizuda.boot.modules.system.entity.SysPost;
 import com.aizuda.boot.modules.system.mapper.SysPostMapper;
 import com.aizuda.boot.modules.system.service.ISysPostService;
 import com.aizuda.service.service.BaseServiceImpl;
-import com.aizuda.boot.modules.system.entity.SysPost;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

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

@@ -5,10 +5,10 @@
  */
 package com.aizuda.boot.modules.system.service.impl;
 
+import com.aizuda.boot.modules.system.entity.SysResourceApi;
 import com.aizuda.boot.modules.system.mapper.SysResourceApiMapper;
 import com.aizuda.boot.modules.system.service.ISysResourceApiService;
 import com.aizuda.service.service.BaseServiceImpl;
-import com.aizuda.boot.modules.system.entity.SysResourceApi;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 

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

@@ -31,7 +31,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;