del 删除节点配置信息
This commit is contained in:
parent
e312c37dda
commit
4b1455008b
@ -1,61 +0,0 @@
|
||||
package org.dromara.workflow.domain;
|
||||
|
||||
import org.dromara.common.tenant.core.TenantEntity;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serial;
|
||||
|
||||
/**
|
||||
* 节点配置对象 wf_node_config
|
||||
*
|
||||
* @author may
|
||||
* @date 2024-03-30
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("wf_node_config")
|
||||
public class WfNodeConfig extends TenantEntity {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(value = "id")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 表单id
|
||||
*/
|
||||
private Long formId;
|
||||
|
||||
/**
|
||||
* 表单类型
|
||||
*/
|
||||
private String formType;
|
||||
|
||||
/**
|
||||
* 节点名称
|
||||
*/
|
||||
private String nodeName;
|
||||
|
||||
/**
|
||||
* 节点id
|
||||
*/
|
||||
private String nodeId;
|
||||
|
||||
/**
|
||||
* 流程定义id
|
||||
*/
|
||||
private String definitionId;
|
||||
|
||||
/**
|
||||
* 是否为申请人节点 (0是 1否)
|
||||
*/
|
||||
private String applyUserTask;
|
||||
|
||||
|
||||
}
|
@ -1,63 +0,0 @@
|
||||
package org.dromara.workflow.domain.bo;
|
||||
|
||||
import org.dromara.workflow.domain.WfNodeConfig;
|
||||
import org.dromara.common.mybatis.core.domain.BaseEntity;
|
||||
import org.dromara.common.core.validate.AddGroup;
|
||||
import org.dromara.common.core.validate.EditGroup;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import jakarta.validation.constraints.*;
|
||||
|
||||
/**
|
||||
* 节点配置业务对象 wf_node_config
|
||||
*
|
||||
* @author may
|
||||
* @date 2024-03-30
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@AutoMapper(target = WfNodeConfig.class, reverseConvertGenerate = false)
|
||||
public class WfNodeConfigBo extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@NotNull(message = "主键不能为空", groups = {EditGroup.class})
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 表单id
|
||||
*/
|
||||
private Long formId;
|
||||
|
||||
/**
|
||||
* 表单类型
|
||||
*/
|
||||
private String formType;
|
||||
|
||||
/**
|
||||
* 节点名称
|
||||
*/
|
||||
@NotBlank(message = "节点名称不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String nodeName;
|
||||
|
||||
/**
|
||||
* 节点id
|
||||
*/
|
||||
@NotBlank(message = "节点id不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String nodeId;
|
||||
|
||||
/**
|
||||
* 流程定义id
|
||||
*/
|
||||
@NotBlank(message = "流程定义id不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String definitionId;
|
||||
|
||||
/**
|
||||
* 是否为申请人节点 (0是 1否)
|
||||
*/
|
||||
@NotBlank(message = "是否为申请人节点不能为空", groups = {AddGroup.class, EditGroup.class})
|
||||
private String applyUserTask;
|
||||
|
||||
}
|
@ -93,8 +93,4 @@ public class ProcessInstanceVo implements Serializable {
|
||||
*/
|
||||
private List<TaskVo> taskVoList;
|
||||
|
||||
/**
|
||||
* 节点配置
|
||||
*/
|
||||
private WfNodeConfigVo wfNodeConfigVo;
|
||||
}
|
||||
|
@ -166,8 +166,4 @@ public class TaskVo implements Serializable {
|
||||
*/
|
||||
private WfDefinitionConfigVo wfDefinitionConfigVo;
|
||||
|
||||
/**
|
||||
* 节点配置
|
||||
*/
|
||||
private WfNodeConfigVo wfNodeConfigVo;
|
||||
}
|
||||
|
@ -1,75 +0,0 @@
|
||||
package org.dromara.workflow.domain.vo;
|
||||
|
||||
import org.dromara.workflow.domain.WfNodeConfig;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.github.linpeilie.annotations.AutoMapper;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
/**
|
||||
* 节点配置视图对象 wf_node_config
|
||||
*
|
||||
* @author may
|
||||
* @date 2024-03-30
|
||||
*/
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
@AutoMapper(target = WfNodeConfig.class)
|
||||
public class WfNodeConfigVo implements Serializable {
|
||||
|
||||
@Serial
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ExcelProperty(value = "主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 表单id
|
||||
*/
|
||||
@ExcelProperty(value = "表单id")
|
||||
private Long formId;
|
||||
|
||||
/**
|
||||
* 表单类型
|
||||
*/
|
||||
@ExcelProperty(value = "表单类型")
|
||||
private String formType;
|
||||
|
||||
/**
|
||||
* 节点名称
|
||||
*/
|
||||
@ExcelProperty(value = "节点名称")
|
||||
private String nodeName;
|
||||
|
||||
/**
|
||||
* 节点id
|
||||
*/
|
||||
@ExcelProperty(value = "节点id")
|
||||
private String nodeId;
|
||||
|
||||
/**
|
||||
* 流程定义id
|
||||
*/
|
||||
@ExcelProperty(value = "流程定义id")
|
||||
private String definitionId;
|
||||
|
||||
/**
|
||||
* 是否为申请人节点 (0是 1否)
|
||||
*/
|
||||
@ExcelProperty(value = "是否为申请人节点 (0是 1否)")
|
||||
private String applyUserTask;
|
||||
|
||||
/**
|
||||
* 表单管理
|
||||
*/
|
||||
private WfFormManageVo wfFormManageVo;
|
||||
|
||||
|
||||
}
|
@ -1,15 +0,0 @@
|
||||
package org.dromara.workflow.mapper;
|
||||
|
||||
import org.dromara.workflow.domain.WfNodeConfig;
|
||||
import org.dromara.workflow.domain.vo.WfNodeConfigVo;
|
||||
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
|
||||
|
||||
/**
|
||||
* 节点配置Mapper接口
|
||||
*
|
||||
* @author may
|
||||
* @date 2024-03-30
|
||||
*/
|
||||
public interface WfNodeConfigMapper extends BaseMapperPlus<WfNodeConfig, WfNodeConfigVo> {
|
||||
|
||||
}
|
@ -1,56 +0,0 @@
|
||||
package org.dromara.workflow.service;
|
||||
|
||||
import org.dromara.workflow.domain.WfNodeConfig;
|
||||
import org.dromara.workflow.domain.vo.WfNodeConfigVo;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 节点配置Service接口
|
||||
*
|
||||
* @author may
|
||||
* @date 2024-03-30
|
||||
*/
|
||||
public interface IWfNodeConfigService {
|
||||
|
||||
/**
|
||||
* 查询节点配置
|
||||
*
|
||||
* @param id 主键
|
||||
* @return 结果
|
||||
*/
|
||||
WfNodeConfigVo queryById(Long id);
|
||||
|
||||
/**
|
||||
* 保存节点配置
|
||||
*
|
||||
* @param list 参数
|
||||
* @return 结果
|
||||
*/
|
||||
Boolean saveOrUpdate(List<WfNodeConfig> list);
|
||||
|
||||
/**
|
||||
* 批量删除节点配置信息
|
||||
*
|
||||
* @param ids 主键
|
||||
* @return 结果
|
||||
*/
|
||||
Boolean deleteByIds(Collection<Long> ids);
|
||||
|
||||
/**
|
||||
* 按照流程定义id删除
|
||||
*
|
||||
* @param ids 流程定义id
|
||||
* @return 结果
|
||||
*/
|
||||
Boolean deleteByDefIds(Collection<String> ids);
|
||||
|
||||
/**
|
||||
* 按照流程定义id查询
|
||||
*
|
||||
* @param ids 流程定义id
|
||||
* @return 结果
|
||||
*/
|
||||
List<WfNodeConfigVo> selectByDefIds(Collection<String> ids);
|
||||
}
|
@ -1,75 +0,0 @@
|
||||
package org.dromara.workflow.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.dromara.common.core.utils.StreamUtils;
|
||||
import org.dromara.workflow.domain.vo.WfFormManageVo;
|
||||
import org.dromara.workflow.service.IWfFormManageService;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.dromara.workflow.domain.vo.WfNodeConfigVo;
|
||||
import org.dromara.workflow.domain.WfNodeConfig;
|
||||
import org.dromara.workflow.mapper.WfNodeConfigMapper;
|
||||
import org.dromara.workflow.service.IWfNodeConfigService;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 节点配置Service业务层处理
|
||||
*
|
||||
* @author may
|
||||
* @date 2024-03-30
|
||||
*/
|
||||
@RequiredArgsConstructor
|
||||
@Service
|
||||
public class WfNodeConfigServiceImpl implements IWfNodeConfigService {
|
||||
|
||||
private final WfNodeConfigMapper baseMapper;
|
||||
private final IWfFormManageService wfFormManageService;
|
||||
|
||||
/**
|
||||
* 查询节点配置
|
||||
*/
|
||||
@Override
|
||||
public WfNodeConfigVo queryById(Long id) {
|
||||
return baseMapper.selectVoById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存节点配置
|
||||
*/
|
||||
@Override
|
||||
public Boolean saveOrUpdate(List<WfNodeConfig> list) {
|
||||
return baseMapper.insertOrUpdateBatch(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除节点配置
|
||||
*/
|
||||
@Override
|
||||
public Boolean deleteByIds(Collection<Long> ids) {
|
||||
return baseMapper.deleteByIds(ids) > 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public Boolean deleteByDefIds(Collection<String> ids) {
|
||||
return baseMapper.delete(new LambdaQueryWrapper<WfNodeConfig>().in(WfNodeConfig::getDefinitionId, ids)) > 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<WfNodeConfigVo> selectByDefIds(Collection<String> ids) {
|
||||
List<WfNodeConfigVo> wfNodeConfigVos = baseMapper.selectVoList(new LambdaQueryWrapper<WfNodeConfig>().in(WfNodeConfig::getDefinitionId, ids));
|
||||
if (CollUtil.isNotEmpty(wfNodeConfigVos)) {
|
||||
List<Long> formIds = StreamUtils.toList(wfNodeConfigVos, WfNodeConfigVo::getFormId);
|
||||
List<WfFormManageVo> wfFormManageVos = wfFormManageService.queryByIds(formIds);
|
||||
for (WfNodeConfigVo wfNodeConfigVo : wfNodeConfigVos) {
|
||||
wfFormManageVos.stream().filter(e -> ObjectUtil.equals(e.getId(), wfNodeConfigVo.getFormId())).findFirst().ifPresent(wfNodeConfigVo::setWfFormManageVo);
|
||||
}
|
||||
}
|
||||
return wfNodeConfigVos;
|
||||
}
|
||||
}
|
@ -1,7 +0,0 @@
|
||||
<?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="org.dromara.workflow.mapper.WfTaskBackNodeMapper">
|
||||
|
||||
</mapper>
|
Loading…
x
Reference in New Issue
Block a user