From 66793b76556845248216db8e256f6254abc5bd30 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 14 Jun 2024 14:45:35 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E5=8E=86=E5=8F=B2=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E6=98=BE=E7=A4=BA=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../execution/ExecutionController.java | 9 ++++++- .../execution/IActRuExecutionService.java | 4 +++ .../impl/ActRuExecutionServiceImpl.java | 26 ++++++++++++++++++- .../act/execution/ViewCurrentFlowDesigner.vue | 14 +++++++++- .../act/execution/curdExecution.js | 10 ++++++- .../PropertySetting/ServerTaskProperties.vue | 2 +- .../registerNode/registerGatewayTask.js | 4 +-- .../registerNode/registerGatewayTask.js | 10 +++---- 8 files changed, 67 insertions(+), 12 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java index 99cc5514..e0c7f4b7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java @@ -2,6 +2,7 @@ package org.nl.wms.flow_manage.flow.controller.execution; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -77,6 +78,7 @@ public class ExecutionController { } return new ResponseEntity<>(HttpStatus.OK); } + @GetMapping("/dtl/{proc_inst_id}") public ResponseEntity getDtl(@PathVariable String proc_inst_id) { List list = iActHiExecutionService.list(new LambdaQueryWrapper().eq(ActHiExecution::getProc_inst_id, proc_inst_id)); @@ -96,7 +98,7 @@ public class ExecutionController { @GetMapping(value = "/confirm/{proc_inst_id}") public ResponseEntity flowConfirm(@PathVariable String proc_inst_id) { - return new ResponseEntity<>(flowOperationService.flowConfirm(proc_inst_id,null), HttpStatus.OK); + return new ResponseEntity<>(flowOperationService.flowConfirm(proc_inst_id, null), HttpStatus.OK); } @GetMapping(value = "/queryByParentId/{id}") @@ -116,4 +118,9 @@ public class ExecutionController { executionService.updateById(dto); return new ResponseEntity<>(HttpStatus.OK); } + + @GetMapping(value = "/queryHisActivityId/{proc_inst_id}") + public ResponseEntity queryHisActivityId(@PathVariable String proc_inst_id) { + return new ResponseEntity<>(executionService.queryHisActivityId(proc_inst_id), HttpStatus.OK); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java index 21f0a30d..7f02eb64 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java @@ -5,6 +5,8 @@ import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.wms.flow_manage.flow.service.execution.dto.ExecutionQuery; +import java.util.List; + /** *

* 流程实例表 服务类 @@ -16,4 +18,6 @@ import org.nl.wms.flow_manage.flow.service.execution.dto.ExecutionQuery; public interface IActRuExecutionService extends IService { Object getAll(ExecutionQuery query, PageQuery page); + + List queryHisActivityId(String proc_inst_id); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java index d0f000c8..3e571b03 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.flow_manage.flow.service.execution.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,9 +17,12 @@ import org.nl.wms.flow_manage.flow.service.execution.dao.mapper.ActRuExecutionMa import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.flow_manage.flow.service.execution.dto.ExecutionQuery; +import org.nl.wms.flow_manage.flow.service.history.IActHiExecutionService; +import org.nl.wms.flow_manage.flow.service.history.dao.ActHiExecution; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -34,11 +38,13 @@ public class ActRuExecutionServiceImpl extends ServiceImpl build = (QueryWrapper)query.build(); + QueryWrapper build = (QueryWrapper) query.build(); build.isNull("parent_id"); Page executionPage = this.page(page.build(), build); List records = executionPage.getRecords(); @@ -46,6 +52,24 @@ public class ActRuExecutionServiceImpl extends ServiceImpl queryHisActivityId(String proc_inst_id) { + List list = iActHiExecutionService.list(new LambdaQueryWrapper().eq(ActHiExecution::getProc_inst_id, proc_inst_id)); + List allHisActivityId = new ArrayList<>(); + this.queryHisActivityId(list, allHisActivityId); + return allHisActivityId; + } + + private void queryHisActivityId(List list, List allHisActivityId) { + for (ActHiExecution actHiExecution : list) { + if (StrUtil.isNotBlank(actHiExecution.getParent_id())) { + List parentList = iActHiExecutionService.list(new LambdaQueryWrapper().eq(ActHiExecution::getProc_inst_id, actHiExecution.getParent_id())); + this.queryHisActivityId(parentList, allHisActivityId); + } + allHisActivityId.add(actHiExecution.getActivity_id()); + } + } + private void findChildren(List records) { for (ActRuExecution record : records) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/ViewCurrentFlowDesigner.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/ViewCurrentFlowDesigner.vue index 2eaad53d..543ecd50 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/ViewCurrentFlowDesigner.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/ViewCurrentFlowDesigner.vue @@ -31,7 +31,7 @@ import { sequence, registerSubProcess, } from '../../view_flow/registerNode' - +import curdExecution from './curdExecution' //const demoData = require('./data.json') export default { @@ -167,10 +167,22 @@ export default { } else { this.lf.render(JSON.parse(json)) } + const proc_inst_id = row.proc_inst_id; + + this.queryHisActivityId(proc_inst_id) const nodeModel = this.lf.getNodeModelById(row.activity_id); nodeModel.setStyle("stroke", "red") nodeModel.setStyle("stroke-width", "2.5") }, + queryHisActivityId(proc_inst_id) { + curdExecution.queryHisActivityId(proc_inst_id).then(res => { + res.forEach((activity_id) => { + const nodeModel = this.lf.getNodeModelById(activity_id); + nodeModel.setStyle("stroke", "red") + nodeModel.setStyle("stroke-width", "1") + }); + }) + }, closeDialog() { this.$data.dialogVisible = false }, diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js b/wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js index ad6cc578..371b9ed1 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js @@ -89,6 +89,13 @@ export function flowConfirm(inst_id) { }) } +export function queryHisActivityId(proc_inst_id) { + return request({ + url: '/api/bpmnExecution/queryHisActivityId/' + proc_inst_id, + method: 'get' + }) +} + export default { add, edit, @@ -101,5 +108,6 @@ export default { getDeploymentById, getDtl, changeActive, - flowConfirm + flowConfirm, + queryHisActivityId } diff --git a/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/ServerTaskProperties.vue b/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/ServerTaskProperties.vue index d07b7ae4..52a13284 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/ServerTaskProperties.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/logicflow/PropertySetting/ServerTaskProperties.vue @@ -15,7 +15,7 @@ - +