BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 95ce628cce0a0c258c7dde531975f6db7deb9665

Authored by YunaiV
1 parent 7d620d16

BPM 模型重构 5：将 form 和 model 模块，合并到 definition 模块下

Inline Side-by-side
Showing 38 changed files with 84 additions and 183 deletions
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/form/BpmFormController.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmFormController.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.form;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition;
2 2  
3   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.*;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.convert.form.BpmFormConvert;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.service.form.BpmFormService;
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.*;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmFormConvert;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmFormService;
7 7 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
8 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
9 9 import io.swagger.annotations.Api;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/BpmModelController.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmModelController.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.model;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition;
2 2  
3   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo.*;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.convert.model.BpmModelConvert;
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model.*;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmModelConvert;
5 5 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmModelService;
6 6 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
7 7 import cn.iocoder.yudao.framework.common.pojo.PageResult;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/BpmProcessDefinitionController.java
  View file @95ce628
1 1 package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition;
2 2  
3   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionListReqVO;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageItemRespVO;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageReqVO;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionRespVO;
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionListReqVO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageReqVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO;
7 7 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;
8 8 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
9 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/form/vo/BpmFormBaseVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormBaseVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form;
2 2  
3 3 import lombok.*;
4 4 import io.swagger.annotations.*;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/form/vo/BpmFormCreateReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormCreateReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form;
2 2  
3 3 import lombok.*;
4 4 import io.swagger.annotations.*;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/form/vo/BpmFormPageReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormPageReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import io.swagger.annotations.ApiModel;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/form/vo/BpmFormRespVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormRespVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/form/vo/BpmFormSimpleRespVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormSimpleRespVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/form/vo/BpmFormUpdateReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/form/BpmFormUpdateReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form;
2 2  
3 3 import lombok.*;
4 4 import io.swagger.annotations.*;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/BpmModeImportReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModeImportReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/BpmModelBaseVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelBaseVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model;
2 2  
3 3 import io.swagger.annotations.ApiModelProperty;
4 4 import lombok.Data;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/BpmModelCreateReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelCreateReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/BpmModelPageItemRespVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelPageItemRespVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/BpmModelRespVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelRespVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/BpmModelUpdateReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelUpdateReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model;
2 2  
3 3 import cn.iocoder.yudao.adminserver.modules.bpm.enums.definition.BpmModelFormTypeEnum;
4 4 import io.swagger.annotations.ApiModel;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/BpmModelUpdateStateReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/BpmModelUpdateStateReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/model/vo/ModelPageReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/model/ModelPageReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import io.swagger.annotations.ApiModel;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/BpmProcessDefinitionListReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionListReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import io.swagger.annotations.ApiModel;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/BpmProcessDefinitionPageItemRespVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionPageItemRespVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/BpmProcessDefinitionPageReqVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionPageReqVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.PageParam;
4 4 import io.swagger.annotations.ApiModel;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/BpmProcessDefinitionRespVO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/controller/definition/vo/process/BpmProcessDefinitionRespVO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process;
2 2  
3 3 import io.swagger.annotations.ApiModel;
4 4 import io.swagger.annotations.ApiModelProperty;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmDefinitionConvert.java
  View file @95ce628
