From ed91c89d4e62d4f1ffe2e388f53b5daa3f045236 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Sat, 11 May 2024 13:17:23 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=B5=81=E7=A8=8B=E5=BC=95=E6=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../4c2e7c33185348f635f5a9dbcc6943e1266cd690 | 7 - .../a85494925056ae5a2edbd2ec7eee55976b36080f | 3 - .../hd/.idea/sonarlint/issuestore/index.pb | 26 +-- .../execution/ExecutionController.java | 64 +++++- .../model/ActDeModelController.java | 8 +- .../execution/IActRuExecutionService.java | 3 + .../service/execution/dao/ActRuExecution.java | 11 +- .../service/execution/dto/ExecutionQuery.java | 26 +++ .../impl/ActRuExecutionServiceImpl.java | 28 +++ .../service/model/IActDeModelService.java | 1 + .../model/impl/ActDeModelServiceImpl.java | 34 +++ .../act/execution/ViewCurrentFlowDesigner.vue | 194 ++++++++++++++++ .../act/execution/curdExecution.js | 71 ++++++ .../wms/flow_manage/act/execution/index.vue | 188 ++++++++++++++++ .../flow_manage/act/model/curdActDeModel.js | 10 +- .../views/wms/flow_manage/act/model/index.vue | 40 +++- .../flow_manage/logicflow/FlowDesigner.vue | 8 +- .../PropertySetting/ServerTaskProperties.vue | 29 ++- .../logicflow/ViewFlowDesigner.vue | 2 +- .../logicflow/registerNode/registerEnd.js | 1 + .../registerNode/registerExecuteFlow.js | 1 + .../registerNode/registerFormTask.js | 2 + .../registerNode/registerGatewayTask.js | 2 + .../registerNode/registerScriptTask.js | 2 + .../registerNode/registerSendTask.js | 2 + .../registerNode/registerServerTask.js | 2 + .../logicflow/registerNode/registerStart.js | 2 + .../registerNode/registerSubProcess.js | 10 +- .../registerNode/registerstorInvTask.js | 2 + .../logicflow/registerNode/sequence.js | 4 + .../view_flow/registerNode/Connect.vue | 43 ++++ .../view_flow/registerNode/index.js | 27 +++ .../view_flow/registerNode/registerConnect.js | 58 +++++ .../registerNode/registerDownload.js | 92 ++++++++ .../view_flow/registerNode/registerEnd.js | 207 ++++++++++++++++++ .../registerNode/registerExecuteFlow.js | 78 +++++++ .../registerNode/registerFormTask.js | 78 +++++++ .../registerNode/registerGatewayTask.js | 204 +++++++++++++++++ .../registerNode/registerPolyline.js | 13 ++ .../view_flow/registerNode/registerPush.js | 139 ++++++++++++ .../registerNode/registerScriptTask.js | 77 +++++++ .../registerNode/registerSendTask.js | 77 +++++++ .../registerNode/registerServerTask.js | 89 ++++++++ .../view_flow/registerNode/registerStart.js | 193 ++++++++++++++++ .../registerNode/registerSubProcess.js | 47 ++++ .../view_flow/registerNode/registerTask.js | 30 +++ .../view_flow/registerNode/registerUser.js | 112 ++++++++++ .../registerNode/registerstorInvTask.js | 77 +++++++ .../view_flow/registerNode/sequence.js | 48 ++++ 49 files changed, 2421 insertions(+), 51 deletions(-) delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 delete mode 100644 wms_pro/hd/.idea/sonarlint/issuestore/a/8/a85494925056ae5a2edbd2ec7eee55976b36080f create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java create mode 100644 wms_pro/qd/src/views/wms/flow_manage/act/execution/ViewCurrentFlowDesigner.vue create mode 100644 wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/Connect.vue create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/index.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerConnect.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerDownload.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerEnd.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerExecuteFlow.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerFormTask.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerGatewayTask.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerPolyline.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerPush.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerScriptTask.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerSendTask.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerServerTask.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerStart.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerSubProcess.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerTask.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerUser.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/registerstorInvTask.js create mode 100644 wms_pro/qd/src/views/wms/flow_manage/view_flow/registerNode/sequence.js diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 b/wms_pro/hd/.idea/sonarlint/issuestore/4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 deleted file mode 100644 index 1c218cc6..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 +++ /dev/null @@ -1,7 +0,0 @@ - -[ -java:S2184N"@Cast one of the operands of this addition operation to a "long".( -N -java:S1117="8Rename "page" which hides the field declared at line 33.(Ҿ -S -java:S1117N"8Rename "page" which hides the field declared at line 33.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/a/8/a85494925056ae5a2edbd2ec7eee55976b36080f b/wms_pro/hd/.idea/sonarlint/issuestore/a/8/a85494925056ae5a2edbd2ec7eee55976b36080f deleted file mode 100644 index fd3e51d2..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/a/8/a85494925056ae5a2edbd2ec7eee55976b36080f +++ /dev/null @@ -1,3 +0,0 @@ - -? -java:S1948 ")Make "content" transient or serializable.(ޑ \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb index f3d465f0..ba141097 100644 --- a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb +++ b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb @@ -29,10 +29,6 @@ gnladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/Sys lnladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java,1/1/11978d8ffa97bb119d9c27e2ba034b73db067e4b p @nladmin-system/src/main/java/org/nl/common/enums/QueryTEnum.java,f/b/fb1fedd5a3547392fa64608ed6291c9931a5ae3d -m -=nladmin-system/src/main/java/org/nl/common/TableDataInfo.java,a/8/a85494925056ae5a2edbd2ec7eee55976b36080f -w -Gnladmin-system/src/main/java/org/nl/common/domain/entity/PageQuery.java,4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 _ /nladmin-system/src/main/java/org/nl/AppRun.java,1/0/10e40d67bd7d0818c5483704f020703d1bef8378  @@ -113,25 +109,5 @@ Hnladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java,9/e/9 ^nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java,7/b/7b8bf4a0135d0713328837025e2a155860cb8beb  cnladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/AuthorizationController.java,3/c/3c48d8ac2d509e895a423ffda0e2e802719133e1 - -Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dto/ModelQuery.java,9/1/91fd50fd8729292d9e298d85ba01a6b5af8593fa  -lnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java,1/6/1682613e5ad252f692c7fe9869e05ba6e993ec0b - -fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/impl/ActDeModelServiceImpl.java,5/c/5c10ac01b36058f8bd7ded010f6280af0a23920f - -^nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java,8/e/8e8e6084896058ef5d6e32aeaa325a4d807bd299 - -fnladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java,0/4/04a9b66d50a0df59977636c2584c0b33c3c80690 - -Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java,3/e/3eca87912d8f4d89cb48ed4d3a065400c26eb414 - -cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854 - -fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818 - -Xnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/enums/TaskTypeEnum.java,9/a/9a80ba3c6d691004cb168b6bef614f1678af32d6 - -bnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java,1/d/1d97c53dde4069e95a2a9b5e87f1839ef118d3b2 - -wnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java,6/2/62bba69557651d0ef8689854cf0192b608958ca8 \ No newline at end of file +lnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java,1/6/1682613e5ad252f692c7fe9869e05ba6e993ec0b \ No newline at end of file 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 5278cb2d..7a60b716 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 @@ -1,15 +1,28 @@ package org.nl.wms.flow_manage.flow.controller.execution; import cn.dev33.satoken.annotation.SaIgnore; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.flow_manage.flow.service.deployment.IActReProcdefService; +import org.nl.wms.flow_manage.flow.service.deployment.dao.ActReProcdef; +import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService; import org.nl.wms.flow_manage.flow.service.execution.IFlowOperationService; +import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; +import org.nl.wms.flow_manage.flow.service.execution.dto.ExecutionQuery; import org.nl.wms.flow_manage.flow.service.execution.dto.StartProcessInstanceVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.File; +import java.util.Arrays; /* * @author ZZQ @@ -23,14 +36,61 @@ public class ExecutionController { @Autowired IFlowOperationService flowOperationService; + @Autowired + private IActRuExecutionService executionService; + @Autowired + private IActReProcdefService procdefService; + + @GetMapping + public ResponseEntity getAll(ExecutionQuery query, PageQuery page) { + return new ResponseEntity<>(executionService.getAll(query, page), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity add(@Validated @RequestBody ActRuExecution dto) { + dto.setCreate_id(SecurityUtils.getCurrentUserId()); + dto.setCreate_time(DateUtil.now()); + dto.setProc_inst_id(IdUtil.getStringId()); + executionService.save(dto); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PutMapping + public ResponseEntity update(@Validated @RequestBody ActRuExecution dto) { + dto.setStatus("30"); + dto.setUpdate_time(DateUtil.now()); + executionService.updateById(dto); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping + public ResponseEntity delete(@RequestBody String[] ids) { + if (ids.length > 0) { + executionService.removeByIds(Arrays.asList(ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } @PostMapping(value = "/open") - public ResponseEntity getBpmnByModelId(JSONObject form){ + public ResponseEntity getBpmnByModelId(JSONObject form) { StartProcessInstanceVo startProcessInstanceVo = form.toJavaObject(StartProcessInstanceVo.class); return new ResponseEntity<>(flowOperationService.startFormFlow(startProcessInstanceVo), HttpStatus.OK); } + @GetMapping(value = "/confirm") - public ResponseEntity flowConfirm(String inst_id){ + public ResponseEntity flowConfirm(String inst_id) { return new ResponseEntity<>(flowOperationService.flowConfirm(inst_id), HttpStatus.OK); } + + @GetMapping(value = "/queryByParentId/{id}") + public ResponseEntity queryByParentId(@PathVariable String id) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(ActRuExecution::getParent_id, id); + return new ResponseEntity<>(executionService.list(lqw), HttpStatus.OK); + } + + @GetMapping(value = "/getDeploymentById/{id}") + public ResponseEntity getDeploymentById(@PathVariable String id) { + return new ResponseEntity<>(procdefService.getById(id), HttpStatus.OK); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java index 92b35dd9..a90535cd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java @@ -7,7 +7,6 @@ import org.nl.common.TableDataInfo; import org.nl.common.domain.entity.PageQuery; import org.nl.common.utils.FileUtil; import org.nl.common.utils.IdUtil; -import org.nl.common.utils.MapOf; import org.nl.common.utils.SecurityUtils; import org.nl.wms.flow_manage.flow.framework.engine.cmd.CommandExecutor; import org.nl.wms.flow_manage.flow.framework.engine.cmd.unify.impl.StartInstanceCmd; @@ -70,6 +69,7 @@ public class ActDeModelController { @PutMapping public ResponseEntity update(@Validated @RequestBody ActDeModel dto) { + dto.setStatus("30"); dto.setUpdated_id(SecurityUtils.getCurrentUserId()); dto.setUpdate_time(DateUtil.now()); modelService.updateById(dto); @@ -129,6 +129,12 @@ public class ActDeModelController { return new ResponseEntity<>(null, HttpStatus.OK); } + @PostMapping("/publish") + public ResponseEntity publish(@Validated @RequestBody ActDeModel dto) { + modelService.publish(dto); + return new ResponseEntity<>(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 2b6d98eb..21f0a30d 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 @@ -1,7 +1,9 @@ package org.nl.wms.flow_manage.flow.service.execution; +import org.nl.common.domain.entity.PageQuery; 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; /** *

@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IActRuExecutionService extends IService { + Object getAll(ExecutionQuery query, PageQuery page); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java index 2f4f8428..ca8baf89 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java @@ -4,7 +4,10 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Data; @@ -21,7 +24,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName(value = "act_ru_execution",autoResultMap = true) +@TableName(value = "act_ru_execution", autoResultMap = true) public class ActRuExecution implements Serializable { private static final long serialVersionUID = 1L; @@ -97,5 +100,11 @@ public class ActRuExecution implements Serializable { @TableField(typeHandler = FastjsonTypeHandler.class) private JSONObject form_data; + @TableField(exist = false) + private List children = new ArrayList<>(); + + @TableField(exist = false) + private Boolean hasChildren = false; + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java new file mode 100644 index 00000000..9df601d8 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java @@ -0,0 +1,26 @@ +package org.nl.wms.flow_manage.flow.service.execution.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; +import org.nl.wms.flow_manage.flow.service.model.dao.ActDeModel; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class ExecutionQuery extends BaseQuery { + + + private String search; + + @Override + public void paramMapping() { + super.doP.put("name", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build()); + } + + +} 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 c47cfe9f..00b8b7ce 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 @@ -1,11 +1,21 @@ package org.nl.wms.flow_manage.flow.service.execution.impl; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; import org.nl.wms.flow_manage.flow.service.execution.dao.mapper.ActRuExecutionMapper; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** *

* 流程实例表 服务实现类 @@ -17,4 +27,22 @@ import org.springframework.stereotype.Service; @Service public class ActRuExecutionServiceImpl extends ServiceImpl implements IActRuExecutionService { + @Override + public Object getAll(ExecutionQuery query, PageQuery page) { + //判断是否存在子实例 + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.isNull(ActRuExecution::getParent_id); + Page executionPage = this.page(page.build(), lqw); + List records = executionPage.getRecords(); + for (ActRuExecution record : records) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ActRuExecution::getParent_id, record.getProc_inst_id()); + List list = this.list(lambdaQueryWrapper); + if (CollectionUtil.isNotEmpty(list)) { + record.setHasChildren(true); + record.setChildren(list); + } + } + return TableDataInfo.build(executionPage); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java index 32096d17..ed9cd4a2 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface IActDeModelService extends IService { + void publish(ActDeModel dto); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/impl/ActDeModelServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/impl/ActDeModelServiceImpl.java index 2f881f62..2596ac9b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/impl/ActDeModelServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/impl/ActDeModelServiceImpl.java @@ -1,12 +1,18 @@ package org.nl.wms.flow_manage.flow.service.model.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.wms.flow_manage.flow.service.deployment.dao.ActReProcdef; +import org.nl.wms.flow_manage.flow.service.deployment.dao.mapper.ActReProcdefMapper; import org.nl.wms.flow_manage.flow.service.model.dao.ActDeModel; import org.nl.wms.flow_manage.flow.service.model.dao.mapper.ActDeModelMapper; import org.nl.wms.flow_manage.flow.service.model.IActDeModelService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; /** *

@@ -18,4 +24,32 @@ import org.springframework.stereotype.Service; */ @Service public class ActDeModelServiceImpl extends ServiceImpl implements IActDeModelService { + + + @Autowired(required = false) + private ActDeModelMapper modelMapper; + @Autowired(required = false) + private ActReProcdefMapper procdefMapper; + + @Transactional(rollbackFor = Exception.class) + @Override + public void publish(ActDeModel dto) { + Assert.notNull(dto, "参数不能为空!"); + //往实例表中添加数据 + dto.setStatus("10"); + dto.setVersion(dto.getVersion() + 1); + dto.setUpdated_id(SecurityUtils.getCurrentUserId()); + dto.setUpdate_time(DateUtil.now()); + modelMapper.updateById(dto); + + ActReProcdef procdef = new ActReProcdef(); + procdef.setDeployment_id(IdUtil.getStringId()); + procdef.setName(dto.getName()); + procdef.setModel_key(dto.getModel_key()); + procdef.setVersion(String.valueOf(dto.getVersion())); + procdef.setDescription(dto.getDescription()); + procdef.setModel_editor_json(dto.getModel_editor_json()); + procdef.setStatus("1"); + procdefMapper.insert(procdef); + } } 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 new file mode 100644 index 00000000..10cdda15 --- /dev/null +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/ViewCurrentFlowDesigner.vue @@ -0,0 +1,194 @@ + + + + + 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 new file mode 100644 index 00000000..bc61d9ff --- /dev/null +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js @@ -0,0 +1,71 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/flow', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/flow', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/flow', + method: 'put', + data + }) +} + +export function getTypes(data) { + return request({ + url: '/api/bmFormStruc/getTypes', + method: 'get', + data + }) +} + +export function getTaskTypes() { + return request({ + url: '/api/flow/getTaskTypes', + method: 'get' + }) +} + +export function getStrategyList() { + return request({ + url: '/api/strategy/decisionColumns', + method: 'get' + }) +} + +export function publish(data) { + return request({ + url: 'api/flow/publish', + method: 'post', + data + }) +} + +export function queryByParentId(id) { + return request({ + url: '/api/bpmnExecution/queryByParentId/' + id, + method: 'get' + }) +} + +export function getDeploymentById(id) { + return request({ + url: '/api/bpmnExecution/getDeploymentById/' + id, + method: 'get' + }) +} + +export default {add, edit, del, getTypes, getTaskTypes, getStrategyList, publish, queryByParentId, getDeploymentById} diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue new file mode 100644 index 00000000..bc356d70 --- /dev/null +++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue @@ -0,0 +1,188 @@ + + + + + diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/model/curdActDeModel.js b/wms_pro/qd/src/views/wms/flow_manage/act/model/curdActDeModel.js index 54a97b77..31750bb5 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/model/curdActDeModel.js +++ b/wms_pro/qd/src/views/wms/flow_manage/act/model/curdActDeModel.js @@ -46,4 +46,12 @@ export function getStrategyList() { }) } -export default {add, edit, del, getTypes, getTaskTypes, getStrategyList} +export function publish(data) { + return request({ + url: 'api/flow/publish', + method: 'post', + data + }) +} + +export default {add, edit, del, getTypes, getTaskTypes, getStrategyList, publish} diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue index 29a0dc21..2a94f0c0 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue @@ -77,6 +77,18 @@ + + + @@ -94,8 +106,11 @@ align="center" >