BJ_ZTEITS-Developers / parking-cloud-yudao

Commit bdcf00d8a0dbcb4e30473166fa5f4db938e59fb5

Authored by YunaiV
1 parent f39bfdab

多模块重构 8：bom 模块，基本完成重构

Inline Side-by-side
Showing 152 changed files with 523 additions and 378 deletions
yudao-module-bpm/TODO.md deleted
View file @f39bfda
1 -1. 类名可以去掉 Bpm 前缀哈  
2 -  
3 -2. 后续接口我们分成 admin 管理后天，app 用户前端；所以 controller 包下，需要有 admin 和 app 两个子包。可见 https://gitee.com/zhijiantianya/ruoyi-vue-pro/tree/feature/multi-module/yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller  
4 -  
5 -3. yudao-module-bpm-core-service-impl 模块，要不改成 yudao-module-bpm-base，本质上是提供给 yudao-module-bpm-flowable-impl 和 yudao-module-bpm-activiti-impl 继承的。这样的话，我们在 yudao-module-bpm-base：  
6 - * 定义一些可被继承的类，例如说 ModelAbstractService；  
7 - * 定义一些无需被继承的类，例如说 UserGroupService、UserGroupController 等等；  
yudao-module-bpm/yudao-module-bpm-api/pom.xml
  View file @bdcf00d
@@ -21,6 +21,13 @@ @@ -21,6 +21,13 @@
21 <groupId>cn.iocoder.boot</groupId> 21 <groupId>cn.iocoder.boot</groupId>
22 <artifactId>yudao-common</artifactId> 22 <artifactId>yudao-common</artifactId>
23 </dependency> 23 </dependency>
  24 +
  25 + <!-- 参数校验 -->
  26 + <dependency>
  27 + <groupId>org.springframework.boot</groupId>
  28 + <artifactId>spring-boot-starter-validation</artifactId>
  29 + <optional>true</optional>
  30 + </dependency>
24 </dependencies> 31 </dependencies>
25 32
26 </project> 33 </project>
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/BpmProcessInstanceApi.java 0 → 100644
  View file @bdcf00d
  1 +package cn.iocoder.yudao.module.bpm.api.task;
  2 +
  3 +import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
  4 +
  5 +import javax.validation.Valid;
  6 +
  7 +/**
  8 + * 流程实例 Api 接口
  9 + *
  10 + * @author 芋道源码
  11 + */
  12 +public interface BpmProcessInstanceApi {
  13 +
  14 + /**
  15 + * 创建流程实例（提供给内部）
  16 + *
  17 + * @param userId 用户编号
  18 + * @param reqDTO 创建信息
  19 + * @return 实例的编号
  20 + */
  21 + String createProcessInstance(Long userId, @Valid BpmProcessInstanceCreateReqDTO reqDTO);
  22 +
  23 +}
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/dto/BpmProcessInstanceCreateReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/task/dto/BpmProcessInstanceCreateReqDTO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.task.dto; 1 +package cn.iocoder.yudao.module.bpm.api.task.dto;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 4
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/definition/FormController.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmFormController.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.definition;
2 2
  3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.*;
