From 004219d58ea4e0aa776c183fc4db61c0a1d3c951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Mon, 17 Apr 2023 15:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 2 +- .../Impl/line/ThsSuperviseServiceImpl.java | 9 +- .../flowable/FlowDefinitionController.java | 6 +- .../service/impl/ThsSuperviseServiceImpl.java | 9 +- .../src/main/resources/gaojing.bpmn20.xml | 105 ++++++++++++++++++ 5 files changed, 125 insertions(+), 6 deletions(-) create mode 100644 pqs-process/process-boot/src/main/resources/gaojing.bpmn20.xml diff --git a/pqs-job/job-executor/src/main/resources/bootstrap.yml b/pqs-job/job-executor/src/main/resources/bootstrap.yml index f96beec5a..36c48ef4d 100644 --- a/pqs-job/job-executor/src/main/resources/bootstrap.yml +++ b/pqs-job/job-executor/src/main/resources/bootstrap.yml @@ -52,7 +52,7 @@ xxl: accessToken: executor: #执行器AppName [选填]：执行器心跳注册分组依据；为空则关闭自动注册 - appname: executor + appname: xuyang #执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 address: #执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"； diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java index 326b2dc9b..ccc831a8a 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ThsSuperviseServiceImpl.java @@ -221,9 +221,16 @@ public class ThsSuperviseServiceImpl extends ServiceImpl mapParam = new HashMap<>(); - flowableDefineFeignClient.start("flow_yzep99kb:1:c0ff8a75-da73-11ed-829f-b07b253cdad9",thsSupervise.getSupIndex(),mapParam).getData(); + String proInId =""; + if(thsSupervise.getType() == 0){ + proInId = "flow_yzep99kb:1:a100b48b-da75-11ed-8335-b07b253cdad9"; + }else { + proInId = "flow_yzep99kb:2:6358e099-dcba-11ed-8026-b07b253cdad9"; + } + flowableDefineFeignClient.start(proInId,thsSupervise.getSupIndex(),mapParam); for (ThsOverRunLog thsOverRunLog : overRunLogList) { thsOverRunLogMapper.insert(thsOverRunLog); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowDefinitionController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowDefinitionController.java index 7443f4a19..acbd4b434 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowDefinitionController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/flowable/FlowDefinitionController.java @@ -59,12 +59,12 @@ public class FlowDefinitionController extends BaseController { @ApiOperation(value = "工作流_部署流程") public void createDeployment() { Deployment deployment = repositoryService.createDeployment() - .addClasspathResource("aa.bpmn20.xml") - .name("技术监督预警流程").category("testCategory") + .addClasspathResource("gaojing.bpmn20.xml") + .name("技术监督告警流程").category("gaojing") .deploy(); ProcessDefinition definition = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).singleResult(); - repositoryService.setProcessDefinitionCategory(definition.getId(), "testCategory"); + repositoryService.setProcessDefinitionCategory(definition.getId(), "gaojing"); System.out.println(deployment.getId()); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java index 0f0d227ab..24e595357 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java @@ -145,7 +145,14 @@ public class ThsSuperviseServiceImpl extends ServiceImpl mapParam = new HashMap<>(); - iFlowDefinitionService.startProcessInstanceById("flow_yzep99kb:1:a100b48b-da75-11ed-8335-b07b253cdad9",thsSupervise.getSupIndex(),mapParam); + String proInId = ""; + if(thsSupervise.getType() == 0){ + proInId = "flow_yzep99kb:1:a100b48b-da75-11ed-8335-b07b253cdad9"; + }else { + proInId = "flow_yzep99kb:2:6358e099-dcba-11ed-8026-b07b253cdad9"; + } + iFlowDefinitionService.startProcessInstanceById(proInId,thsSupervise.getSupIndex(),mapParam); + for (ThsOverRunLog thsOverRunLog : superviceRunLogVo.getOverRunLog()) { thsOverRunLog.setCreateTime(date); diff --git a/pqs-process/process-boot/src/main/resources/gaojing.bpmn20.xml b/pqs-process/process-boot/src/main/resources/gaojing.bpmn20.xml new file mode 100644 index 000000000..8335ef758 --- /dev/null +++ b/pqs-process/process-boot/src/main/resources/gaojing.bpmn20.xml @@ -0,0 +1,105 @@ + + + + + Flow_1wrqzmd + + + Flow_1wrqzmd + Flow_0q5q2pr + + + + Flow_0q5q2pr + Flow_17er5rz + + + + Flow_0nuy3gu + + + + Flow_17er5rz + Flow_01tmwhj + + + + Flow_01tmwhj + Flow_1olja2w + + + + Flow_1olja2w + Flow_0nuy3gu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +