root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:流程引擎

Browse Source
This commit is contained in:
gengby
2024-05-11 13:17:23 +08:00
parent 0da5aed56b
commit ed91c89d4e
49 changed files with 2421 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wms_pro/hd/.idea/sonarlint/issuestore/4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690 generated
View File

@@ -1,7 +0,0 @@
[
java:S2184N"@Cast one of the operands of this addition operation to a "long".(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
N
java:S1117="8Rename "page" which hides the field declared at line 33.(Ҿ<><D2BE>
S
java:S1117N"8Rename "page" which hides the field declared at line 33.(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

3
wms_pro/hd/.idea/sonarlint/issuestore/a/8/a85494925056ae5a2edbd2ec7eee55976b36080f generated
View File

@@ -1,3 +0,0 @@
?
java:S1948 ")Make "content" transient or serializable.(ޑ<><DE91>

26
wms_pro/hd/.idea/sonarlint/issuestore/index.pb generated
View File

@@ -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
<EFBFBD>
@@ -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
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/AuthorizationController.java,3/c/3c48d8ac2d509e895a423ffda0e2e802719133e1
<EFBFBD>
Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dto/ModelQuery.java,9/1/91fd50fd8729292d9e298d85ba01a6b5af8593fa
<EFBFBD>
lnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java,1/6/1682613e5ad252f692c7fe9869e05ba6e993ec0b
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/impl/ActDeModelServiceImpl.java,5/c/5c10ac01b36058f8bd7ded010f6280af0a23920f
<EFBFBD>
^nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java,8/e/8e8e6084896058ef5d6e32aeaa325a4d807bd299
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java,0/4/04a9b66d50a0df59977636c2584c0b33c3c80690
<EFBFBD>
Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java,3/e/3eca87912d8f4d89cb48ed4d3a065400c26eb414
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818
<EFBFBD>
Xnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/enums/TaskTypeEnum.java,9/a/9a80ba3c6d691004cb168b6bef614f1678af32d6
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java,1/d/1d97c53dde4069e95a2a9b5e87f1839ef118d3b2
<EFBFBD>
wnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/StartEventActivityBehavior.java,6/2/62bba69557651d0ef8689854cf0192b608958ca8
lnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/controller/BmClassStandardController.java,1/6/1682613e5ad252f692c7fe9869e05ba6e993ec0b

64
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java
View File

@@ -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<Object> getAll(ExecutionQuery query, PageQuery page) {
return new ResponseEntity<>(executionService.getAll(query, page), HttpStatus.OK);
}
@PostMapping
public ResponseEntity<Object> 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<Object> update(@Validated @RequestBody ActRuExecution dto) {
dto.setStatus("30");
dto.setUpdate_time(DateUtil.now());
executionService.updateById(dto);
return new ResponseEntity<>(HttpStatus.OK);
}
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
if (ids.length > 0) {
executionService.removeByIds(Arrays.asList(ids));
}
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping(value = "/open")
public ResponseEntity<Object> getBpmnByModelId(JSONObject form){
public ResponseEntity<Object> getBpmnByModelId(JSONObject form) {
StartProcessInstanceVo startProcessInstanceVo = form.toJavaObject(StartProcessInstanceVo.class);
return new ResponseEntity<>(flowOperationService.startFormFlow(startProcessInstanceVo), HttpStatus.OK);
}
@GetMapping(value = "/confirm")
public ResponseEntity<Object> flowConfirm(String inst_id){
public ResponseEntity<Object> flowConfirm(String inst_id) {
return new ResponseEntity<>(flowOperationService.flowConfirm(inst_id), HttpStatus.OK);
}
@GetMapping(value = "/queryByParentId/{id}")
public ResponseEntity<Object> queryByParentId(@PathVariable String id) {
LambdaQueryWrapper<ActRuExecution> lqw = new LambdaQueryWrapper<>();
lqw.eq(ActRuExecution::getParent_id, id);
return new ResponseEntity<>(executionService.list(lqw), HttpStatus.OK);
}
@GetMapping(value = "/getDeploymentById/{id}")
public ResponseEntity<Object> getDeploymentById(@PathVariable String id) {
return new ResponseEntity<>(procdefService.getById(id), HttpStatus.OK);
}
}

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java
View File

@@ -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<Object> 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<Object> publish(@Validated @RequestBody ActDeModel dto) {
modelService.publish(dto);
return new ResponseEntity<>(HttpStatus.OK);
}
}

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java
View File

@@ -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;
/**
* <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IActRuExecutionService extends IService<ActRuExecution> {
Object getAll(ExecutionQuery query, PageQuery page);
}

11
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java
View File

@@ -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<ActRuExecution> children = new ArrayList<>();
@TableField(exist = false)
private Boolean hasChildren = false;
}

26
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dto/ExecutionQuery.java Normal file
View File

@@ -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<ActRuExecution> {
private String search;
@Override
public void paramMapping() {
super.doP.put("name", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build());
}
}

28
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java
View File

@@ -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;
/**
* <p>
* 流程实例表 服务实现类
@@ -17,4 +27,22 @@ import org.springframework.stereotype.Service;
@Service
public class ActRuExecutionServiceImpl extends ServiceImpl<ActRuExecutionMapper, ActRuExecution> implements IActRuExecutionService {
@Override
public Object getAll(ExecutionQuery query, PageQuery page) {
//判断是否存在子实例
LambdaQueryWrapper<ActRuExecution> lqw = new LambdaQueryWrapper<>();
lqw.isNull(ActRuExecution::getParent_id);
Page<ActRuExecution> executionPage = this.page(page.build(), lqw);
List<ActRuExecution> records = executionPage.getRecords();
for (ActRuExecution record : records) {
LambdaQueryWrapper<ActRuExecution> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(ActRuExecution::getParent_id, record.getProc_inst_id());
List<ActRuExecution> list = this.list(lambdaQueryWrapper);
if (CollectionUtil.isNotEmpty(list)) {
record.setHasChildren(true);
record.setChildren(list);
}
}
return TableDataInfo.build(executionPage);
}
}

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/IActDeModelService.java
View File

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface IActDeModelService extends IService<ActDeModel> {
void publish(ActDeModel dto);
}

34
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/impl/ActDeModelServiceImpl.java
View File

@@ -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;
/**
* <p>
@@ -18,4 +24,32 @@ import org.springframework.stereotype.Service;
*/
@Service
public class ActDeModelServiceImpl extends ServiceImpl<ActDeModelMapper, ActDeModel> 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);
}
}