3 import cn.iocoder.yudao.module.bpm.convert.definition.BpmFormConvert; 4 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.dal.dataobject.definition.BpmFormDO;
5 import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService; 6 import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;
6 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 7 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
7 import cn.iocoder.yudao.framework.common.pojo.PageResult; 8 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 FormController { 26 +public class BpmFormController {
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/module/bpm/controller/definition/BpmUserGroupController.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmUserGroupController.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.definition;
2 2
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; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupRespVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO;
7 import cn.iocoder.yudao.module.bpm.convert.definition.BpmUserGroupConvert; 7 import cn.iocoder.yudao.module.bpm.convert.definition.BpmUserGroupConvert;
8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; 8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
9 import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService; 9 import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/form/BpmFormBaseVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/form/BpmFormCreateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/form/BpmFormPageReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/form/BpmFormRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/form/BpmFormSimpleRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/form/BpmFormUpdateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.form; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/group/BpmUserGroupBaseVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/group/BpmUserGroupCreateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
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/module/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/admin/definition/vo/group/BpmUserGroupPageReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/group/BpmUserGroupRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/group/BpmUserGroupSimpleRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/module/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/admin/definition/vo/group/BpmUserGroupUpdateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.group; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group;
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/module/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/admin/definition/vo/model/BpmModeImportReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/model/BpmModelBaseVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/model/BpmModelCreateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/model/BpmModelPageItemRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/model/BpmModelRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/model/BpmModelUpdateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/model/BpmModelUpdateStateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/model/ModelPageReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.model; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/process/BpmProcessDefinitionListReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.process; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.process; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/process/BpmProcessDefinitionPageReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.process; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/process/BpmProcessDefinitionRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.process; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/rule/BpmTaskAssignRuleBaseVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.rule; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/rule/BpmTaskAssignRuleCreateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.rule; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/rule/BpmTaskAssignRuleRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.rule; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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-base/src/main/java/cn/iocoder/yudao/module/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/admin/definition/vo/rule/BpmTaskAssignRuleUpdateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.definition.vo.rule; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.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/oa/BpmOALeaveController.http renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.http
  View file @bdcf00d
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/oa/BpmOALeaveController.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOALeaveController.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.oa; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.oa;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeaveCreateReqVO;  
4 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeavePageReqVO;  
5 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeaveRespVO;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.oa.BpmOALeaveConvert; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveRespVO;
  6 +import cn.iocoder.yudao.module.bpm.convert.oa.BpmOALeaveConvert;
7 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; 7 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
8 -import cn.iocoder.yudao.adminserver.modules.bpm.service.oa.BpmOALeaveService;  
9 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 8 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
10 import cn.iocoder.yudao.framework.common.pojo.PageResult; 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  10 +import cn.iocoder.yudao.module.bpm.service.oa.BpmOALeaveService;
11 import io.swagger.annotations.Api; 11 import io.swagger.annotations.Api;
12 import io.swagger.annotations.ApiImplicitParam; 12 import io.swagger.annotations.ApiImplicitParam;
13 import io.swagger.annotations.ApiOperation; 13 import io.swagger.annotations.ApiOperation;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/package-info.java 0 → 100644
  View file @bdcf00d
  1 +/**
  2 + * OA 示例，用于演示外部业务接入 BPM 工作流的示例
  3 + * 一般的接入方式，只需要调用 接口，后续 Admin 用户在管理后台的【待办事务】进行审批
  4 + */
  5 +package cn.iocoder.yudao.module.bpm.controller.admin.oa;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/oa/vo/BpmOALeaveBaseVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.oa.vo; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
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/module/bpm/controller/oa/vo/BpmOALeaveCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveCreateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.oa.vo; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
2 2
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import lombok.Data; 4 import lombok.Data;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/oa/vo/BpmOALeavePageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeavePageReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.oa.vo; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
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/module/bpm/controller/oa/vo/BpmOALeaveRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.oa.vo; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo;
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/module/bpm/controller/admin/task/package-info.java 0 → 100644
  View file @bdcf00d
  1 +package cn.iocoder.yudao.module.bpm.controller.admin.task;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/task/vo/activity/BpmActivityRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/activity/BpmActivityRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.activity; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity;
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/module/bpm/controller/task/vo/instance/BpmProcessInstanceCancelReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCancelReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.instance; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
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/module/bpm/controller/task/vo/instance/BpmProcessInstanceCreateReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceCreateReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.instance; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
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/module/bpm/controller/task/vo/instance/BpmProcessInstanceMyPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceMyPageReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.instance; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
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/module/bpm/controller/task/vo/instance/BpmProcessInstancePageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstancePageItemRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.instance; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
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/module/bpm/controller/task/vo/instance/BpmProcessInstanceRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.instance; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance;
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/module/bpm/controller/task/vo/task/BpmTaskApproveReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskApproveReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
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/module/bpm/controller/task/vo/task/BpmTaskDonePageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageItemRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
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/module/bpm/controller/task/vo/task/BpmTaskDonePageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskDonePageReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
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/module/bpm/controller/task/vo/task/BpmTaskRejectReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
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/module/bpm/controller/task/vo/task/BpmTaskRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
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/module/bpm/controller/task/vo/task/BpmTaskTodoPageItemRespVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
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/module/bpm/controller/task/vo/task/BpmTaskTodoPageReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
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/module/bpm/controller/task/vo/task/BpmTaskUpdateAssigneeReqVO.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskUpdateAssigneeReqVO.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.module.bpm.controller.task.vo.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task;
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/module/bpm/controller/app/package-info.java 0 → 100644
  View file @bdcf00d
  1 +/**
  2 + * 占位
  3 + */
  4 +package cn.iocoder.yudao.module.bpm.controller.app;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/oa/package-info.java deleted
View file @f39bfda
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/package-info.java 0 → 100644
  View file @bdcf00d
  1 +/**
  2 + * 提供 RESTful API 给前端：
  3 + * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目
  4 + * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分
  5 + */
  6 +package cn.iocoder.yudao.module.bpm.controller;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/controller/task/package-info.java deleted
View file @f39bfda
1 -package cn.iocoder.yudao.module.bpm.controller.task;  
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmFormConvert.java
  View file @bdcf00d
1 package cn.iocoder.yudao.module.bpm.convert.definition; 1 package cn.iocoder.yudao.module.bpm.convert.definition;
2 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; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormSimpleRespVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO;
7 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; 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 org.mapstruct.Mapper; 9 import org.mapstruct.Mapper;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmUserGroupConvert.java
  View file @bdcf00d
@@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.bpm.convert.definition; @@ -2,9 +2,9 @@ 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.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; 5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupRespVO;
  7 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO;
8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; 8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
9 import cn.iocoder.yudao.framework.common.pojo.PageResult; 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
10 10
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/oa/BpmOALeaveConvert.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/BpmOALeaveConvert.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.oa; 1 +package cn.iocoder.yudao.module.bpm.convert.oa;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeaveCreateReqVO;  
4 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeaveRespVO; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveRespVO;
5 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.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;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/convert/oa/package-info.java deleted
View file @f39bfda
1 -package cn.iocoder.yudao.module.bpm.convert.oa;  
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmFormMapper.java
  View file @bdcf00d
1 package cn.iocoder.yudao.module.bpm.dal.mysql.definition; 1 package cn.iocoder.yudao.module.bpm.dal.mysql.definition;
2 2
3 3
4 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.form.BpmFormPageReqVO; 4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO;
5 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; 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;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/definition/BpmUserGroupMapper.java
  View file @bdcf00d
1 package cn.iocoder.yudao.module.bpm.dal.mysql.definition; 1 package cn.iocoder.yudao.module.bpm.dal.mysql.definition;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.group.BpmUserGroupPageReqVO; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO;
4 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; 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;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOALeaveMapper.java
  View file @bdcf00d
1 package cn.iocoder.yudao.module.bpm.dal.mysql.oa; 1 package cn.iocoder.yudao.module.bpm.dal.mysql.oa;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeavePageReqVO; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO;
4 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.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;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmProcessInstanceExtMapper.java
  View file @bdcf00d
1 package cn.iocoder.yudao.module.bpm.dal.mysql.task; 1 package cn.iocoder.yudao.module.bpm.dal.mysql.task;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.task.vo.instance.BpmProcessInstanceMyPageReqVO; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceMyPageReqVO;
4 import cn.iocoder.yudao.module.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;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/config/BpmCommonConfiguration.java 0 → 100644
  View file @bdcf00d
  1 +package cn.iocoder.yudao.module.bpm.framework.bpm.config;
  2 +
  3 +import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventPublisher;
  4 +import org.springframework.context.ApplicationEventPublisher;
  5 +import org.springframework.context.annotation.Bean;
  6 +import org.springframework.context.annotation.Configuration;
  7 +
  8 +/**
  9 + * BPM 通用的 Configuration 配置类，提供给 Activiti 和 Flowable
  10 + */
  11 +@Configuration
  12 +public class BpmCommonConfiguration {
  13 +
  14 + @Bean
  15 + public BpmProcessInstanceResultEventPublisher processInstanceResultEventPublisher(ApplicationEventPublisher publisher) {
  16 + return new BpmProcessInstanceResultEventPublisher(publisher);
  17 + }
  18 +
  19 +}
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/BpmProcessInstanceResultEvent.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEvent.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event; 1 +package cn.iocoder.yudao.module.bpm.framework.bpm.core.event;
2 2
3 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; 3 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
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/framework/activiti/core/event/BpmProcessInstanceResultEventListener.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventListener.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event; 1 +package cn.iocoder.yudao.module.bpm.framework.bpm.core.event;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 import org.springframework.context.ApplicationListener; 4 import org.springframework.context.ApplicationListener;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/BpmProcessInstanceResultEventPublisher.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/BpmProcessInstanceResultEventPublisher.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event; 1 +package cn.iocoder.yudao.module.bpm.framework.bpm.core.event;
2 2
3 import lombok.AllArgsConstructor; 3 import lombok.AllArgsConstructor;
4 import org.springframework.context.ApplicationEventPublisher; 4 import org.springframework.context.ApplicationEventPublisher;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/event/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/event/package-info.java
  View file @bdcf00d
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 * 3 *
4 * @author 芋道源码 4 * @author 芋道源码
5 */ 5 */
6 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event; 6 +package cn.iocoder.yudao.module.bpm.framework.bpm.core.event;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/core/package-info.java 0 → 100644
  View file @bdcf00d
  1 +/**
  2 + * 占位
  3 + */
  4 +package cn.iocoder.yudao.module.bpm.framework.bpm.core;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/package-info.java 0 → 100644
  View file @bdcf00d
  1 +/**
  2 + * 提供给 Activiti 和 Flowable 的通用封装
  3 + *
  4 + * @author 芋道源码
  5 + */
  6 +package cn.iocoder.yudao.module.bpm.framework.bpm;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/framework/package-info.java
  View file @bdcf00d
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 * 3 *
4 * @author 芋道源码 4 * @author 芋道源码
5 */ 5 */
6 -package cn.iocoder.yudao.adminserver.modules.bpm.framework; 6 +package cn.iocoder.yudao.module.bpm.framework;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java
  View file @bdcf00d
  1 +/**
  2 + * bpm 包下，业务流程管理（Business Process Management），我们放工作流的功能。
  3 + * 例如说：流程定义、表单配置、审核中心（我的申请、我的待办、我的已办）等等
  4 + *
  5 + * bpm 解释：https://baike.baidu.com/item/BPM/1933
  6 + *
  7 + * 1. Controller URL：以 /bpm/ 开头，避免和其它 Module 冲突
  8 + * 2. DataObject 表名：以 bpm_ 开头，方便在数据库中区分
  9 + */
1 package cn.iocoder.yudao.module.bpm; 10 package cn.iocoder.yudao.module.bpm;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormService.java
  View file @bdcf00d
1 package cn.iocoder.yudao.module.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.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; 4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO;
7 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; 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;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceImpl.java
  View file @bdcf00d
1 package cn.iocoder.yudao.module.bpm.service.definition; 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.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; 4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO;
7 import cn.iocoder.yudao.module.bpm.convert.definition.BpmFormConvert; 7 import cn.iocoder.yudao.module.bpm.convert.definition.BpmFormConvert;
8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; 8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
9 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmFormMapper; 9 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmFormMapper;
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupService.java
  View file @bdcf00d
@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.bpm.service.definition; @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.bpm.service.definition;
3 import java.util.*; 3 import java.util.*;
4 import javax.validation.*; 4 import javax.validation.*;
5 5
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; 6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO;
  7 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO;
  8 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO;
9 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; 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
yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceImpl.java
  View file @bdcf00d
1 package cn.iocoder.yudao.module.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.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; 4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO;
7 import cn.iocoder.yudao.module.bpm.convert.definition.BpmUserGroupConvert; 7 import cn.iocoder.yudao.module.bpm.convert.definition.BpmUserGroupConvert;
8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; 8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
9 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmUserGroupMapper; 9 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmUserGroupMapper;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/BpmOALeaveService.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveService.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.oa; 1 +package cn.iocoder.yudao.module.bpm.service.oa;
2 2
3 3
4 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeaveCreateReqVO;  
5 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeavePageReqVO;  
6 -import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;  
7 import cn.iocoder.yudao.framework.common.pojo.PageResult; 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO;
  7 +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
8 8
9 import javax.validation.Valid; 9 import javax.validation.Valid;
10 10
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/BpmOALeaveServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOALeaveServiceImpl.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.oa; 1 +package cn.iocoder.yudao.module.bpm.service.oa;
2 2
3 import cn.hutool.core.date.DateUtil; 3 import cn.hutool.core.date.DateUtil;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.oa.BpmOALeaveConvert;  
5 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeaveCreateReqVO;  
6 -import cn.iocoder.yudao.module.bpm.controller.oa.vo.BpmOALeavePageReqVO; 4 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
  6 +import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
  7 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeaveCreateReqVO;
  8 +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOALeavePageReqVO;
  9 +import cn.iocoder.yudao.module.bpm.convert.oa.BpmOALeaveConvert;
7 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO; 10 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOALeaveDO;
8 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOALeaveMapper; 11 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOALeaveMapper;
9 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; 12 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
10 -import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService;  
11 -import cn.iocoder.yudao.adminserver.modules.bpm.service.task.dto.BpmProcessInstanceCreateReqDTO;  
12 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
13 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
14 import org.springframework.transaction.annotation.Transactional; 14 import org.springframework.transaction.annotation.Transactional;
15 import org.springframework.validation.annotation.Validated; 15 import org.springframework.validation.annotation.Validated;
16 16
17 import javax.annotation.Resource; 17 import javax.annotation.Resource;
18 -import java.util.*; 18 +import java.util.HashMap;
  19 +import java.util.Map;
19 20
20 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 21 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
21 -import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.*; 22 +import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_LEAVE_NOT_EXISTS;
22 23
23 /** 24 /**
24 * OA 请假申请 Service 实现类 25 * OA 请假申请 Service 实现类
@@ -39,7 +40,7 @@ public class BpmOALeaveServiceImpl implements BpmOALeaveService { @@ -39,7 +40,7 @@ public class BpmOALeaveServiceImpl implements BpmOALeaveService {
39 private BpmOALeaveMapper leaveMapper; 40 private BpmOALeaveMapper leaveMapper;
40 41
41 @Resource 42 @Resource
42 - private BpmProcessInstanceService processInstanceService; 43 + private BpmProcessInstanceApi processInstanceApi;
43 44
44 @Override 45 @Override
45 @Transactional(rollbackFor = Exception.class) 46 @Transactional(rollbackFor = Exception.class)
@@ -53,7 +54,7 @@ public class BpmOALeaveServiceImpl implements BpmOALeaveService { @@ -53,7 +54,7 @@ public class BpmOALeaveServiceImpl implements BpmOALeaveService {
53 // 发起 BPM 流程 54 // 发起 BPM 流程
54 Map<String, Object> processInstanceVariables = new HashMap<>(); 55 Map<String, Object> processInstanceVariables = new HashMap<>();
55 processInstanceVariables.put("day", day); 56 processInstanceVariables.put("day", day);
56 - String processInstanceId = processInstanceService.createProcessInstance(userId, 57 + String processInstanceId = processInstanceApi.createProcessInstance(userId,
57 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY) 58 new BpmProcessInstanceCreateReqDTO().setProcessDefinitionKey(PROCESS_KEY)
58 .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(leave.getId()))); 59 .setVariables(processInstanceVariables).setBusinessKey(String.valueOf(leave.getId())));
59 60
@@ -64,6 +65,7 @@ public class BpmOALeaveServiceImpl implements BpmOALeaveService { @@ -64,6 +65,7 @@ public class BpmOALeaveServiceImpl implements BpmOALeaveService {
64 65
65 @Override 66 @Override
66 public void updateLeaveResult(Long id, Integer result) { 67 public void updateLeaveResult(Long id, Integer result) {
  68 + validateLeaveExists(id);
67 leaveMapper.updateById(new BpmOALeaveDO().setId(id).setResult(result)); 69 leaveMapper.updateById(new BpmOALeaveDO().setId(id).setResult(result));
68 } 70 }
69 71
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/oa/listener/BpmOALeaveResultListener.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOALeaveResultListener.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.oa.listener; 1 +package cn.iocoder.yudao.module.bpm.service.oa.listener;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEvent;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEventListener;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.service.oa.BpmOALeaveService;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.service.oa.BpmOALeaveServiceImpl; 3 +import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent;
  4 +import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventListener;
  5 +import cn.iocoder.yudao.module.bpm.service.oa.BpmOALeaveService;
  6 +import cn.iocoder.yudao.module.bpm.service.oa.BpmOALeaveServiceImpl;
7 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
8 8
9 import javax.annotation.Resource; 9 import javax.annotation.Resource;
yudao-module-bpm/yudao-module-bpm-base/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmFormServiceTest.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmFormServiceTest.java
  View file @bdcf00d
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.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.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; 5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormCreateReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormPageReqVO;
  7 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.form.BpmFormUpdateReqVO;
8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; 8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
9 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmFormMapper; 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; 10 import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmFormFieldRespDTO;
12 import cn.iocoder.yudao.framework.common.pojo.PageResult; 11 import cn.iocoder.yudao.framework.common.pojo.PageResult;
13 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 12 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
yudao-module-bpm/yudao-module-bpm-base/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmUserGroupServiceTest.java renamed to yudao-module-bpm/yudao-module-bpm-base/src/test/java/cn/iocoder/yudao/module/bpm/service/definition/BpmUserGroupServiceTest.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition; 1 +package cn.iocoder.yudao.module.bpm.service.definition;
2 2
3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest; 3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
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; 4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupCreateReqVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.group.BpmUserGroupUpdateReqVO;
7 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; 7 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
8 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmUserGroupMapper; 8 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmUserGroupMapper;
9 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 9 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
@@ -11,7 +11,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -11,7 +11,6 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
11 import cn.iocoder.yudao.framework.common.util.date.DateUtils; 11 import cn.iocoder.yudao.framework.common.util.date.DateUtils;
12 import cn.iocoder.yudao.framework.test.core.util.AssertUtils; 12 import cn.iocoder.yudao.framework.test.core.util.AssertUtils;
13 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; 14 import org.junit.jupiter.api.Assertions;
16 import org.junit.jupiter.api.Test; 15 import org.junit.jupiter.api.Test;
17 import org.springframework.context.annotation.Import; 16 import org.springframework.context.annotation.Import;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/message/BpmMessageConvert.java deleted
View file @f39bfda
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.message;  
2 -  
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.api.user.dto.AdminUserRespDTO;  
7 -import org.activiti.api.task.model.Task;  
8 -import org.activiti.engine.runtime.ProcessInstance;  
9 -import org.mapstruct.Mapper;  
10 -import org.mapstruct.Mapping;  
11 -import org.mapstruct.MappingTarget;  
12 -import org.mapstruct.Mappings;  
13 -import org.mapstruct.factory.Mappers;  
14 -  
15 -@Mapper  
16 -public interface BpmMessageConvert {  
17 -  
18 - BpmMessageConvert INSTANCE = Mappers.getMapper(BpmMessageConvert.class);  
19 -  
20 - default BpmMessageSendWhenTaskCreatedReqDTO convert(ProcessInstance processInstance, AdminUserRespDTO startUser, Task task) {  
21 - BpmMessageSendWhenTaskCreatedReqDTO reqDTO = new BpmMessageSendWhenTaskCreatedReqDTO();  
22 - copyTo(processInstance, reqDTO);  
23 - copyTo(startUser, reqDTO);  
24 - copyTo(task, reqDTO);  
25 - return reqDTO;  
26 - }  
27 - @Mapping(source = "name", target = "processInstanceName")  
28 - void copyTo(ProcessInstance from, @MappingTarget BpmMessageSendWhenTaskCreatedReqDTO to);  
29 - @Mappings({  
30 - @Mapping(source = "id", target = "startUserId"),  
31 - @Mapping(source = "nickname", target = "startUserNickname")  
32 - })  
33 - void copyTo(AdminUserRespDTO from, @MappingTarget BpmMessageSendWhenTaskCreatedReqDTO to);  
34 - @Mappings({  
35 - @Mapping(source = "id", target = "taskId"),  
36 - @Mapping(source = "name", target = "taskName"),  
37 - @Mapping(source = "assignee", target = "assigneeUserId")  
38 - })  
39 - void copyTo(Task task, @MappingTarget BpmMessageSendWhenTaskCreatedReqDTO to);  
40 -  
41 - default BpmMessageSendWhenProcessInstanceRejectReqDTO convert(ProcessInstance processInstance, String comment) {  
42 - BpmMessageSendWhenProcessInstanceRejectReqDTO reqDTO = new BpmMessageSendWhenProcessInstanceRejectReqDTO();  
43 - copyTo(processInstance, reqDTO);  
44 - reqDTO.setComment(comment);  
45 - return reqDTO;  
46 - }  
47 - @Mapping(source = "name", target = "processInstanceName")  
48 - void copyTo(ProcessInstance from, @MappingTarget BpmMessageSendWhenProcessInstanceRejectReqDTO to);  
49 -  
50 - @Mappings({  
51 - @Mapping(source = "id", target = "processInstanceId"),  
52 - @Mapping(source = "name", target = "processInstanceName"),  
53 - @Mapping(source = "initiator", target = "startUserId")  
54 - })  
55 - BpmMessageSendWhenProcessInstanceApproveReqDTO convert(org.activiti.api.process.model.ProcessInstance processInstance);  
56 -  
57 -}  
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/api/package-info.java 0 → 100644
  View file @bdcf00d
  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/module/bpm/api/task/BpmProcessInstanceApiImpl.java 0 → 100644
  View file @bdcf00d
  1 +package cn.iocoder.yudao.module.bpm.api.task;
  2 +
  3 +import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
  4 +import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
  5 +import org.springframework.stereotype.Service;
  6 +import org.springframework.validation.annotation.Validated;
  7 +
  8 +import javax.annotation.Resource;
  9 +
  10 +/**
  11 + * 流程实例 Api 实现类
  12 + *
  13 + * @author 芋道源码
  14 + */
  15 +@Service
  16 +@Validated
  17 +public class BpmProcessInstanceApiImpl implements BpmProcessInstanceApi {
  18 +
  19 + @Resource
  20 + private BpmProcessInstanceService processInstanceService;
  21 +
  22 + @Override
  23 + public String createProcessInstance(Long userId, BpmProcessInstanceCreateReqDTO reqDTO) {
  24 + return processInstanceService.createProcessInstance(userId, reqDTO);
  25 + }
  26 +
  27 +}
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmModelController.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.definition;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmModelConvert;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmModelService; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*;
  4 +import cn.iocoder.yudao.module.bpm.convert.definition.BpmModelConvert;
  5 +import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService;
5 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 6 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 import cn.iocoder.yudao.framework.common.util.io.IoUtils; 8 import cn.iocoder.yudao.framework.common.util.io.IoUtils;
8 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.model.*;  
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;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmProcessDefinitionController.http renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.http
  View file @bdcf00d
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmProcessDefinitionController.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.definition;
2 2
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; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
  7 +import cn.iocoder.yudao.module.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;
10 import io.swagger.annotations.Api; 10 import io.swagger.annotations.Api;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmTaskAssignRuleController.http renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.http
  View file @bdcf00d
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmTaskAssignRuleController.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmTaskAssignRuleController.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.definition;
2 2
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; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;
  6 +import cn.iocoder.yudao.module.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;
9 import io.swagger.annotations.ApiImplicitParam; 9 import io.swagger.annotations.ApiImplicitParam;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmActivityController.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmActivityController.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 -import cn.iocoder.yudao.module.bpm.controller.task.vo.activity.BpmActivityRespVO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmActivityService; 4 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO;
  5 +import cn.iocoder.yudao.module.bpm.service.task.BpmActivityService;
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.util.servlet.ServletUtils; 7 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
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/task/BpmProcessInstanceController.http renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.http
  View file @bdcf00d
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmProcessInstanceController.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmProcessInstanceService; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
  4 +import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 -import cn.iocoder.yudao.module.bpm.controller.task.vo.instance.*;  
7 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
8 import io.swagger.annotations.ApiImplicitParam; 8 import io.swagger.annotations.ApiImplicitParam;
9 import io.swagger.annotations.ApiOperation; 9 import io.swagger.annotations.ApiOperation;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmTaskController.http renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.http
  View file @bdcf00d
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/task/BpmTaskController.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmTaskController.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.controller.task; 1 +package cn.iocoder.yudao.module.bpm.controller.admin.task;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmTaskService; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
  4 +import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
4 import cn.iocoder.yudao.framework.common.pojo.CommonResult; 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 -import cn.iocoder.yudao.module.bpm.controller.task.vo.task.*;  
7 import io.swagger.annotations.Api; 7 import io.swagger.annotations.Api;
8 import io.swagger.annotations.ApiImplicitParam; 8 import io.swagger.annotations.ApiImplicitParam;
9 import io.swagger.annotations.ApiOperation; 9 import io.swagger.annotations.ApiOperation;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/app/package-info.java 0 → 100644
  View file @bdcf00d
  1 +/**
  2 + * 占位
  3 + */
  4 +package cn.iocoder.yudao.module.bpm.controller.app;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/controller/package-info.java 0 → 100644
  View file @bdcf00d
  1 +/**
  2 + * 提供 RESTful API 给前端：
  3 + * 1. admin 包：提供给管理后台 yudao-ui-admin 前端项目
  4 + * 2. app 包：提供给用户 APP yudao-ui-app 前端项目，它的 Controller 和 VO 都要添加 App 前缀，用于和管理后台进行区分
  5 + */
  6 +package cn.iocoder.yudao.module.bpm.controller;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmModelConvert.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition; 1 +package cn.iocoder.yudao.module.bpm.convert.definition;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; 4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*;
  5 +import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
  6 +import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
6 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
7 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 8 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
8 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.model.*;  
9 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; 9 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
10 import org.activiti.engine.impl.persistence.entity.SuspensionState; 10 import org.activiti.engine.impl.persistence.entity.SuspensionState;
11 import org.activiti.engine.repository.Deployment; 11 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/BpmProcessDefinitionConvert.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmProcessDefinitionConvert.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition; 1 +package cn.iocoder.yudao.module.bpm.convert.definition;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;  
4 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
5 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; 5 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
6 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; 6 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
7 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; 7 +import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
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 renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmTaskAssignRuleConvert.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition; 1 +package cn.iocoder.yudao.module.bpm.convert.definition;
2 2
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; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;
6 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; 6 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
8 import org.activiti.bpmn.model.UserTask; 8 import org.activiti.bpmn.model.UserTask;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/package-info.java
  View file @bdcf00d
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 * 3 *
4 * 目前使用 MapStruct 框架 4 * 目前使用 MapStruct 框架
5 */ 5 */
6 -package cn.iocoder.yudao.adminserver.modules.bpm.convert; 6 +package cn.iocoder.yudao.module.bpm.convert;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmActivityConvert.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmActivityConvert.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.task; 1 +package cn.iocoder.yudao.module.bpm.convert.task;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.task.vo.activity.BpmActivityRespVO; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO;
4 import org.activiti.engine.history.HistoricActivityInstance; 4 import org.activiti.engine.history.HistoricActivityInstance;
5 import org.mapstruct.Mapper; 5 import org.mapstruct.Mapper;
6 import org.mapstruct.Mapping; 6 import org.mapstruct.Mapping;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmProcessInstanceConvert.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.task; 1 +package cn.iocoder.yudao.module.bpm.convert.task;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.task.vo.instance.BpmProcessInstancePageItemRespVO;  
4 -import cn.iocoder.yudao.module.bpm.controller.task.vo.instance.BpmProcessInstanceRespVO; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstancePageItemRespVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessInstanceRespVO;
5 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; 5 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
6 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; 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.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEvent;
  8 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO;
  9 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO;
8 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; 10 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
9 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; 11 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
10 import cn.iocoder.yudao.framework.common.pojo.PageResult; 12 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -114,4 +116,20 @@ public interface BpmProcessInstanceConvert { @@ -114,4 +116,20 @@ public interface BpmProcessInstanceConvert {
114 return event; 116 return event;
115 } 117 }
116 118
  119 + default BpmMessageSendWhenProcessInstanceRejectReqDTO convert(ProcessInstance processInstance, String comment) {
  120 + BpmMessageSendWhenProcessInstanceRejectReqDTO reqDTO = new BpmMessageSendWhenProcessInstanceRejectReqDTO();
  121 + copyTo(processInstance, reqDTO);
  122 + reqDTO.setComment(comment);
  123 + return reqDTO;
  124 + }
  125 + @Mapping(source = "name", target = "processInstanceName")
  126 + void copyTo(ProcessInstance from, @MappingTarget BpmMessageSendWhenProcessInstanceRejectReqDTO to);
  127 +
  128 + @Mappings({
  129 + @Mapping(source = "id", target = "processInstanceId"),
  130 + @Mapping(source = "name", target = "processInstanceName"),
  131 + @Mapping(source = "initiator", target = "startUserId")
  132 + })
  133 + BpmMessageSendWhenProcessInstanceApproveReqDTO convert2(org.activiti.api.process.model.ProcessInstance processInstance);
  134 +
117 } 135 }
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/task/BpmTaskConvert.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.convert.task; 1 +package cn.iocoder.yudao.module.bpm.convert.task;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.task.vo.task.BpmTaskDonePageItemRespVO;  
4 -import cn.iocoder.yudao.module.bpm.controller.task.vo.task.BpmTaskRespVO;  
5 -import cn.iocoder.yudao.module.bpm.controller.task.vo.task.BpmTaskTodoPageItemRespVO; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskDonePageItemRespVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskTodoPageItemRespVO;
6 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; 6 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
  7 +import cn.iocoder.yudao.module.bpm.service.message.dto.BpmMessageSendWhenTaskCreatedReqDTO;
