Skip to content

J
jyzb-platform
Commit 8b682a3f by 赵剑炜
Options

Merge branch 'develop-zhaojw' into develop

parents a5ea14b6 6e6621f9
正在显示 包含 653 行增加 和 161 行删除
.gitignore
/jyzb-boot/target /jyzb-process/target
/jyzb-api/target/
/jyzb-biz/target/
##ignore this file##
/target/
.classpath
.project
/.settings/
##filter databfile、sln file##
*.mdb
*.ldb
*.sln
##class file##
*.com
*.class
*.dll
*.exe
*.o
*.so
# compression file
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.via
*.tmp
*.err
# OS generated files #
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
/*/target/*
.gitignore.orig 0 → 100644
<<<<<<< HEAD
/jyzb-process/target
/jyzb-api/target/
/jyzb-biz/target/
##ignore this file##
/target/
.classpath
.project
/.settings/
##filter databfile、sln file##
*.mdb
*.ldb
*.sln
##class file##
*.com
*.class
*.dll
*.exe
*.o
*.so
# compression file
*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.via
*.tmp
*.err
# OS generated files #
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
/*/target/*
=======
/jyzb-boot/target
>>>>>>> develop
.idea/modules.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/jyzb-process/jyzb-process.iml" filepath="$PROJECT_DIR$/jyzb-process/jyzb-process.iml" />
</modules>
</component>
</project>
\ No newline at end of file
jyzb-api/pom.xml
...@@ -38,6 +38,10 @@ ...@@ -38,6 +38,10 @@
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>1.5.22</version> <version>1.5.22</version>
</dependency> </dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>
jyzb-boot/src/main/resources/application-local.yml
...@@ -69,7 +69,7 @@ mybatis-plus: ...@@ -69,7 +69,7 @@ mybatis-plus:
db-config: db-config:
id-type: assign_id id-type: assign_id
table-underline: true table-underline: true
mapper-locations: classpath*:/mapper/**/*Mapper.xml mapper-locations: classpath*:com/junmp/junmpProcess/mapper/**/xml/*Mapper.xml
flowable: flowable:
dmn: dmn:
......
jyzb-boot/target/classes/application-local.yml
...@@ -69,7 +69,7 @@ mybatis-plus: ...@@ -69,7 +69,7 @@ mybatis-plus:
db-config: db-config:
id-type: assign_id id-type: assign_id
table-underline: true table-underline: true
mapper-locations: classpath*:/mapper/**/*Mapper.xml mapper-locations: classpath*:com/junmp/junmpProcess/mapper/**/xml/*Mapper.xml
flowable: flowable:
dmn: dmn:
......
jyzb-process/jyzb-process.iml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="FacetManager">
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
</module>
\ No newline at end of file
jyzb-process/pom.xml
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<version>1.0.0</version> <version>1.0.0</version>
<properties> <properties>
<mysql.version>8.0.21</mysql.version> <mysql.version>8.0.21</mysql.version>
<flowable.version>6.7.2</flowable.version> <flowable.version>6.7.2</flowable.version>
<hutool-all.version>5.8.0</hutool-all.version> <hutool-all.version>5.8.0</hutool-all.version>
<mybatis-plus.vesion>3.5.1</mybatis-plus.vesion> <mybatis-plus.vesion>3.5.1</mybatis-plus.vesion>
...@@ -26,10 +27,32 @@ ...@@ -26,10 +27,32 @@
</properties> </properties>
<dependencies> <dependencies>
<!-- rabbitmq依赖 -->
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>5.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
</dependency>
<!-- 整合到spring项目需要导入此依赖 -->
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit</artifactId>
<version>2.3.10</version>
</dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.module</groupId> <groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId> <artifactId>jackson-module-jaxb-annotations</artifactId>
...@@ -39,6 +62,12 @@ ...@@ -39,6 +62,12 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>${lombok.version}</version> <version>${lombok.version}</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.amqp</groupId>-->
<!-- <artifactId>spring-rabbit-test</artifactId>-->
<!-- <scope>test</scope>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId> <artifactId>spring-web</artifactId>
...@@ -47,6 +76,7 @@ ...@@ -47,6 +76,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId> <artifactId>spring-boot-configuration-processor</artifactId>
...@@ -57,6 +87,8 @@ ...@@ -57,6 +87,8 @@
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql.version}</version> <version>${mysql.version}</version>
</dependency> </dependency>
<!-- JSON 解析器和生成器 --> <!-- JSON 解析器和生成器 -->
<dependency> <dependency>
...@@ -191,20 +223,7 @@ ...@@ -191,20 +223,7 @@
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId> <artifactId>spring-webmvc</artifactId>
</dependency> <version>5.3.19</version>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-spring-webmvc</artifactId>
<version>3.0.0</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.junmp.v2</groupId> <groupId>com.junmp.v2</groupId>
...@@ -229,6 +248,22 @@ ...@@ -229,6 +248,22 @@
<version>3.0.3</version> <version>3.0.3</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>com.junmp.v2</groupId>
<artifactId>system-api</artifactId>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-spring-webmvc</artifactId>
<version>3.0.0</version>
<scope>compile</scope>
</dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>--> <!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger-ui</artifactId>--> <!-- <artifactId>springfox-swagger-ui</artifactId>-->
......
jyzb-process/src/main/java/com/junmp/junmpProcess/common/RabbitMqProducer.java 0 → 100644
package com.junmp.junmpProcess.common;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@Transactional
public class RabbitMqProducer {
// @Autowired
// RabbitTemplate rabbitTemplate;
}
jyzb-process/src/main/java/com/junmp/junmpProcess/config/FlowableGlobListenerConfig.java 0 → 100644
package com.junmp.junmpProcess.config;
import com.junmp.junmpProcess.listener.GlobalEndListener;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher;
import org.flowable.spring.SpringProcessEngineConfiguration;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.event.ContextRefreshedEvent;
@Configuration
public class FlowableGlobListenerConfig implements ApplicationListener<ContextRefreshedEvent> {
@Autowired
private SpringProcessEngineConfiguration configuration;
@Autowired
private GlobalEndListener endListener;
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
FlowableEventDispatcher dispatcher = configuration.getEventDispatcher();
//任务创建全局监听
// dispatcher.addEventListener(endListener, FlowableEngineEventType.TASK_COMPLETED);
// dispatcher.addEventListener(endListener, FlowableEngineEventType.TASK_CREATED);
dispatcher.addEventListener(endListener, FlowableEngineEventType.PROCESS_COMPLETED);
}
}
jyzb-process/src/main/java/com/junmp/junmpProcess/controller/BpmnController.java
...@@ -24,6 +24,7 @@ import com.junmp.junmpProcess.utils.BpmnConvert; ...@@ -24,6 +24,7 @@ import com.junmp.junmpProcess.utils.BpmnConvert;
import com.junmp.junmpProcess.vo.HistoryProcessInstanceVO; import com.junmp.junmpProcess.vo.HistoryProcessInstanceVO;
import com.junmp.junmpProcess.vo.ProcessVO; import com.junmp.junmpProcess.vo.ProcessVO;
import com.junmp.junmpProcess.vo.TaskVO; import com.junmp.junmpProcess.vo.TaskVO;
import com.junmp.junmpProcess.vo.UpdateProcessVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows; import lombok.SneakyThrows;
...@@ -58,19 +59,27 @@ import static com.junmp.junmpProcess.common.CommonConstants.*; ...@@ -58,19 +59,27 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
@Api(tags = "流程表单方法") @Api(tags = "流程表单方法")
public class BpmnController implements BpmnDoc { public class BpmnController implements BpmnDoc {
@Resource
private RepositoryService repositoryService;
@Autowired @Autowired
private ProcessTemplateService processTemplateService; private ProcessTemplateService processTemplateService;
@Autowired @Autowired
private WorkProcessService WorkProcessService; private WorkProcessService WorkProcessService;
@Override @Override
@ApiOperation("创建流程和表单")
@PostMapping(value = "create") @PostMapping(value = "create")
public Result<String> create(@RequestBody ProcessVO processVO) throws JsonProcessingException { public Result<String> create(@RequestBody ProcessVO processVO) throws JsonProcessingException {
return WorkProcessService.createBpmn(processVO); return WorkProcessService.createBpmn(processVO);
} }
/**
* 编辑表单
*/
@ApiOperation("修改表单")
@PutMapping("updateForm")
public Object updateForm(@RequestBody UpdateProcessVO process) throws JsonProcessingException {
return WorkProcessService.updateForm(process);
}
@ApiOperation("通过流程定义id启动流程") @ApiOperation("通过流程定义id启动流程")
@PostMapping("start") @PostMapping("start")
public Result<Object> start(@RequestBody StartProcessInstanceDTO startProcessInstanceDTO) { public Result<Object> start(@RequestBody StartProcessInstanceDTO startProcessInstanceDTO) {
...@@ -103,6 +112,7 @@ public class BpmnController implements BpmnDoc { ...@@ -103,6 +112,7 @@ public class BpmnController implements BpmnDoc {
* @param templateId 模板id * @param templateId 模板id
* @return 模板详情数据 * @return 模板详情数据
*/ */
@ApiOperation("根据ID获取表单信息")
@PostMapping(value = "getFormTemplateById") @PostMapping(value = "getFormTemplateById")
public Object getFormTemplateById(String templateId) { public Object getFormTemplateById(String templateId) {
ProcessTemplates processTemplates = processTemplateService.getById(templateId); ProcessTemplates processTemplates = processTemplateService.getById(templateId);
...@@ -110,7 +120,16 @@ public class BpmnController implements BpmnDoc { ...@@ -110,7 +120,16 @@ public class BpmnController implements BpmnDoc {
return R.ok(processTemplates); return R.ok(processTemplates);
} }
/**
* 查询表单模板数据
*
* @return 模板详情数据
*/
@ApiOperation("获取全部可用的表单和审核流")
@PostMapping(value = "getFormList")
public Object getFormList( ) {
return WorkProcessService.getFormList();
}
/** /**
* 查询表单模板数据 * 查询表单模板数据
...@@ -118,19 +137,10 @@ public class BpmnController implements BpmnDoc { ...@@ -118,19 +137,10 @@ public class BpmnController implements BpmnDoc {
* @param templateId 模板id * @param templateId 模板id
* @return 模板详情数据 * @return 模板详情数据
*/ */
@ApiOperation("通过模板id查看流程信息 会附带流程定义id") @ApiOperation("通过模板id查看流程信息")
@GetMapping("detail") @GetMapping("getFormDetail")
public Result<ProcessTemplates> detail(@RequestParam("templateId") String templateId){ public Result<ProcessTemplates> getFormDetail(@RequestParam("templateId") String templateId){
ProcessTemplates processTemplates = processTemplateService.getById(templateId); return WorkProcessService.getFormDetail(templateId);
processTemplates.setLogo(processTemplates.getIcon());
processTemplates.setFormId(processTemplates.getTemplateId());
processTemplates.setFormName(processTemplates.getTemplateName());
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionKey("process"+templateId).latestVersion().singleResult();
if(processDefinition==null){
throw new WorkFlowException("该流程暂未接入Flowable,请重试");
}
processTemplates.setProcessDefinitionId(processDefinition.getId());
return Result.OK(processTemplates);
} }
......
jyzb-process/src/main/java/com/junmp/junmpProcess/dto/UserListDTO.java 0 → 100644
package com.junmp.junmpProcess.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
@Data
public class UserListDTO implements Serializable {
@ApiModelProperty(value = "用户ID")
private String userID;
@ApiModelProperty
private String realName;
}
jyzb-process/src/main/java/com/junmp/junmpProcess/dto/json/ApproverGroups.java
...@@ -10,4 +10,5 @@ public class ApproverGroups { ...@@ -10,4 +10,5 @@ public class ApproverGroups {
private String levelMode; private String levelMode;
private List<String> approverIds; private List<String> approverIds;
private List<String> approverNames; private List<String> approverNames;
private List<String> orgIds;
} }
jyzb-process/src/main/java/com/junmp/junmpProcess/entity/ProcessTemplates.java
...@@ -33,12 +33,8 @@ public class ProcessTemplates implements Serializable { ...@@ -33,12 +33,8 @@ public class ProcessTemplates implements Serializable {
private String templateId; private String templateId;
@TableField(exist = false) @TableField(exist = false)
private String formId; private String formId;
@TableField(exist = false)
private String formName; private String formName;
/**
* 摸板名称
*/
private String templateName;
private Integer groupId; private Integer groupId;
/** /**
......
jyzb-process/src/main/java/com/junmp/junmpProcess/entity/TemplateGroupBo.java
...@@ -25,7 +25,7 @@ public class TemplateGroupBo { ...@@ -25,7 +25,7 @@ public class TemplateGroupBo {
private String templateId; private String templateId;
private String templateName; private String formName;
private String icon; private String icon;
......
jyzb-process/src/main/java/com/junmp/junmpProcess/listener/CounterSignListener.java
...@@ -4,14 +4,21 @@ import cn.hutool.core.collection.CollUtil; ...@@ -4,14 +4,21 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.TypeReference;
import com.junmp.junmpProcess.dto.UserListDTO;
import com.junmp.junmpProcess.dto.json.*; import com.junmp.junmpProcess.dto.json.*;
import com.junmp.junmpProcess.exception.WorkFlowException; import com.junmp.junmpProcess.exception.WorkFlowException;
import com.junmp.junmpProcess.mapper.OrgUserMapper;
import com.junmp.junmpProcess.service.Repository.ProcessTemplateService;
import com.junmp.v2.sys.api.UserServiceApi;
import com.junmp.v2.sys.api.bean.user.dto.RoleUserDto;
import com.junmp.v2.sys.api.bean.user.vo.QueryUserInfoVo;
import org.flowable.bpmn.model.Process; import org.flowable.bpmn.model.Process;
import org.flowable.bpmn.model.UserTask; import org.flowable.bpmn.model.UserTask;
import org.flowable.engine.RepositoryService; import org.flowable.engine.RepositoryService;
import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.DelegateExecution;
import org.flowable.engine.delegate.ExecutionListener; import org.flowable.engine.delegate.ExecutionListener;
import com.junmp.junmpProcess.enums.AssigneeTypeEnums; import com.junmp.junmpProcess.enums.AssigneeTypeEnums;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -31,7 +38,8 @@ import static com.junmp.junmpProcess.utils.BpmnModelUtils.getChildNode; ...@@ -31,7 +38,8 @@ import static com.junmp.junmpProcess.utils.BpmnModelUtils.getChildNode;
public class CounterSignListener implements ExecutionListener { public class CounterSignListener implements ExecutionListener {
@Resource @Resource
private RepositoryService repositoryService; private RepositoryService repositoryService;
@Resource
private OrgUserMapper orgUserMapper;
@Override @Override
public void notify(DelegateExecution execution) { public void notify(DelegateExecution execution) {
String currentActivityId = execution.getCurrentActivityId(); String currentActivityId = execution.getCurrentActivityId();
...@@ -66,92 +74,66 @@ public class CounterSignListener implements ExecutionListener { ...@@ -66,92 +74,66 @@ public class CounterSignListener implements ExecutionListener {
else if (Type.equals("2"))//指定角色 else if (Type.equals("2"))//指定角色
{ {
List<String> Roles=group.getApproverIds(); List<String> Roles=group.getApproverIds();
for (String role :Roles if (Roles.size()>0)//角色不为空
) { {
//开始拼接传入的多角色
String roleList="(";
for (String role :Roles)
{
roleList+=role+",";
}
roleList = roleList.substring(0, roleList.length() - 1);
roleList+=")";//至此拼接完成
List<UserListDTO> userList=orgUserMapper.QueryUserByRoleId(roleList);
for (UserListDTO userId :userList)
{
assigneeList.add(userId.getUserID());
}
// assigneeList.add(role.getId());
} }
} }
else if (Type.equals("3"))//指定组织机构中的角色 else if (Type.equals("3"))//指定组织机构中的角色
{} {
// Properties props = currentNode.getProps(); // List<UserListDTO> userList=orgUserMapper.QueryUserByRoleIdAndOrg(role);
// String assignedType = props.getAssignedType(); List<String> Roles=group.getApproverIds();
Map<String, Object> nobody = new HashMap<>(); List<String> Orgs=group.getOrgIds();
// if (AssigneeTypeEnums.ASSIGN_USER.getTypeName().equals(assignedType)) { if (Roles.size()>0&&Orgs.size()>0)//角色不为空,组织机构不为空
// List<UserInfo> assignedUser = props.getAssignedUser(); {
// for (UserInfo userInfo : assignedUser) { //开始拼接传入的多角色
// assigneeList.add(userInfo.getId()); String roleList="(";
// } for (String role :Roles)
// } else if (AssigneeTypeEnums.SELF_SELECT.getTypeName().equals(assignedType)) { {
// roleList+=role+",";
// } else if (AssigneeTypeEnums.LEADER_TOP.getTypeName().equals(assignedType)) { }
// throw new WorkFlowException("暂不做这个功能,等发版!");
// } else if (AssigneeTypeEnums.LEADER.getTypeName().equals(assignedType)) { roleList = roleList.substring(0, roleList.length() - 1);
// /* roleList+=")";//至此拼接完成
// 这里代码应该怎么写??? 你想想
// 应该是 通过leader 的code 查出来leader里面的人 然后添加到 //开始拼接传入的多组织机构
// assigneeList.addAll() 既可 String orgList="(";
// 不过本项目没有添加leader的CRUD页面 所以 先这样, for (String org :Orgs)
// 怎么实现就是上述实现手段 {
// 下面角色也一样, 希望我们<布尔什维克>的 orgList+=org+",";
// 同志们 }
// 可以举一反三 一通百通
// */ orgList = orgList.substring(0, orgList.length() - 1);
//// throw new WorkFlowException("当前只是简单的系统 没有RBAC功能,各位可以自己实现!"); orgList+=")";//至此拼接完成
// } else if (AssigneeTypeEnums.ROLE.getTypeName().equals(assignedType)) {
// List<UserListDTO> userList=orgUserMapper.QueryUserByRoleIdAndOrg(roleList,orgList);
//// throw new WorkFlowException("当前只是简单的系统 没有RBAC功能,各位可以自己实现!"); for (UserListDTO userId :userList)
// } else if (AssigneeTypeEnums.SELF.getTypeName().equals(assignedType)) { {
// String startUserJson = execution.getVariable(START_USER_INFO, String.class); assigneeList.add(userId.getUserID());
// UserInfo userInfo = JSONObject.parseObject(startUserJson, new TypeReference<UserInfo>() { }
// });
// assigneeList.add(userInfo.getId());
// } else if (AssigneeTypeEnums.FORM_USER.getTypeName().equals(assignedType)) { }
// String formUser = props.getFormUser();
// List<JSONObject> assigneeUsers = execution.getVariable(formUser, List.class); }
// if (assigneeUsers != null) {
// for (JSONObject assigneeUser : assigneeUsers) {
// assigneeList.add(assigneeUser.getString("id"));
// }
// }
//
// }
// if (CollUtil.isEmpty(assigneeList)) {
// String handler = MapUtil.getStr(nobody, "handler");
// if ("TO_PASS".equals(handler)) {
// assigneeList.add("100000");
// execution.setVariable(variable, assigneeList);
// } else if ("TO_REFUSE".equals(handler)) {
// execution.setVariable("autoRefuse", Boolean.TRUE);
// assigneeList.add("100000");
// execution.setVariable(variable, assigneeList);
// } else if ("TO_ADMIN".equals(handler)) {
// assigneeList.add("381496");
// execution.setVariable(variable, assigneeList);
// } else if ("TO_USER".equals(handler)) {
// Object assignedUserObj = nobody.get("assignedUser");
// if (assignedUserObj != null) {
// List<JSONObject> assignedUser = (List<JSONObject>) assignedUserObj;
// if (assignedUser.size() > 0) {
// for (JSONObject object : assignedUser) {
// assigneeList.add(object.getString("id"));
// }
// execution.setVariable(variable, assigneeList);
// } else {
// assigneeList.add("100000");
// execution.setVariable(variable, assigneeList);
// }
//
// }
//
// } else {
// throw new WorkFlowException("找不到审批人,请检查配置!!!");
// }
// } else {
// execution.setVariable(variable, assigneeList);
// }
if (assigneeList.size()!=0) if (assigneeList.size()!=0)
{execution.setVariable(variable, assigneeList);} {execution.setVariable(variable, assigneeList);}
......
jyzb-process/src/main/java/com/junmp/junmpProcess/listener/GlobalEndListener.java 0 → 100644
package com.junmp.junmpProcess.listener;
import com.junmp.junmpProcess.utils.RabbitMQUtils2;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import lombok.SneakyThrows;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType;
import org.flowable.common.engine.impl.event.FlowableEntityEventImpl;
import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener;
import org.flowable.task.service.impl.persistence.entity.TaskEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
@Component
public class GlobalEndListener extends AbstractFlowableEngineEventListener {
protected Logger logger = LoggerFactory.getLogger(this.getClass());
/**
* @Author: Zhaojw
* @Description: 流程结束监听
* @DateTime: 2023/6/27 13:21
* @Params:
* @Return
*/
@SneakyThrows
@Override
protected void processCompleted(FlowableEngineEntityEvent event) {
//流程结束后工作在这里写
//得到流程定义id
String processDefinitionId = event.getProcessDefinitionId();
//得到流程实例id
String processInstanceId = event.getProcessInstanceId();
/**
* 生产者不需要绑定队列和交换机，只有生产者才需要
*
* 建立连接
* 建立通道
* 推送消息
*/
Connection connection = RabbitMQUtils2.getConnection();
Channel channel = connection.createChannel();
channel.basicPublish("", "info",null,null);
RabbitMQUtils2.closeChannelAndConnection(connection,channel);
}
}
jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/OrgUserMapper.java 0 → 100644
package com.junmp.junmpProcess.mapper;
import com.junmp.junmpProcess.dto.UserListDTO;
import com.junmp.junmpProcess.entity.TemplateGroupBo;
import com.junmp.v2.sys.api.UserServiceApi;
import com.junmp.v2.sys.api.bean.user.dto.RoleUserDto;
import com.junmp.v2.sys.api.bean.user.vo.QueryUserInfoVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface OrgUserMapper {
/**
* 查询所有表单及组
*
* @return
*/
public List<UserListDTO> QueryUserByRoleId(String roleId);
/**
* @Author: Zhaojw
* @Description:根据组织机构和角色查找所有相关用户
* @DateTime: 2023/6/27 13:50
* @Params:
* @Return
*/
public List<UserListDTO> QueryUserByRoleIdAndOrg(String roleId,String orgId);
}
jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/TemplateGroupMapper.java
...@@ -21,8 +21,7 @@ public interface TemplateGroupMapper extends BaseMapper<TemplateGroup> { ...@@ -21,8 +21,7 @@ public interface TemplateGroupMapper extends BaseMapper<TemplateGroup> {
* *
* @return * @return
*/ */
@Select("SELECT fg.group_id, tg.id, fg.group_name, pt.template_id, pt.remark, pt.is_stop, pt.updated, pt.template_name, " + @Select("SELECT pt.template_id, pt.remark, pt.is_stop, pt.updated, pt.form_name, \n" +
"pt.icon, pt.background FROM process_templates pt LEFT JOIN template_group tg ON pt.template_id = tg.template_id\n" + " pt.icon, pt.background FROM process_templates pt ORDER BY updated desc")
"RIGHT JOIN form_groups fg ON tg.group_id = fg.group_id ORDER BY fg.sort_num ASC, tg.sort_num ASC")
List<TemplateGroupBo> getAllFormAndGroups(); List<TemplateGroupBo> getAllFormAndGroups();
} }
jyzb-process/src/main/java/com/junmp/junmpProcess/mapper/xml/OrgUserMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.junmpProcess.mapper.OrgUserMapper">
<resultMap id="UserListDTO" type="com.junmp.junmpProcess.dto.UserListDTO">
<!--@mbg.generated-->
<!--@Table base_cabinet-->
<result column="user_id" jdbcType="VARCHAR" property="userID" />
<result column="real_name" jdbcType="VARCHAR" property="realName" />
</resultMap>
<select id="QueryUserByRoleId" resultMap="UserListDTO">
SELECT su.user_id,su.real_name FROM `sys_role` sr join sys_user_role sur on sr.role_id=sur.role_id JOIN sys_user su on sur.user_id=su.user_id
where sr.role_id in ${roleId}
GROUP BY su.user_id,su.real_name
</select>
<select id="QueryUserByRoleIdAndOrg" resultMap="UserListDTO">
SELECT su.user_id,su.real_name FROM `sys_role` sr join sys_user_role sur on sr.role_id=sur.role_id JOIN sys_user su on sur.user_id=su.user_id
join sys_user_org suo on suo.user_id=su.user_id join pub_org po on po.org_id=suo.org_id
where sr.role_id in ${roleId} and po.org_id in ${orgId}
GROUP BY su.user_id,su.real_name
</select>
</mapper>
\ No newline at end of file
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/WorkProcessService.java
...@@ -23,13 +23,29 @@ public interface WorkProcessService { ...@@ -23,13 +23,29 @@ public interface WorkProcessService {
* @return * @return
*/ */
Result<String> createBpmn(ProcessVO processVO) throws JsonProcessingException; Result<String> createBpmn(ProcessVO processVO) throws JsonProcessingException;
/**
* 编辑表单
*
* @return
*/
Object updateForm(UpdateProcessVO process) throws JsonProcessingException;
/**
* @Author: Zhaojw
* @Description:
* @DateTime: 2023/6/26 13:05
* @Params:
* @Return
*/
Result<ProcessTemplates> getFormDetail(String templateId);
/** /**
* 获取用户可见表单 * 获取用户可见表单
* *
* @return * @return
*/ */
Object getFormGroups(String name); Object getFormList();
/** /**
* 通过模板id查看流程信息 会附带流程定义id * 通过模板id查看流程信息 会附带流程定义id
......
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Bussiness/impl/OrgUserServicelmpl.java 0 → 100644
package com.junmp.junmpProcess.service.Bussiness.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.v2.sys.api.UserServiceApi;
import com.junmp.v2.sys.api.bean.user.OnlineUserDto;
import com.junmp.v2.sys.api.bean.user.SysUserDto;
import com.junmp.v2.sys.api.bean.user.UserLoginInfoDto;
import com.junmp.v2.sys.api.bean.user.dto.RoleUserDto;
import com.junmp.v2.sys.api.bean.user.req.OnlineUserReq;
import com.junmp.v2.sys.api.bean.user.req.SysUserReq;
import com.junmp.v2.sys.api.bean.user.vo.QueryUserInfoVo;
import java.util.Date;
import java.util.List;
import java.util.Set;
public class OrgUserServicelmpl implements UserServiceApi {
@Override
public UserLoginInfoDto getUserLoginInfo(String account) {
return null;
}
@Override
public void updateUserLoginInfo(Long userId, Date date, String ip) {
}
@Override
public Boolean userExist(Long userId) {
return null;
}
@Override
public List<Long> getUserRoleIdList(Long userId) {
return null;
}
@Override
public void deleteUserDataScopeListByOrgIdList(Set<Long> organizationIds) {
}
@Override
public void deleteUserRoleListByRoleId(Long roleId) {
}
@Override
public List<Long> getUserBindDataScope(Long userId) {
return null;
}
@Override
public List<OnlineUserDto> onlineUserList(OnlineUserReq req) {
return null;
}
@Override
public SysUserDto getUserInfoByUserId(Long userId) {
return null;
}
@Override
public List<Long> queryAllUserIdList(SysUserReq req) {
return null;
}
@Override
public List<String> queryAppByUserId(Long userId) {
return null;
}
@Override
public RoleUserDto queryUserByRoleId(Long roleId) {
return null;
}
@Override
public List<QueryUserInfoVo> queryUserByRoleAndOrg(Long roleId, Long orgId) {
return null;
}
}
jyzb-process/src/main/java/com/junmp/junmpProcess/service/Repository/ProcessTemplateService.java
...@@ -11,10 +11,4 @@ import org.flowable.bpmn.model.BpmnModel; ...@@ -11,10 +11,4 @@ import org.flowable.bpmn.model.BpmnModel;
*/ */
public interface ProcessTemplateService extends IService<ProcessTemplates> { public interface ProcessTemplateService extends IService<ProcessTemplates> {
/**
* 获取用户可见表单
*
* @return
*/
public BpmnModel toBpmn(JsonNode processNode, JsonNode formNode,String formName);
} }
jyzb-process/src/main/java/com/junmp/junmpProcess/utils/RabbitMQUtils.java 0 → 100644
package com.junmp.junmpProcess.utils;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
import java.util.Properties;
public class RabbitMQUtils {
private static ConnectionFactory connectionFactory;
private static Properties properties;
static{
//重量级资源 类加载执行之执行一次
connectionFactory = new ConnectionFactory();
connectionFactory.setHost("124.222.235.52");
connectionFactory.setPort(5672);
connectionFactory.setVirtualHost("/");
connectionFactory.setUsername("guest");
connectionFactory.setPassword("guest");
}
//定义提供连接对象的方法
public static Connection getConnection() {
try {
return connectionFactory.newConnection();
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
//关闭通道和关闭连接工具方法
public static void closeConnectionAndChanel(Channel channel, Connection conn) {
try {
if(channel!=null) {
channel.close();
}
if(conn!=null) {
conn.close();
}
} catch (Exception e) {
e.printStackTrace();
}
}
public static void main(String[] args) {
System.out.println("RabbitMQUtils.getConnection() = " + RabbitMQUtils.getConnection());
}
}
jyzb-process/src/main/java/com/junmp/junmpProcess/utils/RabbitMQUtils2.java 0 → 100644
package com.junmp.junmpProcess.utils;
import com.rabbitmq.client.Channel;
import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
import org.springframework.stereotype.Component;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
@Component
public class RabbitMQUtils2 {
private static final String host = "192.168.3.188";
private static final int port = 5672;
private static final String username = "root";
private static final String password = "123456";
public static void closeChannelAndConnection(Connection connection, Channel channel){
try {
channel.close();
connection.close();
} catch (IOException | TimeoutException e) {
e.printStackTrace();
}
}
public static Connection getConnection() throws IOException, TimeoutException {
ConnectionFactory connectionFactory = new ConnectionFactory();
connectionFactory.setHost(host);
connectionFactory.setPort(port);
connectionFactory.setUsername(username);
connectionFactory.setPassword(password);
return connectionFactory.newConnection();
}
}
jyzb-process/src/main/java/com/junmp/junmpProcess/vo/TemplateGroupVo.java
...@@ -31,7 +31,7 @@ public class TemplateGroupVo { ...@@ -31,7 +31,7 @@ public class TemplateGroupVo {
public static class Template { public static class Template {
private String formId; private String formId;
private String processDefinitionId;
private Integer tgId; private Integer tgId;
private String formName; private String formName;
......
jyzb-process/src/main/java/com/junmp/junmpProcess/vo/UpdateProcessVO.java 0 → 100644
package com.junmp.junmpProcess.vo;
import lombok.Data;
@Data
public class UpdateProcessVO {
private String formId;
private String formJson;
private String formName;
private String processJson;
}
jyzb-process/target/classes/com/junmp/junmpProcess/mapper/xml/OrgUserMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.junmp.junmpProcess.mapper.OrgUserMapper">
<resultMap id="UserListDTO" type="com.junmp.junmpProcess.dto.UserListDTO">
<!--@mbg.generated-->
<!--@Table base_cabinet-->
<result column="user_id" jdbcType="VARCHAR" property="userID" />
<result column="real_name" jdbcType="VARCHAR" property="realName" />
<result column="role_name" jdbcType="VARCHAR" property="roleName" />
<result column="role_id" jdbcType="VARCHAR" property="roleID" />
</resultMap>
<select id="QueryUserByRoleId" resultMap="UserListDTO">
SELECT su.user_id,su.real_name,sr.role_name,sr.role_id FROM `sys_role` sr left join sys_user_role sur on sr.role_id=sur.role_id LEFT JOIN sys_user su on sur.user_id=su.user_id
where sr.role_id=#{roleId}
</select>
</mapper>
\ No newline at end of file
jyzb-process/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
com\junmp\junmpProcess\dto\PageDTO.class com\junmp\junmpProcess\dto\PageDTO.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$15.class
com\junmp\junmpProcess\entity\Process.class com\junmp\junmpProcess\entity\Process.class
com\junmp\junmpProcess\dto\json\flowJson\FlowConditionNodes.class com\junmp\junmpProcess\dto\json\flowJson\FlowConditionNodes.class
com\junmp\junmpProcess\dto\json\FormItemProps.class com\junmp\junmpProcess\dto\json\FormItemProps.class
...@@ -12,9 +11,7 @@ com\junmp\junmpProcess\utils\BpmnModelUtils.class ...@@ -12,9 +11,7 @@ com\junmp\junmpProcess\utils\BpmnModelUtils.class
com\junmp\junmpProcess\utils\BpmnModelUtils$FlowType.class com\junmp\junmpProcess\utils\BpmnModelUtils$FlowType.class
com\junmp\junmpProcess\listener\ServiceListener.class com\junmp\junmpProcess\listener\ServiceListener.class
com\junmp\junmpProcess\dto\json\EmailInfo.class com\junmp\junmpProcess\dto\json\EmailInfo.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$7.class
com\junmp\junmpProcess\mapper\UsersMapper.class com\junmp\junmpProcess\mapper\UsersMapper.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$4.class
com\junmp\junmpProcess\controller\MainProcessController.class com\junmp\junmpProcess\controller\MainProcessController.class
com\junmp\junmpProcess\dto\AttachmentDTO.class com\junmp\junmpProcess\dto\AttachmentDTO.class
com\junmp\junmpProcess\listener\CounterSignListener.class com\junmp\junmpProcess\listener\CounterSignListener.class
...@@ -25,15 +22,12 @@ com\junmp\junmpProcess\utils\ExUtils$1.class ...@@ -25,15 +22,12 @@ com\junmp\junmpProcess\utils\ExUtils$1.class
com\junmp\junmpProcess\dto\json\NotifyType.class com\junmp\junmpProcess\dto\json\NotifyType.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$2.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$2.class
com\junmp\junmpProcess\service\Repository\impl\TemplateGroupServiceImpl.class com\junmp\junmpProcess\service\Repository\impl\TemplateGroupServiceImpl.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$1.class
com\junmp\junmpProcess\dto\json\FormOperates.class com\junmp\junmpProcess\dto\json\FormOperates.class
com\junmp\junmpProcess\mapper\TemplateGroupMapper.class com\junmp\junmpProcess\mapper\TemplateGroupMapper.class
com\junmp\junmpProcess\mapper\FormGroupsMapper.class com\junmp\junmpProcess\mapper\FormGroupsMapper.class
com\junmp\junmpProcess\service\Repository\WorkspaceProcessService.class com\junmp\junmpProcess\service\Repository\WorkspaceProcessService.class
com\junmp\junmpProcess\controller\WorkspaceProcessController.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$13.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$13.class
com\junmp\junmpProcess\entity\Process$ProcessBuilder.class com\junmp\junmpProcess\entity\Process$ProcessBuilder.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$12.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$5.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$5.class
com\junmp\junmpProcess\controller\BpmnController.class com\junmp\junmpProcess\controller\BpmnController.class
com\junmp\junmpProcess\dto\HandleDataDTO.class com\junmp\junmpProcess\dto\HandleDataDTO.class
...@@ -49,14 +43,12 @@ com\junmp\junmpProcess\entity\FormGroups$FormGroupsBuilder.class ...@@ -49,14 +43,12 @@ com\junmp\junmpProcess\entity\FormGroups$FormGroupsBuilder.class
com\junmp\junmpProcess\entity\TemplateGroupBo.class com\junmp\junmpProcess\entity\TemplateGroupBo.class
springfox\documentation\spring\web\WebMvcRequestHandler.class springfox\documentation\spring\web\WebMvcRequestHandler.class
com\junmp\junmpProcess\common\CommonConstants.class com\junmp\junmpProcess\common\CommonConstants.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$13.class
com\junmp\junmpProcess\dto\json\LogoInfo.class com\junmp\junmpProcess\dto\json\LogoInfo.class
com\junmp\junmpProcess\vo\TemplateGroupVo$Template$TemplateBuilder.class com\junmp\junmpProcess\vo\TemplateGroupVo$Template$TemplateBuilder.class
com\junmp\junmpProcess\dto\json\UserInfo.class com\junmp\junmpProcess\dto\json\UserInfo.class
com\junmp\junmpProcess\utils\DateUtils$6.class com\junmp\junmpProcess\utils\DateUtils$6.class
com\junmp\junmpProcess\vo\TemplateGroupVo.class com\junmp\junmpProcess\vo\TemplateGroupVo.class
com\junmp\junmpProcess\dto\json\flowJson\Inout.class com\junmp\junmpProcess\dto\json\flowJson\Inout.class
com\junmp\junmpProcess\listener\CounterSignListener$3.class
com\junmp\junmpProcess\entity\TemplateGroup.class com\junmp\junmpProcess\entity\TemplateGroup.class
com\junmp\junmpProcess\config\IdWorkerConfig.class com\junmp\junmpProcess\config\IdWorkerConfig.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$10.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$10.class
...@@ -67,12 +59,10 @@ com\junmp\junmpProcess\vo\MultiVO.class ...@@ -67,12 +59,10 @@ com\junmp\junmpProcess\vo\MultiVO.class
com\junmp\junmpProcess\service\Repository\impl\UserServiceImpl.class com\junmp\junmpProcess\service\Repository\impl\UserServiceImpl.class
com\junmp\junmpProcess\dto\json\flowJson\FlowNode.class com\junmp\junmpProcess\dto\json\flowJson\FlowNode.class
com\junmp\junmpProcess\utils\DateUtils$5.class com\junmp\junmpProcess\utils\DateUtils$5.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$14.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$7.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$7.class
com\junmp\junmpProcess\entity\FormGroups.class com\junmp\junmpProcess\entity\FormGroups.class
com\junmp\junmpProcess\listener\ProcessListener.class com\junmp\junmpProcess\listener\ProcessListener.class
com\junmp\junmpProcess\dto\json\FormItem.class com\junmp\junmpProcess\dto\json\FormItem.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$6.class
com\junmp\junmpProcess\dto\FlowDTO.class com\junmp\junmpProcess\dto\FlowDTO.class
com\junmp\junmpProcess\dto\json\flowJson\FlowApproverGroups.class com\junmp\junmpProcess\dto\json\flowJson\FlowApproverGroups.class
com\junmp\junmpProcess\dto\json\GroupsInfo.class com\junmp\junmpProcess\dto\json\GroupsInfo.class
...@@ -89,7 +79,6 @@ com\junmp\junmpProcess\service\Bussiness\OrgUserAndDeptService.class ...@@ -89,7 +79,6 @@ com\junmp\junmpProcess\service\Bussiness\OrgUserAndDeptService.class
com\junmp\junmpProcess\utils\DateUtils$1.class com\junmp\junmpProcess\utils\DateUtils$1.class
com\junmp\junmpProcess\entity\Departments.class com\junmp\junmpProcess\entity\Departments.class
com\junmp\junmpProcess\utils\DateUtils$7.class com\junmp\junmpProcess\utils\DateUtils$7.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$11.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$6.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$6.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$9.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$9.class
com\junmp\junmpProcess\service\Repository\FormGroupService.class com\junmp\junmpProcess\service\Repository\FormGroupService.class
...@@ -102,20 +91,15 @@ com\junmp\junmpProcess\vo\CommentVO.class ...@@ -102,20 +91,15 @@ com\junmp\junmpProcess\vo\CommentVO.class
com\junmp\junmpProcess\utils\DateUtils.class com\junmp\junmpProcess\utils\DateUtils.class
com\junmp\junmpProcess\config\ActivitiConfig.class com\junmp\junmpProcess\config\ActivitiConfig.class
com\junmp\junmpProcess\controller\OrgUserAndDeptController.class com\junmp\junmpProcess\controller\OrgUserAndDeptController.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$5.class
com\junmp\junmpProcess\mapper\ProcessTemplatesMapper.class com\junmp\junmpProcess\mapper\ProcessTemplatesMapper.class
com\junmp\junmpProcess\vo\AttachmentVO.class com\junmp\junmpProcess\vo\AttachmentVO.class
com\junmp\junmpProcess\vo\ProcessVO.class com\junmp\junmpProcess\vo\ProcessVO.class
com\junmp\junmpProcess\common\Result.class com\junmp\junmpProcess\common\Result.class
com\junmp\junmpProcess\vo\OrgTreeVo$OrgTreeVoBuilder.class com\junmp\junmpProcess\vo\OrgTreeVo$OrgTreeVoBuilder.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$8.class
com\junmp\junmpProcess\dto\TaskDTO.class com\junmp\junmpProcess\dto\TaskDTO.class
com\junmp\junmpProcess\utils\BpmnModelUtils$Type.class com\junmp\junmpProcess\utils\BpmnModelUtils$Type.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$10.class
com\junmp\junmpProcess\dto\json\flowJson\FlowChildNode.class com\junmp\junmpProcess\dto\json\flowJson\FlowChildNode.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$2.class
com\junmp\junmpProcess\entity\ProcessTemplates.class com\junmp\junmpProcess\entity\ProcessTemplates.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$9.class
com\junmp\junmpProcess\dto\json\SettingsInfo.class com\junmp\junmpProcess\dto\json\SettingsInfo.class
com\junmp\junmpProcess\utils\DateUtils$2.class com\junmp\junmpProcess\utils\DateUtils$2.class
com\junmp\junmpProcess\service\Repository\impl\ProcessTemplateServiceImpl.class com\junmp\junmpProcess\service\Repository\impl\ProcessTemplateServiceImpl.class
...@@ -126,7 +110,6 @@ com\junmp\junmpProcess\service\Bussiness\impl\OrgUserAndDeptServiceImpl.class ...@@ -126,7 +110,6 @@ com\junmp\junmpProcess\service\Bussiness\impl\OrgUserAndDeptServiceImpl.class
com\junmp\junmpProcess\service\Repository\UserService.class com\junmp\junmpProcess\service\Repository\UserService.class
com\junmp\junmpProcess\listener\CounterSignListener$2.class com\junmp\junmpProcess\listener\CounterSignListener$2.class
com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$4.class com\junmp\junmpProcess\service\Bussiness\impl\WorkProcessServiceImpl$4.class
com\junmp\junmpProcess\controller\WorkspaceProcessController$3.class
com\junmp\junmpProcess\dto\json\HttpInfo.class com\junmp\junmpProcess\dto\json\HttpInfo.class
com\junmp\junmpProcess\vo\HistoryProcessInstanceVO.class com\junmp\junmpProcess\vo\HistoryProcessInstanceVO.class
com\junmp\junmpProcess\common\WorkFlowConstants.class com\junmp\junmpProcess\common\WorkFlowConstants.class
......
pom.xml
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
<mysql-connector-java.version>8.0.21</mysql-connector-java.version> <mysql-connector-java.version>8.0.21</mysql-connector-java.version>
<mybatis-plus-boot-starter>3.5.1</mybatis-plus-boot-starter> <mybatis-plus-boot-starter>3.5.1</mybatis-plus-boot-starter>
<junmp.v2.version>1.0.0</junmp.v2.version> <junmp.v2.version>1.0.0</junmp.v2.version>
<swagger2.version>1.5.22</swagger2.version>
<spring.ds.version>3.5.1</spring.ds.version> <spring.ds.version>3.5.1</spring.ds.version>
<poi.version>3.14</poi.version> <poi.version>3.14</poi.version>
<itext.version>5.2.0</itext.version> <itext.version>5.2.0</itext.version>
...@@ -92,7 +91,6 @@ ...@@ -92,7 +91,6 @@
<version>${p6spy.version}</version> <version>${p6spy.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
...@@ -100,12 +98,6 @@ ...@@ -100,12 +98,6 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector-java.version}</version> <version>${mysql-connector-java.version}</version>
...@@ -139,6 +131,17 @@ ...@@ -139,6 +131,17 @@
<artifactId>v2-log-boot-starter</artifactId> <artifactId>v2-log-boot-starter</artifactId>
<version>${junmp.v2.version}</version> <version>${junmp.v2.version}</version>
</dependency> </dependency>
<!--引入rabbitmq的相关依赖-->
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>5.7.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
<version>1.5.10.RELEASE</version>
</dependency>
<dependency> <dependency>
<groupId>com.junmp.v2</groupId> <groupId>com.junmp.v2</groupId>
...@@ -233,10 +236,10 @@ ...@@ -233,10 +236,10 @@
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>${fastjson.version}</version> <version>${fastjson.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>javax.servlet</groupId> <!-- <groupId>javax.servlet</groupId>-->
<artifactId>javax.servlet-api</artifactId> <!-- <artifactId>javax.servlet-api</artifactId>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>javax.xml.bind</groupId> <groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId> <artifactId>jaxb-api</artifactId>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论