BJ_ZTEITS-Developers / parking-cloud-yudao

Commit fe1271a6f7eaeb37fb36c6153af33add81e092e0

Authored by YunaiV
1 parent 510917c5

多模块重构 8：bom 模块，尝试公用部分逻辑

Inline Side-by-side
Showing 118 changed files with 274 additions and 509 deletions

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 118 files are displayed.

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/coreservice/modules/bpm/api/form/BpmFormServiceApi.java deleted
View file @510917c
1 -package cn.iocoder.yudao.coreservice.modules.bpm.api.form;  
2 -  
3 -import cn.hutool.core.collection.CollUtil;  
4 -import cn.iocoder.yudao.coreservice.modules.bpm.api.form.dto.BpmFormDTO;  
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 -/**  
13 - * Bpm 动态表单 Service API 接口  
14 - *  
15 - * @author @风里雾里  
16 - */  
17 -public interface BpmFormServiceApi {  
18 - /**  
19 - * 获得动态表单  
20 - *  
21 - * @param id 编号  
22 - * @return 动态表单  
23 - */  
24 - BpmFormDTO getForm(Long id);  
25 -  
26 - /**  
27 - * 获得动态表单列表  
28 - *  
29 - * @param ids 编号  
30 - * @return 动态表单列表  
31 - */  
32 - List<BpmFormDTO> getFormList(Collection<Long> ids);  
33 -  
34 - /**  
35 - * 获得动态表单 Map  
36 - *  
37 - * @param ids 编号  
38 - * @return 动态表单 Map  
39 - */  
40 - default Map<Long, BpmFormDTO> getFormMap(Collection<Long> ids) {  
41 - if (CollUtil.isEmpty(ids)) {  
42 - return Collections.emptyMap();  
43 - }  
44 - return CollectionUtils.convertMap(this.getFormList(ids), BpmFormDTO::getId);  
45 - }  
46 -}  
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/coreservice/modules/bpm/api/form/dto/BpmFormDTO.java deleted
View file @510917c
1 -package cn.iocoder.yudao.coreservice.modules.bpm.api.form.dto;  
2 -  
3 -import lombok.Data;  
4 -  
5 -import java.util.List;  
6 -  
7 -/**  
8 - * 工作流的表单定义 DTO  
9 - * 用于工作流的申请表单，需要动态配置的场景  
10 - * TODO 暂时拷贝 BpmFormDO 字段， 不知道那些字段是必须的， 后续删掉不需要的字段  
11 - * @author jason  
12 - */  
13 -@Data  
14 -public class BpmFormDTO {  
15 -  
16 - /**  
17 - * 编号  
18 - */  
19 - private Long id;  
20 - /**  
21 - * 表单名  
22 - */  
23 - private String name;  
24 - /**  
25 - * 表单的配置  
26 - */  
27 - private String conf;  
28 - /**  
29 - * 表单项的数组  
30 - *  
31 - * 目前直接将 https://github.com/JakHuang/form-generator 生成的 JSON 串，直接保存  
32 - * 定义：https://github.com/JakHuang/form-generator/issues/46  
33 - */  
34 - private List<String> fields;  
35 - /**  
36 - * 备注  
37 - */  
38 - private String remark;  
39 -}  
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/coreservice/modules/bpm/api/group/BpmUserGroupServiceApi.java deleted
View file @510917c
1 -package cn.iocoder.yudao.coreservice.modules.bpm.api.group;  
2 -  
3 -import cn.iocoder.yudao.coreservice.modules.bpm.api.group.dto.BpmUserGroupDTO;  
4 -  
5 -import java.util.Collection;  
6 -import java.util.List;  
7 -import java.util.Set;  
8 -  
9 -/**  
10 - * Bpm 用户组 API 接口  
11 - *  
12 - * @author 芋道源码  
13 - * @author jason  
14 - */  
15 -public interface BpmUserGroupServiceApi {  
16 -  
17 - /**  
18 - * 获得用户组列表  
19 - *  
20 - * @param ids 编号  
21 - * @return 用户组列表  
22 - */  
23 - List<BpmUserGroupDTO> getUserGroupList(Collection<Long> ids);  
24 -  
25 - /**  
26 - * 校验用户组们是否有效。如下情况，视为无效：  
27 - * 1. 用户组编号不存在  
28 - * 2. 用户组被禁用  
29 - *  
30 - * @param ids 用户组编号数组  
31 - */  
32 - void validUserGroups(Set<Long> ids);  
33 -}  
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/coreservice/modules/bpm/api/group/dto/BpmUserGroupDTO.java deleted
View file @510917c
1 -package cn.iocoder.yudao.coreservice.modules.bpm.api.group.dto;  
2 -  
3 -import lombok.Data;  
4 -  
5 -import java.util.Set;  
6 -/**  
7 - * Bpm 用户组 DTO  
8 - *  
9 - * @author jason  
10 - */  
11 -@Data  
12 -public class BpmUserGroupDTO {  
13 - /**  
14 - * 成员用户编号数组  
15 - */  
16 - private Set<Long> memberUserIds;  
17 -}  
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java 0 → 100644
  View file @fe1271a
  1 +/**
  2 + * bpm API 包，定义暴露给其它模块的 API
  3 + */
  4 +package cn.iocoder.yudao.module.bpm.api;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java renamed to yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.enums; 1 +package cn.iocoder.yudao.module.bpm.enums;