7 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; 8 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
8 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; 9 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
9 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 10 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
@@ -123,4 +124,24 @@ public interface BpmTaskConvert { @@ -123,4 +124,24 @@ public interface BpmTaskConvert {
123 }) 124 })
124 BpmTaskTodoPageItemRespVO.ProcessInstance convert(HistoricProcessInstance processInstance, AdminUserRespDTO startUser); 125 BpmTaskTodoPageItemRespVO.ProcessInstance convert(HistoricProcessInstance processInstance, AdminUserRespDTO startUser);
125 126
  127 + default BpmMessageSendWhenTaskCreatedReqDTO convert(ProcessInstance processInstance, AdminUserRespDTO startUser, org.activiti.api.task.model.Task task) {
  128 + BpmMessageSendWhenTaskCreatedReqDTO reqDTO = new BpmMessageSendWhenTaskCreatedReqDTO();
  129 + copyTo(processInstance, reqDTO);
  130 + copyTo(startUser, reqDTO);
  131 + copyTo(task, reqDTO);
  132 + return reqDTO;
  133 + }
  134 + @Mapping(source = "name", target = "processInstanceName")
  135 + void copyTo(ProcessInstance from, @MappingTarget BpmMessageSendWhenTaskCreatedReqDTO to);
  136 + @Mappings({
  137 + @Mapping(source = "id", target = "startUserId"),
  138 + @Mapping(source = "nickname", target = "startUserNickname")
  139 + })
  140 + void copyTo(AdminUserRespDTO from, @MappingTarget BpmMessageSendWhenTaskCreatedReqDTO to);
  141 + @Mappings({
  142 + @Mapping(source = "id", target = "taskId"),
  143 + @Mapping(source = "name", target = "taskName"),
  144 + @Mapping(source = "assignee", target = "assigneeUserId")
  145 + })
  146 + void copyTo(org.activiti.api.task.model.Task task, @MappingTarget BpmMessageSendWhenTaskCreatedReqDTO to);