1 1 package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition;
2 2  
3   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageItemRespVO;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionRespVO;
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO;
5 5 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
7 7 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO;
8 8 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
9 9 import org.activiti.engine.impl.persistence.entity.SuspensionState;
... ... @@ -11,13 +11,11 @@ import org.activiti.engine.repository.Deployment;
11 11 import org.activiti.engine.repository.ProcessDefinition;
12 12 import org.mapstruct.Mapper;
13 13 import org.mapstruct.Mapping;
14   -import org.mapstruct.Mappings;
15 14 import org.mapstruct.Named;
16 15 import org.mapstruct.factory.Mappers;
17 16  
18 17 import java.util.List;
19 18 import java.util.Map;
20   -import java.util.function.Function;
21 19  
22 20 /**
23 21 * Bpm 流程定义的 Convert
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/form/BpmFormConvert.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmFormConvert.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.convert.form;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition;
2 2  
3   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormCreateReqVO;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormRespVO;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormSimpleRespVO;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormUpdateReqVO;
7   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormCreateReqVO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormRespVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormSimpleRespVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
8 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
9 9 import org.mapstruct.Mapper;
10 10 import org.mapstruct.factory.Mappers;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/model/BpmModelConvert.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/convert/definition/BpmModelConvert.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.convert.model;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.convert.definition;
2 2  
3 3 import cn.hutool.core.util.StrUtil;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo.*;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model.*;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
6 6 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO;
7 7 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
8 8 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/form/BpmFormDO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmFormDO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/form/BpmFormDataDO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmFormDataDO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
4 4 import com.baomidou.mybatisplus.annotation.TableField;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/dataobject/definition/BpmProcessDefinitionExtDO.java
  View file @95ce628
1 1 package cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition;
2 2  
3   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
4 3 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
5 4 import com.baomidou.mybatisplus.annotation.TableId;
6 5 import com.baomidou.mybatisplus.annotation.TableName;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/form/BpmFormMapper.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/dal/mysql/definition/BpmFormMapper.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.form;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition;
2 2  
3 3  
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormPageReqVO;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormPageReqVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
6 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
7 7 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
8 8 import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/config/UserGroupManagerService.java deleted
View file @7d620d1
1   -package cn.iocoder.yudao.adminserver.modules.bpm.service.config;
2   -
3   -
4   -import cn.iocoder.yudao.adminserver.modules.system.service.dept.SysPostService;
5   -import cn.iocoder.yudao.adminserver.modules.system.service.permission.SysPermissionService;
6   -import cn.iocoder.yudao.adminserver.modules.system.service.user.SysUserService;
7   -import cn.iocoder.yudao.coreservice.modules.system.dal.dataobject.user.SysUserDO;
8   -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
9   -import cn.iocoder.yudao.framework.security.core.LoginUser;
10   -import org.activiti.api.runtime.shared.identity.UserGroupManager;
11   -import org.springframework.security.core.userdetails.UserDetails;
12   -import org.springframework.security.core.userdetails.UserDetailsService;
13   -import org.springframework.stereotype.Service;
14   -
15   -
16   -import javax.annotation.Resource;
17   -import java.util.*;
18   -import java.util.stream.Collectors;
19   -
20   -import static java.util.Collections.singleton;
21   -
22   -@Service
23   -public class UserGroupManagerService implements UserGroupManager {
24   -
25   - @Resource
26   - private UserDetailsService userDetailsService;
27   -
28   - @Resource
29   - private SysUserService userService;
30   -
31   - @Resource
32   - private SysPostService sysPostService;
33   -
34   - /**
35   - * 暂时使用岗位来代替
36   - * @param userId
37   - * @return
38   - */
39   - @Override
40   - public List<String> getUserGroups(String userId) {
41   -// final LoginUser loginUser = (LoginUser) userDetailsService.loadUserByUsername(userId);
42   -// final Long id = loginUser.getId();
43   - final SysUserDO user = userService.getUserByUsername(userId);
44   - return sysPostService.getPosts(user.getPostIds()).stream().map(post -> post.getCode()).collect(Collectors.toList());
45   -
46   - }
47   -
48   - @Override
49   - public List<String> getUserRoles(String userId) {
50   - return Arrays.asList("ROLE_ACTIVITI_USER");
51   - }
52   -
53   - @Override
54   - public List<String> getGroups() {
55   - throw new UnsupportedOperationException("getGroups is now un supported");
56   - }
57   -
58   - @Override
59   - public List<String> getUsers() {
60   - throw new UnsupportedOperationException("getGroups is now un supported");
61   - }
62   -}
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/config/UserGroupsProvider.java deleted
View file @7d620d1
1   -package cn.iocoder.yudao.adminserver.modules.bpm.service.config;
2   -
3   -import cn.iocoder.yudao.framework.security.core.LoginUser;
4   -import org.activiti.api.runtime.shared.security.PrincipalGroupsProvider;
5   -import org.springframework.security.core.Authentication;
6   -import org.springframework.stereotype.Service;
7   -
8   -import java.security.Principal;
9   -import java.util.Collections;
10   -import java.util.List;
11   -
12   -@Service
13   -public class UserGroupsProvider implements PrincipalGroupsProvider {
14   -
15   - @Override
16   - public List<String> getGroups(Principal principal) {
17   -
18   - if(principal instanceof Authentication){
19   - Authentication authentication = (Authentication) principal;
20   - final Object user = authentication.getPrincipal();
21   - if( user instanceof LoginUser){
22   - return ((LoginUser) user).getGroups();
23   - }else{
24   - return Collections.emptyList();
25   - }
26   - }else{
27   - return Collections.emptyList();
28   - }
29   -
30   - }
31   -}
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/form/BpmFormService.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmFormService.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.service.form;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormCreateReqVO;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormPageReqVO;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormUpdateReqVO;
7   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormCreateReqVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormPageReqVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
8 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
9 9 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
10   -import org.activiti.engine.repository.Model;
11 10  
12 11 import javax.validation.Valid;
13 12 import java.util.Collection;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmModelService.java
  View file @95ce628
1 1 package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;
2 2  
3   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo.*;
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model.*;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5  
6 6 import javax.validation.Valid;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmProcessDefinitionService.java
  View file @95ce628
1 1 package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;
2 2  
3   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionListReqVO;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageItemRespVO;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageReqVO;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionRespVO;
  3 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionListReqVO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageReqVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO;