2 2
3 import cn.iocoder.yudao.framework.common.exception.ErrorCode; 3 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
4 4
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode; @@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
7 * 7 *
8 * 工作流系统，使用 1-009-000-000 段 8 * 工作流系统，使用 1-009-000-000 段
9 */ 9 */
10 -public interface BpmErrorCodeConstants { 10 +public interface ErrorCodeConstants {
11 11
12 // ========== 通用流程处理 模块 1-009-000-000 ========== 12 // ========== 通用流程处理 模块 1-009-000-000 ==========
13 ErrorCode HIGHLIGHT_IMG_ERROR = new ErrorCode(1009000002, "获取高亮流程图异常"); 13 ErrorCode HIGHLIGHT_IMG_ERROR = new ErrorCode(1009000002, "获取高亮流程图异常");
@@ -55,4 +55,5 @@ public interface BpmErrorCodeConstants { @@ -55,4 +55,5 @@ public interface BpmErrorCodeConstants {
55 55
56 // ========== 动态表单模块 1-009-010-000 ========== 56 // ========== 动态表单模块 1-009-010-000 ==========
57 ErrorCode FORM_NOT_EXISTS = new ErrorCode(1009010000, "动态表单不存在"); 57 ErrorCode FORM_NOT_EXISTS = new ErrorCode(1009010000, "动态表单不存在");
  58 +
58 } 59 }
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/api/BpmFormServiceApiImpl.java deleted
View file @510917c
1 -package cn.iocoder.yudao.adminserver.modules.bpm.api;  
2 -  
3 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmFormConvert;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmFormMapper;  
5 -import cn.iocoder.yudao.coreservice.modules.bpm.api.form.BpmFormServiceApi;  
6 -import cn.iocoder.yudao.coreservice.modules.bpm.api.form.dto.BpmFormDTO;  
7 -import org.springframework.stereotype.Service;  
8 -  
9 -import javax.annotation.Resource;  
10 -import java.util.Collection;  
11 -import java.util.List;  
12 -/**  
13 - * 动态表单 Api Service 实现类  
14 - *  
15 - * @author 风里雾里  
16 - * @author jason  
17 - */  
18 -@Service  
19 -public class BpmFormServiceApiImpl implements BpmFormServiceApi {  
20 -  
21 - @Resource  
22 - private BpmFormMapper formMapper;  
23 -  
24 - @Override  
25 - public BpmFormDTO getForm(Long id) {  
26 - return BpmFormConvert.INSTANCE.convert1(formMapper.selectById(id));  
27 - }  
28 -  
29 - @Override  
30 - public List<BpmFormDTO> getFormList(Collection<Long> ids) {  
31 - return BpmFormConvert.INSTANCE.convertList(formMapper.selectBatchIds(ids));  
32 - }  
33 -}  
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/api/BpmUserGroupServiceApiImpl.java deleted
View file @510917c
1 -package cn.iocoder.yudao.adminserver.modules.bpm.api;  
2 -  
3 -import cn.hutool.core.collection.CollUtil;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmUserGroupConvert;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmUserGroupMapper;  
7 -import cn.iocoder.yudao.coreservice.modules.bpm.api.group.BpmUserGroupServiceApi;  
8 -import cn.iocoder.yudao.coreservice.modules.bpm.api.group.dto.BpmUserGroupDTO;  
9 -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;  
10 -import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;  
11 -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;  
12 -import org.springframework.stereotype.Service;  
13 -  
14 -import javax.annotation.Resource;  
15 -import java.util.Collection;  
16 -import java.util.List;  
17 -import java.util.Map;  
18 -import java.util.Set;  
19 -  
20 -import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_IS_DISABLE;  
21 -import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_NOT_EXISTS;  
22 -import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;  
23 -  
24 -/**  
25 - * Bpm 用户组 API 接口 实现类  
26 - *  
27 - * @author 芋道源码  
28 - * @author jason  
29 - */  
30 -@Service  
31 -public class BpmUserGroupServiceApiImpl implements BpmUserGroupServiceApi {  
32 -  
33 - @Resource  
34 - private BpmUserGroupMapper userGroupMapper;  
35 -  
36 - @Override  
37 - public List<BpmUserGroupDTO> getUserGroupList(Collection<Long> ids) {  
38 - return BpmUserGroupConvert.INSTANCE.convertList3(userGroupMapper.selectBatchIds(ids));  
39 - }  
40 -  
41 -  
42 - @Override  
43 - public void validUserGroups(Set<Long> ids) {  
44 -  
45 - if (CollUtil.isEmpty(ids)) {  
46 - return;  
47 - }  
48 - // 获得用户组信息  
49 - List<BpmUserGroupDO> userGroups = userGroupMapper.selectBatchIds(ids);  
50 - Map<Long, BpmUserGroupDO> userGroupMap = CollectionUtils.convertMap(userGroups, BpmUserGroupDO::getId);  
51 - // 校验  
52 - ids.forEach(id -> {  
53 - BpmUserGroupDO userGroup = userGroupMap.get(id);  
54 - if (userGroup == null) {  
55 - throw ServiceExceptionUtil.exception(USER_GROUP_NOT_EXISTS);  
56 - }  
57 - if (!CommonStatusEnum.ENABLE.getStatus().equals(userGroup.getStatus())) {  
58 - throw exception(USER_GROUP_IS_DISABLE, userGroup.getName());  
59 - }  
60 - });  
61 - }  
62 -}  
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/BpmErrorCodeConstants.java deleted
View file @510917c
1 -package cn.iocoder.yudao.adminserver.modules.bpm.enums;  
2 -  
3 -import cn.iocoder.yudao.framework.common.exception.ErrorCode;  
4 -  
5 -public interface BpmErrorCodeConstants {  
6 - // ========== 用户组模块 1-009-011-000 ==========  
7 - ErrorCode USER_GROUP_NOT_EXISTS = new ErrorCode(1009011000, "用户组不存在");  
8 - ErrorCode USER_GROUP_IS_DISABLE = new ErrorCode(1009011001, "名字为【{}】的用户组已被禁用");  
9 -  
10 - // ========== 动态表单模块 1-009-010-000 ==========  
11 - ErrorCode FORM_NOT_EXISTS = new ErrorCode(1009010000, "动态表单不存在");  
12 - ErrorCode FORM_FIELD_REPEAT = new ErrorCode(1009010000, "表单项({}) 和 ({}) 使用了相同的字段名({})");  
13 -}  
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmUserGroupController.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/BpmUserGroupController.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition; 1 +package cn.iocoder.yudao.module.bpm.controller.definition;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupRespVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmUserGroupConvert;  
8 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;  
9 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmUserGroupService; 3 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupRespVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  7 +import cn.iocoder.yudao.module.bpm.convert.definition.BpmUserGroupConvert;
  8 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
  9 +import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService;
10 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 10 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
11 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 11 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
12 import cn.iocoder.yudao.framework.common.pojo.PageResult; 12 import cn.iocoder.yudao.framework.common.pojo.PageResult;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmFormController.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/FormController.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition; 1 +package cn.iocoder.yudao.module.bpm.controller.definition;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.*;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmFormConvert;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmFormService; 3 +import cn.iocoder.yudao.module.bpm.convert.definition.BpmFormConvert;
  4 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
  5 +import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;
7 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 6 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
8 import cn.iocoder.yudao.framework.common.pojo.PageResult; 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  8 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.*;
9 import io.swagger.annotations.Api; 9 import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiImplicitParam; 10 import io.swagger.annotations.ApiImplicitParam;
11 import io.swagger.annotations.ApiOperation; 11 import io.swagger.annotations.ApiOperation;
@@ -23,7 +23,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -23,7 +23,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
23 @RestController 23 @RestController
24 @RequestMapping("/bpm/form") 24 @RequestMapping("/bpm/form")
25 @Validated 25 @Validated
26 -public class BpmFormController { 26 +public class FormController {
27 27
28 @Resource 28 @Resource
29 private BpmFormService formService; 29 private BpmFormService formService;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/form/BpmFormBaseVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.form;
2 2
3 import com.sun.istack.internal.NotNull; 3 import com.sun.istack.internal.NotNull;
4 import lombok.*; 4 import lombok.*;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/form/BpmFormCreateReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.form;
2 2
3 import lombok.*; 3 import lombok.*;
4 import io.swagger.annotations.*; 4 import io.swagger.annotations.*;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/form/BpmFormPageReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.form;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/form/BpmFormRespVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.form;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormSimpleRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/form/BpmFormSimpleRespVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.form;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormUpdateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/form/BpmFormUpdateReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.form;
2 2
3 import lombok.*; 3 import lombok.*;
4 import io.swagger.annotations.*; 4 import io.swagger.annotations.*;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/group/BpmUserGroupBaseVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.group;
2 2
3 import lombok.*; 3 import lombok.*;
4 import java.util.*; 4 import java.util.*;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/group/BpmUserGroupCreateReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.group;
2 2
3 import lombok.*; 3 import lombok.*;
4 -import java.util.*;  
5 import io.swagger.annotations.*; 4 import io.swagger.annotations.*;
6 -import javax.validation.constraints.*;  
7 5
8 @ApiModel("用户组创建 Request VO") 6 @ApiModel("用户组创建 Request VO")
9 @Data 7 @Data
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/group/BpmUserGroupPageReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.group;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import cn.iocoder.yudao.framework.common.util.date.DateUtils; 4 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/group/BpmUserGroupRespVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.group;
2 2
3 import lombok.*; 3 import lombok.*;
4 import java.util.*; 4 import java.util.*;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupSimpleRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/group/BpmUserGroupSimpleRespVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.group;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/group/BpmUserGroupUpdateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/group/BpmUserGroupUpdateReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.group;
2 2
3 import lombok.*; 3 import lombok.*;
4 -import java.util.*;  
5 import io.swagger.annotations.*; 4 import io.swagger.annotations.*;
6 import javax.validation.constraints.*; 5 import javax.validation.constraints.*;
7 6
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModeImportReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/model/BpmModeImportReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.model;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/model/BpmModelBaseVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.model;
2 2
3 import io.swagger.annotations.ApiModelProperty; 3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data; 4 import lombok.Data;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/model/BpmModelCreateReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.model;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelPageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/model/BpmModelPageItemRespVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.model;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/model/BpmModelRespVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.model;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelUpdateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/model/BpmModelUpdateReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.model;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelUpdateStateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/model/BpmModelUpdateStateReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.model;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/ModelPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/model/ModelPageReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.model;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionListReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/process/BpmProcessDefinitionListReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.process;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.process;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/process/BpmProcessDefinitionPageReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.process;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageParam; 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 import io.swagger.annotations.ApiModel; 4 import io.swagger.annotations.ApiModel;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/process/BpmProcessDefinitionRespVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.process;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.rule;
2 2
3 import io.swagger.annotations.ApiModelProperty; 3 import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data; 4 import lombok.Data;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.rule;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/rule/BpmTaskAssignRuleRespVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.rule;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule; 1 +package cn.iocoder.yudao.module.bpm.controller.definition.vo.rule;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
@@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode; @@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode;
7 import lombok.ToString; 7 import lombok.ToString;
8 8
9 import javax.validation.constraints.NotNull; 9 import javax.validation.constraints.NotNull;
10 -import java.util.Set;  
11 10
12 @ApiModel("流程任务分配规则的更新 Request VO") 11 @ApiModel("流程任务分配规则的更新 Request VO")
13 @Data 12 @Data
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/oa/package-info.java 0 → 100644
  View file @fe1271a
  1 +package cn.iocoder.yudao.module.bpm.controller.oa;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/task/package-info.java 0 → 100644
  View file @fe1271a
  1 +package cn.iocoder.yudao.module.bpm.controller.task;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmFormConvert.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmFormConvert.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition;  
2 -  
3 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormCreateReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormRespVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormSimpleRespVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;  
8 -import cn.iocoder.yudao.coreservice.modules.bpm.api.form.dto.BpmFormDTO; 1 +package cn.iocoder.yudao.module.bpm.convert.definition;
  2 +
  3 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormSimpleRespVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;
  7 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
  8 +import cn.iocoder.yudao.module.bpm.api.form.dto.BpmFormDTO;
9 import cn.iocoder.yudao.framework.common.pojo.PageResult; 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
10 import org.mapstruct.Mapper; 10 import org.mapstruct.Mapper;
11 import org.mapstruct.factory.Mappers; 11 import org.mapstruct.factory.Mappers;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmUserGroupConvert.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmUserGroupConvert.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition; 1 +package cn.iocoder.yudao.module.bpm.convert.definition;
2 2
3 import java.util.*; 3 import java.util.*;
4 4
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.BpmUserGroupRespVO;  
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.coreservice.modules.bpm.api.group.dto.BpmUserGroupDTO; 5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupRespVO;
  7 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  8 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
  9 +import cn.iocoder.yudao.module.bpm.api.group.dto.BpmUserGroupDTO;
10 import cn.iocoder.yudao.framework.common.pojo.PageResult; 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
11 11
12 import org.mapstruct.Mapper; 12 import org.mapstruct.Mapper;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmFormDO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmFormDO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition; 1 +package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
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.TableField; 4 import com.baomidou.mybatisplus.annotation.TableField;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition; 1 +package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmModelFormTypeEnum; 3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmModelFormTypeEnum;
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.module.bpm.dal.dataobject.definition.BpmFormDO;
5 import com.baomidou.mybatisplus.annotation.TableField; 6 import com.baomidou.mybatisplus.annotation.TableField;
6 import com.baomidou.mybatisplus.annotation.TableId; 7 import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableName; 8 import com.baomidou.mybatisplus.annotation.TableName;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmTaskAssignRuleDO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition; 1 +package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskRuleScriptEnum; 3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskRuleScriptEnum;
4 import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; 4 import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskAssignRuleTypeEnum;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition; 1 +package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
2 2
3 // TODO 芋艿：先埋个坑。任务消息的配置规则。说白了，就是不同的 3 // TODO 芋艿：先埋个坑。任务消息的配置规则。说白了，就是不同的
4 public class BpmTaskMessageRuleDO { 4 public class BpmTaskMessageRuleDO {
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmUserGroupDO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmUserGroupDO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition; 1 +package cn.iocoder.yudao.module.bpm.dal.dataobject.definition;
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;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/leave/BpmOALeaveDO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOALeaveDO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave; 1 +package cn.iocoder.yudao.module.bpm.dal.dataobject.oa;
2 2
3 import cn.iocoder.yudao.module.system.dal.dataobject.user.SysUserDO; 3 import cn.iocoder.yudao.module.system.dal.dataobject.user.SysUserDO;
4 import lombok.*; 4 import lombok.*;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task; 1 +package cn.iocoder.yudao.module.bpm.dal.dataobject.task;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceResultEnum; 3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceResultEnum;
4 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceStatusEnum; 4 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceStatusEnum;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/task/BpmTaskExtDO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmTaskExtDO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task; 1 +package cn.iocoder.yudao.module.bpm.dal.dataobject.task;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceResultEnum; 3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.task.BpmProcessInstanceResultEnum;
4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; 4 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmFormMapper.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmFormMapper.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition; 1 +package cn.iocoder.yudao.module.bpm.dal.mysql.definition;
2 2
3 3
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormPageReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO; 4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormPageReqVO;
  5 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 7 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
8 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; 8 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmUserGroupMapper.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmUserGroupMapper.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition; 1 +package cn.iocoder.yudao.module.bpm.dal.mysql.definition;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO; 3 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  4 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 6 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
7 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 7 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmModelFormTypeEnum.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmModelFormTypeEnum.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.enums.definition; 1 +package cn.iocoder.yudao.module.bpm.enums.definition;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskAssignRuleTypeEnum.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.enums.definition; 1 +package cn.iocoder.yudao.module.bpm.enums.definition;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/definition/BpmTaskRuleScriptEnum.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.enums.definition; 1 +package cn.iocoder.yudao.module.bpm.enums.definition;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/message/BpmMessageEnum.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/enums/message/BpmMessageEnum.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.enums.message; 1 +package cn.iocoder.yudao.module.bpm.enums.message;
2 2
3 import cn.iocoder.yudao.module.system.dal.dataobject.sms.SysSmsTemplateDO; 3 import cn.iocoder.yudao.module.system.dal.dataobject.sms.SysSmsTemplateDO;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceDeleteReasonEnum.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.enums.task; 1 +package cn.iocoder.yudao.module.bpm.enums.task;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/task/BpmProcessInstanceResultEnum.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceResultEnum.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.enums.task; 1 +package cn.iocoder.yudao.module.bpm.enums.task;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/enums/task/BpmProcessInstanceStatusEnum.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.enums.task; 1 +package cn.iocoder.yudao.module.bpm.enums.task;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import lombok.Getter; 4 import lombok.Getter;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java 0 → 100644
  View file @fe1271a
  1 +package cn.iocoder.yudao.module.bpm;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmFormService.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormService.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition; 1 +package cn.iocoder.yudao.module.bpm.service.definition;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormCreateReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormPageReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO; 4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormCreateReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;
  7 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
8 import cn.iocoder.yudao.framework.common.pojo.PageResult; 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
9 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 9 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
10 10
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmFormServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl; 1 +package cn.iocoder.yudao.module.bpm.service.definition;
2 2
3 import cn.hutool.core.lang.Assert; 3 import cn.hutool.core.lang.Assert;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormCreateReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormPageReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmFormConvert;  
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.enums.BpmErrorCodeConstants;  
11 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmFormService;  
12 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmFormFieldRespDTO; 4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormCreateReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;
  7 +import cn.iocoder.yudao.module.bpm.convert.definition.BpmFormConvert;
  8 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
  9 +import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmFormMapper;
  10 +import cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants;
  11 +import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmFormFieldRespDTO;
13 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; 12 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
14 import cn.iocoder.yudao.framework.common.pojo.PageResult; 13 import cn.iocoder.yudao.framework.common.pojo.PageResult;
15 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 14 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
@@ -64,7 +63,7 @@ public class BpmFormServiceImpl implements BpmFormService { @@ -64,7 +63,7 @@ public class BpmFormServiceImpl implements BpmFormService {
64 63
65 private void validateFormExists(Long id) { 64 private void validateFormExists(Long id) {
66 if (formMapper.selectById(id) == null) { 65 if (formMapper.selectById(id) == null) {
67 - throw ServiceExceptionUtil.exception(BpmErrorCodeConstants.FORM_NOT_EXISTS); 66 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.FORM_NOT_EXISTS);
68 } 67 }
69 } 68 }
70 69
@@ -104,7 +103,7 @@ public class BpmFormServiceImpl implements BpmFormService { @@ -104,7 +103,7 @@ public class BpmFormServiceImpl implements BpmFormService {
104 continue; 103 continue;
105 } 104 }
106 // 如果存在，则报错 105 // 如果存在，则报错
107 - throw ServiceExceptionUtil.exception(BpmErrorCodeConstants.FORM_FIELD_REPEAT, oldLabel, fieldDTO.getLabel(), fieldDTO.getVModel()); 106 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.FORM_FIELD_REPEAT, oldLabel, fieldDTO.getLabel(), fieldDTO.getVModel());
108 } 107 }
109 } 108 }
110 109
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmUserGroupService.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupService.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition; 1 +package cn.iocoder.yudao.module.bpm.service.definition;
2 2
3 import java.util.*; 3 import java.util.*;
4 import javax.validation.*; 4 import javax.validation.*;
5 5
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;  
8 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;  
9 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO; 6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  7 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  8 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  9 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
10 import cn.iocoder.yudao.framework.common.pojo.PageResult; 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
11 11
12 /** 12 /**
@@ -61,4 +61,13 @@ public interface BpmUserGroupService { @@ -61,4 +61,13 @@ public interface BpmUserGroupService {
61 * @return 用户组分页 61 * @return 用户组分页
62 */ 62 */
63 PageResult<BpmUserGroupDO> getUserGroupPage(BpmUserGroupPageReqVO pageReqVO); 63 PageResult<BpmUserGroupDO> getUserGroupPage(BpmUserGroupPageReqVO pageReqVO);
  64 +
  65 + /**
  66 + * 校验用户组们是否有效。如下情况，视为无效：
  67 + * 1. 用户组编号不存在
  68 + * 2. 用户组被禁用
  69 + *
  70 + * @param ids 用户组编号数组
  71 + */
  72 + void validUserGroups(Set<Long> ids);
64 } 73 }
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmUserGroupServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl; 1 +package cn.iocoder.yudao.module.bpm.service.definition;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmUserGroupConvert;  
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.BpmUserGroupService; 4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  7 +import cn.iocoder.yudao.module.bpm.convert.definition.BpmUserGroupConvert;
  8 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
  9 +import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmUserGroupMapper;