126 } 147 }
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/convert/《芋道 Spring Boot 对象转换 MapStruct 入门》.md
  View file @bdcf00d
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/config/BpmActivitiConfiguration.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/config/BpmActivitiConfiguration.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.config; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.config;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.BpmActivityBehaviorFactory;  
4 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEventPublisher;  
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;  
8 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService; 3 +import cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.BpmActivityBehaviorFactory;
  4 +import cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
  5 +import cn.iocoder.yudao.module.bpm.framework.activiti.core.identity.EmptyUserGroupManager;
  6 +import cn.iocoder.yudao.module.bpm.framework.activiti.core.listener.BpmTackActivitiEventListener;
  7 +import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService;
9 import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService; 8 import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService;
10 import cn.iocoder.yudao.module.system.api.dept.DeptApi; 9 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
11 import cn.iocoder.yudao.module.system.api.permission.PermissionApi; 10 import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
12 import cn.iocoder.yudao.module.system.api.user.AdminUserApi; 11 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
13 import org.activiti.api.runtime.shared.identity.UserGroupManager; 12 import org.activiti.api.runtime.shared.identity.UserGroupManager;
14 import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer; 13 import org.activiti.spring.boot.ProcessEngineConfigurationConfigurer;
15 -import org.springframework.context.ApplicationEventPublisher;  
16 import org.springframework.context.annotation.Bean; 14 import org.springframework.context.annotation.Bean;
17 import org.springframework.context.annotation.Configuration; 15 import org.springframework.context.annotation.Configuration;
18 16
@@ -79,9 +77,4 @@ public class BpmActivitiConfiguration { @@ -79,9 +77,4 @@ public class BpmActivitiConfiguration {
79 return bpmActivityBehaviorFactory; 77 return bpmActivityBehaviorFactory;
80 } 78 }
81 79
82 - @Bean  
83 - public BpmProcessInstanceResultEventPublisher processInstanceResultEventPublisher(ApplicationEventPublisher publisher) {  
84 - return new BpmProcessInstanceResultEventPublisher(publisher);  
85 - }  
86 -  
87 } 80 }
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmActivityBehaviorFactory.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/BpmActivityBehaviorFactory.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior;
2 2
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; 3 +import cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
  4 +import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService;
