Yaxin
/
know_sub
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加流程修改相关代码

Browse Source
release_1.0.0
xueqingkun 8 months ago
parent 35c4e1064c
commit b85c59cd6d
5 changed files with 41 additions and 49 deletions
Show Stats Download Patch File Download Diff File

31
know_sub_business/src/main/java/com/supervision/knowsub/service/impl/FlowManageServiceImpl.java
Unescape Escape View File

@ -3,7 +3,6 @@ package com.supervision.knowsub.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.knowsub.dto.flow.FlowBaseRelationTypeDTO;
import com.supervision.knowsub.exception.BusinessException;
import com.supervision.knowsub.model.SystemBase;
import com.supervision.knowsub.model.SystemFlow;
@ -11,17 +10,15 @@ import com.supervision.knowsub.model.SystemFlowBaseRelation;
import com.supervision.knowsub.model.SystemFlowTypeRelation;
import com.supervision.knowsub.service.*;
import com.supervision.knowsub.vo.flow.*;
import com.supervision.knowsub.vo.sublibrary.SubLibraryResVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.imageio.metadata.IIOMetadataFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@Service
@Slf4j
@ -46,11 +43,11 @@ public class FlowManageServiceImpl implements FlowManageService {
// 一个子库最多对应一种流程类型
List<String> baseIdList = flowInfoReqVo.getBaseIdList();
if (CollUtil.isNotEmpty(baseIdList)){
List<Integer> flowTypeList = flowInfoReqVo.getFlowTypeList();
if (CollUtil.isNotEmpty(baseIdList) & CollUtil.isNotEmpty(flowTypeList)){
List<SystemFlowTypeRelation> flowTypeRelationList = systemFlowTypeRelationService.lambdaQuery().in(SystemFlowTypeRelation::getBaseId, baseIdList).list();
List<String> usedBaseIds = listUsedBaseIds(flowInfoReqVo.getFlowTypeList());
flowTypeRelationList.forEach(flowTypeRelation ->
Assert.isTrue(!usedBaseIds.contains(flowTypeRelation.getBaseId()), "该子库已存在流程类型"));
Assert.isTrue(!flowTypeList.contains(flowTypeRelation.getFlowType()), "该子库已存在流程类型"));
}
// 保存数据
@ -108,7 +105,7 @@ public class FlowManageServiceImpl implements FlowManageService {
return CollUtil.newArrayList();
}
return systemFlowTypeRelationService.lambdaQuery().in(SystemFlowTypeRelation::getFlowId, typeIds).list()
return systemFlowTypeRelationService.lambdaQuery().in(SystemFlowTypeRelation::getFlowType, typeIds).list()
.stream().map(SystemFlowTypeRelation::getBaseId).distinct().toList();
}
@ -119,6 +116,7 @@ public class FlowManageServiceImpl implements FlowManageService {
Assert.notEmpty(flowInfoReqVo.getNodeInfoList());
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateFlow(FlowInfoReqVo flowInfoReqVo) {
Assert.notEmpty(flowInfoReqVo.getId(), "流程id不能为空");
@ -129,12 +127,12 @@ public class FlowManageServiceImpl implements FlowManageService {
// 一个子库最多对应一种流程类型
List<String> baseIdList = flowInfoReqVo.getBaseIdList();
if (CollUtil.isNotEmpty(baseIdList)){
List<Integer> flowTypeList = flowInfoReqVo.getFlowTypeList();
if (CollUtil.isNotEmpty(baseIdList) && CollUtil.isNotEmpty(flowTypeList)){
List<SystemFlowTypeRelation> flowTypeRelationList = systemFlowTypeRelationService.lambdaQuery()
.in(SystemFlowTypeRelation::getBaseId, baseIdList).notIn(SystemFlowTypeRelation::getFlowId, flowInfoReqVo.getId()).list();
List<String> usedBaseIds = listUsedBaseIds(flowInfoReqVo.getFlowTypeList());
flowTypeRelationList.forEach(flowTypeRelation ->
Assert.isTrue(!usedBaseIds.contains(flowTypeRelation.getBaseId()), "该子库已存在流程类型"));
Assert.isTrue(!flowTypeList.contains(flowTypeRelation.getFlowType()), "该子库已存在流程类型"));
}
// 更新主表数据
@ -159,6 +157,9 @@ public class FlowManageServiceImpl implements FlowManageService {
// 更新流程类型关联表数据
updateFlowTypeRelation(flowInfoReqVo.getId(), flowInfoReqVo.getFlowTypeList(), flowInfoReqVo.getBaseIdList());
// 更新流程规则表数据
flowRuleManageService.updateFlowRule(flowInfoReqVo.getId(), flowInfoReqVo.getNodeInfoList());
}
/**
@ -212,7 +213,7 @@ public class FlowManageServiceImpl implements FlowManageService {
List<Integer> needInsert = flowTypeList.stream().filter(flowType -> !dbFlowTypeList.contains(flowType)).toList();
// 数据库中存在，入参中不存在，删除
List<Integer> needDelete = dbFlowTypeList.stream().filter(flowType -> !flowTypeList.contains(flowType)).toList();
List<Integer> needDelete = dbFlowTypeList.stream().filter(flowType -> !flowTypeList.contains(flowType)).distinct().toList();
if (CollUtil.isNotEmpty(needInsert)){
doBatchSaveFlowTypeRelation(flowId, needInsert, baseIdList);
@ -263,10 +264,11 @@ public class FlowManageServiceImpl implements FlowManageService {
SystemFlow systemFlow = systemFlowService.getById(flowId);
Assert.notNull(systemFlow, "流程不存在");
FlowDetailResVo flowDetail = FlowDetailResVo.builder().id(systemFlow.getId()).flowName(systemFlow.getFlowName()).build();
FlowDetailResVo flowDetail = FlowDetailResVo.builder().id(systemFlow.getId())
.flowName(systemFlow.getFlowName()).remark(systemFlow.getRemark()).build();
List<SystemFlowBaseRelation> flowBaseRelationList = systemFlowBaseRelationService.lambdaQuery().eq(SystemFlowBaseRelation::getId, flowId).list();
List<SystemFlowBaseRelation> flowBaseRelationList = systemFlowBaseRelationService.lambdaQuery().eq(SystemFlowBaseRelation::getFlowId, flowId).list();
if (CollUtil.isNotEmpty(flowBaseRelationList)){
flowDetail.setSubLibraryIdList(flowBaseRelationList.stream().map(SystemFlowBaseRelation::getBaseId).toList());
}
@ -278,6 +280,7 @@ public class FlowManageServiceImpl implements FlowManageService {
}
List<NodeInfo> nodeInfos = flowRuleManageService.listFlowRule(flowId);
nodeInfos.sort(Comparator.comparing(NodeInfo::getOrder));
flowDetail.setNodeInfoList(nodeInfos);
return flowDetail;
}

33
know_sub_business/src/main/java/com/supervision/knowsub/service/impl/FlowRuleManageServiceImpl.java
Unescape Escape View File

@ -65,9 +65,9 @@ public class FlowRuleManageServiceImpl implements FlowRuleManageService {
SystemFlowRule systemFlowRule = systemFlowRuleDTO.toSystemFlowRule();
systemFlowRuleService.save(systemFlowRule);
List<SystemFlowRuleUser> systemFlowRuleUserList = systemFlowRuleDTO.toSystemFlowRuleUserList();
if (CollUtil.isEmpty(systemFlowRuleUserList)){
if (CollUtil.isNotEmpty(systemFlowRuleUserList)){
for (SystemFlowRuleUser systemFlowRuleUser : systemFlowRuleUserList) {
systemFlowRuleUser.setFlowId(systemFlowRule.getId());
systemFlowRuleUser.setRuleId(systemFlowRule.getId());
systemFlowRuleUserService.save(systemFlowRuleUser);
}
}
@ -85,11 +85,11 @@ public class FlowRuleManageServiceImpl implements FlowRuleManageService {
for (SystemFlowRuleDTO systemFlowRuleDTO : systemFlowRuleDTOList) {
SystemFlowRule systemFlowRule = systemFlowRuleDTO.toSystemFlowRule();
systemFlowRuleService.updateById(systemFlowRule);
systemFlowRuleUserService.lambdaUpdate().eq(SystemFlowRuleUser::getFlowId, systemFlowRuleDTO.getId()).remove();
systemFlowRuleUserService.lambdaUpdate().eq(SystemFlowRuleUser::getRuleId, systemFlowRuleDTO.getId()).remove();
List<SystemFlowRuleUser> systemFlowRuleUserList = systemFlowRuleDTO.toSystemFlowRuleUserList();
if (CollUtil.isEmpty(systemFlowRuleUserList)){
if (CollUtil.isNotEmpty(systemFlowRuleUserList)){
for (SystemFlowRuleUser systemFlowRuleUser : systemFlowRuleUserList) {
systemFlowRuleUser.setFlowId(systemFlowRule.getId());
systemFlowRuleUser.setRuleId(systemFlowRule.getId());
systemFlowRuleUserService.save(systemFlowRuleUser);
}
}
@ -108,7 +108,6 @@ public class FlowRuleManageServiceImpl implements FlowRuleManageService {
List<String> flowRuleIdList = flowRuleList.stream().map(SystemFlowRule::getId).toList();
Set<String> flowRuleIdSet = flowRuleList.stream().map(SystemFlowRule::getId).collect(Collectors.toSet());
FlowRuleDTOPair flowRuleDTOPair = pickInsertAndUpdateFlowRuleDTO(flowId, nodeInfoList, flowRuleIdSet);
// 新增数据
@ -117,7 +116,7 @@ public class FlowRuleManageServiceImpl implements FlowRuleManageService {
}
// 更新数据
if (CollUtil.isEmpty(flowRuleDTOPair.needUpdateRuleList())){
if (CollUtil.isNotEmpty(flowRuleDTOPair.needUpdateRuleList())){
updateFlowRule(flowRuleDTOPair.needUpdateRuleList());
}
//如果数据库中存在，列表中不存在，则删除
@ -125,10 +124,18 @@ public class FlowRuleManageServiceImpl implements FlowRuleManageService {
if (CollUtil.isNotEmpty(needDeleteRuleIdList)){
deleteFlowRuleByRuleIds(needDeleteRuleIdList);
}
return false;
return true;
}
private static FlowRuleDTOPair pickInsertAndUpdateFlowRuleDTO(String flowId, List<NodeInfo> nodeInfoList, Set<String> flowRuleIdSet) {
/**
* 提取需要新增和需要更新的数据
* @param flowId 流程id
* @param nodeInfoList 节点信息
* @param flowRuleIdSet 数据库中已经存在的规则数据
* @return
*/
private FlowRuleDTOPair pickInsertAndUpdateFlowRuleDTO(String flowId, List<NodeInfo> nodeInfoList, Set<String> flowRuleIdSet) {
List<SystemFlowRuleDTO> needUpdateRuleList = new ArrayList<>();
List<SystemFlowRuleDTO> needAddRuleList = new ArrayList<>();
int order = 0;
@ -155,12 +162,12 @@ public class FlowRuleManageServiceImpl implements FlowRuleManageService {
}
List<SystemFlowRule> flowRuleList = systemFlowRuleService.lambdaQuery().eq(SystemFlowRule::getFlowId, flowId).list();
if (CollUtil.isNotEmpty(flowRuleList)){
if (CollUtil.isEmpty(flowRuleList)){
return CollUtil.newArrayList();
}
List<NodeInfo> nodeInfoList = flowRuleList.stream().map(flowRule -> NodeInfo.builder()
.NodeName(flowRule.getRuleName()).id(flowRule.getId())
.order(flowRule.getRuleOrder()).build()).toList();
.order(flowRule.getRuleOrder()).build()).collect(Collectors.toList());
List<SystemFlowRuleUser> ruleUserList = systemFlowRuleUserService.lambdaQuery().in(SystemFlowRuleUser::getFlowId, flowId).list();
Map<String, List<SystemFlowRuleUser>> ruleUserGroupByRuleId = ruleUserList.stream().collect(Collectors.groupingBy(SystemFlowRuleUser::getRuleId));
@ -176,10 +183,10 @@ public class FlowRuleManageServiceImpl implements FlowRuleManageService {
@Override
public void deleteFlowRuleByRuleIds(List<String> ruleIdList) {
if (CollUtil.isEmpty(ruleIdList)){
log.info("流程id为空，不执行删除操作");
log.info("流程规则id为空，不执行删除操作");
return;
}
systemFlowRuleUserService.removeBatchByIds(ruleIdList);
systemFlowRuleService.removeBatchByIds(ruleIdList);
systemFlowRuleUserService.lambdaUpdate().in(SystemFlowRuleUser::getRuleId, ruleIdList).remove();
}

20
know_sub_model/src/main/java/com/supervision/knowsub/dto/flow/FlowBaseRelationTypeDTO.java
Unescape Escape View File

@ -1,20 +0,0 @@
package com.supervision.knowsub.dto.flow;
import lombok.Data;
import java.util.List;
/**
* 子库关联流程类型
*/
@Data
public class FlowBaseRelationTypeDTO {
private String id;
private String flowId;
private String baseId;
private List<Integer> flowTypeList;
}

3
know_sub_model/src/main/java/com/supervision/knowsub/dto/flow/SystemFlowRuleDTO.java
Unescape Escape View File

@ -40,7 +40,8 @@ public class SystemFlowRuleDTO {
SystemFlowRuleDTO systemFlowRuleDTO = new SystemFlowRuleDTO();
systemFlowRuleDTO.setId(nodeInfo.getId());
systemFlowRuleDTO.setRuleName(nodeInfo.getNodeName());
systemFlowRuleDTO.setFlowId(flowId);
systemFlowRuleDTO.setRuleOrder(nodeInfo.getOrder());
List<SystemFlowRuleUser> ruleUserList = nodeInfo.getUserIdList().stream().map(userId -> {
SystemFlowRuleUser flowRuleUser = new SystemFlowRuleUser();
flowRuleUser.setFlowId(flowId);

3
know_sub_model/src/main/resources/mapper/SystemFlowMapper.xml
Unescape Escape View File

@ -29,8 +29,9 @@
from ks_system_flow f
left join ks_system_user u on f.create_user_id = u.id
where
1 = 1
<if test="flowName != null and flowName != ''">
f.flow_name like concat('%', #{flowName}, '%')
and f.flow_name like concat('%', #{flowName}, '%')
</if>
</select>
</mapper>

Write Preview
Loading…
Cancel
Save