11 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 10 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
12 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; 11 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
13 import cn.iocoder.yudao.framework.common.pojo.PageResult; 12 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -16,13 +15,11 @@ import org.springframework.stereotype.Service; @@ -16,13 +15,11 @@ import org.springframework.stereotype.Service;
16 import org.springframework.validation.annotation.Validated; 15 import org.springframework.validation.annotation.Validated;
17 16
18 import javax.annotation.Resource; 17 import javax.annotation.Resource;
19 -import java.util.Collection;  
20 import java.util.List; 18 import java.util.List;
21 import java.util.Map; 19 import java.util.Map;
22 import java.util.Set; 20 import java.util.Set;
23 21
24 -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; 22 +import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.USER_GROUP_NOT_EXISTS;
26 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 23 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
27 24
28 /** 25 /**
@@ -85,4 +82,24 @@ public class BpmUserGroupServiceImpl implements BpmUserGroupService { @@ -85,4 +82,24 @@ public class BpmUserGroupServiceImpl implements BpmUserGroupService {
85 return userGroupMapper.selectPage(pageReqVO); 82 return userGroupMapper.selectPage(pageReqVO);
86 } 83 }
87 84
  85 + @Override
  86 + public void validUserGroups(Set<Long> ids) {
  87 + if (CollUtil.isEmpty(ids)) {
  88 + return;
  89 + }
  90 + // 获得用户组信息
  91 + List<BpmUserGroupDO> userGroups = userGroupMapper.selectBatchIds(ids);
  92 + Map<Long, BpmUserGroupDO> userGroupMap = CollectionUtils.convertMap(userGroups, BpmUserGroupDO::getId);
  93 + // 校验
  94 + ids.forEach(id -> {
  95 + BpmUserGroupDO userGroup = userGroupMap.get(id);
  96 + if (userGroup == null) {
  97 + throw ServiceExceptionUtil.exception(USER_GROUP_NOT_EXISTS);
  98 + }
  99 + if (!CommonStatusEnum.ENABLE.getStatus().equals(userGroup.getStatus())) {
  100 + throw exception(USER_GROUP_IS_DISABLE, userGroup.getName());
  101 + }
  102 + });
  103 + }
  104 +
88 } 105 }
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/dto/BpmFormFieldRespDTO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmFormFieldRespDTO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto; 1 +package cn.iocoder.yudao.module.bpm.service.definition.dto;
2 2
3 import com.fasterxml.jackson.annotation.JsonProperty; 3 import com.fasterxml.jackson.annotation.JsonProperty;
4 import lombok.Data; 4 import lombok.Data;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/BpmMessageService.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageService.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.message; 1 +package cn.iocoder.yudao.module.bpm.service.message;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; 3 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;
  4 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;
  5 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
6 6
7 import javax.validation.Valid; 7 import javax.validation.Valid;
8 8
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/impl/BpmMessageServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/BpmMessageServiceImpl.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.message.impl; 1 +package cn.iocoder.yudao.module.bpm.service.message;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.message.BpmMessageEnum; 3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.message.BpmMessageEnum;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.BpmMessageService;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; 4 +import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService;
  5 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;
  6 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;
  7 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
8 import cn.iocoder.yudao.module.system.service.sms.SysSmsCoreService; 8 import cn.iocoder.yudao.module.system.service.sms.SysSmsCoreService;
9 import lombok.extern.slf4j.Slf4j; 9 import lombok.extern.slf4j.Slf4j;
10 import org.springframework.beans.factory.annotation.Value; 10 import org.springframework.beans.factory.annotation.Value;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceApproveReqDTO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto; 1 +package cn.iocoder.yudao.module.bpm.service.message.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenProcessInstanceRejectReqDTO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto; 1 +package cn.iocoder.yudao.module.bpm.service.message.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/message/dto/BpmMessageSendWhenTaskCreatedReqDTO.java
  View file @fe1271a
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto; 1 +package cn.iocoder.yudao.module.bpm.service.message.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
yudao-module-bpm/yudao-module-bpm-base/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmFormServiceTest.java
  View file @fe1271a
@@ -2,13 +2,13 @@ package cn.iocoder.yudao.adminserver.modules.bpm.service.definition; @@ -2,13 +2,13 @@ package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;
2 2
3 import cn.hutool.core.util.RandomUtil; 3 import cn.hutool.core.util.RandomUtil;
4 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 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; 5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormCreateReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormPageReqVO;
  7 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;
  8 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
  9 +import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmFormMapper;
  10 +import cn.iocoder.yudao.module.bpm.service.definition.BpmFormServiceImpl;
  11 +import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmFormFieldRespDTO;
12 import cn.iocoder.yudao.framework.common.pojo.PageResult; 12 import cn.iocoder.yudao.framework.common.pojo.PageResult;
13 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 13 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
14 import org.junit.jupiter.api.Test; 14 import org.junit.jupiter.api.Test;
@@ -19,7 +19,7 @@ import java.util.List; @@ -19,7 +19,7 @@ import java.util.List;
19 import java.util.stream.Collectors; 19 import java.util.stream.Collectors;
20 import java.util.stream.Stream; 20 import java.util.stream.Stream;
21 21
22 -import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.FORM_NOT_EXISTS; 22 +import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.FORM_NOT_EXISTS;
23 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; 23 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
24 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; 24 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; 25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
yudao-module-bpm/yudao-module-bpm-base/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmUserGroupServiceTest.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.service.definition; 1 package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;
2 2
3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmUserGroupDO;  
8 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmUserGroupMapper;  
9 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl.BpmUserGroupServiceImpl; 4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupCreateReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupUpdateReqVO;
  7 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
  8 +import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmUserGroupMapper;
10 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 9 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
11 import cn.iocoder.yudao.framework.common.pojo.PageResult; 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
12 import cn.iocoder.yudao.framework.common.util.date.DateUtils; 11 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
13 import cn.iocoder.yudao.framework.test.core.util.AssertUtils; 12 import cn.iocoder.yudao.framework.test.core.util.AssertUtils;
14 import cn.iocoder.yudao.framework.test.core.util.RandomUtils; 13 import cn.iocoder.yudao.framework.test.core.util.RandomUtils;
  14 +import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupServiceImpl;
15 import org.junit.jupiter.api.Assertions; 15 import org.junit.jupiter.api.Assertions;
16 import org.junit.jupiter.api.Test; 16 import org.junit.jupiter.api.Test;
17 import org.springframework.context.annotation.Import; 17 import org.springframework.context.annotation.Import;
18 18
19 import javax.annotation.Resource; 19 import javax.annotation.Resource;
20 20
21 -import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.USER_GROUP_NOT_EXISTS; 21 +import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.USER_GROUP_NOT_EXISTS;
22 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; 22 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
23 23
24 /** 24 /**
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmModelController.java
  View file @fe1271a
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmModelServi @@ -6,6 +6,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmModelServi
6 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 6 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
7 import cn.iocoder.yudao.framework.common.pojo.PageResult; 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
8 import cn.iocoder.yudao.framework.common.util.io.IoUtils; 8 import cn.iocoder.yudao.framework.common.util.io.IoUtils;
  9 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.model.*;
9 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiImplicitParam; 11 import io.swagger.annotations.ApiImplicitParam;
11 import io.swagger.annotations.ApiOperation; 12 import io.swagger.annotations.ApiOperation;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmProcessDefinitionController.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition; 1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionListReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageReqVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO; 3 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionListReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO;
7 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService; 7 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;
8 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 8 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
9 import cn.iocoder.yudao.framework.common.pojo.PageResult; 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmTaskAssignRuleController.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition; 1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule.BpmTaskAssignRuleRespVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO; 3 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;
6 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService; 6 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService;
7 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 7 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
8 import io.swagger.annotations.Api; 8 import io.swagger.annotations.Api;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.java
  View file @fe1271a
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeaveCreat @@ -4,7 +4,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeaveCreat
4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeavePageReqVO; 4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeavePageReqVO;
5 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeaveRespVO; 5 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeaveRespVO;
6 import cn.iocoder.yudao.adminserver.modules.bpm.convert.oa.BpmOALeaveConvert; 6 import cn.iocoder.yudao.adminserver.modules.bpm.convert.oa.BpmOALeaveConvert;
7 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave.BpmOALeaveDO; 7 +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
8 import cn.iocoder.yudao.adminserver.modules.bpm.service.oa.BpmOALeaveService; 8 import cn.iocoder.yudao.adminserver.modules.bpm.service.oa.BpmOALeaveService;
9 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 9 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
10 import cn.iocoder.yudao.framework.common.pojo.PageResult; 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmModelConvert.java
  View file @fe1271a
@@ -4,9 +4,10 @@ import cn.hutool.core.util.StrUtil; @@ -4,9 +4,10 @@ import cn.hutool.core.util.StrUtil;
4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model.*; 4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model.*;
5 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmModelMetaInfoRespDTO; 5 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
6 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; 6 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
7 -import cn.iocoder.yudao.coreservice.modules.bpm.api.form.dto.BpmFormDTO; 7 +import cn.iocoder.yudao.module.bpm.api.form.dto.BpmFormDTO;
8 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 8 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
9 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 9 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
  10 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.model.*;
10 import org.activiti.engine.impl.persistence.entity.SuspensionState; 11 import org.activiti.engine.impl.persistence.entity.SuspensionState;
11 import org.activiti.engine.repository.Deployment; 12 import org.activiti.engine.repository.Deployment;
12 import org.activiti.engine.repository.Model; 13 import org.activiti.engine.repository.Model;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmProcessDefinitionConvert.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition; 1 package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; 3 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO;
  5 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
6 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; 6 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
7 -import cn.iocoder.yudao.coreservice.modules.bpm.api.form.dto.BpmFormDTO; 7 +import cn.iocoder.yudao.module.bpm.api.form.dto.BpmFormDTO;
8 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 8 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
9 import org.activiti.engine.impl.persistence.entity.SuspensionState; 9 import org.activiti.engine.impl.persistence.entity.SuspensionState;
10 import org.activiti.engine.repository.Deployment; 10 import org.activiti.engine.repository.Deployment;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmTaskAssignRuleConvert.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition; 1 package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition;
2 2
3 -import cn.hutool.core.collection.CollUtil;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule.BpmTaskAssignRuleRespVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; 3 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;
  6 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
8 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
9 import org.activiti.bpmn.model.UserTask; 8 import org.activiti.bpmn.model.UserTask;
10 import org.mapstruct.Mapper; 9 import org.mapstruct.Mapper;
@@ -12,7 +11,6 @@ import org.mapstruct.factory.Mappers; @@ -12,7 +11,6 @@ import org.mapstruct.factory.Mappers;
12 11
13 import java.util.List; 12 import java.util.List;
14 import java.util.Map; 13 import java.util.Map;
15 -import java.util.function.Function;  
16 14
17 @Mapper 15 @Mapper
18 public interface BpmTaskAssignRuleConvert { 16 public interface BpmTaskAssignRuleConvert {
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/message/BpmMessageConvert.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.convert.message; 1 package cn.iocoder.yudao.adminserver.modules.bpm.convert.message;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO; 3 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;
  4 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;
  5 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
6 import cn.iocoder.yudao.module.system.dal.dataobject.user.SysUserDO; 6 import cn.iocoder.yudao.module.system.dal.dataobject.user.SysUserDO;
7 import org.activiti.api.task.model.Task; 7 import org.activiti.api.task.model.Task;
8 import org.activiti.engine.runtime.ProcessInstance; 8 import org.activiti.engine.runtime.ProcessInstance;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/oa/BpmOALeaveConvert.java
  View file @fe1271a
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.bpm.convert.oa; @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.bpm.convert.oa;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeaveCreateReqVO; 3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeaveCreateReqVO;
4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeaveRespVO; 4 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeaveRespVO;
5 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave.BpmOALeaveDO; 5 +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 import org.mapstruct.Mapper; 7 import org.mapstruct.Mapper;
8 import org.mapstruct.factory.Mappers; 8 import org.mapstruct.factory.Mappers;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmActivityConvert.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.convert.task; 1 package cn.iocoder.yudao.adminserver.modules.bpm.convert.task;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.activity.BpmActivityRespVO; 3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.activity.BpmActivityRespVO;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmTaskExtDO;  
5 -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;  
6 import org.activiti.engine.history.HistoricActivityInstance; 4 import org.activiti.engine.history.HistoricActivityInstance;
7 import org.mapstruct.Mapper; 5 import org.mapstruct.Mapper;
8 import org.mapstruct.Mapping; 6 import org.mapstruct.Mapping;
@@ -10,7 +8,6 @@ import org.mapstruct.Mappings; @@ -10,7 +8,6 @@ import org.mapstruct.Mappings;
10 import org.mapstruct.factory.Mappers; 8 import org.mapstruct.factory.Mappers;
11 9
12 import java.util.List; 10 import java.util.List;
13 -import java.util.Map;  
14 11
15 /** 12 /**
16 * BPM 活动 Convert 13 * BPM 活动 Convert
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmProcessInstanceConvert.java
  View file @fe1271a
@@ -2,8 +2,8 @@ package cn.iocoder.yudao.adminserver.modules.bpm.convert.task; @@ -2,8 +2,8 @@ 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.dal.dataobject.definition.BpmProcessDefinitionExtDO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; 5 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
  6 +import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
7 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;
8 import cn.iocoder.yudao.module.system.dal.dataobject.dept.SysDeptDO; 8 import cn.iocoder.yudao.module.system.dal.dataobject.dept.SysDeptDO;
9 import cn.iocoder.yudao.module.system.dal.dataobject.user.SysUserDO; 9 import cn.iocoder.yudao.module.system.dal.dataobject.user.SysUserDO;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmTaskConvert.java
  View file @fe1271a
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.bpm.convert.task; @@ -3,7 +3,7 @@ package cn.iocoder.yudao.adminserver.modules.bpm.convert.task;
3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskDonePageItemRespVO; 3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.task.BpmTaskDonePageItemRespVO;
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.module.bpm.dal.dataobject.task.BpmTaskExtDO;
7 import cn.iocoder.yudao.module.system.dal.dataobject.dept.SysDeptDO; 7 import cn.iocoder.yudao.module.system.dal.dataobject.dept.SysDeptDO;
8 import cn.iocoder.yudao.module.system.dal.dataobject.user.SysUserDO; 8 import cn.iocoder.yudao.module.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;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmProcessDefinitionExtMapper.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition; 1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; 3 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;  
6 -import com.baomidou.mybatisplus.core.mapper.BaseMapper;  
7 import org.apache.ibatis.annotations.Mapper; 5 import org.apache.ibatis.annotations.Mapper;
8 6
9 import java.util.Collection; 7 import java.util.Collection;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmTaskAssignRuleMapper.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition; 1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; 3 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
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.QueryWrapperX; 5 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
6 import org.apache.ibatis.annotations.Mapper; 6 import org.apache.ibatis.annotations.Mapper;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/oa/BpmOALeaveMapper.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.oa; 1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.oa;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeavePageReqVO; 3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.oa.vo.BpmOALeavePageReqVO;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.leave.BpmOALeaveDO; 4 +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 6 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
7 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 7 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.task; 1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.task;
2 2
3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceMyPageReqVO; 3 import cn.iocoder.yudao.adminserver.modules.bpm.controller.task.vo.instance.BpmProcessInstanceMyPageReqVO;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; 4 +import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 6 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
7 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX; 7 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/task/BpmTaskExtMapper.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.task; 1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.task;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmTaskExtDO; 3 +import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 5 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
6 import org.apache.ibatis.annotations.Mapper; 6 import org.apache.ibatis.annotations.Mapper;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/config/BpmActivitiConfiguration.java
  View file @fe1271a
@@ -6,7 +6,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.Bp @@ -6,7 +6,7 @@ import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.Bp
6 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.identity.EmptyUserGroupManager; 6 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.identity.EmptyUserGroupManager;
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.coreservice.modules.bpm.api.group.BpmUserGroupServiceApi; 9 +import cn.iocoder.yudao.module.bpm.api.group.BpmUserGroupServiceApi;
10 import cn.iocoder.yudao.module.system.service.dept.SysDeptCoreService; 10 import cn.iocoder.yudao.module.system.service.dept.SysDeptCoreService;
11 import cn.iocoder.yudao.module.system.service.permission.SysPermissionCoreService; 11 import cn.iocoder.yudao.module.system.service.permission.SysPermissionCoreService;
12 import cn.iocoder.yudao.module.system.service.user.SysUserCoreService; 12 import cn.iocoder.yudao.module.system.service.user.SysUserCoreService;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmActivityBehaviorFactory.java
  View file @fe1271a
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavio @@ -2,7 +2,7 @@ package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavio
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.bpm.service.definition.BpmTaskAssignRuleService; 4 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService;
5 -import cn.iocoder.yudao.coreservice.modules.bpm.api.group.BpmUserGroupServiceApi; 5 +import cn.iocoder.yudao.module.bpm.api.group.BpmUserGroupServiceApi;
6 import cn.iocoder.yudao.module.system.service.dept.SysDeptCoreService; 6 import cn.iocoder.yudao.module.system.service.dept.SysDeptCoreService;
7 import cn.iocoder.yudao.module.system.service.permission.SysPermissionCoreService; 7 import cn.iocoder.yudao.module.system.service.permission.SysPermissionCoreService;
8 import cn.iocoder.yudao.module.system.service.user.SysUserCoreService; 8 import cn.iocoder.yudao.module.system.service.user.SysUserCoreService;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehavior.java
  View file @fe1271a
@@ -3,12 +3,12 @@ package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavio @@ -3,12 +3,12 @@ package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavio
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.util.RandomUtil; 4 import cn.hutool.core.util.RandomUtil;
5 import cn.hutool.core.util.StrUtil; 5 import cn.hutool.core.util.StrUtil;
6 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; 6 +import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
  7 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum;
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.coreservice.modules.bpm.api.group.BpmUserGroupServiceApi;  
11 -import cn.iocoder.yudao.coreservice.modules.bpm.api.group.dto.BpmUserGroupDTO; 10 +import cn.iocoder.yudao.module.bpm.api.group.BpmUserGroupServiceApi;
  11 +import cn.iocoder.yudao.module.bpm.api.group.dto.BpmUserGroupDTO;
12 import cn.iocoder.yudao.module.system.dal.dataobject.dept.SysDeptDO; 12 import cn.iocoder.yudao.module.system.dal.dataobject.dept.SysDeptDO;
13 import cn.iocoder.yudao.module.system.dal.dataobject.user.SysUserDO; 13 import cn.iocoder.yudao.module.system.dal.dataobject.user.SysUserDO;
14 import cn.iocoder.yudao.module.system.service.dept.SysDeptCoreService; 14 import cn.iocoder.yudao.module.system.service.dept.SysDeptCoreService;
@@ -28,8 +28,8 @@ import org.activiti.engine.impl.persistence.entity.TaskEntityManager; @@ -28,8 +28,8 @@ import org.activiti.engine.impl.persistence.entity.TaskEntityManager;
28 28
29 import java.util.*; 29 import java.util.*;
30 30
31 -import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.TASK_ASSIGN_SCRIPT_NOT_EXISTS;  
32 -import static cn.iocoder.yudao.adminserver.modules.bpm.enums.BpmErrorCodeConstants.TASK_CREATE_FAIL_NO_CANDIDATE_USER; 31 +import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.TASK_ASSIGN_SCRIPT_NOT_EXISTS;
  32 +import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.TASK_CREATE_FAIL_NO_CANDIDATE_USER;
33 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 33 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
34 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap; 34 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
35 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet; 35 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/package-info.java
  View file @fe1271a
1 /** 1 /**
2 - * 拓展 {@link org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior} 实现，基于 {@link cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO} 实现自定义的任务分配规则。 2 + * 拓展 {@link org.activiti.engine.impl.bpmn.behavior.UserTaskActivityBehavior} 实现，基于 {@link cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO} 实现自定义的任务分配规则。
3 * 原因：BPMN 默认的 assign、candidateUsers、candidateGroups 拓展起来有一定的难度，所以选择放弃它们，使用自己定义的规则。 3 * 原因：BPMN 默认的 assign、candidateUsers、candidateGroups 拓展起来有一定的难度，所以选择放弃它们，使用自己定义的规则。
4 * 4 *
5 * @author 芋道源码 5 * @author 芋道源码
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/BpmTaskAssignScript.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script; 1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmTaskRuleScriptEnum; 3 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum;
4 import org.activiti.engine.impl.persistence.entity.TaskEntity; 4 import org.activiti.engine.impl.persistence.entity.TaskEntity;
5 5
6 -import java.util.List;  
7 import java.util.Set; 6 import java.util.Set;
8 7
9 /** 8 /**
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java
  View file @fe1271a
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.enums.definition.BpmTaskRuleScriptEnum; 3 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum;
4 import org.activiti.engine.impl.persistence.entity.TaskEntity; 4 import org.activiti.engine.impl.persistence.entity.TaskEntity;
5 import org.springframework.stereotype.Component; 5 import org.springframework.stereotype.Component;
6 6
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java
  View file @fe1271a
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.enums.definition.BpmTaskRuleScriptEnum; 3 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum;
4 import org.activiti.engine.impl.persistence.entity.TaskEntity; 4 import org.activiti.engine.impl.persistence.entity.TaskEntity;
5 import org.springframework.stereotype.Component; 5 import org.springframework.stereotype.Component;
6 6
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignStartUserScript.java
  View file @fe1271a
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.enums.definition.BpmTaskRuleScriptEnum; 3 +import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskRuleScriptEnum;
4 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript; 4 import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
5 import cn.iocoder.yudao.framework.common.util.collection.SetUtils; 5 import cn.iocoder.yudao.framework.common.util.collection.SetUtils;
6 import org.activiti.engine.impl.persistence.entity.TaskEntity; 6 import org.activiti.engine.impl.persistence.entity.TaskEntity;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/BpmProcessInstanceResultEvent.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event; 1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; 3 +import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
4 import lombok.Data; 4 import lombok.Data;
5 import org.springframework.context.ApplicationEvent; 5 import org.springframework.context.ApplicationEvent;
6 6
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmProcessInstanceEventListener.java
  View file @fe1271a
1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.listener; 1 package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.listener;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; 3 +import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
4 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService; 4 import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService;
5 import org.activiti.api.model.shared.event.RuntimeEvent; 5 import org.activiti.api.model.shared.event.RuntimeEvent;
6 import org.activiti.api.process.model.ProcessInstance; 6 import org.activiti.api.process.model.ProcessInstance;
7 import org.activiti.api.process.model.events.ProcessRuntimeEvent; 7 import org.activiti.api.process.model.events.ProcessRuntimeEvent;
8 import org.activiti.api.process.runtime.events.ProcessCancelledEvent; 8 import org.activiti.api.process.runtime.events.ProcessCancelledEvent;
9 -import org.activiti.api.process.runtime.events.listener.ProcessEventListener;  
10 import org.activiti.api.process.runtime.events.listener.ProcessRuntimeEventListener; 9 import org.activiti.api.process.runtime.events.listener.ProcessRuntimeEventListener;
11 -import org.activiti.api.task.model.events.TaskRuntimeEvent;  
12 import org.springframework.context.annotation.Lazy; 10 import org.springframework.context.annotation.Lazy;
13 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
14 12