5 import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService; 5 import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService;
6 import cn.iocoder.yudao.module.system.api.dept.DeptApi; 6 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
7 import cn.iocoder.yudao.module.system.api.permission.PermissionApi; 7 import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehavior.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehavior.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior;
2 2
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.framework.activiti.core.behavior.script.BpmTaskAssignScript;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService; 6 +import cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
  7 +import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService;
8 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 8 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
9 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; 9 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
10 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO; 10 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmUserGroupDO;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/package-info.java
  View file @bdcf00d
@@ -4,4 +4,4 @@ @@ -4,4 +4,4 @@
4 * 4 *
5 * @author 芋道源码 5 * @author 芋道源码
6 */ 6 */
7 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior; 7 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/BpmTaskAssignScript.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/script/BpmTaskAssignScript.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script;
2 2
3 import cn.iocoder.yudao.module.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;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.impl; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.impl;
2 2
3 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript; 3 +import cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
4 4
5 import cn.iocoder.yudao.module.system.api.dept.DeptApi; 5 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
6 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; 6 import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
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 renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX1Script.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.impl; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.impl;
2 2
3 import cn.iocoder.yudao.module.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;
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 renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX2Script.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.impl; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.impl;
2 2
3 import cn.iocoder.yudao.module.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;
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 renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignStartUserScript.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.impl; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.impl;
2 2
3 import cn.iocoder.yudao.module.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.module.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;
7 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/identity/EmptyUserGroupManager.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/identity/EmptyUserGroupManager.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.identity; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.identity;
2 2
3 import org.activiti.api.runtime.shared.identity.UserGroupManager; 3 import org.activiti.api.runtime.shared.identity.UserGroupManager;
4 4
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmProcessInstanceEventListener.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/listener/BpmProcessInstanceEventListener.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.listener; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.listener;
2 2
3 import cn.iocoder.yudao.module.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.module.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;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmTackActivitiEventListener.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/listener/BpmTackActivitiEventListener.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.listener; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.listener;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;  
5 -import org.activiti.api.process.runtime.events.listener.ProcessRuntimeEventListener; 4 +import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
6 import org.activiti.api.task.runtime.events.listener.TaskEventListener; 5 import org.activiti.api.task.runtime.events.listener.TaskEventListener;
7 import org.activiti.engine.delegate.event.ActivitiEvent; 6 import org.activiti.engine.delegate.event.ActivitiEvent;
8 import org.activiti.engine.delegate.event.ActivitiEventListener; 7 import org.activiti.engine.delegate.event.ActivitiEventListener;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/BpmTaskEventListener.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/listener/BpmTaskEventListener.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.listener; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.listener;
2 2
3 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; 3 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.service.task.BpmTaskService; 4 +import cn.iocoder.yudao.module.bpm.service.task.BpmTaskService;
5 import org.activiti.api.model.shared.event.RuntimeEvent; 5 import org.activiti.api.model.shared.event.RuntimeEvent;
6 import org.activiti.api.task.model.Task; 6 import org.activiti.api.task.model.Task;
7 import org.activiti.api.task.model.events.TaskRuntimeEvent; 7 import org.activiti.api.task.model.events.TaskRuntimeEvent;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/listener/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/listener/package-info.java
  View file @bdcf00d
