BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 4ba064d8b3e4ed1cc7b15fdda50ca4880bf1cbcc

Authored by jason
1 parent 9d6a0469

抽取 activiti 到module-bpm-activiti, 为接入flowable 准备

Inline Side-by-side
Showing 232 changed files with 873 additions and 811 deletions
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
13 <module>yudao-admin-server</module> 13 <module>yudao-admin-server</module>
14 <module>yudao-user-server</module> 14 <module>yudao-user-server</module>
15 <module>yudao-core-service</module> 15 <module>yudao-core-service</module>
  16 + <module>yudao-module-bpm</module>
16 </modules> 17 </modules>
17 18
18 <name>${artifactId}</name> 19 <name>${artifactId}</name>
yudao-admin-server/pom.xml
  View file @4ba064d
@@ -44,9 +44,10 @@ @@ -44,9 +44,10 @@
44 <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId> 44 <artifactId>yudao-spring-boot-starter-biz-data-permission</artifactId>
45 </dependency> 45 </dependency>
46 46
  47 + <!-- 默认引入bpm-activiti. 可以替换为bpm-flowable -->
47 <dependency> 48 <dependency>
48 <groupId>cn.iocoder.boot</groupId> 49 <groupId>cn.iocoder.boot</groupId>
49 - <artifactId>yudao-spring-boot-starter-activiti</artifactId> 50 + <artifactId>yudao-module-bpm-activiti</artifactId>
50 </dependency> 51 </dependency>
51 52
52 <!-- Web 相关 --> 53 <!-- Web 相关 -->
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/config/vo/InfConfigExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.infra.controller.config.vo;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apiaccesslog/InfApiAccessLogExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiacces @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apiacces
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/infra/controller/logger/vo/apierrorlog/InfApiErrorLogExcelVO.java
  View file @4ba064d
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierror @@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.infra.controller.logger.vo.apierror
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants; 5 import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants;
6 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 6 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
7 import com.alibaba.excel.annotation.ExcelProperty; 7 import com.alibaba.excel.annotation.ExcelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 9
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/order/vo/order/PayOrderExcelVO.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.pay.controller.order.vo.order; 1 package cn.iocoder.yudao.adminserver.modules.pay.controller.order.vo.order;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 3 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
4 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 4 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
5 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 5 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/controller/order/vo/refund/vo/PayRefundExcelVO.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.pay.controller.order.vo.refund.vo; 1 package cn.iocoder.yudao.adminserver.modules.pay.controller.order.vo.refund.vo;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 3 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
4 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 4 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
5 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 5 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/pay/convert/app/PayAppConvert.java
  View file @4ba064d
@@ -2,8 +2,6 @@ package cn.iocoder.yudao.adminserver.modules.pay.convert.app; @@ -2,8 +2,6 @@ package cn.iocoder.yudao.adminserver.modules.pay.convert.app;
2 2
3 import java.util.*; 3 import java.util.*;
4 4
5 -import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserPageItemRespVO;  
6 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
7 import cn.iocoder.yudao.coreservice.modules.pay.dal.dataobject.merchant.PayAppDO; 5 import cn.iocoder.yudao.coreservice.modules.pay.dal.dataobject.merchant.PayAppDO;
8 import cn.iocoder.yudao.coreservice.modules.pay.dal.dataobject.merchant.PayMerchantDO; 6 import cn.iocoder.yudao.coreservice.modules.pay.dal.dataobject.merchant.PayMerchantDO;
9 import cn.iocoder.yudao.framework.common.pojo.PageResult; 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/auth/SysAuthController.java
  View file @4ba064d
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.auth; @@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.auth;
3 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.*; 3 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.*;
4 import cn.iocoder.yudao.adminserver.modules.system.convert.auth.SysAuthConvert; 4 import cn.iocoder.yudao.adminserver.modules.system.convert.auth.SysAuthConvert;
5 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysMenuDO; 5 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysMenuDO;
6 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 6 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
7 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.MenuTypeEnum; 7 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.MenuTypeEnum;
8 import cn.iocoder.yudao.adminserver.modules.system.service.auth.SysAuthService; 8 import cn.iocoder.yudao.adminserver.modules.system.service.auth.SysAuthService;
9 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService; 9 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/auth/SysUserSessionController.java
  View file @4ba064d
@@ -3,13 +3,15 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.auth; @@ -3,13 +3,15 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.auth;
3 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.session.SysUserSessionPageItemRespVO; 3 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.session.SysUserSessionPageItemRespVO;
4 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO; 4 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
5 import cn.iocoder.yudao.adminserver.modules.system.convert.auth.SysUserSessionConvert; 5 import cn.iocoder.yudao.adminserver.modules.system.convert.auth.SysUserSessionConvert;
6 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 6 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
7 import cn.iocoder.yudao.adminserver.modules.system.service.auth.SysUserSessionService; 7 import cn.iocoder.yudao.adminserver.modules.system.service.auth.SysUserSessionService;
8 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService; 8 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;
9 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 9 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService;
10 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.auth.SysUserSessionDO; 10 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.auth.SysUserSessionDO;
11 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 11 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
12 import cn.iocoder.yudao.coreservice.modules.system.service.auth.SysUserSessionCoreService; 12 import cn.iocoder.yudao.coreservice.modules.system.service.auth.SysUserSessionCoreService;
  13 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  14 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
