Browse Source

[feat]

1、优化预警生成触发流程获取流程code逻辑
pull/1/head
杨威 3 months ago
parent
commit
ab69f16415
  1. 2
      dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelPostBindBo.java
  2. 18
      dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java
  3. 1
      dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java
  4. 13
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java

2
dk-modules/system/src/main/java/org/dromara/system/domain/bo/AiLabelPostBindBo.java

@ -17,7 +17,7 @@ public class AiLabelPostBindBo {
private Long postId;
@NotNull(message = "标签不能为空")
// @NotNull(message = "标签不能为空")
private List<Long> lableIdList;
}

18
dk-modules/system/src/main/java/org/dromara/system/service/impl/AiLablePostServiceImpl.java

@ -154,13 +154,19 @@ public class AiLablePostServiceImpl implements IAiLabelPostService {
public Boolean insertByBatchBo(AiLabelPostBindBo aiLabelPostBindBo) {
delPostId(aiLabelPostBindBo.getPostId());
List<AiLabelPost> resultlist = new ArrayList<>();
for (Long labelId : aiLabelPostBindBo.getLableIdList()) {
AiLabelPost ailabelPost = new AiLabelPost();
ailabelPost.setPostId(aiLabelPostBindBo.getPostId());
ailabelPost.setLabelId(labelId);
resultlist.add(ailabelPost);
if (ObjectUtil.isNotEmpty(aiLabelPostBindBo.getLableIdList())){
for (Long labelId : aiLabelPostBindBo.getLableIdList()) {
AiLabelPost ailabelPost = new AiLabelPost();
ailabelPost.setPostId(aiLabelPostBindBo.getPostId());
ailabelPost.setLabelId(labelId);
resultlist.add(ailabelPost);
}
return this.baseMapper.insertBatch(resultlist);
}
return this.baseMapper.insertBatch(resultlist);
return true;
}
@Override

1
dk-modules/workflow/src/main/java/org/dromara/workflow/domain/FlowLabel.java

@ -37,7 +37,6 @@ public class FlowLabel {
/**
* 部门id集合
*/
@NotNull(message = "标签id不能为空", groups = AddGroup.class)
@TableField(value = "label_ids",typeHandler = ListTypeHandler.class)
List<String> labelIds;
}

13
dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/FlwLabelServiceImpl.java

@ -1,5 +1,6 @@
package org.dromara.workflow.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
@ -30,12 +31,14 @@ public class FlwLabelServiceImpl extends ServiceImpl<FlwLabelMapper, FlowLabel>
updateWrapper.eq(FlowLabel::getFlowCode, flowDepart.getFlowCode());
this.baseMapper.delete(updateWrapper);
//查询部门是否还存在别的流程
if (this.baseMapper.checkFlowLabel(flowDepart.getLabelIds()) > 0){
throw new ServiceException("所选的标签中,已存在在其他流程中,请检查后在提交!");
}
if (ObjectUtil.isNotEmpty(flowDepart.getLabelIds())) {
//查询部门是否还存在别的流程
if (this.baseMapper.checkFlowLabel(flowDepart.getLabelIds()) > 0){
throw new ServiceException("所选的标签中,已存在在其他流程中,请检查后在提交!");
}
this.baseMapper.insert(flowDepart);
this.baseMapper.insert(flowDepart);
}
return flowDepart;
}

Loading…
Cancel
Save