@@ -4,4 +4,4 @@ @@ -4,4 +4,4 @@
4 * 4 *
5 * @author 芋道源码 5 * @author 芋道源码
6 */ 6 */
7 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.listener; 7 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.listener;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/framework/package-info.java 0 → 100644
  View file @bdcf00d
  1 +/**
  2 + * 属于 bpm 模块的 framework 封装
  3 + *
  4 + * @author 芋道源码
  5 + */
  6 +package cn.iocoder.yudao.module.bpm.framework;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/package-info.java
  View file @bdcf00d
@@ -4,6 +4,9 @@ @@ -4,6 +4,9 @@
4 * 4 *
5 * bpm 解释：https://baike.baidu.com/item/BPM/1933 5 * bpm 解释：https://baike.baidu.com/item/BPM/1933
6 * 6 *
7 - * 缩写：bpm 7 + * 1. Controller URL：以 /bpm/ 开头，避免和其它 Module 冲突
  8 + * 2. DataObject 表名：以 bpm_ 开头，方便在数据库中区分
  9 + *
  10 + * 注意，由于 Bpm 模块下，容易和其它模块重名，所以类名都加载 Pay 的前缀~
8 */ 11 */
9 -package cn.iocoder.yudao.adminserver.modules.bpm; 12 +package cn.iocoder.yudao.module.bpm;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmModelService.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition; 1 +package cn.iocoder.yudao.module.bpm.service.definition;
2 2
3 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
4 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.model.*; 4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*;
5 import org.activiti.bpmn.model.BpmnModel; 5 import org.activiti.bpmn.model.BpmnModel;
6 6
7 import javax.validation.Valid; 7 import javax.validation.Valid;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmModelServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
  View file @bdcf00d
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.hutool.core.util.ArrayUtil; 4 import cn.hutool.core.util.ArrayUtil;
5 import cn.hutool.core.util.StrUtil; 5 import cn.hutool.core.util.StrUtil;
6 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmModelConvert;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;  
8 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; 6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.model.*;
  7 +import cn.iocoder.yudao.module.bpm.convert.definition.BpmModelConvert;
  8 +import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
  9 +import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
9 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils; 10 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils;
10 import cn.iocoder.yudao.framework.common.pojo.PageResult; 11 import cn.iocoder.yudao.framework.common.pojo.PageResult;
11 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 12 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
12 import cn.iocoder.yudao.framework.common.util.json.JsonUtils; 13 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
13 import cn.iocoder.yudao.framework.common.util.object.PageUtils; 14 import cn.iocoder.yudao.framework.common.util.object.PageUtils;
14 import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; 15 import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils;
15 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.model.*;  
16 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleRespVO; 16 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO;
17 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; 17 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
18 import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum; 18 import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum;
19 -import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;  
20 import lombok.extern.slf4j.Slf4j; 19 import lombok.extern.slf4j.Slf4j;
21 import org.activiti.bpmn.model.BpmnModel; 20 import org.activiti.bpmn.model.BpmnModel;
22 import org.activiti.engine.RepositoryService; 21 import org.activiti.engine.RepositoryService;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmProcessDefinitionService.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionService.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition; 1 +package cn.iocoder.yudao.module.bpm.service.definition;
2 2
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; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO;
  6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
7 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; 7 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
8 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; 8 +import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
9 import cn.iocoder.yudao.framework.common.pojo.PageResult; 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
10 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 10 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
11 import org.activiti.bpmn.model.BpmnModel; 11 import org.activiti.bpmn.model.BpmnModel;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmProcessDefinitionServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmProcessDefinitionServiceImpl.java
  View file @bdcf00d
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.hutool.core.util.ObjectUtil; 4 import cn.hutool.core.util.ObjectUtil;
5 import cn.hutool.core.util.StrUtil; 5 import cn.hutool.core.util.StrUtil;
6 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmProcessDefinitionConvert;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO; 6 +import cn.iocoder.yudao.module.bpm.convert.definition.BpmProcessDefinitionConvert;
  7 +import cn.iocoder.yudao.module.bpm.service.definition.dto.BpmProcessDefinitionCreateReqDTO;
8 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils; 8 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils;
9 import cn.iocoder.yudao.framework.common.pojo.PageResult; 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
10 import cn.iocoder.yudao.framework.common.util.object.PageUtils; 10 import cn.iocoder.yudao.framework.common.util.object.PageUtils;
11 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionListReqVO;  
12 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;  
13 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionPageReqVO;  
14 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO; 11 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionListReqVO;
  12 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  13 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionPageReqVO;
  14 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.process.BpmProcessDefinitionRespVO;
15 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO; 15 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmFormDO;
16 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; 16 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
17 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmProcessDefinitionExtMapper; 17 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmProcessDefinitionExtMapper;
18 -import cn.iocoder.yudao.module.bpm.service.definition.BpmFormService;  
19 import lombok.extern.slf4j.Slf4j; 18 import lombok.extern.slf4j.Slf4j;
20 import org.activiti.bpmn.model.BpmnModel; 19 import org.activiti.bpmn.model.BpmnModel;
21 import org.activiti.engine.RepositoryService; 20 import org.activiti.engine.RepositoryService;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmTaskAssignRuleService.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleService.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.definition; 1 +package cn.iocoder.yudao.module.bpm.service.definition;
2 2
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; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;
  4 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO;
  5 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;
6 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; 6 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
7 import org.springframework.lang.Nullable; 7 import org.springframework.lang.Nullable;
8 8
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmTaskAssignRuleServiceImpl.java
  View file @bdcf00d
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.hutool.core.util.ObjectUtil; 4 import cn.hutool.core.util.ObjectUtil;
5 import cn.hutool.core.util.StrUtil; 5 import cn.hutool.core.util.StrUtil;
6 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;  
7 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleRespVO;  
8 -import cn.iocoder.yudao.module.bpm.controller.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;  
9 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmTaskAssignRuleConvert; 6 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleCreateReqVO;
  7 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleRespVO;
  8 +import cn.iocoder.yudao.module.bpm.controller.admin.definition.vo.rule.BpmTaskAssignRuleUpdateReqVO;
  9 +import cn.iocoder.yudao.module.bpm.convert.definition.BpmTaskAssignRuleConvert;
10 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO; 10 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmTaskAssignRuleDO;
11 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmTaskAssignRuleMapper; 11 import cn.iocoder.yudao.module.bpm.dal.mysql.definition.BpmTaskAssignRuleMapper;
12 import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum; 12 import cn.iocoder.yudao.module.bpm.enums.definition.BpmTaskAssignRuleTypeEnum;
13 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils; 13 import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils;
14 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 14 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
15 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils; 15 import cn.iocoder.yudao.framework.common.util.object.ObjectUtils;
16 -import cn.iocoder.yudao.module.bpm.service.definition.BpmUserGroupService;  
17 import cn.iocoder.yudao.module.system.api.dept.DeptApi; 16 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
18 import cn.iocoder.yudao.module.system.api.dept.PostApi; 17 import cn.iocoder.yudao.module.system.api.dept.PostApi;
19 import cn.iocoder.yudao.module.system.api.dict.DictDataApi; 18 import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmModelMetaInfoRespDTO.java
  View file @bdcf00d
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 cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum; 3 import cn.iocoder.yudao.module.bpm.enums.definition.BpmModelFormTypeEnum;
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/definition/dto/BpmProcessDefinitionCreateReqDTO.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/dto/BpmProcessDefinitionCreateReqDTO.java
  View file @bdcf00d
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 cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.util.StrUtil; 4 import cn.hutool.core.util.StrUtil;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmActivityService.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityService.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.task; 1 +package cn.iocoder.yudao.module.bpm.service.task;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.task.vo.activity.BpmActivityRespVO; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO;
4 4
5 import java.util.List; 5 import java.util.List;
6 6
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmActivityServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmActivityServiceImpl.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.task; 1 +package cn.iocoder.yudao.module.bpm.service.task;
2 2
3 import cn.hutool.core.io.IoUtil; 3 import cn.hutool.core.io.IoUtil;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.task.BpmActivityConvert;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService; 4 +import cn.iocoder.yudao.module.bpm.convert.task.BpmActivityConvert;
  5 +import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