13 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 15 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
14 import cn.iocoder.yudao.framework.common.pojo.PageResult; 16 import cn.iocoder.yudao.framework.common.pojo.PageResult;
15 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 17 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
@@ -38,9 +40,10 @@ public class SysUserSessionController { @@ -38,9 +40,10 @@ public class SysUserSessionController {
38 @Resource 40 @Resource
39 private SysUserSessionCoreService userSessionCoreService; 41 private SysUserSessionCoreService userSessionCoreService;
40 @Resource 42 @Resource
41 - private SysUserService userService; 43 + private SysUserCoreService userCoreService;
  44 +
42 @Resource 45 @Resource
43 - private SysDeptService deptService; 46 + private SysDeptCoreService deptCoreService;
44 47
45 @GetMapping("/page") 48 @GetMapping("/page")
46 @ApiOperation("获得 Session 分页列表") 49 @ApiOperation("获得 Session 分页列表")
@@ -50,9 +53,9 @@ public class SysUserSessionController { @@ -50,9 +53,9 @@ public class SysUserSessionController {
50 PageResult<SysUserSessionDO> pageResult = userSessionService.getUserSessionPage(reqVO); 53 PageResult<SysUserSessionDO> pageResult = userSessionService.getUserSessionPage(reqVO);
51 54
52 // 获得拼接需要的数据 55 // 获得拼接需要的数据
53 - Map<Long, SysUserDO> userMap = userService.getUserMap( 56 + Map<Long, SysUserDO> userMap = userCoreService.getUserMap(
54 convertList(pageResult.getList(), SysUserSessionDO::getUserId)); 57 convertList(pageResult.getList(), SysUserSessionDO::getUserId));
55 - Map<Long, SysDeptDO> deptMap = deptService.getDeptMap( 58 + Map<Long, SysDeptDO> deptMap = deptCoreService.getDeptMap(
56 convertList(userMap.values(), SysUserDO::getDeptId)); 59 convertList(userMap.values(), SysUserDO::getDeptId));
57 // 拼接结果返回 60 // 拼接结果返回
58 List<SysUserSessionPageItemRespVO> sessionList = new ArrayList<>(pageResult.getList().size()); 61 List<SysUserSessionPageItemRespVO> sessionList = new ArrayList<>(pageResult.getList().size());
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/dept/SysDeptController.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.system.controller.dept; 1 package cn.iocoder.yudao.adminserver.modules.system.controller.dept;
2 2
  3 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.*; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.*;
6 import cn.iocoder.yudao.adminserver.modules.system.convert.dept.SysDeptConvert; 7 import cn.iocoder.yudao.adminserver.modules.system.convert.dept.SysDeptConvert;
7 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 8 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
8 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService; 9 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;
9 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiImplicitParam; 11 import io.swagger.annotations.ApiImplicitParam;
@@ -29,6 +30,9 @@ public class SysDeptController { @@ -29,6 +30,9 @@ public class SysDeptController {
29 @Resource 30 @Resource
30 private SysDeptService deptService; 31 private SysDeptService deptService;
31 32
  33 + @Resource
  34 + private SysDeptCoreService deptCoreService;
  35 +
32 @PostMapping("create") 36 @PostMapping("create")
33 @ApiOperation("创建部门") 37 @ApiOperation("创建部门")
34 @PreAuthorize("@ss.hasPermission('system:dept:create')") 38 @PreAuthorize("@ss.hasPermission('system:dept:create')")
@@ -80,7 +84,7 @@ public class SysDeptController { @@ -80,7 +84,7 @@ public class SysDeptController {
80 @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) 84 @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
81 @PreAuthorize("@ss.hasPermission('system:dept:query')") 85 @PreAuthorize("@ss.hasPermission('system:dept:query')")
82 public CommonResult<SysDeptRespVO> getDept(@RequestParam("id") Long id) { 86 public CommonResult<SysDeptRespVO> getDept(@RequestParam("id") Long id) {
83 - return success(SysDeptConvert.INSTANCE.convert(deptService.getDept(id))); 87 + return success(SysDeptConvert.INSTANCE.convert(deptCoreService.getDept(id)));
84 } 88 }
85 89
86 } 90 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/dept/SysPostController.java
  View file @4ba064d
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; @@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
8 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.*; 8 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.*;
9 import cn.iocoder.yudao.adminserver.modules.system.convert.dept.SysPostConvert; 9 import cn.iocoder.yudao.adminserver.modules.system.convert.dept.SysPostConvert;
10 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO; 10 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
11 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService; 11 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService;
12 import io.swagger.annotations.Api; 12 import io.swagger.annotations.Api;
13 import io.swagger.annotations.ApiImplicitParam; 13 import io.swagger.annotations.ApiImplicitParam;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/dept/vo/post/SysPostExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/dict/vo/data/SysDictDataExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.dict.vo.data; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.dict.vo.data;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/dict/vo/type/SysDictTypeExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.dict.vo.type; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.dict.vo.type;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/logger/SysOperateLogController.java
  View file @4ba064d
@@ -9,6 +9,7 @@ import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.logger.SysOper @@ -9,6 +9,7 @@ import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.logger.SysOper
9 import cn.iocoder.yudao.adminserver.modules.system.service.logger.SysOperateLogService; 9 import cn.iocoder.yudao.adminserver.modules.system.service.logger.SysOperateLogService;
10 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 10 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService;
11 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 11 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  12 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
12 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 13 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
13 import cn.iocoder.yudao.framework.common.pojo.PageResult; 14 import cn.iocoder.yudao.framework.common.pojo.PageResult;
14 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 15 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -44,7 +45,7 @@ public class SysOperateLogController { @@ -44,7 +45,7 @@ public class SysOperateLogController {
44 @Resource 45 @Resource
45 private SysOperateLogService operateLogService; 46 private SysOperateLogService operateLogService;
46 @Resource 47 @Resource
47 - private SysUserService userService; 48 + private SysUserCoreService userCoreService;
48 49
49 @GetMapping("/page") 50 @GetMapping("/page")
50 @ApiOperation("查看操作日志分页列表") 51 @ApiOperation("查看操作日志分页列表")
@@ -54,7 +55,7 @@ public class SysOperateLogController { @@ -54,7 +55,7 @@ public class SysOperateLogController {
54 55
55 // 获得拼接需要的数据 56 // 获得拼接需要的数据
56 Collection<Long> userIds = CollectionUtils.convertList(pageResult.getList(), SysOperateLogDO::getUserId); 57 Collection<Long> userIds = CollectionUtils.convertList(pageResult.getList(), SysOperateLogDO::getUserId);
57 - Map<Long, SysUserDO> userMap = userService.getUserMap(userIds); 58 + Map<Long, SysUserDO> userMap = userCoreService.getUserMap(userIds);
58 // 拼接数据 59 // 拼接数据
59 List<SysOperateLogRespVO> list = new ArrayList<>(pageResult.getList().size()); 60 List<SysOperateLogRespVO> list = new ArrayList<>(pageResult.getList().size());
60 pageResult.getList().forEach(operateLog -> { 61 pageResult.getList().forEach(operateLog -> {
@@ -75,7 +76,7 @@ public class SysOperateLogController { @@ -75,7 +76,7 @@ public class SysOperateLogController {
75 76
76 // 获得拼接需要的数据 77 // 获得拼接需要的数据
77 Collection<Long> userIds = CollectionUtils.convertList(list, SysOperateLogDO::getUserId); 78 Collection<Long> userIds = CollectionUtils.convertList(list, SysOperateLogDO::getUserId);
78 - Map<Long, SysUserDO> userMap = userService.getUserMap(userIds); 79 + Map<Long, SysUserDO> userMap = userCoreService.getUserMap(userIds);
79 // 拼接数据 80 // 拼接数据
80 List<SysOperateLogExcelVO> excelDataList = SysOperateLogConvert.INSTANCE.convertList(list, userMap); 81 List<SysOperateLogExcelVO> excelDataList = SysOperateLogConvert.INSTANCE.convertList(list, userMap);
81 // 输出 82 // 输出
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/logger/vo/loginlog/SysLoginLogExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.logger.vo.loginlo @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.logger.vo.loginlo
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/logger/vo/operatelog/SysOperateLogExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.logger.vo.operate @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.logger.vo.operate
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/permission/SysRoleController.java
  View file @4ba064d
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; @@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 7 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
8 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.*; 8 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.*;
9 import cn.iocoder.yudao.adminserver.modules.system.convert.permission.SysRoleConvert; 9 import cn.iocoder.yudao.adminserver.modules.system.convert.permission.SysRoleConvert;
10 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 10 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
11 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysRoleService; 11 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysRoleService;
12 import io.swagger.annotations.Api; 12 import io.swagger.annotations.Api;
13 import io.swagger.annotations.ApiImplicitParam; 13 import io.swagger.annotations.ApiImplicitParam;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/permission/vo/role/SysRoleExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.rol @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.rol
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/sms/vo/log/SysSmsLogExcelVO.java
  View file @4ba064d
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.sms.vo.log; @@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.sms.vo.log;
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.yudao.framework.excel.core.convert.JsonConvert; 5 import cn.iocoder.yudao.framework.excel.core.convert.JsonConvert;
6 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 6 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
7 import com.alibaba.excel.annotation.ExcelProperty; 7 import com.alibaba.excel.annotation.ExcelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 9
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/sms/vo/template/SysSmsTemplateExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.sms.vo.template; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.sms.vo.template;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/user/SysUserController.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.system.controller.user; 1 package cn.iocoder.yudao.adminserver.modules.system.controller.user;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 -import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptListReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptSimpleRespVO;  
6 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*; 4 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*;
7 -import cn.iocoder.yudao.adminserver.modules.system.convert.dept.SysDeptConvert;  
8 import cn.iocoder.yudao.adminserver.modules.system.convert.user.SysUserConvert; 5 import cn.iocoder.yudao.adminserver.modules.system.convert.user.SysUserConvert;
9 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
10 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService; 6 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
11 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 7 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService;
12 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 8 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
13 import cn.iocoder.yudao.coreservice.modules.system.enums.common.SysSexEnum; 9 import cn.iocoder.yudao.coreservice.modules.system.enums.common.SysSexEnum;
  10 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
14 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService; 11 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
15 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 12 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
16 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 13 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
17 import cn.iocoder.yudao.framework.common.pojo.PageResult; 14 import cn.iocoder.yudao.framework.common.pojo.PageResult;
18 -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;  
19 import cn.iocoder.yudao.framework.common.util.collection.MapUtils; 15 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
20 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; 16 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
21 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 17 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
@@ -50,7 +46,7 @@ public class SysUserController { @@ -50,7 +46,7 @@ public class SysUserController {
50 @Resource 46 @Resource
51 private SysUserCoreService userCoreService; 47 private SysUserCoreService userCoreService;
52 @Resource 48 @Resource
53 - private SysDeptService deptService; 49 + private SysDeptCoreService deptCoreService;
54 50
55 @PostMapping("/create") 51 @PostMapping("/create")
56 @ApiOperation("新增用户") 52 @ApiOperation("新增用户")
@@ -105,7 +101,7 @@ public class SysUserController { @@ -105,7 +101,7 @@ public class SysUserController {
105 101
106 // 获得拼接需要的数据 102 // 获得拼接需要的数据
107 Collection<Long> deptIds = convertList(pageResult.getList(), SysUserDO::getDeptId); 103 Collection<Long> deptIds = convertList(pageResult.getList(), SysUserDO::getDeptId);
108 - Map<Long, SysDeptDO> deptMap = deptService.getDeptMap(deptIds); 104 + Map<Long, SysDeptDO> deptMap = deptCoreService.getDeptMap(deptIds);
109 // 拼接结果返回 105 // 拼接结果返回
110 List<SysUserPageItemRespVO> userList = new ArrayList<>(pageResult.getList().size()); 106 List<SysUserPageItemRespVO> userList = new ArrayList<>(pageResult.getList().size());
111 pageResult.getList().forEach(user -> { 107 pageResult.getList().forEach(user -> {
@@ -144,8 +140,8 @@ public class SysUserController { @@ -144,8 +140,8 @@ public class SysUserController {
144 140
145 // 获得拼接需要的数据 141 // 获得拼接需要的数据
146 Collection<Long> deptIds = convertList(users, SysUserDO::getDeptId); 142 Collection<Long> deptIds = convertList(users, SysUserDO::getDeptId);
147 - Map<Long, SysDeptDO> deptMap = deptService.getDeptMap(deptIds);  
148 - Map<Long, SysUserDO> deptLeaderUserMap = userService.getUserMap(convertSet(deptMap.values(), SysDeptDO::getLeaderUserId)); 143 + Map<Long, SysDeptDO> deptMap = deptCoreService.getDeptMap(deptIds);
  144 + Map<Long, SysUserDO> deptLeaderUserMap = userCoreService.getUserMap(convertSet(deptMap.values(), SysDeptDO::getLeaderUserId));
149 // 拼接数据 145 // 拼接数据
150 List<SysUserExcelVO> excelUsers = new ArrayList<>(users.size()); 146 List<SysUserExcelVO> excelUsers = new ArrayList<>(users.size());
151 users.forEach(user -> { 147 users.forEach(user -> {
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/user/SysUserProfileController.java
  View file @4ba064d
@@ -5,16 +5,16 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.Sy @@ -5,16 +5,16 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.Sy
5 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; 5 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO;
6 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO;
7 import cn.iocoder.yudao.adminserver.modules.system.convert.user.SysUserConvert; 7 import cn.iocoder.yudao.adminserver.modules.system.convert.user.SysUserConvert;
8 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
9 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO;  
10 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO;  
11 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
12 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService; 8 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService;
13 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService; 9 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;
14 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysRoleService; 10 import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysRoleService;
15 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 11 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService;
  12 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
  13 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
  14 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
16 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.social.SysSocialUserDO; 15 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.social.SysSocialUserDO;
17 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 16 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  17 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
18 import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialCoreService; 18 import cn.iocoder.yudao.coreservice.modules.system.service.social.SysSocialCoreService;
19 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService; 19 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
20 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 20 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
@@ -48,7 +48,8 @@ public class SysUserProfileController { @@ -48,7 +48,8 @@ public class SysUserProfileController {
48 @Resource 48 @Resource
49 private SysUserCoreService userCoreService; 49 private SysUserCoreService userCoreService;
50 @Resource 50 @Resource
51 - private SysDeptService deptService; 51 + private SysDeptCoreService deptCoreService;
  52 +
52 @Resource 53 @Resource
53 private SysPostService postService; 54 private SysPostService postService;
54 @Resource 55 @Resource
@@ -69,7 +70,7 @@ public class SysUserProfileController { @@ -69,7 +70,7 @@ public class SysUserProfileController {
69 resp.setRoles(SysUserConvert.INSTANCE.convertList(userRoles)); 70 resp.setRoles(SysUserConvert.INSTANCE.convertList(userRoles));
70 // 获得部门信息 71 // 获得部门信息
71 if (user.getDeptId() != null) { 72 if (user.getDeptId() != null) {
72 - SysDeptDO dept = deptService.getDept(user.getDeptId()); 73 + SysDeptDO dept = deptCoreService.getDept(user.getDeptId());
73 resp.setDept(SysUserConvert.INSTANCE.convert02(dept)); 74 resp.setDept(SysUserConvert.INSTANCE.convert02(dept));
74 } 75 }
75 // 获得岗位信息 76 // 获得岗位信息
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/user/vo/user/SysUserExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.Data; 7 import lombok.Data;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/controller/user/vo/user/SysUserImportExcelVO.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user;
2 2
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 5 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
6 import com.alibaba.excel.annotation.ExcelProperty; 6 import com.alibaba.excel.annotation.ExcelProperty;
7 import lombok.AllArgsConstructor; 7 import lombok.AllArgsConstructor;
8 import lombok.Builder; 8 import lombok.Builder;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/convert/auth/SysAuthConvert.java
  View file @4ba064d
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.system.convert.auth; @@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.system.convert.auth;
3 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO; 3 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO;
4 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAuthPermissionInfoRespVO; 4 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAuthPermissionInfoRespVO;
5 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysMenuDO; 5 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysMenuDO;
6 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 6 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
7 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.MenuIdEnum; 7 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.MenuIdEnum;
8 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 8 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
9 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum; 9 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/convert/dept/SysDeptConvert.java
  View file @4ba064d
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDe @@ -4,7 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDe
4 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptRespVO; 4 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptRespVO;
5 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptSimpleRespVO; 5 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptSimpleRespVO;
6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
7 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 7 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
8 import org.mapstruct.Mapper; 8 import org.mapstruct.Mapper;
9 import org.mapstruct.factory.Mappers; 9 import org.mapstruct.factory.Mappers;
10 10
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/convert/dept/SysPostConvert.java
  View file @4ba064d
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.convert.dept; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.system.convert.dept;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.*; 4 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.*;
5 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO; 5 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
6 import org.mapstruct.Mapper; 6 import org.mapstruct.Mapper;
7 import org.mapstruct.factory.Mappers; 7 import org.mapstruct.factory.Mappers;
8 8
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/convert/permission/SysRoleConvert.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.system.convert.permission; 1 package cn.iocoder.yudao.adminserver.modules.system.convert.permission;
2 2
3 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.*; 3 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.*;
4 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 4 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
5 import org.mapstruct.Mapper; 5 import org.mapstruct.Mapper;
6 import org.mapstruct.factory.Mappers; 6 import org.mapstruct.factory.Mappers;
7 7
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/convert/user/SysUserConvert.java
  View file @4ba064d
@@ -4,9 +4,9 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.Sy @@ -4,9 +4,9 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.Sy
4 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; 4 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO;
5 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; 5 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO;
6 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*;
7 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
8 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO;  
9 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 7 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
  8 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
  9 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
10 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.social.SysSocialUserDO; 10 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.social.SysSocialUserDO;
11 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 11 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
12 import org.mapstruct.Mapper; 12 import org.mapstruct.Mapper;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/dept/SysDeptMapper.java
  View file @4ba064d
@@ -3,11 +3,9 @@ package cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept; @@ -3,11 +3,9 @@ package cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept;
3 import cn.iocoder.yudao.adminserver.modules.tool.enums.SqlConstants; 3 import cn.iocoder.yudao.adminserver.modules.tool.enums.SqlConstants;
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6 -import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;  
7 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptListReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
8 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 7 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
9 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 8 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
10 -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;  
11 import org.apache.ibatis.annotations.Mapper; 9 import org.apache.ibatis.annotations.Mapper;
12 10
13 import java.util.Date; 11 import java.util.Date;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/dept/SysPostMapper.java
  View file @4ba064d
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostExportReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostExportReqVO;
7 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostPageReqVO; 7 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostPageReqVO;
8 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO; 8 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 import org.apache.ibatis.annotations.Mapper; 10 import org.apache.ibatis.annotations.Mapper;
11 11
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/permission/SysRoleMapper.java
  View file @4ba064d
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
6 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleExportReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleExportReqVO;
7 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRolePageReqVO; 7 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRolePageReqVO;
8 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 8 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 import org.apache.ibatis.annotations.Mapper; 10 import org.apache.ibatis.annotations.Mapper;
11 import org.springframework.lang.Nullable; 11 import org.springframework.lang.Nullable;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/mysql/permission/SysUserRoleMapper.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission; 1 package cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysUserRoleDO; 4 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysUserRoleDO;
5 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 5 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6 import org.apache.ibatis.annotations.Mapper; 6 import org.apache.ibatis.annotations.Mapper;
7 7
@@ -20,9 +20,6 @@ public interface SysUserRoleMapper extends BaseMapperX&lt;SysUserRoleDO&gt; { @@ -20,9 +20,6 @@ public interface SysUserRoleMapper extends BaseMapperX&lt;SysUserRoleDO&gt; {
20 return selectList(new QueryWrapper<SysUserRoleDO>().eq("role_id", roleId)); 20 return selectList(new QueryWrapper<SysUserRoleDO>().eq("role_id", roleId));
21 } 21 }
22 22
23 - default List<SysUserRoleDO> selectListByRoleIds(Collection<Long> roleIds) {  
24 - return selectList("role_id", roleIds);  
25 - }  
26 23
27 default void insertList(Long userId, Collection<Long> roleIds) { 24 default void insertList(Long userId, Collection<Long> roleIds) {
28 List<SysUserRoleDO> list = roleIds.stream().map(roleId -> { 25 List<SysUserRoleDO> list = roleIds.stream().map(roleId -> {
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/framework/datapermission/config/SysDataPermissionConfiguration.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.system.framework.datapermission.config; 1 package cn.iocoder.yudao.adminserver.modules.system.framework.datapermission.config;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 3 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
4 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 4 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
5 import cn.iocoder.yudao.framework.datapermission.core.dept.rule.DeptDataPermissionRuleCustomizer; 5 import cn.iocoder.yudao.framework.datapermission.core.dept.rule.DeptDataPermissionRuleCustomizer;
6 import org.springframework.context.annotation.Bean; 6 import org.springframework.context.annotation.Bean;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/auth/impl/SysAuthServiceImpl.java
  View file @4ba064d
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAu @@ -6,7 +6,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAu
6 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAuthSocialLogin2ReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAuthSocialLogin2ReqVO;
7 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAuthSocialLoginReqVO; 7 import cn.iocoder.yudao.adminserver.modules.system.controller.auth.vo.auth.SysAuthSocialLoginReqVO;
8 import cn.iocoder.yudao.adminserver.modules.system.convert.auth.SysAuthConvert; 8 import cn.iocoder.yudao.adminserver.modules.system.convert.auth.SysAuthConvert;
9 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO; 9 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
10 import cn.iocoder.yudao.adminserver.modules.system.enums.logger.SysLoginLogTypeEnum; 10 import cn.iocoder.yudao.adminserver.modules.system.enums.logger.SysLoginLogTypeEnum;
11 import cn.iocoder.yudao.adminserver.modules.system.enums.logger.SysLoginResultEnum; 11 import cn.iocoder.yudao.adminserver.modules.system.enums.logger.SysLoginResultEnum;
12 import cn.iocoder.yudao.adminserver.modules.system.service.auth.SysAuthService; 12 import cn.iocoder.yudao.adminserver.modules.system.service.auth.SysAuthService;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dept/SysDeptService.java
  View file @4ba064d
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil; @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO; 4 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO;
5 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptListReqVO; 5 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
7 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 7 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
8 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 8 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
9 9
10 import java.util.Collection; 10 import java.util.Collection;
@@ -46,27 +46,6 @@ public interface SysDeptService { @@ -46,27 +46,6 @@ public interface SysDeptService {
46 */ 46 */
47 void deleteDept(Long id); 47 void deleteDept(Long id);
48 48
49 - /**  
50 - * 获得指定编号的部门列表  
51 - *  
52 - * @param ids 部门编号数组  
53 - * @return 部门列表  
54 - */  
55 - List<SysDeptDO> getSimpleDepts(Collection<Long> ids);  
56 -  
57 - /**  
58 - * 获得指定编号的部门 Map  
59 - *  
60 - * @param ids 部门编号数组  
61 - * @return 部门 Map  
62 - */  
63 - default Map<Long, SysDeptDO> getDeptMap(Collection<Long> ids) {  
64 - if (CollUtil.isEmpty(ids)) {  
65 - return Collections.emptyMap();  
66 - }  
67 - List<SysDeptDO> list = getSimpleDepts(ids);  
68 - return CollectionUtils.convertMap(list, SysDeptDO::getId);  
69 - }  
70 49
71 /** 50 /**
72 * 筛选部门列表 51 * 筛选部门列表
@@ -77,22 +56,6 @@ public interface SysDeptService { @@ -77,22 +56,6 @@ public interface SysDeptService {
77 List<SysDeptDO> getSimpleDepts(SysDeptListReqVO reqVO); 56 List<SysDeptDO> getSimpleDepts(SysDeptListReqVO reqVO);
78 57
79 /** 58 /**
80 - * 获得部门信息  
81 - *  
82 - * @param id 部门编号  
83 - * @return 部门信息  
84 - */  
85 - SysDeptDO getDept(Long id);  
86 -  
87 - /**  
88 - * 获得部门信息数组  
89 - *  
90 - * @param ids 部门编号数组  
91 - * @return 部门信息数组  
92 - */  
93 - List<SysDeptDO> getDepts(Collection<Long> ids);  
94 -  
95 - /**  
96 * 获得所有子部门，从缓存中 59 * 获得所有子部门，从缓存中
97 * 60 *
98 * @param parentId 部门编号 61 * @param parentId 部门编号
@@ -101,13 +64,4 @@ public interface SysDeptService { @@ -101,13 +64,4 @@ public interface SysDeptService {
101 */ 64 */
102 List<SysDeptDO> getDeptsByParentIdFromCache(Long parentId, boolean recursive); 65 List<SysDeptDO> getDeptsByParentIdFromCache(Long parentId, boolean recursive);
103 66
104 - /**  
105 - * 校验部门们是否有效。如下情况，视为无效：  
106 - * 1. 部门编号不存在  
107 - * 2. 部门被禁用  
108 - *  
109 - * @param ids 角色编号数组  
110 - */  
111 - void validDepts(Collection<Long> ids);  
112 -  
113 } 67 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dept/SysPostService.java
  View file @4ba064d
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPo @@ -6,7 +6,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPo
6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostExportReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostExportReqVO;
7 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostPageReqVO; 7 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostPageReqVO;
8 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostUpdateReqVO; 8 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostUpdateReqVO;
9 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO; 9 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
10 import org.springframework.lang.Nullable; 10 import org.springframework.lang.Nullable;
11 11
12 import java.util.Collection; 12 import java.util.Collection;
@@ -86,13 +86,4 @@ public interface SysPostService { @@ -86,13 +86,4 @@ public interface SysPostService {
86 */ 86 */
87 SysPostDO getPost(Long id); 87 SysPostDO getPost(Long id);
88 88
89 - /**  
90 - * 校验岗位们是否有效。如下情况，视为无效：  
91 - * 1. 岗位编号不存在  
92 - * 2. 岗位被禁用  
93 - *  
94 - * @param ids 岗位编号数组  
95 - */  
96 - void validPosts(Collection<Long> ids);  
97 -  
98 } 89 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dept/impl/SysDeptServiceImpl.java
  View file @4ba064d
@@ -10,7 +10,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDe @@ -10,7 +10,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDe
10 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO; 10 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
11 import cn.iocoder.yudao.adminserver.modules.system.convert.dept.SysDeptConvert; 11 import cn.iocoder.yudao.adminserver.modules.system.convert.dept.SysDeptConvert;
12 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept.SysDeptMapper; 12 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept.SysDeptMapper;
13 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 13 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
14 import cn.iocoder.yudao.adminserver.modules.system.enums.dept.DeptIdEnum; 14 import cn.iocoder.yudao.adminserver.modules.system.enums.dept.DeptIdEnum;
15 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.dept.SysDeptProducer; 15 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.dept.SysDeptProducer;
16 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService; 16 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;
@@ -160,11 +160,6 @@ public class SysDeptServiceImpl implements SysDeptService { @@ -160,11 +160,6 @@ public class SysDeptServiceImpl implements SysDeptService {
160 } 160 }
161 161
162 @Override 162 @Override
163 - public List<SysDeptDO> getSimpleDepts(Collection<Long> ids) {  
164 - return deptMapper.selectBatchIds(ids);  
165 - }  
166 -  
167 - @Override  
168 public List<SysDeptDO> getSimpleDepts(SysDeptListReqVO reqVO) { 163 public List<SysDeptDO> getSimpleDepts(SysDeptListReqVO reqVO) {
169 return deptMapper.selectList(reqVO); 164 return deptMapper.selectList(reqVO);
170 } 165 }
@@ -182,26 +177,6 @@ public class SysDeptServiceImpl implements SysDeptService { @@ -182,26 +177,6 @@ public class SysDeptServiceImpl implements SysDeptService {
182 return result; 177 return result;
183 } 178 }
184 179
185 - @Override  
186 - public void validDepts(Collection<Long> ids) {  
187 - if (CollUtil.isEmpty(ids)) {  
188 - return;  
189 - }  
190 - // 获得科室信息  
191 - List<SysDeptDO> depts = deptMapper.selectBatchIds(ids);  
192 - Map<Long, SysDeptDO> deptMap = CollectionUtils.convertMap(depts, SysDeptDO::getId);  
193 - // 校验  
194 - ids.forEach(id -> {  
195 - SysDeptDO dept = deptMap.get(id);  
196 - if (dept == null) {  
197 - throw exception(DEPT_NOT_FOUND);  
198 - }  
199 - if (!CommonStatusEnum.ENABLE.getStatus().equals(dept.getStatus())) {  
200 - throw exception(DEPT_NOT_ENABLE, dept.getName());  
201 - }  
202 - });  
203 - }  
204 -  
205 /** 180 /**
206 * 递归获取所有的子部门，添加到 result 结果 181 * 递归获取所有的子部门，添加到 result 结果
207 * 182 *
@@ -227,16 +202,6 @@ public class SysDeptServiceImpl implements SysDeptService { @@ -227,16 +202,6 @@ public class SysDeptServiceImpl implements SysDeptService {
227 recursiveCount - 1, parentDeptMap)); 202 recursiveCount - 1, parentDeptMap));
228 } 203 }
229 204
230 - @Override  
231 - public SysDeptDO getDept(Long id) {  
232 - return deptMapper.selectById(id);  
233 - }  
234 -  
235 - @Override  
236 - public List<SysDeptDO> getDepts(Collection<Long> ids) {  
237 - return deptMapper.selectBatchIds(ids);  
238 - }  
239 -  
240 private void checkCreateOrUpdate(Long id, Long parentId, String name) { 205 private void checkCreateOrUpdate(Long id, Long parentId, String name) {
241 // 校验自己存在 206 // 校验自己存在
242 checkDeptExists(id); 207 checkDeptExists(id);
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dept/impl/SysPostServiceImpl.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.system.service.dept.impl; 1 package cn.iocoder.yudao.adminserver.modules.system.service.dept.impl;
2 2
3 -import cn.hutool.core.collection.CollUtil;  
4 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
5 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
6 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; 3 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
7 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostCreateReqVO; 5 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostCreateReqVO;
@@ -11,16 +8,14 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPo @@ -11,16 +8,14 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPo
11 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostUpdateReqVO; 8 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostUpdateReqVO;
12 import cn.iocoder.yudao.adminserver.modules.system.convert.dept.SysPostConvert; 9 import cn.iocoder.yudao.adminserver.modules.system.convert.dept.SysPostConvert;
13 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept.SysPostMapper; 10 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept.SysPostMapper;
14 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO; 11 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
15 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService; 12 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService;
16 -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;  
17 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
18 import org.springframework.validation.annotation.Validated; 14 import org.springframework.validation.annotation.Validated;
19 15
20 import javax.annotation.Resource; 16 import javax.annotation.Resource;
21 import java.util.Collection; 17 import java.util.Collection;
22 import java.util.List; 18 import java.util.List;
23 -import java.util.Map;  
24 19
25 import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.*; 20 import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.*;
26 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 21 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -84,26 +79,6 @@ public class SysPostServiceImpl implements SysPostService { @@ -84,26 +79,6 @@ public class SysPostServiceImpl implements SysPostService {
84 return postMapper.selectById(id); 79 return postMapper.selectById(id);
85 } 80 }
86 81
87 - @Override  
88 - public void validPosts(Collection<Long> ids) {  
89 - if (CollUtil.isEmpty(ids)) {  
90 - return;  
91 - }  
92 - // 获得岗位信息  
93 - List<SysPostDO> posts = postMapper.selectBatchIds(ids);  
94 - Map<Long, SysPostDO> postMap = CollectionUtils.convertMap(posts, SysPostDO::getId);  
95 - // 校验  
96 - ids.forEach(id -> {  
97 - SysPostDO post = postMap.get(id);  
98 - if (post == null) {  
99 - throw exception(POST_NOT_FOUND);  
100 - }  
101 - if (!CommonStatusEnum.ENABLE.getStatus().equals(post.getStatus())) {  
102 - throw exception(POST_NOT_ENABLE, post.getName());  
103 - }  
104 - });  
105 - }  
106 -  
107 private void checkCreateOrUpdate(Long id, String name, String code) { 82 private void checkCreateOrUpdate(Long id, String name, String code) {
108 // 校验自己存在 83 // 校验自己存在
109 checkPostExists(id); 84 checkPostExists(id);
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dict/SysDictDataService.java
  View file @4ba064d
@@ -79,14 +79,4 @@ public interface SysDictDataService { @@ -79,14 +79,4 @@ public interface SysDictDataService {
79 */ 79 */
80 int countByDictType(String dictType); 80 int countByDictType(String dictType);
81 81
82 - /**  
83 - * 校验字典数据们是否有效。如下情况，视为无效：  
84 - * 1. 字典数据不存在  
85 - * 2. 字典数据被禁用  
86 - *  
87 - * @param dictType 字典类型  
88 - * @param values 字典数据值的数组  
89 - */  
90 - void validDictDatas(String dictType, Collection<String> values);  
91 -  
92 } 82 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/dict/impl/SysDictDataServiceImpl.java
  View file @4ba064d
@@ -134,25 +134,6 @@ public class SysDictDataServiceImpl implements SysDictDataService { @@ -134,25 +134,6 @@ public class SysDictDataServiceImpl implements SysDictDataService {
134 return dictDataMapper.selectCountByDictType(dictType); 134 return dictDataMapper.selectCountByDictType(dictType);
135 } 135 }
136 136
137 - @Override  
138 - public void validDictDatas(String dictType, Collection<String> values) {  
139 - if (CollUtil.isEmpty(values)) {  
140 - return;  
141 - }  
142 - // 获得字典数据信息  
143 - List<SysDictDataDO> dictDatas = dictDataMapper.selectByDictTypeAndValues(dictType, values);  
144 - Map<String, SysDictDataDO> dictDataMap = CollectionUtils.convertMap(dictDatas, SysDictDataDO::getValue);  
145 - // 校验  
146 - values.forEach(value -> {  
147 - SysDictDataDO dictData = dictDataMap.get(value);  
148 - if (dictData == null) {  
149 - throw exception(DICT_DATA_NOT_EXISTS);  
150 - }  
151 - if (!CommonStatusEnum.ENABLE.getStatus().equals(dictData.getStatus())) {  
152 - throw exception(DICT_DATA_NOT_ENABLE, dictData.getLabel());  
153 - }  
154 - });  
155 - }  
156 137
157 private void checkCreateOrUpdate(Long id, String value, String dictType) { 138 private void checkCreateOrUpdate(Long id, String value, String dictType) {
158 // 校验自己存在 139 // 校验自己存在
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/permission/SysPermissionService.java
  View file @4ba064d
@@ -78,14 +78,6 @@ public interface SysPermissionService extends SecurityPermissionFrameworkService @@ -78,14 +78,6 @@ public interface SysPermissionService extends SecurityPermissionFrameworkService
78 Set<Long> getUserRoleIdListByRoleId(Long roleId); 78 Set<Long> getUserRoleIdListByRoleId(Long roleId);
79 79
80 /** 80 /**
81 - * 获得拥有多个角色的用户编号集合  
82 - *  
83 - * @param roleIds 角色编号集合  
84 - * @return 用户编号集合  
85 - */  
86 - Set<Long> getUserRoleIdListByRoleIds(Collection<Long> roleIds);  
87 -  
88 - /**  
89 * 设置用户角色 81 * 设置用户角色
90 * 82 *
91 * @param userId 角色编号 83 * @param userId 角色编号
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/permission/SysRoleService.java
  View file @4ba064d
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role @@ -5,7 +5,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role
5 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleExportReqVO; 5 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleExportReqVO;
6 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRolePageReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRolePageReqVO;
7 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO; 7 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO;
8 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 8 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
9 import org.springframework.lang.Nullable; 9 import org.springframework.lang.Nullable;
10 10
11 import java.util.Collection; 11 import java.util.Collection;
@@ -129,13 +129,6 @@ public interface SysRoleService { @@ -129,13 +129,6 @@ public interface SysRoleService {
129 */ 129 */
130 List<SysRoleDO> getRoleList(SysRoleExportReqVO reqVO); 130 List<SysRoleDO> getRoleList(SysRoleExportReqVO reqVO);
131 131
132 - /**  
133 - * 校验角色们是否有效。如下情况，视为无效：  
134 - * 1. 角色编号不存在  
135 - * 2. 角色被禁用  
136 - *  
137 - * @param ids 角色编号数组  
138 - */  
139 - void validRoles(Collection<Long> ids); 132 +
140 133
141 } 134 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/permission/impl/SysPermissionServiceImpl.java
  View file @4ba064d
@@ -3,11 +3,11 @@ package cn.iocoder.yudao.adminserver.modules.system.service.permission.impl; @@ -3,11 +3,11 @@ package cn.iocoder.yudao.adminserver.modules.system.service.permission.impl;
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.collection.CollectionUtil; 4 import cn.hutool.core.collection.CollectionUtil;
5 import cn.hutool.core.util.ArrayUtil; 5 import cn.hutool.core.util.ArrayUtil;
6 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 6 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
7 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysMenuDO; 7 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysMenuDO;
8 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 8 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
9 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleMenuDO; 9 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleMenuDO;
10 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysUserRoleDO; 10 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysUserRoleDO;
11 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysRoleMenuMapper; 11 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysRoleMenuMapper;
12 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysUserRoleMapper; 12 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysUserRoleMapper;
13 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysPermissionProducer; 13 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysPermissionProducer;
@@ -227,11 +227,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { @@ -227,11 +227,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
227 SysUserRoleDO::getRoleId); 227 SysUserRoleDO::getRoleId);
228 } 228 }
229 229
230 - @Override  
231 - public Set<Long> getUserRoleIdListByRoleIds(Collection<Long> roleIds) {  
232 - return CollectionUtils.convertSet(userRoleMapper.selectListByRoleIds(roleIds),  
233 - SysUserRoleDO::getRoleId);  
234 - } 230 +
235 231
236 @Override 232 @Override
237 public void assignUserRole(Long userId, Set<Long> roleIds) { 233 public void assignUserRole(Long userId, Set<Long> roleIds) {
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/permission/impl/SysRoleServiceImpl.java
  View file @4ba064d
@@ -3,9 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.system.service.permission.impl; @@ -3,9 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.system.service.permission.impl;
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.collection.CollectionUtil; 4 import cn.hutool.core.collection.CollectionUtil;
5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
6 -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;  
7 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;  
9 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 7 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
10 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; 8 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleCreateReqVO;
11 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleExportReqVO; 9 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleExportReqVO;
@@ -13,7 +11,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role @@ -13,7 +11,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role
13 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO; 11 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO;
14 import cn.iocoder.yudao.adminserver.modules.system.convert.permission.SysRoleConvert; 12 import cn.iocoder.yudao.adminserver.modules.system.convert.permission.SysRoleConvert;
15 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysRoleMapper; 13 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysRoleMapper;
16 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 14 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
17 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.RoleCodeEnum; 15 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.RoleCodeEnum;
18 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.SysRoleTypeEnum; 16 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.SysRoleTypeEnum;
19 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysRoleProducer; 17 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysRoleProducer;
@@ -34,7 +32,6 @@ import org.springframework.util.StringUtils; @@ -34,7 +32,6 @@ import org.springframework.util.StringUtils;
34 import javax.annotation.PostConstruct; 32 import javax.annotation.PostConstruct;
35 import javax.annotation.Resource; 33 import javax.annotation.Resource;
36 import java.util.*; 34 import java.util.*;
37 -import java.util.function.Consumer;  
38 import java.util.stream.Collectors; 35 import java.util.stream.Collectors;
39 36
40 import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.*; 37 import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.*;
@@ -241,26 +238,6 @@ public class SysRoleServiceImpl implements SysRoleService { @@ -241,26 +238,6 @@ public class SysRoleServiceImpl implements SysRoleService {
241 return roleMapper.listRoles(reqVO); 238 return roleMapper.listRoles(reqVO);
242 } 239 }
243 240
244 - @Override  
245 - public void validRoles(Collection<Long> ids) {  
246 - if (CollUtil.isEmpty(ids)) {  
247 - return;  
248 - }  
249 - // 获得角色信息  
250 - List<SysRoleDO> roles = roleMapper.selectBatchIds(ids);  
251 - Map<Long, SysRoleDO> roleMap = CollectionUtils.convertMap(roles, SysRoleDO::getId);  
252 - // 校验  
253 - ids.forEach(id -> {  
254 - SysRoleDO role = roleMap.get(id);  
255 - if (role == null) {  
256 - throw exception(ROLE_NOT_EXISTS);  
257 - }  
258 - if (!CommonStatusEnum.ENABLE.getStatus().equals(role.getStatus())) {  
259 - throw exception(ROLE_IS_DISABLE, role.getName());  
260 - }  
261 - });  
262 - }  
263 -  
264 /** 241 /**
265 * 校验角色的唯一字段是否重复 242 * 校验角色的唯一字段是否重复
266 * 243 *
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/user/SysUserService.java
  View file @4ba064d
@@ -120,26 +120,7 @@ public interface SysUserService { @@ -120,26 +120,7 @@ public interface SysUserService {
120 */ 120 */
121 List<SysUserDO> getUsers(SysUserExportReqVO reqVO); 121 List<SysUserDO> getUsers(SysUserExportReqVO reqVO);
122 122
123 - /**  
124 - * 获得用户列表  
125 - *  
126 - * @param ids 用户编号数组  
127 - * @return 用户列表  
128 - */  
129 - List<SysUserDO> getUsers(Collection<Long> ids);  
130 123
131 - /**  
132 - * 获得用户 Map  
133 - *  
134 - * @param ids 用户编号数组  
135 - * @return 用户 Map  
136 - */  
137 - default Map<Long, SysUserDO> getUserMap(Collection<Long> ids) {  
138 - if (CollUtil.isEmpty(ids)) {  
139 - return new HashMap<>();  
140 - }  
141 - return CollectionUtils.convertMap(getUsers(ids), SysUserDO::getId);  
142 - }  
143 124
144 /** 125 /**
145 * 获得用户列表，基于昵称模糊匹配 126 * 获得用户列表，基于昵称模糊匹配
@@ -174,29 +155,4 @@ public interface SysUserService { @@ -174,29 +155,4 @@ public interface SysUserService {
174 */ 155 */
175 List<SysUserDO> getUsersByStatus(Integer status); 156 List<SysUserDO> getUsersByStatus(Integer status);
176 157
177 - /**  
178 - * 获得指定岗位的用户数组  
179 - *  
180 - * @param postIds 岗位数组  
181 - * @return 用户数组  
182 - */  
183 - List<SysUserDO> getUsersByPostIds(Collection<Long> postIds);  
184 -  
185 - /**  
186 - * 获得指定部门的用户数组  
187 - *  
188 - * @param deptIds 部门数组  
189 - * @return 用户数组  
190 - */  
191 - List<SysUserDO> getUsersByDeptIds(Collection<Long> deptIds);  
192 -  
193 - /**  
194 - * 校验用户们是否有效。如下情况，视为无效：  
195 - * 1. 用户编号不存在  
196 - * 2. 用户被禁用  
197 - *  
198 - * @param ids 用户编号数组  
199 - */  
200 - void validUsers(Set<Long> ids);  
201 -  
202 } 158 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/service/user/impl/SysUserServiceImpl.java
  View file @4ba064d
@@ -8,8 +8,8 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.Sy @@ -8,8 +8,8 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.Sy
8 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; 8 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO;
9 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*; 9 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*;
10 import cn.iocoder.yudao.adminserver.modules.system.convert.user.SysUserConvert; 10 import cn.iocoder.yudao.adminserver.modules.system.convert.user.SysUserConvert;
11 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
12 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO; 11 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
  12 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
13 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.user.SysUserMapper; 13 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.user.SysUserMapper;
14 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService; 14 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;
15 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService; 15 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService;
@@ -17,6 +17,7 @@ import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermiss @@ -17,6 +17,7 @@ import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermiss
17 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 17 import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService;
18 import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService; 18 import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
19 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 19 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  20 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
20 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 21 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
21 import cn.iocoder.yudao.framework.common.exception.ServiceException; 22 import cn.iocoder.yudao.framework.common.exception.ServiceException;
22 import cn.iocoder.yudao.framework.common.pojo.PageResult; 23 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -52,6 +53,9 @@ public class SysUserServiceImpl implements SysUserService { @@ -52,6 +53,9 @@ public class SysUserServiceImpl implements SysUserService {
52 53
53 @Resource 54 @Resource
54 private SysDeptService deptService; 55 private SysDeptService deptService;
  56 +
  57 + @Resource
  58 + private SysDeptCoreService deptCoreService;
55 @Resource 59 @Resource
56 private SysPostService postService; 60 private SysPostService postService;
57 @Resource 61 @Resource
@@ -174,18 +178,6 @@ public class SysUserServiceImpl implements SysUserService { @@ -174,18 +178,6 @@ public class SysUserServiceImpl implements SysUserService {
174 return userMapper.selectList(reqVO, this.getDeptCondition(reqVO.getDeptId())); 178 return userMapper.selectList(reqVO, this.getDeptCondition(reqVO.getDeptId()));
175 } 179 }
176 180
177 - @Override  
178 - public List<SysUserDO> getUsers(Collection<Long> ids) {  
179 - if (CollUtil.isEmpty(ids)) {  
180 - return Collections.emptyList();  
181 - }  
182 - return userMapper.selectBatchIds(ids);  
183 - }  
184 -  
185 - @Override  
186 - public Map<Long, SysUserDO> getUserMap(Collection<Long> ids) {  
187 - return SysUserService.super.getUserMap(ids);  
188 - }  
189 181
190 @Override 182 @Override
191 public List<SysUserDO> getUsersByNickname(String nickname) { 183 public List<SysUserDO> getUsersByNickname(String nickname) {
@@ -299,7 +291,7 @@ public class SysUserServiceImpl implements SysUserService { @@ -299,7 +291,7 @@ public class SysUserServiceImpl implements SysUserService {
299 if (deptId == null) { // 允许不选择 291 if (deptId == null) { // 允许不选择
300 return; 292 return;
301 } 293 }
302 - SysDeptDO dept = deptService.getDept(deptId); 294 + SysDeptDO dept = deptCoreService.getDept(deptId);
303 if (dept == null) { 295 if (dept == null) {
304 throw exception(DEPT_NOT_FOUND); 296 throw exception(DEPT_NOT_FOUND);
305 } 297 }
@@ -389,44 +381,4 @@ public class SysUserServiceImpl implements SysUserService { @@ -389,44 +381,4 @@ public class SysUserServiceImpl implements SysUserService {
389 return userMapper.selectListByStatus(status); 381 return userMapper.selectListByStatus(status);
390 } 382 }
391 383
392 - @Override  
393 - public List<SysUserDO> getUsersByPostIds(Collection<Long> postIds) {  
394 - if (CollUtil.isEmpty(postIds)) {  
395 - return Collections.emptyList();  
396 - }  
397 - // 过滤不符合条件的  
398 - // TODO 芋艿：暂时只能内存过滤。解决方案：1、新建一个关联表；2、基于 where + 函数；3、json 字段，适合 mysql 8+ 版本  
399 - List<SysUserDO> users = userMapper.selectList();  
400 - users.removeIf(user -> !CollUtil.containsAny(user.getPostIds(), postIds));  
401 - return users;  
402 - }  
403 -  
404 - @Override  
405 - public List<SysUserDO> getUsersByDeptIds(Collection<Long> deptIds) {  
406 - if (CollUtil.isEmpty(deptIds)) {  
407 - return Collections.emptyList();  
408 - }  
409 - return userMapper.selectListByDeptIds(deptIds);  
410 - }  
411 -  
412 - @Override  
413 - public void validUsers(Set<Long> ids) {  
414 - if (CollUtil.isEmpty(ids)) {  
415 - return;  
416 - }  
417 - // 获得岗位信息  
418 - List<SysUserDO> users = userMapper.selectBatchIds(ids);  
419 - Map<Long, SysUserDO> userMap = CollectionUtils.convertMap(users, SysUserDO::getId);  
420 - // 校验  
421 - ids.forEach(id -> {  
422 - SysUserDO user = userMap.get(id);  
423 - if (user == null) {  
424 - throw exception(USER_NOT_EXISTS);  
425 - }  
426 - if (!CommonStatusEnum.ENABLE.getStatus().equals(user.getStatus())) {  
427 - throw exception(USER_IS_DISABLE, user.getNickname());  
428 - }  
429 - });  
430 - }  
431 -  
432 } 384 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/tool/controller/test/vo/ToolTestDemoExcelVO.java
  View file @4ba064d
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.tool.controller.test.vo; @@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.tool.controller.test.vo;
3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; 3 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; 4 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
5 import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants; 5 import cn.iocoder.yudao.adminserver.modules.infra.enums.InfDictTypeConstants;
6 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants; 6 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
7 import com.alibaba.excel.annotation.ExcelProperty; 7 import com.alibaba.excel.annotation.ExcelProperty;
8 import lombok.Data; 8 import lombok.Data;
9 9
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmFormServiceTest.java deleted
View file @9d6a046
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;  
2 -  
3 -import cn.hutool.core.util.RandomUtil;  
4 -import cn.iocoder.yudao.adminserver.BaseDbUnitTest;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormCreateReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormPageReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;  
9 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmFormMapper;  
10 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmFormFieldRespDTO;  
11 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl.BpmFormServiceImpl;  
12 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
13 -import cn.iocoder.yudao.framework.common.util.json.JsonUtils;  
14 -import org.junit.jupiter.api.Test;  
15 -import org.springframework.context.annotation.Import;  
16 -  
17 -import javax.annotation.Resource;  
18 -  
19 -import java.util.ArrayList;  
20 -import java.util.Arrays;  
21 -import java.util.Collections;  
22 -import java.util.List;  
23 -import java.util.function.Consumer;  
24 -import java.util.function.Function;  
25 -import java.util.stream.Collectors;  
26 -import java.util.stream.Stream;  
27 -  
28 -import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.FORM_NOT_EXISTS;  
29 -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;  
30 -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;  
31 -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;  
32 -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;  
33 -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;  
34 -import static org.junit.jupiter.api.Assertions.*;  
35 -  
36 -/**  
37 - * {@link BpmFormServiceImpl} 的单元测试类  
38 - *  
39 - * @author 芋道源码  
40 - */  
41 -@Import(BpmFormServiceImpl.class)  
42 -public class BpmFormServiceTest extends BaseDbUnitTest {  
43 -  
44 - @Resource  
45 - private BpmFormServiceImpl formService;  
46 -  
47 - @Resource  
48 - private BpmFormMapper formMapper;  
49 -  
50 - @Test  
51 - public void testCreateForm_success() {  
52 - // 准备参数  
53 - BpmFormCreateReqVO reqVO = randomPojo(BpmFormCreateReqVO.class, o -> {  
54 - o.setConf("{}");  
55 - o.setFields(randomFields());  
56 - });  
57 -  
58 - // 调用  
59 - Long formId = formService.createForm(reqVO);  
60 - // 断言  
61 - assertNotNull(formId);  
62 - // 校验记录的属性是否正确  
63 - BpmFormDO form = formMapper.selectById(formId);  
64 - assertPojoEquals(reqVO, form);  
65 - }  
66 -  
67 - @Test  
68 - public void testUpdateForm_success() {  
69 - // mock 数据  
70 - BpmFormDO dbForm = randomPojo(BpmFormDO.class, o -> {  
71 - o.setConf("{}");  
72 - o.setFields(randomFields());  
73 - });  
74 - formMapper.insert(dbForm);// @Sql: 先插入出一条存在的数据  
75 - // 准备参数  
76 - BpmFormUpdateReqVO reqVO = randomPojo(BpmFormUpdateReqVO.class, o -> {  
77 - o.setId(dbForm.getId()); // 设置更新的 ID  
78 - o.setConf("{'yudao': 'yuanma'}");  
79 - o.setFields(randomFields());  
80 - });  
81 -  
82 - // 调用  
83 - formService.updateForm(reqVO);  
84 - // 校验是否更新正确  
85 - BpmFormDO form = formMapper.selectById(reqVO.getId()); // 获取最新的  
86 - assertPojoEquals(reqVO, form);  
87 - }  
88 -  
89 - @Test  
90 - public void testUpdateForm_notExists() {  
91 - // 准备参数  
92 - BpmFormUpdateReqVO reqVO = randomPojo(BpmFormUpdateReqVO.class, o -> {  
93 - o.setConf("{'yudao': 'yuanma'}");  
94 - o.setFields(randomFields());  
95 - });  
96 -  
97 - // 调用, 并断言异常  
98 - assertServiceException(() -> formService.updateForm(reqVO), FORM_NOT_EXISTS);  
99 - }  
100 -  
101 - @Test  
102 - public void testDeleteForm_success() {  
103 - // mock 数据  
104 - BpmFormDO dbForm = randomPojo(BpmFormDO.class);  
105 - formMapper.insert(dbForm);// @Sql: 先插入出一条存在的数据  
106 - // 准备参数  
107 - Long id = dbForm.getId();  
108 -  
109 - // 调用  
110 - formService.deleteForm(id);  
111 - // 校验数据不存在了  
112 - assertNull(formMapper.selectById(id));  
113 - }  
114 -  
115 - @Test  
116 - public void testDeleteForm_notExists() {  
117 - // 准备参数  
118 - Long id = randomLongId();  
119 -  
120 - // 调用, 并断言异常  
121 - assertServiceException(() -> formService.deleteForm(id), FORM_NOT_EXISTS);  
122 - }  
123 -  
124 - @Test  
125 - public void testGetFormPage() {  
126 - // mock 数据  
127 - BpmFormDO dbForm = randomPojo(BpmFormDO.class, o -> { // 等会查询到  
128 - o.setName("芋道源码");  
129 - });  
130 - formMapper.insert(dbForm);  
131 - // 测试 name 不匹配  
132 - formMapper.insert(cloneIgnoreId(dbForm, o -> o.setName("源码")));  
133 - // 准备参数  
134 - BpmFormPageReqVO reqVO = new BpmFormPageReqVO();  
135 - reqVO.setName("芋道");  
136 -  
137 - // 调用  
138 - PageResult<BpmFormDO> pageResult = formService.getFormPage(reqVO);  
139 - // 断言  
140 - assertEquals(1, pageResult.getTotal());  
141 - assertEquals(1, pageResult.getList().size());  
142 - assertPojoEquals(dbForm, pageResult.getList().get(0));  
143 - }  
144 -  
145 - private List<String> randomFields() {  
146 - int size = RandomUtil.randomInt(1, 3);  
147 - return Stream.iterate(0, i -> i).limit(size)  
148 - .map(i -> JsonUtils.toJsonString(randomPojo(BpmFormFieldRespDTO.class)))  
149 - .collect(Collectors.toList());  
150 - }  
151 -  
152 -}  
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmUserGroupServiceTest.java deleted
View file @9d6a046
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;  
2 -  
3 -import cn.hutool.core.date.DateUtil;  
4 -import cn.iocoder.yudao.adminserver.BaseDbUnitTest;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;  
9 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmUserGroupMapper;  
10 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl.BpmUserGroupServiceImpl;  
11 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
12 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
13 -import cn.iocoder.yudao.framework.common.util.date.DateUtils;  
14 -import org.junit.jupiter.api.Test;  
15 -import org.springframework.context.annotation.Import;  
16 -  
17 -import javax.annotation.Resource;  
18 -  
19 -import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_NOT_EXISTS;  
20 -import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;  
21 -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;  
22 -import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;  
23 -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;  
24 -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;  
25 -import static org.junit.jupiter.api.Assertions.*;  
26 -  
27 -/**  
28 -* {@link BpmUserGroupServiceImpl} 的单元测试类  
29 -*  
30 -* @author 芋道源码  
31 -*/  
32 -@Import(BpmUserGroupServiceImpl.class)  
33 -public class BpmUserGroupServiceTest extends BaseDbUnitTest {  
34 -  
35 - @Resource  
36 - private BpmUserGroupServiceImpl userGroupService;  
37 -  
38 - @Resource  
39 - private BpmUserGroupMapper userGroupMapper;  
40 -  
41 - @Test  
42 - public void testCreateUserGroup_success() {  
43 - // 准备参数  
44 - BpmUserGroupCreateReqVO reqVO = randomPojo(BpmUserGroupCreateReqVO.class);  
45 -  
46 - // 调用  
47 - Long userGroupId = userGroupService.createUserGroup(reqVO);  
48 - // 断言  
49 - assertNotNull(userGroupId);  
50 - // 校验记录的属性是否正确  
51 - BpmUserGroupDO userGroup = userGroupMapper.selectById(userGroupId);  
52 - assertPojoEquals(reqVO, userGroup);  
53 - }  
54 -  
55 - @Test  
56 - public void testUpdateUserGroup_success() {  
57 - // mock 数据  
58 - BpmUserGroupDO dbUserGroup = randomPojo(BpmUserGroupDO.class);  
59 - userGroupMapper.insert(dbUserGroup);// @Sql: 先插入出一条存在的数据  
60 - // 准备参数  
61 - BpmUserGroupUpdateReqVO reqVO = randomPojo(BpmUserGroupUpdateReqVO.class, o -> {  
62 - o.setId(dbUserGroup.getId()); // 设置更新的 ID  
63 - });  
64 -  
65 - // 调用  
66 - userGroupService.updateUserGroup(reqVO);  
67 - // 校验是否更新正确  
68 - BpmUserGroupDO userGroup = userGroupMapper.selectById(reqVO.getId()); // 获取最新的  
69 - assertPojoEquals(reqVO, userGroup);  
70 - }  
71 -  
72 - @Test  
73 - public void testUpdateUserGroup_notExists() {  
74 - // 准备参数  
75 - BpmUserGroupUpdateReqVO reqVO = randomPojo(BpmUserGroupUpdateReqVO.class);  
76 -  
77 - // 调用, 并断言异常  
78 - assertServiceException(() -> userGroupService.updateUserGroup(reqVO), USER_GROUP_NOT_EXISTS);  
79 - }  
80 -  
81 - @Test  
82 - public void testDeleteUserGroup_success() {  
83 - // mock 数据  
84 - BpmUserGroupDO dbUserGroup = randomPojo(BpmUserGroupDO.class);  
85 - userGroupMapper.insert(dbUserGroup);// @Sql: 先插入出一条存在的数据  
86 - // 准备参数  
87 - Long id = dbUserGroup.getId();  
88 -  
89 - // 调用  
90 - userGroupService.deleteUserGroup(id);  
91 - // 校验数据不存在了  
92 - assertNull(userGroupMapper.selectById(id));  
93 - }  
94 -  
95 - @Test  
96 - public void testDeleteUserGroup_notExists() {  
97 - // 准备参数  
98 - Long id = randomLongId();  
99 -  
100 - // 调用, 并断言异常  
101 - assertServiceException(() -> userGroupService.deleteUserGroup(id), USER_GROUP_NOT_EXISTS);  
102 - }  
103 -  
104 - @Test  
105 - public void testGetUserGroupPage() {  
106 - // mock 数据  
107 - BpmUserGroupDO dbUserGroup = randomPojo(BpmUserGroupDO.class, o -> { // 等会查询到  
108 - o.setName("芋道源码");  
109 - o.setStatus(CommonStatusEnum.ENABLE.getStatus());  
110 - o.setCreateTime(DateUtils.buildTime(2021, 11, 11));  
111 - });  
112 - userGroupMapper.insert(dbUserGroup);  
113 - // 测试 name 不匹配  
114 - userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setName("芋道")));  
115 - // 测试 status 不匹配  
116 - userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setStatus(CommonStatusEnum.DISABLE.getStatus())));  
117 - // 测试 createTime 不匹配  
118 - userGroupMapper.insert(cloneIgnoreId(dbUserGroup, o -> o.setCreateTime(DateUtils.buildTime(2021, 12, 12))));  
119 - // 准备参数  
120 - BpmUserGroupPageReqVO reqVO = new BpmUserGroupPageReqVO();  
121 - reqVO.setName("源码");  
122 - reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());  
123 - reqVO.setBeginCreateTime(DateUtils.buildTime(2021, 11, 10));  
124 - reqVO.setEndCreateTime(DateUtils.buildTime(2021, 11, 12));  
125 -  
126 - // 调用  
127 - PageResult<BpmUserGroupDO> pageResult = userGroupService.getUserGroupPage(reqVO);  
128 - // 断言  
129 - assertEquals(1, pageResult.getTotal());  
130 - assertEquals(1, pageResult.getList().size());  
131 - assertPojoEquals(dbUserGroup, pageResult.getList().get(0));  
132 - }  
133 -  
134 -}  
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/dept/SysDeptServiceTest.java
  View file @4ba064d
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
5 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO; 5 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO;
6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptListReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
7 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO; 7 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
8 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 8 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
9 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept.SysDeptMapper; 9 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept.SysDeptMapper;
10 import cn.iocoder.yudao.adminserver.modules.system.enums.dept.DeptIdEnum; 10 import cn.iocoder.yudao.adminserver.modules.system.enums.dept.DeptIdEnum;
11 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.dept.SysDeptProducer; 11 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.dept.SysDeptProducer;
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/dept/SysPostServiceTest.java
  View file @4ba064d
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPo @@ -7,7 +7,7 @@ import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPo
7 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostExportReqVO; 7 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostExportReqVO;
8 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostPageReqVO; 8 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostPageReqVO;
9 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostUpdateReqVO; 9 import cn.iocoder.yudao.adminserver.modules.system.controller.dept.vo.post.SysPostUpdateReqVO;
10 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO; 10 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
11 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept.SysPostMapper; 11 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.dept.SysPostMapper;
12 import cn.iocoder.yudao.adminserver.modules.system.service.dept.impl.SysPostServiceImpl; 12 import cn.iocoder.yudao.adminserver.modules.system.service.dept.impl.SysPostServiceImpl;
13 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; 13 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/permission/SysPermissionServiceTest.java
  View file @4ba064d
@@ -2,10 +2,10 @@ package cn.iocoder.yudao.adminserver.modules.system.service.permission; @@ -2,10 +2,10 @@ package cn.iocoder.yudao.adminserver.modules.system.service.permission;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 4 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
5 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
6 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 5 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
  6 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
7 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleMenuDO; 7 import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleMenuDO;
8 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysUserRoleDO; 8 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysUserRoleDO;
9 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysRoleMenuMapper; 9 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysRoleMenuMapper;
10 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysUserRoleMapper; 10 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysUserRoleMapper;
11 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysPermissionProducer; 11 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysPermissionProducer;
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/permission/SysRoleServiceTest.java
  View file @4ba064d
@@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.security.core.enums.DataScopeEnum; @@ -8,7 +8,7 @@ import cn.iocoder.yudao.framework.security.core.enums.DataScopeEnum;
8 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleCreateReqVO; 8 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleCreateReqVO;
9 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRolePageReqVO; 9 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRolePageReqVO;
10 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO; 10 import cn.iocoder.yudao.adminserver.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO;
11 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission.SysRoleDO; 11 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
12 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysRoleMapper; 12 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.permission.SysRoleMapper;
13 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.SysRoleTypeEnum; 13 import cn.iocoder.yudao.adminserver.modules.system.enums.permission.SysRoleTypeEnum;
14 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysRoleProducer; 14 import cn.iocoder.yudao.adminserver.modules.system.mq.producer.permission.SysRoleProducer;
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/system/service/user/SysUserServiceImplTest.java
  View file @4ba064d
@@ -6,8 +6,8 @@ import cn.iocoder.yudao.adminserver.BaseDbUnitTest; @@ -6,8 +6,8 @@ import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
6 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO; 6 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdatePasswordReqVO;
7 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO; 7 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.profile.SysUserProfileUpdateReqVO;
8 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*; 8 import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.*;
9 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
10 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysPostDO; 9 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
  10 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
11 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.user.SysUserMapper; 11 import cn.iocoder.yudao.adminserver.modules.system.dal.mysql.user.SysUserMapper;
12 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService; 12 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;
13 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService; 13 import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService;
@@ -16,11 +16,11 @@ import cn.iocoder.yudao.adminserver.modules.system.service.user.impl.SysUserServ @@ -16,11 +16,11 @@ import cn.iocoder.yudao.adminserver.modules.system.service.user.impl.SysUserServ
16 import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService; 16 import cn.iocoder.yudao.coreservice.modules.infra.service.file.InfFileCoreService;
17 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 17 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
18 import cn.iocoder.yudao.coreservice.modules.system.enums.common.SysSexEnum; 18 import cn.iocoder.yudao.coreservice.modules.system.enums.common.SysSexEnum;
  19 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
19 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 20 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
20 import cn.iocoder.yudao.framework.common.pojo.PageResult; 21 import cn.iocoder.yudao.framework.common.pojo.PageResult;
21 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils; 22 import cn.iocoder.yudao.framework.common.util.collection.ArrayUtils;
22 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 23 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
23 -import cn.iocoder.yudao.framework.common.util.collection.SetUtils;  
24 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 24 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
25 import org.junit.jupiter.api.Test; 25 import org.junit.jupiter.api.Test;
26 import org.mockito.stubbing.Answer; 26 import org.mockito.stubbing.Answer;
@@ -42,7 +42,6 @@ import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEq @@ -42,7 +42,6 @@ import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEq
42 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 42 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
43 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*; 43 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
44 import static java.util.Collections.singleton; 44 import static java.util.Collections.singleton;
45 -import static java.util.Collections.singletonList;  
46 import static org.assertj.core.util.Lists.newArrayList; 45 import static org.assertj.core.util.Lists.newArrayList;
47 import static org.junit.jupiter.api.Assertions.assertEquals; 46 import static org.junit.jupiter.api.Assertions.assertEquals;
48 import static org.junit.jupiter.api.Assertions.assertNull; 47 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -65,6 +64,9 @@ public class SysUserServiceImplTest extends BaseDbUnitTest { @@ -65,6 +64,9 @@ public class SysUserServiceImplTest extends BaseDbUnitTest {
65 64
66 @MockBean 65 @MockBean
67 private SysDeptService deptService; 66 private SysDeptService deptService;
  67 +
  68 + @MockBean
  69 + private SysDeptCoreService deptCoreService;
68 @MockBean 70 @MockBean
69 private SysPostService postService; 71 private SysPostService postService;
70 @MockBean 72 @MockBean
@@ -86,7 +88,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest { @@ -86,7 +88,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest {
86 o.setId(reqVO.getDeptId()); 88 o.setId(reqVO.getDeptId());
87 o.setStatus(CommonStatusEnum.ENABLE.getStatus()); 89 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
88 }); 90 });
89 - when(deptService.getDept(eq(dept.getId()))).thenReturn(dept); 91 + when(deptCoreService.getDept(eq(dept.getId()))).thenReturn(dept);
90 // mock postService 的方法 92 // mock postService 的方法
91 List<SysPostDO> posts = CollectionUtils.convertList(reqVO.getPostIds(), postId -> 93 List<SysPostDO> posts = CollectionUtils.convertList(reqVO.getPostIds(), postId ->
92 randomPojo(SysPostDO.class, o -> { 94 randomPojo(SysPostDO.class, o -> {
@@ -122,7 +124,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest { @@ -122,7 +124,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest {
122 o.setId(reqVO.getDeptId()); 124 o.setId(reqVO.getDeptId());
123 o.setStatus(CommonStatusEnum.ENABLE.getStatus()); 125 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
124 }); 126 });
125 - when(deptService.getDept(eq(dept.getId()))).thenReturn(dept); 127 + when(deptCoreService.getDept(eq(dept.getId()))).thenReturn(dept);
126 // mock postService 的方法 128 // mock postService 的方法
127 List<SysPostDO> posts = CollectionUtils.convertList(reqVO.getPostIds(), postId -> 129 List<SysPostDO> posts = CollectionUtils.convertList(reqVO.getPostIds(), postId ->
128 randomPojo(SysPostDO.class, o -> { 130 randomPojo(SysPostDO.class, o -> {
@@ -357,7 +359,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest { @@ -357,7 +359,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest {
357 o.setId(importUser.getDeptId()); 359 o.setId(importUser.getDeptId());
358 o.setStatus(CommonStatusEnum.ENABLE.getStatus()); 360 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
359 }); 361 });
360 - when(deptService.getDept(eq(dept.getId()))).thenReturn(dept); 362 + when(deptCoreService.getDept(eq(dept.getId()))).thenReturn(dept);
361 // mock passwordEncoder 的方法 363 // mock passwordEncoder 的方法
362 when(passwordEncoder.encode(eq("yudaoyuanma"))).thenReturn("java"); 364 when(passwordEncoder.encode(eq("yudaoyuanma"))).thenReturn("java");
363 365
@@ -391,7 +393,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest { @@ -391,7 +393,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest {
391 o.setId(importUser.getDeptId()); 393 o.setId(importUser.getDeptId());
392 o.setStatus(CommonStatusEnum.ENABLE.getStatus()); 394 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
393 }); 395 });
394 - when(deptService.getDept(eq(dept.getId()))).thenReturn(dept); 396 + when(deptCoreService.getDept(eq(dept.getId()))).thenReturn(dept);
395 397
396 // 调用 398 // 调用
397 SysUserImportRespVO respVO = userService.importUsers(newArrayList(importUser), false); 399 SysUserImportRespVO respVO = userService.importUsers(newArrayList(importUser), false);
@@ -421,7 +423,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest { @@ -421,7 +423,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest {
421 o.setId(importUser.getDeptId()); 423 o.setId(importUser.getDeptId());
422 o.setStatus(CommonStatusEnum.ENABLE.getStatus()); 424 o.setStatus(CommonStatusEnum.ENABLE.getStatus());
423 }); 425 });
424 - when(deptService.getDept(eq(dept.getId()))).thenReturn(dept); 426 + when(deptCoreService.getDept(eq(dept.getId()))).thenReturn(dept);
425 427
426 // 调用 428 // 调用
427 SysUserImportRespVO respVO = userService.importUsers(newArrayList(importUser), true); 429 SysUserImportRespVO respVO = userService.importUsers(newArrayList(importUser), true);
@@ -528,7 +530,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest { @@ -528,7 +530,7 @@ public class SysUserServiceImplTest extends BaseDbUnitTest {
528 o.setId(deptId); 530 o.setId(deptId);
529 o.setStatus(CommonStatusEnum.DISABLE.getStatus()); 531 o.setStatus(CommonStatusEnum.DISABLE.getStatus());
530 }); 532 });
531 - when(deptService.getDept(eq(dept.getId()))).thenReturn(dept); 533 + when(deptCoreService.getDept(eq(dept.getId()))).thenReturn(dept);
532 534
533 // 调用，校验异常 535 // 调用，校验异常
534 assertServiceException(() -> userService.checkDeptEnable(deptId), 536 assertServiceException(() -> userService.checkDeptEnable(deptId),
@@ -580,22 +582,22 @@ public class SysUserServiceImplTest extends BaseDbUnitTest { @@ -580,22 +582,22 @@ public class SysUserServiceImplTest extends BaseDbUnitTest {
580 verify(passwordEncoder, times(1)).matches(eq(oldPassword), eq(user.getPassword())); 582 verify(passwordEncoder, times(1)).matches(eq(oldPassword), eq(user.getPassword()));
581 } 583 }
582 584
583 - @Test  
584 - public void testUsersByPostIds() {  
585 - // 准备参数  
586 - Collection<Long> postIds = asSet(10L, 20L);  
587 - // mock 方法  
588 - SysUserDO user1 = randomSysUserDO(o -> o.setPostIds(asSet(10L, 30L)));  
589 - userMapper.insert(user1);  
590 - SysUserDO user2 = randomSysUserDO(o -> o.setPostIds(singleton(100L)));  
591 - userMapper.insert(user2);  
592 -  
593 - // 调用  
594 - List<SysUserDO> result = userService.getUsersByPostIds(postIds);  
595 - // 断言  
596 - assertEquals(1, result.size());  
597 - assertEquals(user1, result.get(0));  
598 - } 585 +// @Test //TODO jason 已经移到userCoreService.getUsersByPostIds
  586 +// public void testUsersByPostIds() {
  587 +// // 准备参数
  588 +// Collection<Long> postIds = asSet(10L, 20L);
  589 +// // mock 方法
  590 +// SysUserDO user1 = randomSysUserDO(o -> o.setPostIds(asSet(10L, 30L)));
  591 +// userMapper.insert(user1);
  592 +// SysUserDO user2 = randomSysUserDO(o -> o.setPostIds(singleton(100L)));
  593 +// userMapper.insert(user2);
  594 +//
  595 +// // 调用
  596 +// List<SysUserDO> result = userService.getUsersByPostIds(postIds);
  597 +// // 断言
  598 +// assertEquals(1, result.size());
  599 +// assertEquals(user1, result.get(0));
  600 +// }
599 601
600 // ========== 随机对象 ========== 602 // ========== 随机对象 ==========
601 603
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/dataobject/dept/SysDeptDO.java renamed to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/dal/dataobject/dept/SysDeptDO.java
  View file @4ba064d
1 -package cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept; 1 +package cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept;
2 2
3 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 3 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/dataobject/dept/SysPostDO.java renamed to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/dal/dataobject/dept/SysPostDO.java
  View file @4ba064d
1 -package cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept; 1 +package cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept;
2 2
3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO; 4 import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/dataobject/permission/SysRoleDO.java renamed to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/dal/dataobject/permission/SysRoleDO.java
  View file @4ba064d
1 -package cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission; 1 +package cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission;
2 2
3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
5 import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler; 5 import cn.iocoder.yudao.framework.mybatis.core.type.JsonLongSetTypeHandler;
6 import cn.iocoder.yudao.framework.security.core.enums.DataScopeEnum; 6 import cn.iocoder.yudao.framework.security.core.enums.DataScopeEnum;
7 -import cn.iocoder.yudao.adminserver.modules.system.enums.permission.RoleCodeEnum;  
8 -import cn.iocoder.yudao.adminserver.modules.system.enums.permission.SysRoleTypeEnum;  
9 import com.baomidou.mybatisplus.annotation.TableField; 7 import com.baomidou.mybatisplus.annotation.TableField;
10 import com.baomidou.mybatisplus.annotation.TableId; 8 import com.baomidou.mybatisplus.annotation.TableId;
11 import com.baomidou.mybatisplus.annotation.TableName; 9 import com.baomidou.mybatisplus.annotation.TableName;
@@ -36,7 +34,7 @@ public class SysRoleDO extends BaseDO { @@ -36,7 +34,7 @@ public class SysRoleDO extends BaseDO {
36 /** 34 /**
37 * 角色标识 35 * 角色标识
38 * 36 *
39 - * 枚举 {@link RoleCodeEnum} 37 + * 枚举
40 */ 38 */
41 private String code; 39 private String code;
42 /** 40 /**
@@ -52,7 +50,7 @@ public class SysRoleDO extends BaseDO { @@ -52,7 +50,7 @@ public class SysRoleDO extends BaseDO {
52 /** 50 /**
53 * 角色类型 51 * 角色类型
54 * 52 *
55 - * 枚举 {@link SysRoleTypeEnum} 53 + * 枚举
56 */ 54 */
57 private Integer type; 55 private Integer type;
58 /** 56 /**
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/dal/dataobject/permission/SysUserRoleDO.java renamed to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/dal/dataobject/permission/SysUserRoleDO.java
  View file @4ba064d
1 -package cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.permission; 1 +package cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission;
2 2
3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 import com.baomidou.mybatisplus.annotation.TableId; 4 import com.baomidou.mybatisplus.annotation.TableId;
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/dal/mysql/dept/SysDeptCoreMapper.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.dal.mysql.dept;
  2 +
  3 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import org.apache.ibatis.annotations.Mapper;
  6 +
  7 +@Mapper
  8 +public interface SysDeptCoreMapper extends BaseMapperX<SysDeptDO> {
  9 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/dal/mysql/dept/SysPostCoreMapper.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.dal.mysql.dept;
  2 +
  3 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import org.apache.ibatis.annotations.Mapper;
  6 +
  7 +@Mapper
  8 +public interface SysPostCoreMapper extends BaseMapperX<SysPostDO> {
  9 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/dal/mysql/permission/SysRoleCoreMapper.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.dal.mysql.permission;
  2 +
  3 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import org.apache.ibatis.annotations.Mapper;
  6 +
  7 +@Mapper
  8 +public interface SysRoleCoreMapper extends BaseMapperX<SysRoleDO> {
  9 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/dal/mysql/permission/SysUserRoleCoreMapper.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.dal.mysql.permission;
  2 +
  3 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysUserRoleDO;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import org.apache.ibatis.annotations.Mapper;
  6 +
  7 +import java.util.Collection;
  8 +import java.util.List;
  9 +
  10 +@Mapper
  11 +public interface SysUserRoleCoreMapper extends BaseMapperX<SysUserRoleDO> {
  12 +
  13 + default List<SysUserRoleDO> selectListByRoleIds(Collection<Long> roleIds) {
  14 + return selectList(SysUserRoleDO::getRoleId, roleIds);
  15 + }
  16 +
  17 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/dal/mysql/user/SysUserCoreMapper.java
  View file @4ba064d
@@ -5,7 +5,13 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; @@ -5,7 +5,13 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 5 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6 import org.apache.ibatis.annotations.Mapper; 6 import org.apache.ibatis.annotations.Mapper;
7 7
  8 +import java.util.Collection;
  9 +import java.util.List;
  10 +
8 @Mapper 11 @Mapper
9 public interface SysUserCoreMapper extends BaseMapperX<SysUserDO> { 12 public interface SysUserCoreMapper extends BaseMapperX<SysUserDO> {
10 13
  14 + default List<SysUserDO> selectListByDeptIds(Collection<Long> deptIds) {
  15 + return selectList(SysUserDO::getDeptId, deptIds);
  16 + }
11 } 17 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/system/enums/SysDictTypeConstants.java renamed to yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysDictTypeConstants.java
  View file @4ba064d
1 -package cn.iocoder.yudao.adminserver.modules.system.enums; 1 +package cn.iocoder.yudao.coreservice.modules.system.enums;
2 2
3 /** 3 /**
4 * System 字典类型的枚举类 4 * System 字典类型的枚举类
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/enums/SysErrorCodeConstants.java
  View file @4ba064d
@@ -22,4 +22,24 @@ public interface SysErrorCodeConstants { @@ -22,4 +22,24 @@ public interface SysErrorCodeConstants {
22 ErrorCode SOCIAL_AUTH_FAILURE = new ErrorCode(1006002000, "社交授权失败，原因是：{}"); 22 ErrorCode SOCIAL_AUTH_FAILURE = new ErrorCode(1006002000, "社交授权失败，原因是：{}");
23 ErrorCode SOCIAL_UNBIND_NOT_SELF = new ErrorCode(1006002001, "社交解绑失败，非当前用户绑定"); 23 ErrorCode SOCIAL_UNBIND_NOT_SELF = new ErrorCode(1006002001, "社交解绑失败，非当前用户绑定");
24 24
  25 + // ========== 用户模块 1006003000 ==========
  26 + ErrorCode USER_NOT_EXISTS = new ErrorCode(1006003000, "用户不存在");
  27 + ErrorCode USER_IS_DISABLE = new ErrorCode(1006003001, "名字为【{}】的用户已被禁用");
  28 +
  29 + // ========== 部门模块 1006004000 ==========
  30 + ErrorCode DEPT_NOT_FOUND = new ErrorCode(1006004000, "当前部门不存在");
  31 + ErrorCode DEPT_NOT_ENABLE = new ErrorCode(1006004001, "部门不处于开启状态，不允许选择");
  32 +
  33 + // ========== 角色模块 1006005000 ==========
  34 + ErrorCode ROLE_NOT_EXISTS = new ErrorCode(1006005000, "角色不存在");
  35 + ErrorCode ROLE_IS_DISABLE = new ErrorCode(1006005001, "名字为【{}】的角色已被禁用");
  36 +
  37 + // ========== 字典类型 1006006000 ==========
  38 + ErrorCode DICT_DATA_NOT_EXISTS = new ErrorCode(1006006000, "当前字典数据不存在");
  39 + ErrorCode DICT_DATA_NOT_ENABLE = new ErrorCode(1006006001, "字典数据({})不处于开启状态，不允许选择");
  40 +
  41 + // ========== 岗位模块 1006007000 ==========
  42 + ErrorCode POST_NOT_FOUND = new ErrorCode(1006007000, "当前岗位不存在");
  43 + ErrorCode POST_NOT_ENABLE = new ErrorCode(1006007001, "岗位({}) 不处于开启状态，不允许选择");
  44 +
25 } 45 }
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/dept/SysDeptCoreService.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.service.dept;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
  5 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  6 +
  7 +import java.util.Collection;
  8 +import java.util.Collections;
  9 +import java.util.List;
  10 +import java.util.Map;
  11 +
  12 +public interface SysDeptCoreService {
  13 + /**
  14 + * 获得部门信息数组
  15 + *
  16 + * @param ids 部门编号数组
  17 + * @return 部门信息数组
  18 + */
  19 + List<SysDeptDO> getDepts(Collection<Long> ids);
  20 +
  21 + /**
  22 + * 获得部门信息
  23 + *
  24 + * @param id 部门编号
  25 + * @return 部门信息
  26 + */
  27 + SysDeptDO getDept(Long id);
  28 +
  29 + /**
  30 + * 校验部门们是否有效。如下情况，视为无效：
  31 + * 1. 部门编号不存在
  32 + * 2. 部门被禁用
  33 + *
  34 + * @param ids 角色编号数组
  35 + */
  36 + void validDepts(Collection<Long> ids);
  37 +
  38 + /**
  39 + * 获得指定编号的部门列表
  40 + *
  41 + * @param ids 部门编号数组
  42 + * @return 部门列表
  43 + */
  44 + List<SysDeptDO> getSimpleDepts(Collection<Long> ids);
  45 +
  46 + /**
  47 + * 获得指定编号的部门 Map
  48 + *
  49 + * @param ids 部门编号数组
  50 + * @return 部门 Map
  51 + */
  52 + default Map<Long, SysDeptDO> getDeptMap(Collection<Long> ids) {
  53 + if (CollUtil.isEmpty(ids)) {
  54 + return Collections.emptyMap();
  55 + }
  56 + List<SysDeptDO> list = getSimpleDepts(ids);
  57 + return CollectionUtils.convertMap(list, SysDeptDO::getId);
  58 + }
  59 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/dept/SysPostCoreService.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.service.dept;
  2 +
  3 +import java.util.Collection;
  4 +
  5 +/**
  6 + * 岗位 Core Service 接口
  7 + *
  8 + * @author 芋道源码
  9 + */
  10 +public interface SysPostCoreService {
  11 + /**
  12 + * 校验岗位们是否有效。如下情况，视为无效：
  13 + * 1. 岗位编号不存在
  14 + * 2. 岗位被禁用
  15 + *
  16 + * @param ids 岗位编号数组
  17 + */
  18 + void validPosts(Collection<Long> ids);
  19 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/dept/impl/SysDeptCoreServiceImpl.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.service.dept.impl;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
  5 +import cn.iocoder.yudao.coreservice.modules.system.dal.mysql.dept.SysDeptCoreMapper;
  6 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  7 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  8 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  9 +import lombok.extern.slf4j.Slf4j;
  10 +import org.springframework.stereotype.Service;
  11 +import org.springframework.validation.annotation.Validated;
  12 +
  13 +import javax.annotation.Resource;
  14 +import java.util.Collection;
  15 +import java.util.List;
  16 +import java.util.Map;
  17 +
  18 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.DEPT_NOT_ENABLE;
  19 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.DEPT_NOT_FOUND;
  20 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  21 +
  22 +/**
  23 + * 部门 Core Service 实现类
  24 + *
  25 + * @author 芋道源码
  26 + */
  27 +@Service
  28 +@Slf4j
  29 +public class SysDeptCoreServiceImpl implements SysDeptCoreService {
  30 +
  31 + @Resource
  32 + private SysDeptCoreMapper deptCoreMapper;
  33 +
  34 + @Override
  35 + public List<SysDeptDO> getDepts(Collection<Long> ids) {
  36 + return deptCoreMapper.selectBatchIds(ids);
  37 + }
  38 +
  39 + @Override
  40 + public SysDeptDO getDept(Long id) {
  41 + return deptCoreMapper.selectById(id);
  42 + }
  43 +
  44 + @Override
  45 + public void validDepts(Collection<Long> ids) {
  46 + if (CollUtil.isEmpty(ids)) {
  47 + return;
  48 + }
  49 + // 获得科室信息
  50 + List<SysDeptDO> depts = deptCoreMapper.selectBatchIds(ids);
  51 + Map<Long, SysDeptDO> deptMap = CollectionUtils.convertMap(depts, SysDeptDO::getId);
  52 + // 校验
  53 + ids.forEach(id -> {
  54 + SysDeptDO dept = deptMap.get(id);
  55 + if (dept == null) {
  56 + throw exception(DEPT_NOT_FOUND);
  57 + }
  58 + if (!CommonStatusEnum.ENABLE.getStatus().equals(dept.getStatus())) {
  59 + throw exception(DEPT_NOT_ENABLE, dept.getName());
  60 + }
  61 + });
  62 + }
  63 +
  64 + @Override
  65 + public List<SysDeptDO> getSimpleDepts(Collection<Long> ids) {
  66 + return deptCoreMapper.selectBatchIds(ids);
  67 + }
  68 +
  69 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/dept/impl/SysPostCoreServiceImpl.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.service.dept.impl;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysPostDO;
  5 +import cn.iocoder.yudao.coreservice.modules.system.dal.mysql.dept.SysPostCoreMapper;
  6 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysPostCoreService;
  7 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  8 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  9 +import org.springframework.stereotype.Service;
  10 +
  11 +import javax.annotation.Resource;
  12 +import java.util.Collection;
  13 +import java.util.List;
  14 +import java.util.Map;
  15 +
  16 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.POST_NOT_ENABLE;
  17 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.POST_NOT_FOUND;
  18 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  19 +
  20 +/**
  21 + * 岗位 Core Service 实现类
  22 + *
  23 + * @author 芋道源码
  24 + */
  25 +@Service
  26 +public class SysPostCoreServiceImpl implements SysPostCoreService {
  27 +
  28 + @Resource
  29 + private SysPostCoreMapper sysPostCoreMapper;
  30 +
  31 + @Override
  32 + public void validPosts(Collection<Long> ids) {
  33 + if (CollUtil.isEmpty(ids)) {
  34 + return;
  35 + }
  36 + // 获得岗位信息
  37 + List<SysPostDO> posts = sysPostCoreMapper.selectBatchIds(ids);
  38 + Map<Long, SysPostDO> postMap = CollectionUtils.convertMap(posts, SysPostDO::getId);
  39 + // 校验
  40 + ids.forEach(id -> {
  41 + SysPostDO post = postMap.get(id);
  42 + if (post == null) {
  43 + throw exception(POST_NOT_FOUND);
  44 + }
  45 + if (!CommonStatusEnum.ENABLE.getStatus().equals(post.getStatus())) {
  46 + throw exception(POST_NOT_ENABLE, post.getName());
  47 + }
  48 + });
  49 + }
  50 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/dict/SysDictDataCoreService.java
  View file @4ba064d
@@ -2,6 +2,8 @@ package cn.iocoder.yudao.coreservice.modules.system.service.dict; @@ -2,6 +2,8 @@ package cn.iocoder.yudao.coreservice.modules.system.service.dict;
2 2
3 import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService; 3 import cn.iocoder.yudao.framework.dict.core.service.DictDataFrameworkService;
4 4
  5 +import java.util.Collection;
  6 +
5 /** 7 /**
6 * 字典数据 Service 接口 8 * 字典数据 Service 接口
7 * 9 *
@@ -14,4 +16,14 @@ public interface SysDictDataCoreService extends DictDataFrameworkService { @@ -14,4 +16,14 @@ public interface SysDictDataCoreService extends DictDataFrameworkService {
14 */ 16 */
15 void initLocalCache(); 17 void initLocalCache();
16 18
  19 + /**
  20 + * 校验字典数据们是否有效。如下情况，视为无效：
  21 + * 1. 字典数据不存在
  22 + * 2. 字典数据被禁用
  23 + *
  24 + * @param dictType 字典类型
  25 + * @param values 字典数据值的数组
  26 + */
  27 + void validDictDatas(String dictType, Collection<String> values);
  28 +
17 } 29 }
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/dict/impl/SysDictDataCoreServiceImpl.java
  View file @4ba064d
@@ -5,8 +5,11 @@ import cn.iocoder.yudao.coreservice.modules.system.convert.dict.SysDictDataCoreC @@ -5,8 +5,11 @@ import cn.iocoder.yudao.coreservice.modules.system.convert.dict.SysDictDataCoreC
5 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dict.SysDictDataDO; 5 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dict.SysDictDataDO;
6 import cn.iocoder.yudao.coreservice.modules.system.dal.mysql.dict.SysDictDataCoreMapper; 6 import cn.iocoder.yudao.coreservice.modules.system.dal.mysql.dict.SysDictDataCoreMapper;
7 import cn.iocoder.yudao.coreservice.modules.system.service.dict.SysDictDataCoreService; 7 import cn.iocoder.yudao.coreservice.modules.system.service.dict.SysDictDataCoreService;
  8 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  9 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
8 import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO; 10 import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
9 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 11 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  12 +import com.google.common.collect.ImmutableMap;
10 import com.google.common.collect.ImmutableTable; 13 import com.google.common.collect.ImmutableTable;
11 import lombok.extern.slf4j.Slf4j; 14 import lombok.extern.slf4j.Slf4j;
12 import org.springframework.scheduling.annotation.Scheduled; 15 import org.springframework.scheduling.annotation.Scheduled;
@@ -14,9 +17,11 @@ import org.springframework.stereotype.Service; @@ -14,9 +17,11 @@ import org.springframework.stereotype.Service;
14 17
15 import javax.annotation.PostConstruct; 18 import javax.annotation.PostConstruct;
16 import javax.annotation.Resource; 19 import javax.annotation.Resource;
17 -import java.util.Comparator;  
18 -import java.util.Date;  
19 -import java.util.List; 20 +import java.util.*;
  21 +
  22 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.DICT_DATA_NOT_ENABLE;
  23 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.DICT_DATA_NOT_EXISTS;
  24 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
20 25
21 /** 26 /**
22 * 字典数据 Service 实现类 27 * 字典数据 Service 实现类
@@ -119,4 +124,22 @@ public class SysDictDataCoreServiceImpl implements SysDictDataCoreService { @@ -119,4 +124,22 @@ public class SysDictDataCoreServiceImpl implements SysDictDataCoreService {
119 return SysDictDataCoreConvert.INSTANCE.convertList03(labelDictDataCache.row(type).values()); 124 return SysDictDataCoreConvert.INSTANCE.convertList03(labelDictDataCache.row(type).values());
120 } 125 }
121 126
  127 + @Override
  128 + public void validDictDatas(String dictType, Collection<String> values) {
  129 + if (CollUtil.isEmpty(values)) {
  130 + return;
  131 + }
  132 + ImmutableMap<String, SysDictDataDO> dictDataMap = valueDictDataCache.row(dictType);
  133 + // 校验
  134 + values.forEach(value -> {
  135 + SysDictDataDO dictData = dictDataMap.get(value);
  136 + if (dictData == null) {
  137 + throw exception(DICT_DATA_NOT_EXISTS);
  138 + }
  139 + if (!CommonStatusEnum.ENABLE.getStatus().equals(dictData.getStatus())) {
  140 + throw exception(DICT_DATA_NOT_ENABLE, dictData.getLabel());
  141 + }
  142 + });
  143 + }
  144 +
122 } 145 }
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/permission/SysPermissionCoreService.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.service.permission;
  2 +
  3 +import java.util.Collection;
  4 +import java.util.Set;
  5 +/**
  6 + * 权限 Core Service 接口
  7 + *
  8 + * 提供用户-角色、角色-菜单、角色-部门的关联权限处理
  9 + *
  10 + * @author 芋道源码
  11 + */
  12 +public interface SysPermissionCoreService {
  13 + /**
  14 + * 获得拥有多个角色的用户编号集合
  15 + *
  16 + * @param roleIds 角色编号集合
  17 + * @return 用户编号集合
  18 + */
  19 + Set<Long> getUserRoleIdListByRoleIds(Collection<Long> roleIds);
  20 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/permission/SysRoleCoreService.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.service.permission;
  2 +
  3 +import java.util.Collection;
  4 +
  5 +/**
  6 + * 角色 Core Service 接口
  7 + *
  8 + * @author 芋道源码
  9 + */
  10 +public interface SysRoleCoreService {
  11 + /**
  12 + * 校验角色们是否有效。如下情况，视为无效：
  13 + * 1. 角色编号不存在
  14 + * 2. 角色被禁用
  15 + *
  16 + * @param ids 角色编号数组
  17 + */
  18 + void validRoles(Collection<Long> ids);
  19 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/permission/impl/SysPermissionCoreServiceImpl.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.service.permission.impl;
  2 +
  3 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysUserRoleDO;
  4 +import cn.iocoder.yudao.coreservice.modules.system.dal.mysql.permission.SysUserRoleCoreMapper;
  5 +import cn.iocoder.yudao.coreservice.modules.system.service.permission.SysPermissionCoreService;
  6 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  7 +import org.springframework.stereotype.Service;
  8 +
  9 +import javax.annotation.Resource;
  10 +import java.util.Collection;
  11 +import java.util.Set;
  12 +/**
  13 + * 权限 Core Service 实现类
  14 + *
  15 + * @author 芋道源码
  16 + */
  17 +@Service
  18 +public class SysPermissionCoreServiceImpl implements SysPermissionCoreService {
  19 +
  20 + @Resource
  21 + private SysUserRoleCoreMapper userRoleCoreMapper;
  22 +
  23 + @Override
  24 + public Set<Long> getUserRoleIdListByRoleIds(Collection<Long> roleIds) {
  25 + return CollectionUtils.convertSet(userRoleCoreMapper.selectListByRoleIds(roleIds),
  26 + SysUserRoleDO::getRoleId);
  27 + }
  28 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/permission/impl/SysRoleCoreServiceImpl.java 0 → 100644
  View file @4ba064d
  1 +package cn.iocoder.yudao.coreservice.modules.system.service.permission.impl;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.permission.SysRoleDO;
  5 +import cn.iocoder.yudao.coreservice.modules.system.dal.mysql.permission.SysRoleCoreMapper;
  6 +import cn.iocoder.yudao.coreservice.modules.system.service.permission.SysRoleCoreService;
  7 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  8 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  9 +import org.springframework.stereotype.Service;
  10 +
  11 +import javax.annotation.Resource;
  12 +import java.util.Collection;
  13 +import java.util.List;
  14 +import java.util.Map;
  15 +
  16 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.ROLE_IS_DISABLE;
  17 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.ROLE_NOT_EXISTS;
  18 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  19 +
  20 +/**
  21 + * 角色 Core Service 实现类
  22 + *
  23 + * @author 芋道源码
  24 + */
  25 +@Service
  26 +public class SysRoleCoreServiceImpl implements SysRoleCoreService {
  27 +
  28 + @Resource
  29 + private SysRoleCoreMapper sysRoleCoreMapper;
  30 +
  31 + @Override
  32 + public void validRoles(Collection<Long> ids) {
  33 + if (CollUtil.isEmpty(ids)) {
  34 + return;
  35 + }
  36 + // 获得角色信息
  37 + List<SysRoleDO> roles = sysRoleCoreMapper.selectBatchIds(ids);
  38 + Map<Long, SysRoleDO> roleMap = CollectionUtils.convertMap(roles, SysRoleDO::getId);
  39 + // 校验
  40 + ids.forEach(id -> {
  41 + SysRoleDO role = roleMap.get(id);
  42 + if (role == null) {
  43 + throw exception(ROLE_NOT_EXISTS);
  44 + }
  45 + if (!CommonStatusEnum.ENABLE.getStatus().equals(role.getStatus())) {
  46 + throw exception(ROLE_IS_DISABLE, role.getName());
  47 + }
  48 + });
  49 + }
  50 +}
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/user/SysUserCoreService.java
  View file @4ba064d
1 package cn.iocoder.yudao.coreservice.modules.system.service.user; 1 package cn.iocoder.yudao.coreservice.modules.system.service.user;
2 2
  3 +import cn.hutool.core.collection.CollUtil;
3 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 4 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  5 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
  6 +
  7 +import java.util.*;
4 8
5 /** 9 /**
6 * 后台用户 Service Core 接口 10 * 后台用户 Service Core 接口
@@ -17,4 +21,50 @@ public interface SysUserCoreService { @@ -17,4 +21,50 @@ public interface SysUserCoreService {
17 */ 21 */
18 SysUserDO getUser(Long id); 22 SysUserDO getUser(Long id);
19 23
  24 + /**
  25 + * 获得指定部门的用户数组
  26 + *
  27 + * @param deptIds 部门数组
  28 + * @return 用户数组
  29 + */
  30 + List<SysUserDO> getUsersByDeptIds(Collection<Long> deptIds);
  31 +
  32 + /**
  33 + * 获得指定岗位的用户数组
  34 + *
  35 + * @param postIds 岗位数组
  36 + * @return 用户数组
  37 + */
  38 + List<SysUserDO> getUsersByPostIds(Collection<Long> postIds);
  39 +
  40 + /**
  41 + * 获得用户列表
  42 + *
  43 + * @param ids 用户编号数组
  44 + * @return 用户列表
  45 + */
  46 + List<SysUserDO> getUsers(Collection<Long> ids);
  47 +
  48 + /**
  49 + * 校验用户们是否有效。如下情况，视为无效：
  50 + * 1. 用户编号不存在
  51 + * 2. 用户被禁用
  52 + *
  53 + * @param ids 用户编号数组
  54 + */
  55 + void validUsers(Set<Long> ids);
  56 +
  57 + /**
  58 + * 获得用户 Map
  59 + *
  60 + * @param ids 用户编号数组
  61 + * @return 用户 Map
  62 + */
  63 + default Map<Long, SysUserDO> getUserMap(Collection<Long> ids) {
  64 + if (CollUtil.isEmpty(ids)) {
  65 + return new HashMap<>();
  66 + }
  67 + return CollectionUtils.convertMap(getUsers(ids), SysUserDO::getId);
  68 + }
  69 +
20 } 70 }
yudao-core-service/src/main/java/cn/iocoder/yudao/coreservice/modules/system/service/user/impl/SysUserCoreServiceImpl.java
  View file @4ba064d
1 package cn.iocoder.yudao.coreservice.modules.system.service.user.impl; 1 package cn.iocoder.yudao.coreservice.modules.system.service.user.impl;
2 2
  3 +import cn.hutool.core.collection.CollUtil;
3 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 4 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
4 import cn.iocoder.yudao.coreservice.modules.system.dal.mysql.user.SysUserCoreMapper; 5 import cn.iocoder.yudao.coreservice.modules.system.dal.mysql.user.SysUserCoreMapper;
5 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService; 6 import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
  7 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  8 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
6 import org.springframework.stereotype.Service; 9 import org.springframework.stereotype.Service;
7 10
8 import javax.annotation.Resource; 11 import javax.annotation.Resource;
  12 +import java.util.*;
  13 +
  14 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.USER_IS_DISABLE;
  15 +import static cn.iocoder.yudao.coreservice.modules.system.enums.SysErrorCodeConstants.USER_NOT_EXISTS;
  16 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
9 17
10 /** 18 /**
11 * 后台用户 Service Core 实现 19 * 后台用户 Service Core 实现
@@ -23,4 +31,52 @@ public class SysUserCoreServiceImpl implements SysUserCoreService { @@ -23,4 +31,52 @@ public class SysUserCoreServiceImpl implements SysUserCoreService {
23 return userCoreMapper.selectById(id); 31 return userCoreMapper.selectById(id);
24 } 32 }
25 33
  34 + @Override
  35 + public List<SysUserDO> getUsersByDeptIds(Collection<Long> deptIds) {
  36 + if (CollUtil.isEmpty(deptIds)) {
  37 + return Collections.emptyList();
  38 + }
  39 + return userCoreMapper.selectListByDeptIds(deptIds);
  40 + }
  41 +
  42 + @Override
  43 + public List<SysUserDO> getUsersByPostIds(Collection<Long> postIds) {
  44 + if (CollUtil.isEmpty(postIds)) {
  45 + return Collections.emptyList();
  46 + }
  47 + // 过滤不符合条件的
  48 + // TODO 芋艿：暂时只能内存过滤。解决方案：1、新建一个关联表；2、基于 where + 函数；3、json 字段，适合 mysql 8+ 版本
  49 + List<SysUserDO> users = userCoreMapper.selectList();
  50 + users.removeIf(user -> !CollUtil.containsAny(user.getPostIds(), postIds));
  51 + return users;
  52 + }
  53 +
  54 + @Override
  55 + public List<SysUserDO> getUsers(Collection<Long> ids) {
  56 + if (CollUtil.isEmpty(ids)) {
  57 + return Collections.emptyList();
  58 + }
  59 + return userCoreMapper.selectBatchIds(ids);
  60 + }
  61 +
  62 + @Override
  63 + public void validUsers(Set<Long> ids) {
  64 + if (CollUtil.isEmpty(ids)) {
  65 + return;
  66 + }
  67 + // 获得岗位信息
  68 + List<SysUserDO> users = userCoreMapper.selectBatchIds(ids);
  69 + Map<Long, SysUserDO> userMap = CollectionUtils.convertMap(users, SysUserDO::getId);
  70 + // 校验
  71 + ids.forEach(id -> {
  72 + SysUserDO user = userMap.get(id);
  73 + if (user == null) {
  74 + throw exception(USER_NOT_EXISTS);
  75 + }
  76 + if (!CommonStatusEnum.ENABLE.getStatus().equals(user.getStatus())) {
  77 + throw exception(USER_IS_DISABLE, user.getNickname());
  78 + }
  79 + });
  80 + }
  81 +
26 } 82 }
yudao-dependencies/pom.xml
  View file @4ba064d
@@ -43,6 +43,7 @@ @@ -43,6 +43,7 @@
43 <mockito-inline.version>3.6.28</mockito-inline.version> 43 <mockito-inline.version>3.6.28</mockito-inline.version>
44 <!-- Bpm 工作流相关 --> 44 <!-- Bpm 工作流相关 -->
45 <activiti.version>7.1.0.M6</activiti.version> 45 <activiti.version>7.1.0.M6</activiti.version>
  46 + <flowable.version>6.7.0</flowable.version>
46 <!-- 工具类相关 --> 47 <!-- 工具类相关 -->
47 <lombok.version>1.18.20</lombok.version> 48 <lombok.version>1.18.20</lombok.version>
48 <mapstruct.version>1.4.1.Final</mapstruct.version> 49 <mapstruct.version>1.4.1.Final</mapstruct.version>
@@ -396,6 +397,33 @@ @@ -396,6 +397,33 @@
396 <artifactId>activiti-image-generator</artifactId> 397 <artifactId>activiti-image-generator</artifactId>
397 <version>${activiti.version}</version> 398 <version>${activiti.version}</version>
398 </dependency> 399 </dependency>
  400 + <!-- 工作流相关 flowable -->
  401 + <dependency>
  402 + <groupId>org.flowable</groupId>
  403 + <artifactId>flowable-spring-boot-starter-basic</artifactId>
  404 + <version>${flowable.version}</version>
  405 + </dependency>
  406 + <dependency>
  407 + <groupId>org.flowable</groupId>
  408 + <artifactId>flowable-spring-boot-starter-actuator</artifactId>
  409 + <version>${flowable.version}</version>
  410 + </dependency>
  411 + <dependency>
  412 + <groupId>cn.iocoder.boot</groupId>
  413 + <artifactId>yudao-module-bpm-core-service</artifactId>
  414 + <version>${revision}</version>
  415 + </dependency>
  416 + <dependency>
  417 + <groupId>cn.iocoder.boot</groupId>
  418 + <artifactId>yudao-module-bpm-activiti</artifactId>
  419 + <version>${revision}</version>
  420 + </dependency>
  421 + <dependency>
  422 + <groupId>cn.iocoder.boot</groupId>
  423 + <artifactId>yudao-module-bpm-flowable</artifactId>
  424 + <version>${revision}</version>
  425 + </dependency>
  426 + <!-- 工作流相关结束 -->
399 427
400 <!-- 工具类相关 --> 428 <!-- 工具类相关 -->
401 <dependency> 429 <dependency>
yudao-module-bpm/pom.xml 0 → 100644
  View file @4ba064d
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <artifactId>yudao</artifactId>
  7 + <groupId>cn.iocoder.boot</groupId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <packaging>pom</packaging>
  11 + <modules>
  12 + <module>yudao-module-bpm-flowable</module>
  13 + <module>yudao-module-bpm-activiti</module>
  14 + <module>yudao-module-bpm-core-service</module>
  15 + </modules>
  16 + <modelVersion>4.0.0</modelVersion>
  17 + <artifactId>yudao-module-bpm</artifactId>
  18 +</project>
0 \ No newline at end of file 19 \ No newline at end of file
yudao-module-bpm/yudao-module-bpm-activiti/pom.xml 0 → 100644
  View file @4ba064d
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <artifactId>yudao-module-bpm</artifactId>
  7 + <groupId>cn.iocoder.boot</groupId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 +
  12 + <artifactId>yudao-module-bpm-activiti</artifactId>
  13 + <dependencies>
  14 + <dependency>
  15 + <groupId>cn.iocoder.boot</groupId>
  16 + <artifactId>yudao-spring-boot-starter-activiti</artifactId>
  17 + </dependency>
  18 + <dependency>
  19 + <groupId>cn.iocoder.boot</groupId>
  20 + <artifactId>yudao-core-service</artifactId>
  21 + </dependency>
  22 + <!-- Test 测试相关 -->
  23 + <dependency>
  24 + <groupId>cn.iocoder.boot</groupId>
  25 + <artifactId>yudao-spring-boot-starter-test</artifactId>
  26 + <scope>test</scope>
  27 + </dependency>
  28 + </dependencies>
  29 +
  30 +</project>
0 \ No newline at end of file 31 \ No newline at end of file
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmFormController.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmFormController.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmModelController.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmModelController.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmProcessDefinitionController.http renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmProcessDefinitionController.http
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmProcessDefinitionController.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmProcessDefinitionController.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmTaskAssignRuleController.http renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmTaskAssignRuleController.http
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmTaskAssignRuleController.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmTaskAssignRuleController.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmUserGroupController.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmUserGroupController.java
  View file @4ba064d
@@ -7,9 +7,6 @@ import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.B @@ -7,9 +7,6 @@ import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.B
7 import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmUserGroupConvert; 7 import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmUserGroupConvert;
8 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO; 8 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;
9 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService; 9 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService;
10 -import cn.iocoder.yudao.adminserver.modules.system.controller.user.vo.user.SysUserSimpleRespVO;  
11 -import cn.iocoder.yudao.adminserver.modules.system.convert.user.SysUserConvert;  
12 -import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;  
13 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 10 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
14 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 11 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
15 import cn.iocoder.yudao.framework.common.pojo.PageResult; 12 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -22,7 +19,6 @@ import org.springframework.web.bind.annotation.*; @@ -22,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
22 19
23 import javax.annotation.Resource; 20 import javax.annotation.Resource;
24 import javax.validation.Valid; 21 import javax.validation.Valid;
25 -  
26 import java.util.List; 22 import java.util.List;
27 23
28 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 24 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormBaseVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormCreateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormPageReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormSimpleRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormSimpleRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormUpdateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormUpdateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupBaseVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupCreateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupPageReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupSimpleRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupSimpleRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupUpdateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupUpdateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModeImportReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModeImportReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelBaseVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelCreateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelPageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelPageItemRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelUpdateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelUpdateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelUpdateStateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelUpdateStateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/ModelPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/ModelPageReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionListReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionListReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionPageReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.http
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/BpmOALeaveBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/BpmOALeaveBaseVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/BpmOALeaveCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/BpmOALeaveCreateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/BpmOALeavePageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/BpmOALeavePageReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/BpmOALeaveRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/vo/BpmOALeaveRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmActivityController.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmActivityController.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmProcessInstanceController.http renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmProcessInstanceController.http
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmProcessInstanceController.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmProcessInstanceController.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmTaskController.http renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmTaskController.http
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmTaskController.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmTaskController.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/activity/BpmActivityRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/activity/BpmActivityRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceCancelReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceCancelReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceCreateReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceMyPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceMyPageReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstancePageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstancePageItemRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskApproveReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskApproveReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskDonePageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskDonePageItemRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskDonePageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskDonePageReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskRejectReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskRejectReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskTodoPageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskTodoPageItemRespVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskTodoPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskTodoPageReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskUpdateAssigneeReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/vo/task/BpmTaskUpdateAssigneeReqVO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmFormConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmFormConvert.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmModelConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmModelConvert.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmProcessDefinitionConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmProcessDefinitionConvert.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmTaskAssignRuleConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmTaskAssignRuleConvert.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmUserGroupConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmUserGroupConvert.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/message/BpmMessageConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/message/BpmMessageConvert.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/oa/BpmOALeaveConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/oa/BpmOALeaveConvert.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/package-info.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmActivityConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmActivityConvert.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmProcessInstanceConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmProcessInstanceConvert.java
  View file @4ba064d
@@ -2,11 +2,10 @@ package cn.iocoder.yudao.adminserver.modules.bpm.convert.task; @@ -2,11 +2,10 @@ package cn.iocoder.yudao.adminserver.modules.bpm.convert.task;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstancePageItemRespVO; 3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstancePageItemRespVO;
4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceRespVO; 4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceRespVO;
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskRespVO;  
6 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; 5 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
7 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; 6 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
8 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEvent; 7 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEvent;
9 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 8 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
10 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 9 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
11 import cn.iocoder.yudao.framework.common.pojo.PageResult; 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
12 import org.activiti.engine.history.HistoricProcessInstance; 11 import org.activiti.engine.history.HistoricProcessInstance;
@@ -19,10 +18,8 @@ import org.mapstruct.MappingTarget; @@ -19,10 +18,8 @@ import org.mapstruct.MappingTarget;
19 import org.mapstruct.Mappings; 18 import org.mapstruct.Mappings;
20 import org.mapstruct.factory.Mappers; 19 import org.mapstruct.factory.Mappers;
21 20
22 -import java.sql.SQLXML;  
23 import java.util.List; 21 import java.util.List;
24 import java.util.Map; 22 import java.util.Map;
25 -import java.util.function.Consumer;  
26 23
27 /** 24 /**
28 * 流程实例 Convert 25 * 流程实例 Convert
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmTaskConvert.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmTaskConvert.java
  View file @4ba064d
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskD @@ -4,7 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskD
4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskRespVO; 4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskRespVO;
5 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskTodoPageItemRespVO; 5 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskTodoPageItemRespVO;
6 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmTaskExtDO; 6 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmTaskExtDO;
7 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO; 7 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
8 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 8 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
9 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 9 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
10 import cn.iocoder.yudao.framework.common.util.number.NumberUtils; 10 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmFormDO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmFormDO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmUserGroupDO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmUserGroupDO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/BpmOALeaveDO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/BpmOALeaveDO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/BpmTaskExtDO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/BpmTaskExtDO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmFormMapper.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmFormMapper.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmTaskAssignRuleMapper.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmTaskAssignRuleMapper.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmUserGroupMapper.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmUserGroupMapper.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/oa/BpmOALeaveMapper.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/oa/BpmOALeaveMapper.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/task/BpmTaskExtMapper.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/task/BpmTaskExtMapper.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmModelFormTypeEnum.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmModelFormTypeEnum.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmTaskRuleScriptEnum.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmTaskRuleScriptEnum.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/message/BpmMessageEnum.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/message/BpmMessageEnum.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/task/BpmProcessInstanceResultEnum.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/task/BpmProcessInstanceResultEnum.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/task/BpmProcessInstanceStatusEnum.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/task/BpmProcessInstanceStatusEnum.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/config/BpmActivitiConfiguration.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/config/BpmActivitiConfiguration.java
  View file @4ba064d
@@ -7,9 +7,9 @@ import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.identity @@ -7,9 +7,9 @@ import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.identity
7 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.listener.BpmTackActivitiEventListener; 7 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.listener.BpmTackActivitiEventListener;
8 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService; 8 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService;
9 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService; 9 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService;
10 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
11 -import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;  
12 -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 10 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  11 +import cn.iocoder.yudao.coreservice.modules.system.service.permission.SysPermissionCoreService;
  12 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
13 import org.activiti.api.runtime.shared.identity.UserGroupManager; 13 import org.activiti.api.runtime.shared.identity.UserGroupManager;
14 import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer; 14 import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer;
15 import org.springframework.context.ApplicationEventPublisher; 15 import org.springframework.context.ApplicationEventPublisher;
@@ -58,17 +58,17 @@ public class BpmActivitiConfiguration { @@ -58,17 +58,17 @@ public class BpmActivitiConfiguration {
58 58
59 @Bean 59 @Bean
60 public BpmActivityBehaviorFactory bpmActivityBehaviorFactory(BpmTaskAssignRuleService taskRuleService, 60 public BpmActivityBehaviorFactory bpmActivityBehaviorFactory(BpmTaskAssignRuleService taskRuleService,
61 - SysPermissionService permissionService,  
62 - SysDeptService deptService, 61 + SysPermissionCoreService permissionCoreService,
  62 + SysDeptCoreService deptCoreService,
63 BpmUserGroupService userGroupService, 63 BpmUserGroupService userGroupService,
64 - SysUserService userService, 64 + SysUserCoreService userCoreService,
65 List<BpmTaskAssignScript> scripts) { 65 List<BpmTaskAssignScript> scripts) {
66 BpmActivityBehaviorFactory bpmActivityBehaviorFactory = new BpmActivityBehaviorFactory(); 66 BpmActivityBehaviorFactory bpmActivityBehaviorFactory = new BpmActivityBehaviorFactory();
67 bpmActivityBehaviorFactory.setBpmTaskRuleService(taskRuleService); 67 bpmActivityBehaviorFactory.setBpmTaskRuleService(taskRuleService);
68 - bpmActivityBehaviorFactory.setPermissionService(permissionService);  
69 - bpmActivityBehaviorFactory.setDeptService(deptService); 68 + bpmActivityBehaviorFactory.setPermissionCoreService(permissionCoreService);
  69 + bpmActivityBehaviorFactory.setDeptCoreService(deptCoreService);
70 bpmActivityBehaviorFactory.setUserGroupService(userGroupService); 70 bpmActivityBehaviorFactory.setUserGroupService(userGroupService);
71 - bpmActivityBehaviorFactory.setUserService(userService); 71 + bpmActivityBehaviorFactory.setUserCoreService(userCoreService);
72 bpmActivityBehaviorFactory.setScripts(scripts); 72 bpmActivityBehaviorFactory.setScripts(scripts);
73 return bpmActivityBehaviorFactory; 73 return bpmActivityBehaviorFactory;
74 } 74 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmActivityBehaviorFactory.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmActivityBehaviorFactory.java
  View file @4ba064d
@@ -3,9 +3,9 @@ package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavio @@ -3,9 +3,9 @@ package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavio
3 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript; 3 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
4 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService; 4 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService;
5 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService; 5 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService;
6 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
7 -import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;  
8 -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 6 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  7 +import cn.iocoder.yudao.coreservice.modules.system.service.permission.SysPermissionCoreService;
  8 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
9 import lombok.Data; 9 import lombok.Data;
10 import lombok.EqualsAndHashCode; 10 import lombok.EqualsAndHashCode;
11 import lombok.Setter; 11 import lombok.Setter;
@@ -14,7 +14,6 @@ import org.activiti.bpmn.model.UserTask; @@ -14,7 +14,6 @@ import org.activiti.bpmn.model.UserTask;
14 import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior; 14 import org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior;
15 import org.activiti.engine.impl.bpmn.parser.factory.DefaultActivityBehaviorFactory; 15 import org.activiti.engine.impl.bpmn.parser.factory.DefaultActivityBehaviorFactory;
16 16
17 -import javax.annotation.Resource;  
18 import java.util.List; 17 import java.util.List;
19 18
20 /** 19 /**
@@ -31,13 +30,13 @@ public class BpmActivityBehaviorFactory extends DefaultActivityBehaviorFactory { @@ -31,13 +30,13 @@ public class BpmActivityBehaviorFactory extends DefaultActivityBehaviorFactory {
31 @Setter 30 @Setter
32 private BpmTaskAssignRuleService bpmTaskRuleService; 31 private BpmTaskAssignRuleService bpmTaskRuleService;
33 @Setter 32 @Setter
34 - private SysPermissionService permissionService; 33 + private SysPermissionCoreService permissionCoreService;
35 @Setter 34 @Setter
36 - private SysDeptService deptService; 35 + private SysDeptCoreService deptCoreService;
37 @Setter 36 @Setter
38 private BpmUserGroupService userGroupService; 37 private BpmUserGroupService userGroupService;
39 @Setter 38 @Setter
40 - private SysUserService userService; 39 + private SysUserCoreService userCoreService;
41 @Setter 40 @Setter
42 private List<BpmTaskAssignScript> scripts; 41 private List<BpmTaskAssignScript> scripts;
43 42
@@ -45,10 +44,10 @@ public class BpmActivityBehaviorFactory extends DefaultActivityBehaviorFactory { @@ -45,10 +44,10 @@ public class BpmActivityBehaviorFactory extends DefaultActivityBehaviorFactory {
45 public UserTaskActivityBehavior createUserTaskActivityBehavior(UserTask userTask) { 44 public UserTaskActivityBehavior createUserTaskActivityBehavior(UserTask userTask) {
46 BpmUserTaskActivitiBehavior userTaskActivityBehavior = new BpmUserTaskActivitiBehavior(userTask); 45 BpmUserTaskActivitiBehavior userTaskActivityBehavior = new BpmUserTaskActivitiBehavior(userTask);
47 userTaskActivityBehavior.setBpmTaskRuleService(bpmTaskRuleService); 46 userTaskActivityBehavior.setBpmTaskRuleService(bpmTaskRuleService);
48 - userTaskActivityBehavior.setPermissionService(permissionService);  
49 - userTaskActivityBehavior.setDeptService(deptService); 47 + userTaskActivityBehavior.setPermissionCoreService(permissionCoreService);
  48 + userTaskActivityBehavior.setDeptCoreService(deptCoreService);
50 userTaskActivityBehavior.setUserGroupService(userGroupService); 49 userTaskActivityBehavior.setUserGroupService(userGroupService);
51 - userTaskActivityBehavior.setUserService(userService); 50 + userTaskActivityBehavior.setSysUserCoreService(userCoreService);
52 userTaskActivityBehavior.setScripts(scripts); 51 userTaskActivityBehavior.setScripts(scripts);
53 return userTaskActivityBehavior; 52 return userTaskActivityBehavior;
54 } 53 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehavior.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehavior.java
  View file @4ba064d
@@ -9,11 +9,11 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskAssignRu @@ -9,11 +9,11 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskAssignRu
9 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript; 9 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
10 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService; 10 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService;
11 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService; 11 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService;
12 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
13 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
14 -import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;  
15 -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 12 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
16 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 13 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  14 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  15 +import cn.iocoder.yudao.coreservice.modules.system.service.permission.SysPermissionCoreService;
  16 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
17 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 17 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
18 import com.google.common.annotations.VisibleForTesting; 18 import com.google.common.annotations.VisibleForTesting;
19 import lombok.Setter; 19 import lombok.Setter;
@@ -49,13 +49,13 @@ public class BpmUserTaskActivitiBehavior extends UserTaskActivityBehavior { @@ -49,13 +49,13 @@ public class BpmUserTaskActivitiBehavior extends UserTaskActivityBehavior {
49 @Setter 49 @Setter
50 private BpmTaskAssignRuleService bpmTaskRuleService; 50 private BpmTaskAssignRuleService bpmTaskRuleService;
51 @Setter 51 @Setter
52 - private SysPermissionService permissionService; 52 + private SysPermissionCoreService permissionCoreService;
53 @Setter 53 @Setter
54 - private SysDeptService deptService; 54 + private SysDeptCoreService deptCoreService;
55 @Setter 55 @Setter
56 private BpmUserGroupService userGroupService; 56 private BpmUserGroupService userGroupService;
57 @Setter 57 @Setter
58 - private SysUserService userService; 58 + private SysUserCoreService sysUserCoreService;
59 /** 59 /**
60 * 任务分配脚本 60 * 任务分配脚本
61 */ 61 */
@@ -133,21 +133,21 @@ public class BpmUserTaskActivitiBehavior extends UserTaskActivityBehavior { @@ -133,21 +133,21 @@ public class BpmUserTaskActivitiBehavior extends UserTaskActivityBehavior {
133 } 133 }
134 134
135 private Set<Long> calculateTaskCandidateUsersByRole(TaskEntity task, BpmTaskAssignRuleDO rule) { 135 private Set<Long> calculateTaskCandidateUsersByRole(TaskEntity task, BpmTaskAssignRuleDO rule) {
136 - return permissionService.getUserRoleIdListByRoleIds(rule.getOptions()); 136 + return permissionCoreService.getUserRoleIdListByRoleIds(rule.getOptions());
137 } 137 }
138 138
139 private Set<Long> calculateTaskCandidateUsersByDeptMember(TaskEntity task, BpmTaskAssignRuleDO rule) { 139 private Set<Long> calculateTaskCandidateUsersByDeptMember(TaskEntity task, BpmTaskAssignRuleDO rule) {
140 - List<SysUserDO> users = userService.getUsersByDeptIds(rule.getOptions()); 140 + List<SysUserDO> users = sysUserCoreService.getUsersByDeptIds(rule.getOptions());
141 return convertSet(users, SysUserDO::getId); 141 return convertSet(users, SysUserDO::getId);
142 } 142 }
143 143
144 private Set<Long> calculateTaskCandidateUsersByDeptLeader(TaskEntity task, BpmTaskAssignRuleDO rule) { 144 private Set<Long> calculateTaskCandidateUsersByDeptLeader(TaskEntity task, BpmTaskAssignRuleDO rule) {
145 - List<SysDeptDO> depts = deptService.getDepts(rule.getOptions()); 145 + List<SysDeptDO> depts = deptCoreService.getDepts(rule.getOptions());
146 return convertSet(depts, SysDeptDO::getLeaderUserId); 146 return convertSet(depts, SysDeptDO::getLeaderUserId);
147 } 147 }
148 148
149 private Set<Long> calculateTaskCandidateUsersByPost(TaskEntity task, BpmTaskAssignRuleDO rule) { 149 private Set<Long> calculateTaskCandidateUsersByPost(TaskEntity task, BpmTaskAssignRuleDO rule) {
150 - List<SysUserDO> users = userService.getUsersByPostIds(rule.getOptions()); 150 + List<SysUserDO> users = sysUserCoreService.getUsersByPostIds(rule.getOptions());
151 return convertSet(users, SysUserDO::getId); 151 return convertSet(users, SysUserDO::getId);
152 } 152 }
153 153
@@ -183,7 +183,7 @@ public class BpmUserTaskActivitiBehavior extends UserTaskActivityBehavior { @@ -183,7 +183,7 @@ public class BpmUserTaskActivitiBehavior extends UserTaskActivityBehavior {
183 if (CollUtil.isEmpty(assigneeUserIds)) { 183 if (CollUtil.isEmpty(assigneeUserIds)) {
184 return; 184 return;
185 } 185 }
186 - Map<Long, SysUserDO> userMap = userService.getUserMap(assigneeUserIds); 186 + Map<Long, SysUserDO> userMap = sysUserCoreService.getUserMap(assigneeUserIds);
187 assigneeUserIds.removeIf(id -> { 187 assigneeUserIds.removeIf(id -> {
188 SysUserDO user = userMap.get(id); 188 SysUserDO user = userMap.get(id);
189 return user == null || !CommonStatusEnum.ENABLE.getStatus().equals(user.getStatus()); 189 return user == null || !CommonStatusEnum.ENABLE.getStatus().equals(user.getStatus());
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/package-info.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/BpmTaskAssignScript.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/BpmTaskAssignScript.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.impl; 1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.impl;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript; 3 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
4 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
5 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
6 -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 4 +
  5 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
7 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 6 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  7 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  8 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
8 import org.activiti.engine.impl.persistence.entity.TaskEntity; 9 import org.activiti.engine.impl.persistence.entity.TaskEntity;
9 import org.springframework.util.Assert; 10 import org.springframework.util.Assert;
10 11
@@ -23,9 +24,9 @@ import static java.util.Collections.emptySet; @@ -23,9 +24,9 @@ import static java.util.Collections.emptySet;
23 public abstract class BpmTaskAssignLeaderAbstractScript implements BpmTaskAssignScript { 24 public abstract class BpmTaskAssignLeaderAbstractScript implements BpmTaskAssignScript {
24 25
25 @Resource 26 @Resource
26 - private SysUserService userService; 27 + private SysUserCoreService userCoreService;
27 @Resource 28 @Resource
28 - private SysDeptService deptService; 29 + private SysDeptCoreService deptCoreService;
29 30
30 protected Set<Long> calculateTaskCandidateUsers(TaskEntity task, int level) { 31 protected Set<Long> calculateTaskCandidateUsers(TaskEntity task, int level) {
31 Assert.isTrue(level > 0, "level 必须大于 0"); 32 Assert.isTrue(level > 0, "level 必须大于 0");
@@ -41,7 +42,7 @@ public abstract class BpmTaskAssignLeaderAbstractScript implements BpmTaskAssign @@ -41,7 +42,7 @@ public abstract class BpmTaskAssignLeaderAbstractScript implements BpmTaskAssign
41 return emptySet(); 42 return emptySet();
42 } 43 }
43 } else { 44 } else {
44 - SysDeptDO parentDept = deptService.getDept(dept.getParentId()); 45 + SysDeptDO parentDept = deptCoreService.getDept(dept.getParentId());
45 if (parentDept == null) { // 找不到父级部门，所以只好结束寻找。原因是：例如说，级别比较高的人，所在部门层级比较少 46 if (parentDept == null) { // 找不到父级部门，所以只好结束寻找。原因是：例如说，级别比较高的人，所在部门层级比较少
46 break; 47 break;
47 } 48 }
@@ -52,11 +53,11 @@ public abstract class BpmTaskAssignLeaderAbstractScript implements BpmTaskAssign @@ -52,11 +53,11 @@ public abstract class BpmTaskAssignLeaderAbstractScript implements BpmTaskAssign
52 } 53 }
53 54
54 private SysDeptDO getStartUserDept(Long startUserId) { 55 private SysDeptDO getStartUserDept(Long startUserId) {
55 - SysUserDO startUser = userService.getUser(startUserId); 56 + SysUserDO startUser = userCoreService.getUser(startUserId);
56 if (startUser.getDeptId() == null) { // 找不到部门，所以无法使用该规则 57 if (startUser.getDeptId() == null) { // 找不到部门，所以无法使用该规则
57 return null; 58 return null;
58 } 59 }
59 - return deptService.getDept(startUser.getDeptId()); 60 + return deptCoreService.getDept(startUser.getDeptId());
60 } 61 }
61 62
62 } 63 }
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignStartUserScript.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignStartUserScript.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/BpmProcessInstanceResultEvent.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/BpmProcessInstanceResultEvent.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/BpmProcessInstanceResultEventListener.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/BpmProcessInstanceResultEventListener.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/BpmProcessInstanceResultEventPublisher.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/BpmProcessInstanceResultEventPublisher.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/package-info.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/identity/EmptyUserGroupManager.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/identity/EmptyUserGroupManager.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmProcessInstanceEventListener.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmProcessInstanceEventListener.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmTackActivitiEventListener.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmTackActivitiEventListener.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmTaskEventListener.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmTaskEventListener.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/package-info.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/package-info.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/package-info.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmFormService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmFormService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmModelService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmModelService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmProcessDefinitionService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmProcessDefinitionService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmTaskAssignRuleService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmTaskAssignRuleService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmUserGroupService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmUserGroupService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/dto/BpmFormFieldRespDTO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/dto/BpmFormFieldRespDTO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmFormServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmFormServiceImpl.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmModelServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmModelServiceImpl.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmProcessDefinitionServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmProcessDefinitionServiceImpl.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmTaskAssignRuleServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmTaskAssignRuleServiceImpl.java
  View file @4ba064d
@@ -16,12 +16,13 @@ import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmModelServi @@ -16,12 +16,13 @@ import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmModelServi
16 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService; 16 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;
17 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService; 17 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService;
18 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService; 18 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService;
19 -import cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants;  
20 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
21 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService;  
22 -import cn.iocoder.yudao.adminserver.modules.system.service.dict.SysDictDataService;  
23 -import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysRoleService;  
24 -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 19 +
  20 +import cn.iocoder.yudao.coreservice.modules.system.enums.SysDictTypeConstants;
  21 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  22 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysPostCoreService;
  23 +import cn.iocoder.yudao.coreservice.modules.system.service.dict.SysDictDataCoreService;
  24 +import cn.iocoder.yudao.coreservice.modules.system.service.permission.SysRoleCoreService;
  25 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
25 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils; 26 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils;
26 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 27 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
27 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 28 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
@@ -36,7 +37,6 @@ import javax.annotation.Resource; @@ -36,7 +37,6 @@ import javax.annotation.Resource;
36 import java.util.*; 37 import java.util.*;
37 38
38 import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.*; 39 import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.*;
39 -import static cn.iocoder.yudao.adminserver.modules.system.enums.SysDictTypeConstants.BPM_TASK_ASSIGN_RULE_TYPE;  
40 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 40 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
41 41
42 /** 42 /**
@@ -57,17 +57,17 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService { @@ -57,17 +57,17 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService {
57 @Lazy // 解决循环依赖 57 @Lazy // 解决循环依赖
58 private BpmProcessDefinitionService processDefinitionService; 58 private BpmProcessDefinitionService processDefinitionService;
59 @Resource 59 @Resource
60 - private SysRoleService roleService; 60 + private SysRoleCoreService roleCoreService;
61 @Resource 61 @Resource
62 - private SysDeptService deptService; 62 + private SysDeptCoreService deptCoreService;
63 @Resource 63 @Resource
64 - private SysPostService postService; 64 + private SysPostCoreService postService;
65 @Resource 65 @Resource
66 - private SysUserService userService; 66 + private SysUserCoreService userCoreService;
67 @Resource 67 @Resource
68 private BpmUserGroupService userGroupService; 68 private BpmUserGroupService userGroupService;
69 @Resource 69 @Resource
70 - private SysDictDataService dictDataService; 70 + private SysDictDataCoreService dictDataCoreService;
71 71
72 @Override 72 @Override
73 public List<BpmTaskAssignRuleDO> getTaskAssignRuleListByProcessDefinitionId(String processDefinitionId, 73 public List<BpmTaskAssignRuleDO> getTaskAssignRuleListByProcessDefinitionId(String processDefinitionId,
@@ -182,18 +182,18 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService { @@ -182,18 +182,18 @@ public class BpmTaskAssignRuleServiceImpl implements BpmTaskAssignRuleService {
182 182
183 private void validTaskAssignRuleOptions(Integer type, Set<Long> options) { 183 private void validTaskAssignRuleOptions(Integer type, Set<Long> options) {
184 if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.ROLE.getType())) { 184 if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.ROLE.getType())) {
185 - roleService.validRoles(options); 185 + roleCoreService.validRoles(options);
186 } else if (ObjectUtils.equalsAny(type, BpmTaskAssignRuleTypeEnum.DEPT_MEMBER.getType(), 186 } else if (ObjectUtils.equalsAny(type, BpmTaskAssignRuleTypeEnum.DEPT_MEMBER.getType(),
187 BpmTaskAssignRuleTypeEnum.DEPT_LEADER.getType())) { 187 BpmTaskAssignRuleTypeEnum.DEPT_LEADER.getType())) {
188 - deptService.validDepts(options); 188 + deptCoreService.validDepts(options);
189 } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.POST.getType())) { 189 } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.POST.getType())) {
190 postService.validPosts(options); 190 postService.validPosts(options);
191 } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.USER.getType())) { 191 } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.USER.getType())) {
192 - userService.validUsers(options); 192 + userCoreService.validUsers(options);
193 } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.USER_GROUP.getType())) { 193 } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.USER_GROUP.getType())) {
194 userGroupService.validUserGroups(options); 194 userGroupService.validUserGroups(options);
195 } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.SCRIPT.getType())) { 195 } else if (Objects.equals(type, BpmTaskAssignRuleTypeEnum.SCRIPT.getType())) {
196 - dictDataService.validDictDatas(SysDictTypeConstants.BPM_TASK_ASSIGN_SCRIPT, 196 + dictDataCoreService.validDictDatas(SysDictTypeConstants.BPM_TASK_ASSIGN_SCRIPT,
197 CollectionUtils.convertSet(options, String::valueOf)); 197 CollectionUtils.convertSet(options, String::valueOf));
198 } else { 198 } else {
199 throw new IllegalArgumentException(StrUtil.format("未知的规则类型({})", type)); 199 throw new IllegalArgumentException(StrUtil.format("未知的规则类型({})", type));
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmUserGroupServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmUserGroupServiceImpl.java
  View file @4ba064d
@@ -8,7 +8,6 @@ import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmUserGroupC @@ -8,7 +8,6 @@ import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmUserGroupC
8 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO; 8 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;
9 import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmUserGroupMapper; 9 import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmUserGroupMapper;
10 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService; 10 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService;
11 -import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;  
12 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 11 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
13 import cn.iocoder.yudao.framework.common.pojo.PageResult; 12 import cn.iocoder.yudao.framework.common.pojo.PageResult;
14 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 13 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -23,8 +22,6 @@ import java.util.Set; @@ -23,8 +22,6 @@ import java.util.Set;
23 22
24 import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_IS_DISABLE; 23 import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_IS_DISABLE;
25 import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_NOT_EXISTS; 24 import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_NOT_EXISTS;
26 -import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.USER_IS_DISABLE;  
27 -import static cn.iocoder.yudao.adminserver.modules.system.enums.SysErrorCodeConstants.USER_NOT_EXISTS;  
28 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 25 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
29 26
30 /** 27 /**
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/BpmMessageService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/BpmMessageService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/impl/BpmMessageServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/impl/BpmMessageServiceImpl.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/BpmOALeaveService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/BpmOALeaveService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/impl/BpmOALeaveServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/impl/BpmOALeaveServiceImpl.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/listener/BpmOALeaveResultListener.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/listener/BpmOALeaveResultListener.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmActivityService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmActivityService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmProcessInstanceService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmProcessInstanceService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmTaskService.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmTaskService.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/dto/BpmProcessInstanceCreateReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/dto/BpmProcessInstanceCreateReqDTO.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/impl/BpmActivityServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/impl/BpmActivityServiceImpl.java
  View file @4ba064d
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java
  View file @4ba064d
@@ -12,18 +12,16 @@ import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.task.BpmProcessInstanc @@ -12,18 +12,16 @@ import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.task.BpmProcessInstanc
12 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; 12 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum;
13 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceResultEnum; 13 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceResultEnum;
14 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceStatusEnum; 14 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceStatusEnum;
15 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEvent;  
16 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEventListener;  
17 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEventPublisher; 15 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEventPublisher;
18 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService; 16 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;
19 import cn.iocoder.yudao.adminserver.modules.bpm.service.message.BpmMessageService; 17 import cn.iocoder.yudao.adminserver.modules.bpm.service.message.BpmMessageService;
20 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService; 18 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService;
21 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmTaskService; 19 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmTaskService;
22 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.dto.BpmProcessInstanceCreateReqDTO; 20 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.dto.BpmProcessInstanceCreateReqDTO;
23 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
24 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
25 -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 21 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
26 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 22 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  23 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  24 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
27 import cn.iocoder.yudao.framework.common.pojo.PageResult; 25 import cn.iocoder.yudao.framework.common.pojo.PageResult;
28 import cn.iocoder.yudao.framework.common.util.number.NumberUtils; 26 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
29 import lombok.extern.slf4j.Slf4j; 27 import lombok.extern.slf4j.Slf4j;
@@ -68,9 +66,9 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @@ -68,9 +66,9 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
68 private HistoryService historyService; 66 private HistoryService historyService;
69 67
70 @Resource 68 @Resource
71 - private SysUserService userService; 69 + private SysUserCoreService userCoreService;
72 @Resource 70 @Resource
73 - private SysDeptService deptService; 71 + private SysDeptCoreService deptCoreService;
74 @Resource 72 @Resource
75 @Lazy // 解决循环依赖 73 @Lazy // 解决循环依赖
76 private BpmTaskService taskService; 74 private BpmTaskService taskService;
@@ -192,10 +190,10 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @@ -192,10 +190,10 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
192 String bpmnXml = processDefinitionService.getProcessDefinitionBpmnXML(processInstance.getProcessDefinitionId()); 190 String bpmnXml = processDefinitionService.getProcessDefinitionBpmnXML(processInstance.getProcessDefinitionId());
193 191
194 // 获得 User 192 // 获得 User
195 - SysUserDO startUser = userService.getUser(NumberUtils.parseLong(processInstance.getStartUserId())); 193 + SysUserDO startUser = userCoreService.getUser(NumberUtils.parseLong(processInstance.getStartUserId()));
196 SysDeptDO dept = null; 194 SysDeptDO dept = null;
197 if (startUser != null) { 195 if (startUser != null) {
198 - dept = deptService.getDept(startUser.getDeptId()); 196 + dept = deptCoreService.getDept(startUser.getDeptId());
199 } 197 }
200 198
201 // 拼接结果 199 // 拼接结果
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/impl/BpmTaskServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/impl/BpmTaskServiceImpl.java
  View file @4ba064d
@@ -11,10 +11,11 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceRes @@ -11,10 +11,11 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceRes
11 import cn.iocoder.yudao.adminserver.modules.bpm.service.message.BpmMessageService; 11 import cn.iocoder.yudao.adminserver.modules.bpm.service.message.BpmMessageService;
12 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService; 12 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService;
13 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmTaskService; 13 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmTaskService;
14 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
15 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
16 -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 14 +
  15 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
17 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 16 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  17 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  18 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
18 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils; 19 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils;
19 import cn.iocoder.yudao.framework.common.pojo.PageResult; 20 import cn.iocoder.yudao.framework.common.pojo.PageResult;
20 import cn.iocoder.yudao.framework.common.util.number.NumberUtils; 21 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
@@ -59,9 +60,9 @@ public class BpmTaskServiceImpl implements BpmTaskService { @@ -59,9 +60,9 @@ public class BpmTaskServiceImpl implements BpmTaskService {
59 private HistoryService historyService; 60 private HistoryService historyService;
60 61
61 @Resource 62 @Resource
62 - private SysUserService userService; 63 + private SysUserCoreService userCoreService;
63 @Resource 64 @Resource
64 - private SysDeptService deptService; 65 + private SysDeptCoreService deptCoreService;
65 @Resource 66 @Resource
66 @Lazy // 解决循环依赖 67 @Lazy // 解决循环依赖
67 private BpmProcessInstanceService processInstanceService; 68 private BpmProcessInstanceService processInstanceService;
@@ -95,9 +96,9 @@ public class BpmTaskServiceImpl implements BpmTaskService { @@ -95,9 +96,9 @@ public class BpmTaskServiceImpl implements BpmTaskService {
95 // 获得 User Map 96 // 获得 User Map
96 Set<Long> userIds = convertSet(tasks, task -> NumberUtils.parseLong(task.getAssignee())); 97 Set<Long> userIds = convertSet(tasks, task -> NumberUtils.parseLong(task.getAssignee()));
97 userIds.add(NumberUtils.parseLong(processInstance.getStartUserId())); 98 userIds.add(NumberUtils.parseLong(processInstance.getStartUserId()));
98 - Map<Long, SysUserDO> userMap = userService.getUserMap(userIds); 99 + Map<Long, SysUserDO> userMap = userCoreService.getUserMap(userIds);
99 // 获得 Dept Map 100 // 获得 Dept Map
100 - Map<Long, SysDeptDO> deptMap = deptService.getDeptMap(convertSet(userMap.values(), SysUserDO::getDeptId)); 101 + Map<Long, SysDeptDO> deptMap = deptCoreService.getDeptMap(convertSet(userMap.values(), SysUserDO::getDeptId));
101 102
102 // 拼接数据 103 // 拼接数据
103 return BpmTaskConvert.INSTANCE.convertList3(tasks, bpmTaskExtDOMap, processInstance, userMap, deptMap); 104 return BpmTaskConvert.INSTANCE.convertList3(tasks, bpmTaskExtDOMap, processInstance, userMap, deptMap);
@@ -144,7 +145,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { @@ -144,7 +145,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
144 Map<String, ProcessInstance> processInstanceMap = processInstanceService.getProcessInstanceMap( 145 Map<String, ProcessInstance> processInstanceMap = processInstanceService.getProcessInstanceMap(
145 convertSet(tasks, Task::getProcessInstanceId)); 146 convertSet(tasks, Task::getProcessInstanceId));
146 // 获得 User Map 147 // 获得 User Map
147 - Map<Long, SysUserDO> userMap = userService.getUserMap( 148 + Map<Long, SysUserDO> userMap = userCoreService.getUserMap(
148 convertSet(processInstanceMap.values(), instance -> Long.valueOf(instance.getStartUserId()))); 149 convertSet(processInstanceMap.values(), instance -> Long.valueOf(instance.getStartUserId())));
149 // 拼接结果 150 // 拼接结果
150 return new PageResult<>(BpmTaskConvert.INSTANCE.convertList1(tasks, processInstanceMap, userMap), 151 return new PageResult<>(BpmTaskConvert.INSTANCE.convertList1(tasks, processInstanceMap, userMap),
@@ -180,7 +181,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { @@ -180,7 +181,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
180 Map<String, HistoricProcessInstance> historicProcessInstanceMap = processInstanceService.getHistoricProcessInstanceMap( 181 Map<String, HistoricProcessInstance> historicProcessInstanceMap = processInstanceService.getHistoricProcessInstanceMap(
181 convertSet(tasks, HistoricTaskInstance::getProcessInstanceId)); 182 convertSet(tasks, HistoricTaskInstance::getProcessInstanceId));
182 // 获得 User Map 183 // 获得 User Map
183 - Map<Long, SysUserDO> userMap = userService.getUserMap( 184 + Map<Long, SysUserDO> userMap = userCoreService.getUserMap(
184 convertSet(historicProcessInstanceMap.values(), instance -> Long.valueOf(instance.getStartUserId()))); 185 convertSet(historicProcessInstanceMap.values(), instance -> Long.valueOf(instance.getStartUserId())));
185 // 拼接结果 186 // 拼接结果
186 return new PageResult<>(BpmTaskConvert.INSTANCE.convertList2(tasks, bpmTaskExtDOMap, historicProcessInstanceMap, userMap), 187 return new PageResult<>(BpmTaskConvert.INSTANCE.convertList2(tasks, bpmTaskExtDOMap, historicProcessInstanceMap, userMap),
@@ -291,7 +292,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { @@ -291,7 +292,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
291 @Override 292 @Override
292 public void afterCommit() { 293 public void afterCommit() {
293 ProcessInstance processInstance = processInstanceService.getProcessInstance(task.getProcessInstanceId()); 294 ProcessInstance processInstance = processInstanceService.getProcessInstance(task.getProcessInstanceId());
294 - SysUserDO startUser = userService.getUser(Long.valueOf(processInstance.getStartUserId())); 295 + SysUserDO startUser = userCoreService.getUser(Long.valueOf(processInstance.getStartUserId()));
295 messageService.sendMessageWhenTaskAssigned(BpmMessageConvert.INSTANCE.convert(processInstance, startUser, task)); 296 messageService.sendMessageWhenTaskAssigned(BpmMessageConvert.INSTANCE.convert(processInstance, startUser, task));
296 } 297 }
297 }); 298 });
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/package-info.java
  View file @4ba064d
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehaviorTest.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehaviorTest.java
  View file @4ba064d
@@ -8,27 +8,28 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskRuleScri @@ -8,27 +8,28 @@ import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskRuleScri
8 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript; 8 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
9 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService; 9 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService;
10 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService; 10 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService;
11 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
12 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
13 -import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;  
14 -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 11 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
15 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 12 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  13 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  14 +import cn.iocoder.yudao.coreservice.modules.system.service.permission.SysPermissionCoreService;
  15 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
16 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 16 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
17 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 17 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
18 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; 18 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
19 import org.activiti.engine.impl.persistence.entity.TaskEntity; 19 import org.activiti.engine.impl.persistence.entity.TaskEntity;
20 -import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;  
21 import org.junit.jupiter.api.Test; 20 import org.junit.jupiter.api.Test;
22 import org.mockito.InjectMocks; 21 import org.mockito.InjectMocks;
23 import org.mockito.Mock; 22 import org.mockito.Mock;
24 23
25 -import java.util.*; 24 +import java.util.Arrays;
  25 +import java.util.List;
  26 +import java.util.Map;
  27 +import java.util.Set;
26 28
27 -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.*; 29 +import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
28 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; 30 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
29 import static java.util.Collections.singleton; 31 import static java.util.Collections.singleton;
30 -import static java.util.Collections.singletonList;  
31 -import static org.junit.jupiter.api.Assertions.*; 32 +import static org.junit.jupiter.api.Assertions.assertEquals;
32 import static org.mockito.ArgumentMatchers.eq; 33 import static org.mockito.ArgumentMatchers.eq;
33 import static org.mockito.Mockito.when; 34 import static org.mockito.Mockito.when;
34 35
@@ -39,13 +40,13 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest { @@ -39,13 +40,13 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest {
39 @Mock 40 @Mock
40 private BpmTaskAssignRuleService bpmTaskRuleService; 41 private BpmTaskAssignRuleService bpmTaskRuleService;
41 @Mock 42 @Mock
42 - private SysPermissionService permissionService; 43 + private SysPermissionCoreService permissionCoreService;
43 @Mock 44 @Mock
44 - private SysDeptService deptService; 45 + private SysDeptCoreService deptCoreService;
45 @Mock 46 @Mock
46 private BpmUserGroupService userGroupService; 47 private BpmUserGroupService userGroupService;
47 @Mock 48 @Mock
48 - private SysUserService userService; 49 + private SysUserCoreService userCoreService;
49 50
50 @Test 51 @Test
51 public void testCalculateTaskCandidateUsers_Role() { 52 public void testCalculateTaskCandidateUsers_Role() {
@@ -53,7 +54,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest { @@ -53,7 +54,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest {
53 BpmTaskAssignRuleDO rule = new BpmTaskAssignRuleDO().setOptions(asSet(1L, 2L)) 54 BpmTaskAssignRuleDO rule = new BpmTaskAssignRuleDO().setOptions(asSet(1L, 2L))
54 .setType(BpmTaskAssignRuleTypeEnum.ROLE.getType()); 55 .setType(BpmTaskAssignRuleTypeEnum.ROLE.getType());
55 // mock 方法 56 // mock 方法
56 - when(permissionService.getUserRoleIdListByRoleIds(eq(rule.getOptions()))) 57 + when(permissionCoreService.getUserRoleIdListByRoleIds(eq(rule.getOptions())))
57 .thenReturn(asSet(11L, 22L)); 58 .thenReturn(asSet(11L, 22L));
58 mockGetUserMap(asSet(11L, 22L)); 59 mockGetUserMap(asSet(11L, 22L));
59 60
@@ -71,7 +72,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest { @@ -71,7 +72,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest {
71 // mock 方法 72 // mock 方法
72 List<SysUserDO> users = CollectionUtils.convertList(asSet(11L, 22L), 73 List<SysUserDO> users = CollectionUtils.convertList(asSet(11L, 22L),
73 id -> new SysUserDO().setId(id)); 74 id -> new SysUserDO().setId(id));
74 - when(userService.getUsersByDeptIds(eq(rule.getOptions()))).thenReturn(users); 75 + when(userCoreService.getUsersByDeptIds(eq(rule.getOptions()))).thenReturn(users);
75 mockGetUserMap(asSet(11L, 22L)); 76 mockGetUserMap(asSet(11L, 22L));
76 77
77 // 调用 78 // 调用
@@ -88,7 +89,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest { @@ -88,7 +89,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest {
88 // mock 方法 89 // mock 方法
89 SysDeptDO dept1 = randomPojo(SysDeptDO.class, o -> o.setLeaderUserId(11L)); 90 SysDeptDO dept1 = randomPojo(SysDeptDO.class, o -> o.setLeaderUserId(11L));
90 SysDeptDO dept2 = randomPojo(SysDeptDO.class, o -> o.setLeaderUserId(22L)); 91 SysDeptDO dept2 = randomPojo(SysDeptDO.class, o -> o.setLeaderUserId(22L));
91 - when(deptService.getDepts(eq(rule.getOptions()))).thenReturn(Arrays.asList(dept1, dept2)); 92 + when(deptCoreService.getDepts(eq(rule.getOptions()))).thenReturn(Arrays.asList(dept1, dept2));
92 mockGetUserMap(asSet(11L, 22L)); 93 mockGetUserMap(asSet(11L, 22L));
93 94
94 // 调用 95 // 调用
@@ -105,7 +106,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest { @@ -105,7 +106,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest {
105 // mock 方法 106 // mock 方法
106 List<SysUserDO> users = CollectionUtils.convertList(asSet(11L, 22L), 107 List<SysUserDO> users = CollectionUtils.convertList(asSet(11L, 22L),
107 id -> new SysUserDO().setId(id)); 108 id -> new SysUserDO().setId(id));
108 - when(userService.getUsersByPostIds(eq(rule.getOptions()))).thenReturn(users); 109 + when(userCoreService.getUsersByPostIds(eq(rule.getOptions()))).thenReturn(users);
109 mockGetUserMap(asSet(11L, 22L)); 110 mockGetUserMap(asSet(11L, 22L));
110 111
111 // 调用 112 // 调用
@@ -195,7 +196,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest { @@ -195,7 +196,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest {
195 .setStatus(CommonStatusEnum.DISABLE.getStatus())); 196 .setStatus(CommonStatusEnum.DISABLE.getStatus()));
196 Map<Long, SysUserDO> userMap = MapUtil.builder(user1.getId(), user1) 197 Map<Long, SysUserDO> userMap = MapUtil.builder(user1.getId(), user1)
197 .put(user2.getId(), user2).build(); 198 .put(user2.getId(), user2).build();
198 - when(userService.getUserMap(eq(assigneeUserIds))).thenReturn(userMap); 199 + when(userCoreService.getUserMap(eq(assigneeUserIds))).thenReturn(userMap);
199 200
200 // 调用 201 // 调用
201 behavior.removeDisableUsers(assigneeUserIds); 202 behavior.removeDisableUsers(assigneeUserIds);
@@ -206,7 +207,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest { @@ -206,7 +207,7 @@ public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest {
206 private void mockGetUserMap(Set<Long> assigneeUserIds) { 207 private void mockGetUserMap(Set<Long> assigneeUserIds) {
207 Map<Long, SysUserDO> userMap = CollectionUtils.convertMap(assigneeUserIds, id -> id, 208 Map<Long, SysUserDO> userMap = CollectionUtils.convertMap(assigneeUserIds, id -> id,
208 id -> new SysUserDO().setId(id).setStatus(CommonStatusEnum.ENABLE.getStatus())); 209 id -> new SysUserDO().setId(id).setStatus(CommonStatusEnum.ENABLE.getStatus()));
209 - when(userService.getUserMap(eq(assigneeUserIds))).thenReturn(userMap); 210 + when(userCoreService.getUserMap(eq(assigneeUserIds))).thenReturn(userMap);
210 } 211 }
211 212
212 } 213 }
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java
  View file @4ba064d
1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.impl; 1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.impl;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.system.dal.dataobject.dept.SysDeptDO;  
4 -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysDeptService;  
5 -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService; 3 +import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.dept.SysDeptDO;
6 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO; 4 import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
  5 +import cn.iocoder.yudao.coreservice.modules.system.service.dept.SysDeptCoreService;
  6 +import cn.iocoder.yudao.coreservice.modules.system.service.user.SysUserCoreService;
7 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; 7 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
8 import org.activiti.engine.impl.persistence.entity.ExecutionEntityImpl; 8 import org.activiti.engine.impl.persistence.entity.ExecutionEntityImpl;
9 import org.activiti.engine.impl.persistence.entity.TaskEntity; 9 import org.activiti.engine.impl.persistence.entity.TaskEntity;
@@ -12,15 +12,12 @@ import org.junit.jupiter.api.Test; @@ -12,15 +12,12 @@ import org.junit.jupiter.api.Test;
12 import org.mockito.InjectMocks; 12 import org.mockito.InjectMocks;
13 import org.mockito.Mock; 13 import org.mockito.Mock;
14 14
15 -import javax.annotation.Resource;  
16 -  
17 import java.util.Set; 15 import java.util.Set;
18 16
19 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet; 17 import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
20 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; 18 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
21 -import static org.junit.jupiter.api.Assertions.*; 19 +import static org.junit.jupiter.api.Assertions.assertEquals;
22 import static org.mockito.ArgumentMatchers.eq; 20 import static org.mockito.ArgumentMatchers.eq;
23 -import static org.mockito.Mockito.mock;  
24 import static org.mockito.Mockito.when; 21 import static org.mockito.Mockito.when;
25 22
26 class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest { 23 class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest {
@@ -29,9 +26,9 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest { @@ -29,9 +26,9 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest {
29 private BpmTaskAssignLeaderX2Script script; 26 private BpmTaskAssignLeaderX2Script script;
30 27
31 @Mock 28 @Mock
32 - private SysUserService userService; 29 + private SysUserCoreService userCoreService;
33 @Mock 30 @Mock
34 - private SysDeptService deptService; 31 + private SysDeptCoreService deptCoreService;
35 32
36 @Test 33 @Test
37 public void testCalculateTaskCandidateUsers_noDept() { 34 public void testCalculateTaskCandidateUsers_noDept() {
@@ -39,7 +36,7 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest { @@ -39,7 +36,7 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest {
39 TaskEntity task = buildTaskEntity(1L); 36 TaskEntity task = buildTaskEntity(1L);
40 // mock 方法(startUser) 37 // mock 方法(startUser)
41 SysUserDO startUser = randomPojo(SysUserDO.class, o -> o.setDeptId(10L)); 38 SysUserDO startUser = randomPojo(SysUserDO.class, o -> o.setDeptId(10L));
42 - when(userService.getUser(eq(1L))).thenReturn(startUser); 39 + when(userCoreService.getUser(eq(1L))).thenReturn(startUser);
43 40
44 // 调用 41 // 调用
45 Set<Long> result = script.calculateTaskCandidateUsers(task); 42 Set<Long> result = script.calculateTaskCandidateUsers(task);
@@ -53,10 +50,10 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest { @@ -53,10 +50,10 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest {
53 TaskEntity task = buildTaskEntity(1L); 50 TaskEntity task = buildTaskEntity(1L);
54 // mock 方法(startUser) 51 // mock 方法(startUser)
55 SysUserDO startUser = randomPojo(SysUserDO.class, o -> o.setDeptId(10L)); 52 SysUserDO startUser = randomPojo(SysUserDO.class, o -> o.setDeptId(10L));
56 - when(userService.getUser(eq(1L))).thenReturn(startUser); 53 + when(userCoreService.getUser(eq(1L))).thenReturn(startUser);
57 SysDeptDO startUserDept = randomPojo(SysDeptDO.class, o -> o.setId(10L).setParentId(100L) 54 SysDeptDO startUserDept = randomPojo(SysDeptDO.class, o -> o.setId(10L).setParentId(100L)
58 .setLeaderUserId(20L)); 55 .setLeaderUserId(20L));
59 - when(deptService.getDept(eq(10L))).thenReturn(startUserDept); 56 + when(deptCoreService.getDept(eq(10L))).thenReturn(startUserDept);
60 57
61 // 调用 58 // 调用
62 Set<Long> result = script.calculateTaskCandidateUsers(task); 59 Set<Long> result = script.calculateTaskCandidateUsers(task);
@@ -70,14 +67,14 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest { @@ -70,14 +67,14 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest {
70 TaskEntity task = buildTaskEntity(1L); 67 TaskEntity task = buildTaskEntity(1L);
71 // mock 方法(startUser) 68 // mock 方法(startUser)
72 SysUserDO startUser = randomPojo(SysUserDO.class, o -> o.setDeptId(10L)); 69 SysUserDO startUser = randomPojo(SysUserDO.class, o -> o.setDeptId(10L));
73 - when(userService.getUser(eq(1L))).thenReturn(startUser); 70 + when(userCoreService.getUser(eq(1L))).thenReturn(startUser);
74 SysDeptDO startUserDept = randomPojo(SysDeptDO.class, o -> o.setId(10L).setParentId(100L) 71 SysDeptDO startUserDept = randomPojo(SysDeptDO.class, o -> o.setId(10L).setParentId(100L)
75 .setLeaderUserId(20L)); 72 .setLeaderUserId(20L));
76 - when(deptService.getDept(eq(10L))).thenReturn(startUserDept); 73 + when(deptCoreService.getDept(eq(10L))).thenReturn(startUserDept);
77 // mock 方法（父 dept） 74 // mock 方法（父 dept）
78 SysDeptDO parentDept = randomPojo(SysDeptDO.class, o -> o.setId(100L).setParentId(1000L) 75 SysDeptDO parentDept = randomPojo(SysDeptDO.class, o -> o.setId(100L).setParentId(1000L)
79 .setLeaderUserId(200L)); 76 .setLeaderUserId(200L));
80 - when(deptService.getDept(eq(100L))).thenReturn(parentDept); 77 + when(deptCoreService.getDept(eq(100L))).thenReturn(parentDept);
81 78
82 // 调用 79 // 调用
83 Set<Long> result = script.calculateTaskCandidateUsers(task); 80 Set<Long> result = script.calculateTaskCandidateUsers(task);
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-activiti/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/package-info.java
  View file @4ba064d
yudao-module-bpm/yudao-module-bpm-core-service/pom.xml 0 → 100644
  View file @4ba064d
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <artifactId>yudao-module-bpm</artifactId>
  7 + <groupId>cn.iocoder.boot</groupId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 +
  12 + <artifactId>yudao-module-bpm-core-service</artifactId>
  13 +
  14 +
  15 +</project>
0 \ No newline at end of file 16 \ No newline at end of file
yudao-module-bpm/yudao-module-bpm-flowable/pom.xml 0 → 100644
  View file @4ba064d
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <parent>
  6 + <artifactId>yudao-module-bpm</artifactId>
  7 + <groupId>cn.iocoder.boot</groupId>
  8 + <version>${revision}</version>
  9 + </parent>
  10 + <modelVersion>4.0.0</modelVersion>
  11 + <artifactId>yudao-module-bpm-flowable</artifactId>
  12 + <dependencies>
  13 + <dependency>
  14 + <groupId>org.flowable</groupId>
  15 + <artifactId>flowable-spring-boot-starter-basic</artifactId>
  16 + </dependency>
  17 + <dependency>
  18 + <groupId>org.flowable</groupId>
  19 + <artifactId>flowable-spring-boot-starter-actuator</artifactId>
  20 + </dependency>
  21 + </dependencies>
  22 +
  23 +</project>
0 \ No newline at end of file 24 \ No newline at end of file