7 7 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO;
8 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
9 9 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/form/dto/BpmFormFieldRespDTO.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/dto/BpmFormFieldRespDTO.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.service.form.dto;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto;
2 2  
3 3 import com.fasterxml.jackson.annotation.JsonProperty;
4 4 import lombok.Data;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/form/impl/BpmFormServiceImpl.java renamed to yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmFormServiceImpl.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.service.form.impl;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl;
2 2  
3 3 import cn.hutool.core.lang.Assert;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormCreateReqVO;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormPageReqVO;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormUpdateReqVO;
7   -import cn.iocoder.yudao.adminserver.modules.bpm.convert.form.BpmFormConvert;
8   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
9   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.form.BpmFormMapper;
10   -import cn.iocoder.yudao.adminserver.modules.bpm.service.form.BpmFormService;
11   -import cn.iocoder.yudao.adminserver.modules.bpm.service.form.dto.BpmFormFieldRespDTO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormCreateReqVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormPageReqVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmFormConvert;
  8 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
  9 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmFormMapper;
  10 +import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmFormService;
  11 +import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmFormFieldRespDTO;
12 12 import cn.iocoder.yudao.framework.common.pojo.PageResult;
13 13 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
14 14 import org.springframework.stereotype.Service;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmModelServiceImpl.java
  View file @95ce628
1 1 package cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl;
2 2  
3 3 import cn.hutool.core.util.StrUtil;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.model.vo.*;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.convert.model.BpmModelConvert;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.model.*;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmModelConvert;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
7 7 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;
8 8 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO;
9   -import cn.iocoder.yudao.adminserver.modules.bpm.service.form.BpmFormService;
  9 +import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmFormService;
10 10 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmModelService;
11 11 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmModelMetaInfoRespDTO;
12   -import cn.iocoder.yudao.framework.activiti.core.util.ActivitiUtils;
13 12 import cn.iocoder.yudao.framework.common.pojo.PageResult;
14 13 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
15 14 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
... ... @@ -31,7 +30,6 @@ import org.springframework.util.ObjectUtils;
31 30 import org.springframework.validation.annotation.Validated;
32 31  
33 32 import javax.annotation.Resource;
34   -import java.nio.charset.StandardCharsets;
35 33 import java.util.HashSet;
36 34 import java.util.List;
37 35 import java.util.Map;
... ...
yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/impl/BpmProcessDefinitionServiceImpl.java
  View file @95ce628
... ... @@ -2,17 +2,17 @@ package cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.util.StrUtil;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionListReqVO;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageItemRespVO;
7   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionPageReqVO;
8   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.BpmProcessDefinitionRespVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionListReqVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageItemRespVO;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionPageReqVO;
  8 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.process.BpmProcessDefinitionRespVO;
9 9 import cn.iocoder.yudao.adminserver.modules.bpm.convert.definition.BpmDefinitionConvert;
10 10 import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmProcessDefinitionExtDO;
11   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
  11 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
12 12 import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmProcessDefinitionExtMapper;
13 13 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmProcessDefinitionService;
14 14 import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.dto.BpmDefinitionCreateReqDTO;
15   -import cn.iocoder.yudao.adminserver.modules.bpm.service.form.BpmFormService;
  15 +import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.BpmFormService;
16 16 import cn.iocoder.yudao.framework.common.pojo.PageResult;
17 17 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
18 18 import cn.iocoder.yudao.framework.common.util.object.PageUtils;
... ...
yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/form/BpmFormServiceTest.java renamed to yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/service/definition/BpmFormServiceTest.java
  View file @95ce628
1   -package cn.iocoder.yudao.adminserver.modules.bpm.service.form;
  1 +package cn.iocoder.yudao.adminserver.modules.bpm.service.definition;
2 2  
3 3 import cn.iocoder.yudao.adminserver.BaseDbUnitTest;
4   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormCreateReqVO;
5   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormPageReqVO;
6   -import cn.iocoder.yudao.adminserver.modules.bpm.controller.form.vo.BpmFormUpdateReqVO;
7   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.form.BpmFormDO;
8   -import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.form.BpmFormMapper;
9   -import cn.iocoder.yudao.adminserver.modules.bpm.service.form.impl.BpmFormServiceImpl;
  4 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormCreateReqVO;
  5 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormPageReqVO;
  6 +import cn.iocoder.yudao.adminserver.modules.bpm.controller.definition.vo.form.BpmFormUpdateReqVO;
  7 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.dataobject.definition.BpmFormDO;
  8 +import cn.iocoder.yudao.adminserver.modules.bpm.dal.mysql.definition.BpmFormMapper;
  9 +import cn.iocoder.yudao.adminserver.modules.bpm.service.definition.impl.BpmFormServiceImpl;
10 10 import cn.iocoder.yudao.framework.common.pojo.PageResult;
11 11 import org.junit.jupiter.api.Test;
12 12 import org.springframework.context.annotation.Import;
... ...