6 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 6 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
7 -import cn.iocoder.yudao.module.bpm.controller.task.vo.activity.BpmActivityRespVO; 7 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.activity.BpmActivityRespVO;
8 import lombok.extern.slf4j.Slf4j; 8 import lombok.extern.slf4j.Slf4j;
9 import org.activiti.bpmn.model.BpmnModel; 9 import org.activiti.bpmn.model.BpmnModel;
10 import org.activiti.engine.HistoryService; 10 import org.activiti.engine.HistoryService;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmProcessInstanceService.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceService.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.task; 1 +package cn.iocoder.yudao.module.bpm.service.task;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.task.vo.instance.*; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
4 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; 4 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum;
5 -import cn.iocoder.yudao.adminserver.modules.bpm.service.task.dto.BpmProcessInstanceCreateReqDTO; 5 +import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
6 import cn.iocoder.yudao.framework.common.pojo.PageResult; 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
8 import org.activiti.engine.history.HistoricProcessInstance; 8 import org.activiti.engine.history.HistoricProcessInstance;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmProcessInstanceServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.task; 1 +package cn.iocoder.yudao.module.bpm.service.task;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.lang.Assert; 4 import cn.hutool.core.lang.Assert;
5 import cn.hutool.core.util.StrUtil; 5 import cn.hutool.core.util.StrUtil;
6 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.message.BpmMessageConvert;  
7 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.task.BpmProcessInstanceConvert;  
8 -import cn.iocoder.yudao.module.bpm.controller.task.vo.instance.*; 6 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.*;
  7 +import cn.iocoder.yudao.module.bpm.convert.task.BpmProcessInstanceConvert;
9 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO; 8 import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
10 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; 9 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO;
11 import cn.iocoder.yudao.module.bpm.dal.mysql.task.BpmProcessInstanceExtMapper; 10 import cn.iocoder.yudao.module.bpm.dal.mysql.task.BpmProcessInstanceExtMapper;
12 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum; 11 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceDeleteReasonEnum;
13 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; 12 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
14 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum; 13 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum;
15 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.event.BpmProcessInstanceResultEventPublisher;  
16 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService; 14 +import cn.iocoder.yudao.module.bpm.framework.bpm.core.event.BpmProcessInstanceResultEventPublisher;
  15 +import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
17 import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; 16 import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService;
18 -import cn.iocoder.yudao.adminserver.modules.bpm.service.task.dto.BpmProcessInstanceCreateReqDTO; 17 +import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
19 import cn.iocoder.yudao.framework.common.pojo.PageResult; 18 import cn.iocoder.yudao.framework.common.pojo.PageResult;
20 import cn.iocoder.yudao.framework.common.util.number.NumberUtils; 19 import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
21 import cn.iocoder.yudao.module.system.api.dept.DeptApi; 20 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -278,7 +277,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @@ -278,7 +277,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
278 processInstanceExtMapper.updateByProcessInstanceId(instanceExtDO); 277 processInstanceExtMapper.updateByProcessInstanceId(instanceExtDO);
279 278
280 // 发送流程被通过的消息 279 // 发送流程被通过的消息
281 - messageService.sendMessageWhenProcessInstanceApprove(BpmMessageConvert.INSTANCE.convert(instance)); 280 + messageService.sendMessageWhenProcessInstanceApprove(BpmProcessInstanceConvert.INSTANCE.convert2(instance));
282 281
283 // 发送流程实例的状态事件 282 // 发送流程实例的状态事件
284 processInstanceResultEventPublisher.sendProcessInstanceResultEvent( 283 processInstanceResultEventPublisher.sendProcessInstanceResultEvent(
@@ -301,7 +300,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService @@ -301,7 +300,7 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService
301 processInstanceExtMapper.updateByProcessInstanceId(instanceExtDO); 300 processInstanceExtMapper.updateByProcessInstanceId(instanceExtDO);
302 301
303 // 发送流程被不通过的消息 302 // 发送流程被不通过的消息
304 - messageService.sendMessageWhenProcessInstanceReject(BpmMessageConvert.INSTANCE.convert(processInstance, comment)); 303 + messageService.sendMessageWhenProcessInstanceReject(BpmProcessInstanceConvert.INSTANCE.convert(processInstance, comment));
305 304
306 // 发送流程实例的状态事件 305 // 发送流程实例的状态事件
307 processInstanceResultEventPublisher.sendProcessInstanceResultEvent( 306 processInstanceResultEventPublisher.sendProcessInstanceResultEvent(
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/BpmTaskService.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.task; 1 +package cn.iocoder.yudao.module.bpm.service.task;
2 2
3 -import cn.iocoder.yudao.module.bpm.controller.task.vo.task.*; 3 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
4 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; 4 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 6 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/service/task/BpmTaskServiceImpl.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service.task; 1 +package cn.iocoder.yudao.module.bpm.service.task;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.util.StrUtil; 4 import cn.hutool.core.util.StrUtil;
5 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.message.BpmMessageConvert;  
6 -import cn.iocoder.yudao.adminserver.modules.bpm.convert.task.BpmTaskConvert;  
7 -import cn.iocoder.yudao.module.bpm.controller.task.vo.task.*; 5 +import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*;
  6 +import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert;
8 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO; 7 import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
9 import cn.iocoder.yudao.module.bpm.dal.mysql.task.BpmTaskExtMapper; 8 import cn.iocoder.yudao.module.bpm.dal.mysql.task.BpmTaskExtMapper;
10 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; 9 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
@@ -291,7 +290,7 @@ public class BpmTaskServiceImpl implements BpmTaskService { @@ -291,7 +290,7 @@ public class BpmTaskServiceImpl implements BpmTaskService {
291 public void afterCommit() { 290 public void afterCommit() {
292 ProcessInstance processInstance = processInstanceService.getProcessInstance(task.getProcessInstanceId()); 291 ProcessInstance processInstance = processInstanceService.getProcessInstance(task.getProcessInstanceId());
293 AdminUserRespDTO startUser = adminUserApi.getUser(Long.valueOf(processInstance.getStartUserId())); 292 AdminUserRespDTO startUser = adminUserApi.getUser(Long.valueOf(processInstance.getStartUserId()));
294 - messageService.sendMessageWhenTaskAssigned(BpmMessageConvert.INSTANCE.convert(processInstance, startUser, task)); 293 + messageService.sendMessageWhenTaskAssigned(BpmTaskConvert.INSTANCE.convert(processInstance, startUser, task));
295 } 294 }
296 }); 295 });
297 } 296 }
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/task/package-info.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/main/java/cn/iocoder/yudao/module/bpm/service/task/package-info.java
  View file @bdcf00d
@@ -9,4 +9,4 @@ @@ -9,4 +9,4 @@
9 * 9 *
10 * @author 芋道源码 10 * @author 芋道源码
11 */ 11 */
12 -package cn.iocoder.yudao.adminserver.modules.bpm.service.task; 12 +package cn.iocoder.yudao.module.bpm.service.task;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/package-info.java deleted
View file @f39bfda
1 -package cn.iocoder.yudao.adminserver.modules.bpm.service;  
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehaviorTest.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehaviorTest.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior;
2 2
3 import cn.hutool.core.map.MapUtil; 3 import cn.hutool.core.map.MapUtil;
4 -import cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;  
5 -import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmTaskAssignRuleService; 4 +import cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.BpmTaskAssignScript;
  5 +import cn.iocoder.yudao.module.bpm.service.definition.BpmTaskAssignRuleService;
