|
|
@@ -3,15 +3,20 @@ package cn.iocoder.yudao.module.iscs.service.workdesign;
|
|
|
import cn.hutool.core.lang.Assert;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
|
+import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowdesign.vo.PcValueVO;
|
|
|
import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowdesignnode.vo.WorkflowDesignNodePageReqVO;
|
|
|
import cn.iocoder.yudao.module.iscs.controller.admin.workdesign.workflowdesignnode.vo.WorkflowDesignNodeSaveReqVO;
|
|
|
+import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowDesignDO;
|
|
|
import cn.iocoder.yudao.module.iscs.dal.dataobject.workdesign.WorkflowDesignNodeDO;
|
|
|
import cn.iocoder.yudao.module.iscs.dal.mysql.workdesign.WorkflowDesignNodeMapper;
|
|
|
+import cn.iocoder.yudao.module.iscs.utils.PcValueParser;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import jakarta.annotation.Resource;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.springframework.context.annotation.Lazy;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
|
@@ -19,6 +24,7 @@ import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* 流程节点配置 Service 实现类
|
|
|
@@ -31,6 +37,9 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
|
|
|
@Resource
|
|
|
private WorkflowDesignNodeMapper workflowDesignNodeMapper;
|
|
|
+ @Resource
|
|
|
+ @Lazy
|
|
|
+ private WorkflowDesignService workflowDesignService;
|
|
|
|
|
|
@Override
|
|
|
public Long createWorkflowDesignNode(WorkflowDesignNodeSaveReqVO createReqVO) {
|
|
|
@@ -83,6 +92,12 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
List<WorkflowDesignNodeDO> workflowDesignNodeDOS = parseJsonToList(content);
|
|
|
workflowDesignNodeDOS.forEach(o -> o.setDesignId(designId));
|
|
|
saveBatch(workflowDesignNodeDOS);
|
|
|
+ if (!workflowDesignNodeDOS.isEmpty()) {
|
|
|
+ workflowDesignService.update(Wrappers.<WorkflowDesignDO>lambdaUpdate()
|
|
|
+ .eq(WorkflowDesignDO::getDeleted, designId)
|
|
|
+ .set(WorkflowDesignDO::getNodeCount, workflowDesignNodeDOS.size())
|
|
|
+ );
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
log.error(e + "");
|
|
|
Assert.isFalse(true, "流程node解析失败!");
|
|
|
@@ -91,7 +106,7 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
}
|
|
|
|
|
|
|
|
|
- public List<WorkflowDesignNodeDO> parseJsonToList(String json) {
|
|
|
+ public static List<WorkflowDesignNodeDO> parseJsonToList(String json) {
|
|
|
// 替换为你的JSON字符串(实际使用时注意转义,或从文件/接口读取)
|
|
|
String jsonStr = json;
|
|
|
List<WorkflowDesignNodeDO> workflowDesignNodeDOS = new ArrayList<>();
|
|
|
@@ -103,7 +118,16 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
JsonNode rootNode = objectMapper.readTree(jsonStr);
|
|
|
// 3. 核心:获取nodes数组节点
|
|
|
JsonNode nodesArray = rootNode.get("nodes");
|
|
|
- System.out.println(nodesArray);
|
|
|
+ JsonNode adjacencyNode = rootNode.get("adjacency");
|
|
|
+
|
|
|
+ Map<String, PcValueVO> pcValueMap = PcValueParser.parseAdjacencyToMap(adjacencyNode);
|
|
|
+
|
|
|
+ // 现在您可以根据 UUID 访问特定的 PcValueVO 对象
|
|
|
+ System.out.println("map: " + pcValueMap);
|
|
|
+ PcValueVO someNode = pcValueMap.get("createJob-1766023817148");
|
|
|
+ System.out.println("Parent UUIDs: " + someNode.getParentUuid());
|
|
|
+ System.out.println("Children UUIDs: " + someNode.getChildrenUuid());
|
|
|
+
|
|
|
|
|
|
// 4. 遍历nodes数组,提取数据
|
|
|
if (nodesArray.isArray()) {
|
|
|
@@ -129,6 +153,12 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
workflowDesignNodeDO.setType(type);
|
|
|
workflowDesignNodeDO.setPosition(position);
|
|
|
workflowDesignNodeDO.setData(data);
|
|
|
+ // 处理关系字段
|
|
|
+ PcValueVO pcValueVO = pcValueMap.get(uuid);
|
|
|
+ if (pcValueVO != null) {
|
|
|
+ workflowDesignNodeDO.setParentUuid(StringUtils.join(pcValueVO.getParentUuid(), ','));
|
|
|
+ workflowDesignNodeDO.setChildrenUuid(StringUtils.join(pcValueVO.getChildrenUuid(), ','));
|
|
|
+ }
|
|
|
workflowDesignNodeDOS.add(workflowDesignNodeDO);
|
|
|
}
|
|
|
}
|
|
|
@@ -142,120 +172,120 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
public static void main(String[] args) {
|
|
|
|
|
|
String aa = "{\n" +
|
|
|
- " \"generatedAt\": \"2025-12-18T02:12:57.931Z\",\n" +
|
|
|
+ " \"generatedAt\": \"2025-12-18T08:36:23.787Z\",\n" +
|
|
|
" \"nodeCount\": 14,\n" +
|
|
|
" \"edgeCount\": 16,\n" +
|
|
|
" \"adjacency\": {\n" +
|
|
|
" \"createJob-1766023817148\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"confirm-1766023821012\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": []\n" +
|
|
|
+ " \"childrenUuid\": []\n" +
|
|
|
" },\n" +
|
|
|
" \"confirm-1766023821012\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"review-1766023825604\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"createJob-1766023817148\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"review-1766023825604\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"inputInfo-1766023831636\",\n" +
|
|
|
" \"inputInfo-1766023848740\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"confirm-1766023821012\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"inputInfo-1766023831636\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"isolation-1766023834331\",\n" +
|
|
|
" \"isolation-1766023839756\",\n" +
|
|
|
" \"isolation-1766023837357\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"review-1766023825604\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"isolation-1766023834331\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"releaseIsolation-1766023890300\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"inputInfo-1766023831636\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"isolation-1766023837357\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"releaseIsolation-1766023887325\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"inputInfo-1766023831636\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"isolation-1766023839756\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"releaseIsolation-1766023893308\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"inputInfo-1766023831636\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"inputInfo-1766023848740\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"confirm-1766023875733\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"review-1766023825604\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"confirm-1766023875733\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"complete-1766023921996\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"inputInfo-1766023848740\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"releaseIsolation-1766023887325\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"returnLock-1766023906693\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"isolation-1766023837357\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"releaseIsolation-1766023890300\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"returnLock-1766023906693\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"isolation-1766023834331\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"releaseIsolation-1766023893308\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"returnLock-1766023906693\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"isolation-1766023839756\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"returnLock-1766023906693\": {\n" +
|
|
|
- " \"incoming\": [\n" +
|
|
|
+ " \"parentUuid\": [\n" +
|
|
|
" \"complete-1766023921996\"\n" +
|
|
|
" ],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"releaseIsolation-1766023887325\",\n" +
|
|
|
" \"releaseIsolation-1766023890300\",\n" +
|
|
|
" \"releaseIsolation-1766023893308\"\n" +
|
|
|
" ]\n" +
|
|
|
" },\n" +
|
|
|
" \"complete-1766023921996\": {\n" +
|
|
|
- " \"incoming\": [],\n" +
|
|
|
- " \"outgoing\": [\n" +
|
|
|
+ " \"parentUuid\": [],\n" +
|
|
|
+ " \"childrenUuid\": [\n" +
|
|
|
" \"returnLock-1766023906693\",\n" +
|
|
|
" \"confirm-1766023875733\"\n" +
|
|
|
" ]\n" +
|
|
|
@@ -274,7 +304,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"创建作业\",\n" +
|
|
|
" \"type\": \"createJob\",\n" +
|
|
|
- " \"nodeId\": \"001\"\n" +
|
|
|
+ " \"nodeId\": \"001\",\n" +
|
|
|
+ " \"icon\": \"createJob\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -289,7 +337,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"确认\",\n" +
|
|
|
" \"type\": \"confirm\",\n" +
|
|
|
- " \"nodeId\": \"002\"\n" +
|
|
|
+ " \"nodeId\": \"002\",\n" +
|
|
|
+ " \"icon\": \"confirm\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -304,7 +370,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"审核\",\n" +
|
|
|
" \"type\": \"review\",\n" +
|
|
|
- " \"nodeId\": \"003\"\n" +
|
|
|
+ " \"nodeId\": \"003\",\n" +
|
|
|
+ " \"icon\": \"review\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -319,7 +403,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"录入信息\",\n" +
|
|
|
" \"type\": \"inputInfo\",\n" +
|
|
|
- " \"nodeId\": \"004\"\n" +
|
|
|
+ " \"nodeId\": \"004\",\n" +
|
|
|
+ " \"icon\": \"inputInfo\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -334,7 +436,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"隔离/方案\",\n" +
|
|
|
" \"type\": \"isolation\",\n" +
|
|
|
- " \"nodeId\": \"005\"\n" +
|
|
|
+ " \"nodeId\": \"005\",\n" +
|
|
|
+ " \"icon\": \"isolation\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -349,7 +469,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"隔离/方案\",\n" +
|
|
|
" \"type\": \"isolation\",\n" +
|
|
|
- " \"nodeId\": \"006\"\n" +
|
|
|
+ " \"nodeId\": \"006\",\n" +
|
|
|
+ " \"icon\": \"isolation\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -364,7 +502,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"隔离/方案\",\n" +
|
|
|
" \"type\": \"isolation\",\n" +
|
|
|
- " \"nodeId\": \"007\"\n" +
|
|
|
+ " \"nodeId\": \"007\",\n" +
|
|
|
+ " \"icon\": \"isolation\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -379,7 +535,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"录入信息\",\n" +
|
|
|
" \"type\": \"inputInfo\",\n" +
|
|
|
- " \"nodeId\": \"008\"\n" +
|
|
|
+ " \"nodeId\": \"008\",\n" +
|
|
|
+ " \"icon\": \"inputInfo\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -394,7 +568,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"确认\",\n" +
|
|
|
" \"type\": \"confirm\",\n" +
|
|
|
- " \"nodeId\": \"009\"\n" +
|
|
|
+ " \"nodeId\": \"009\",\n" +
|
|
|
+ " \"icon\": \"confirm\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -409,7 +601,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"解除隔离\",\n" +
|
|
|
" \"type\": \"releaseIsolation\",\n" +
|
|
|
- " \"nodeId\": \"010\"\n" +
|
|
|
+ " \"nodeId\": \"010\",\n" +
|
|
|
+ " \"icon\": \"releaseIsolation\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -424,7 +634,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"解除隔离\",\n" +
|
|
|
" \"type\": \"releaseIsolation\",\n" +
|
|
|
- " \"nodeId\": \"011\"\n" +
|
|
|
+ " \"nodeId\": \"011\",\n" +
|
|
|
+ " \"icon\": \"releaseIsolation\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -439,7 +667,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"解除隔离\",\n" +
|
|
|
" \"type\": \"releaseIsolation\",\n" +
|
|
|
- " \"nodeId\": \"012\"\n" +
|
|
|
+ " \"nodeId\": \"012\",\n" +
|
|
|
+ " \"icon\": \"releaseIsolation\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -454,7 +700,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"还锁\",\n" +
|
|
|
" \"type\": \"returnLock\",\n" +
|
|
|
- " \"nodeId\": \"013\"\n" +
|
|
|
+ " \"nodeId\": \"013\",\n" +
|
|
|
+ " \"icon\": \"returnLock\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" },\n" +
|
|
|
" {\n" +
|
|
|
@@ -469,7 +733,25 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" \"data\": {\n" +
|
|
|
" \"label\": \"完成/结束\",\n" +
|
|
|
" \"type\": \"complete\",\n" +
|
|
|
- " \"nodeId\": \"014\"\n" +
|
|
|
+ " \"nodeId\": \"014\",\n" +
|
|
|
+ " \"icon\": \"complete\",\n" +
|
|
|
+ " \"responsible\": \"\",\n" +
|
|
|
+ " \"remark\": \"\",\n" +
|
|
|
+ " \"submitForm\": \"\",\n" +
|
|
|
+ " \"isolationMethod\": \"\",\n" +
|
|
|
+ " \"isolationPoints\": [],\n" +
|
|
|
+ " \"isolationNode\": [],\n" +
|
|
|
+ " \"selectedIsolationNodeId\": \"\",\n" +
|
|
|
+ " \"lockPerson\": \"\",\n" +
|
|
|
+ " \"coLockPersons\": [],\n" +
|
|
|
+ " \"notificationMethods\": {\n" +
|
|
|
+ " \"sms\": false,\n" +
|
|
|
+ " \"message\": false,\n" +
|
|
|
+ " \"email\": false,\n" +
|
|
|
+ " \"app\": false\n" +
|
|
|
+ " },\n" +
|
|
|
+ " \"notificationPerson\": \"\",\n" +
|
|
|
+ " \"notificationTime\": \"\"\n" +
|
|
|
" }\n" +
|
|
|
" }\n" +
|
|
|
" ],\n" +
|
|
|
@@ -605,7 +887,9 @@ public class WorkflowDesignNodeServiceImpl extends ServiceImpl<WorkflowDesignNod
|
|
|
" ]\n" +
|
|
|
"}";
|
|
|
|
|
|
- // parseJsonToList(aa);
|
|
|
+ parseJsonToList(aa);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
}
|