6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; 6 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; 7 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
8 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; 8 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/java/cn/iocoder/yudao/module/bpm/framework/activiti/core/behavior/script/impl/BpmTaskAssignLeaderX2ScriptTest.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver.modules.bpm.framework.activiti.core.behavior.script.impl; 1 +package cn.iocoder.yudao.module.bpm.framework.activiti.core.behavior.script.impl;
2 2
3 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest; 3 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
4 import cn.iocoder.yudao.module.system.api.dept.DeptApi; 4 import cn.iocoder.yudao.module.system.api.dept.DeptApi;
@@ -10,6 +10,7 @@ import org.activiti.engine.impl.persistence.entity.TaskEntity; @@ -10,6 +10,7 @@ import org.activiti.engine.impl.persistence.entity.TaskEntity;
10 import org.activiti.engine.impl.persistence.entity.TaskEntityImpl; 10 import org.activiti.engine.impl.persistence.entity.TaskEntityImpl;
11 import org.junit.jupiter.api.Test; 11 import org.junit.jupiter.api.Test;
12 import org.mockito.InjectMocks; 12 import org.mockito.InjectMocks;
  13 +import org.mockito.Mock;
13 import org.springframework.boot.test.mock.mockito.MockBean; 14 import org.springframework.boot.test.mock.mockito.MockBean;
14 15
15 import java.util.Set; 16 import java.util.Set;
@@ -25,9 +26,9 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest { @@ -25,9 +26,9 @@ class BpmTaskAssignLeaderX2ScriptTest extends BaseMockitoUnitTest {
25 @InjectMocks 26 @InjectMocks
26 private BpmTaskAssignLeaderX2Script script; 27 private BpmTaskAssignLeaderX2Script script;
27 28
28 - @MockBean 29 + @Mock
29 private AdminUserApi adminUserApi; 30 private AdminUserApi adminUserApi;
30 - @MockBean 31 + @Mock
31 private DeptApi deptApi; 32 private DeptApi deptApi;
32 33
33 @Test 34 @Test
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/java/cn/iocoder/yudao/module/bpm/service/package-info.java 0 → 100644
  View file @bdcf00d
  1 +package cn.iocoder.yudao.module.bpm.service;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/java/cn/iocoder/yudao/adminserver/BaseDbUnitTest.java renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/java/cn/iocoder/yudao/module/bpm/test/BaseDbUnitTest.java
  View file @bdcf00d
1 -package cn.iocoder.yudao.adminserver; 1 +package cn.iocoder.yudao.module.bpm.test;
2 2
3 import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration; 3 import cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration;
4 import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration; 4 import cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration;
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/resources/application-unit-test.yaml
  View file @bdcf00d
@@ -18,6 +18,12 @@ spring: @@ -18,6 +18,12 @@ spring:
18 async-init: true # 单元测试，异步初始化 Druid 连接池，提升启动速度 18 async-init: true # 单元测试，异步初始化 Druid 连接池，提升启动速度
19 initial-size: 1 # 单元测试，配置为 1，提升启动速度 19 initial-size: 1 # 单元测试，配置为 1，提升启动速度
20 20
  21 + # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
  22 + redis:
  23 + host: 127.0.0.1 # 地址
  24 + port: 16379 # 端口（单元测试，使用 16379 端口）
  25 + database: 0 # 数据库索引
  26 +
21 mybatis: 27 mybatis:
22 lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试 28 lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试
23 29
@@ -36,3 +42,9 @@ mybatis: @@ -36,3 +42,9 @@ mybatis:
36 --- #################### 芋道相关配置 #################### 42 --- #################### 芋道相关配置 ####################
37 43
38 # 芋道配置项，设置当前项目所有自定义的配置 44 # 芋道配置项，设置当前项目所有自定义的配置
  45 +yudao:
  46 + info:
  47 + base-package: cn.iocoder.yudao.module.member.dal.mysql
  48 + base-package2: cn.iocoder.yudao.module
  49 + core-service:
  50 + base-package: cn.iocoder.yudao.module.member.dal.mysql # TODO 芋艿：要清理掉
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/resources/application.yaml deleted
View file @f39bfda
1 -spring:  
2 - application:  
3 - name: yudao-module-bpm-service  
4 -  
5 - # Jackson 配置项  
6 - jackson:  
7 - serialization:  
8 - write-dates-as-timestamps: true # 设置 Date 的格式，使用时间戳  
9 - write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401，而是直接 1611460870401  
10 - write-durations-as-timestamps: true # 设置 Duration 的格式，使用时间戳  
11 - fail-on-empty-beans: false # 允许序列化无属性的 Bean  
12 -  
13 -# MyBatis Plus 的配置项  
14 -mybatis-plus:  
15 - configuration:  
16 - map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。  
17 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 打印日志  
18 - global-config:  
19 - db-config:  
20 - id-type: AUTO # 自增 ID  
21 - logic-delete-value: 1 # 逻辑已删除值(默认为 1)  
22 - logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)  
23 - mapper-locations: classpath*:mapper/*.xml  
24 - type-aliases-package: ${yudao.core-service.base-package}.modules.*.dal.dataobject  
25 -  
26 ---- #################### 芋道相关配置 ####################  
27 -  
28 -yudao:  
29 - info:  
30 - version: 1.0.0  
31 - base-package: cn.iocoder.yudao.adminserver  
32 - core-service:  
33 - base-package: cn.iocoder.yudao.coreservice  
34 -  
35 -debug: false  
yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/resources/logback-spring.xml renamed to yudao-module-bpm/yudao-module-bpm-impl-activiti/src/test/resources/logback.xml
  View file @bdcf00d
yudao-module-system/yudao-module-system-api/pom.xml
  View file @bdcf00d
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 <artifactId>spring-boot-starter-validation</artifactId> 28 <artifactId>spring-boot-starter-validation</artifactId>
29 <optional>true</optional> 29 <optional>true</optional>
30 </dependency> 30 </dependency>
  31 +
31 <!-- 用户信息 --> 32 <!-- 用户信息 -->
32 <dependency> 33 <dependency>
33 <groupId>cn.iocoder.boot</groupId> 34 <groupId>cn.iocoder.boot</groupId>
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/api/dept/PostApiImpl.java 0 → 100644
  View file @bdcf00d
  1 +package cn.iocoder.yudao.module.system.api.dept;
  2 +
  3 +import cn.iocoder.yudao.module.system.service.dept.PostService;
  4 +import org.springframework.stereotype.Service;
  5 +
  6 +import javax.annotation.Resource;
  7 +import java.util.Collection;
  8 +
  9 +/**
  10 + * 岗位 API 实现类
  11 + *
  12 + * @author 芋道源码
  13 + */
  14 +@Service
  15 +public class PostApiImpl implements PostApi {
  16 +
  17 + @Resource
  18 + private PostService postService;
  19 +
  20 + @Override
  21 + public void validPosts(Collection<Long> ids) {
  22 + postService.validPosts(ids);
  23 + }
  24 +}
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java 0 → 100644
  View file @bdcf00d
  1 +package cn.iocoder.yudao.module.system.api.dict;
  2 +
  3 +import cn.iocoder.yudao.module.system.service.dict.DictDataService;
  4 +import org.springframework.stereotype.Service;
  5 +
  6 +import javax.annotation.Resource;
  7 +import java.util.Collection;
  8 +
  9 +/**
  10 + * 字典数据 API 实现类
  11 + *
  12 + * @author 芋道源码
  13 + */
  14 +@Service
  15 +public class DictDataApiImpl implements DictDataApi {
  16 +
  17 + @Resource
  18 + private DictDataService dictDataService;
  19 +
  20 + @Override
  21 + public void validDictDatas(String dictType, Collection<String> values) {
  22 + dictDataService.validDictDatas(dictType, values);
  23 + }
  24 +
  25 +}
yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/api/permission/RoleApiImpl.java 0 → 100644
  View file @bdcf00d
  1 +package cn.iocoder.yudao.module.system.api.permission;
  2 +
  3 +import cn.iocoder.yudao.module.system.service.permission.RoleService;
  4 +import org.springframework.stereotype.Service;
  5 +
  6 +import javax.annotation.Resource;
  7 +import java.util.Collection;
  8 +
  9 +/**
  10 + * 角色 API 实现类
  11 + *
  12 + * @author 芋道源码
  13 + */
  14 +@Service
  15 +public class RoleApiImpl implements RoleApi {
  16 +
  17 + @Resource
  18 + private RoleService roleService;
  19 +
  20 + @Override
  21 + public void validRoles(Collection<Long> ids) {
  22 + roleService.validRoles(ids);
  23 + }
  24 +}