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

rev:logicflow

Browse Source
This commit is contained in:
gengby
2024-04-02 11:08:56 +08:00
parent a3b91e18e4
commit d0cbc07399
106 changed files with 4861 additions and 18492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,8 +35,6 @@ w
Gnladmin-system/src/main/java/org/nl/common/domain/entity/PageQuery.java,4/c/4c2e7c33185348f635f5a9dbcc6943e1266cd690
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/RequestMappingParam.java,b/9/b9d6f798f97296813c3841cfa2a60c772c87530a
<EFBFBD>
_nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingQuery.java,8/6/866203b5eb8727cc6dfd1175f534632b5b301cf2
<EFBFBD>
]nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingDto.java,e/4/e4d40d63f40ac834a65cd47f2b9ab2436efb39d1
<EFBFBD>
@@ -49,18 +47,12 @@ _
dnladmin-system/src/main/java/org/nl/wms/base_manage/material/service/impl/BmMaterialServiceImpl.java,a/7/a7241c86cb8a37ed0ceeb0177d553b8d09139e0f
<EFBFBD>
Xnladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/BmMaterial.java,1/3/13dcb74adf880fa445de696c0054cd586cf8b27a
<EFBFBD>
rnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/controller/BmExternalFieldMappingController.java,4/9/491288c6a971edd368823e6e6d6a676827d0d7b8
<EFBFBD>
[nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java,4/0/400fbf00a1743bc1972994d7dffce150f50044f7
<EFBFBD>
hnladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/xml/BmMaterialMapper.xml,0/b/0b7d19b44eabe0d51a7ebb8a0badcbec8bf1236c
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/mapper/BmMaterialMapper.java,a/4/a47ce58066d26fa89d378900d3c7057e934eea66
<EFBFBD>
mnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/IBmExternalFieldMappingService.java,6/3/6380d92563f750329b625bda0586fc4ba3b71943
<EFBFBD>
unladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/impl/BmExternalFieldMappingServiceImpl.java,9/0/9019fde59766868f22fd17bff1ddac61f4908ef3
<EFBFBD>
vnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/BmExternalFieldMappingMapper.java,3/8/3828de74f3f9d1252984dd2c3524e61bc6632160
<EFBFBD>
@@ -133,7 +125,31 @@ cnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dao/
gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dto/BmClassStandardTree.java,a/e/ae5dc050d1cb8e346c5d74dfdfbe81380844f770
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/IBmClassStandardService.java,c/5/c5993a1d750d7041a840a41a573358502883c091
<EFBFBD>
onladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java,b/1/b140d08f0cb476ebc6fa39caddd1c7f4819af4c3
<EFBFBD>
_nladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dto/MappingQuery.java,8/6/866203b5eb8727cc6dfd1175f534632b5b301cf2
<EFBFBD>
unladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/impl/BmExternalFieldMappingServiceImpl.java,9/0/9019fde59766868f22fd17bff1ddac61f4908ef3
<EFBFBD>
mnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/IBmExternalFieldMappingService.java,6/3/6380d92563f750329b625bda0586fc4ba3b71943
x
Hnladmin-system/src/main/java/org/nl/config/satoken/SaTokenConfigure.java,9/e/9ebc8f924932814262c2d3968e862babba46e751
<EFBFBD>
^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>
onladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java,b/1/b140d08f0cb476ebc6fa39caddd1c7f4819af4c3
<EFBFBD>
rnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/controller/BmExternalFieldMappingController.java,4/9/491288c6a971edd368823e6e6d6a676827d0d7b8
<EFBFBD>
Znladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java,3/e/3eca87912d8f4d89cb48ed4d3a065400c26eb414
<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>
cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854

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

@@ -2,7 +2,11 @@ package org.nl.wms.flow_manage.flow.controller.model;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.date.DateUtil;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.utils.FileUtil;
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;
import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity;
@@ -11,16 +15,15 @@ import org.nl.wms.flow_manage.flow.service.deployment.dao.ActReProcdef;
import org.nl.wms.flow_manage.flow.service.model.IActDeModelService;
import org.nl.wms.flow_manage.flow.service.model.dao.ActDeModel;
import org.nl.wms.flow_manage.flow.service.model.dto.ModelInfoVo;
import org.nl.wms.flow_manage.flow.service.model.dto.ModelQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.io.File;
import java.io.FileInputStream;
import java.util.Arrays;
/**
* <p>
@@ -31,20 +34,48 @@ import java.io.FileInputStream;
* @since 2024-03-18
*/
@RestController
@RequestMapping("api/flow/bpmnDesigner")
@RequestMapping("api/flow")
@SaIgnore
public class ActDeModelController {
@Autowired
IActDeModelService modelService;
private IActDeModelService modelService;
@Autowired
private IActReProcdefService reProcdefService;
@Autowired
private CommandExecutor commandExecutor;
@Autowired
IActReProcdefService reProcdefService;
@Autowired
CommandExecutor commandExecutor;
@GetMapping
public ResponseEntity<Object> getAll(ModelQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(modelService.page(page.build(), query.build())), HttpStatus.OK);
}
@PostMapping
public ResponseEntity<Object> add(@Validated @RequestBody ActDeModel dto) {
dto.setCreate_id(SecurityUtils.getCurrentUserId());
dto.setCreate_time(DateUtil.now());
modelService.save(dto);
return new ResponseEntity<>(HttpStatus.OK);
}
@PutMapping
public ResponseEntity<Object> update(@Validated @RequestBody ActDeModel dto) {
dto.setUpdated_id(SecurityUtils.getCurrentUserId());
dto.setUpdate_time(DateUtil.now());
modelService.updateById(dto);
return new ResponseEntity<>(HttpStatus.OK);
}
@DeleteMapping
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
if (ids.length > 0) {
modelService.removeByIds(Arrays.asList(ids));
}
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping(value = "/select/{modelId}", produces = "application/json")
public ResponseEntity<ModelInfoVo> getBpmnByModelId(@PathVariable String modelId){
public ResponseEntity<ModelInfoVo> getBpmnByModelId(@PathVariable String modelId) {
ActDeModel byId = modelService.getById(modelId);
ModelInfoVo vo = new ModelInfoVo();
vo.setModelId(byId.getId());
@@ -59,12 +90,12 @@ public class ActDeModelController {
}
@GetMapping(value = "/start/{deployment_id}", produces = "application/json")
public ResponseEntity<ModelInfoVo> startByModelId(@PathVariable String deployment_id){
public ResponseEntity<ModelInfoVo> startByModelId(@PathVariable String deployment_id) {
ActReProcdef deployment = reProcdefService.getById(deployment_id);
String model_editor_json = deployment.getModel_editor_json();
//TODO:转成bpmnModel对象:创建ExecutionEntity参数
ExecutionEntity entity = new ExecutionEntity();
commandExecutor.execute(new StartInstanceCmd(),new ExecutionEntity());
commandExecutor.execute(new StartInstanceCmd(), new ExecutionEntity());
return new ResponseEntity<>(HttpStatus.OK);
}

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IActDeModelService extends IService<ActDeModel> {
}

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

@@ -0,0 +1,26 @@
package org.nl.wms.flow_manage.flow.service.model.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.base_manage.field_mapping.service.dao.BmExternalFieldMapping;
import org.nl.wms.flow_manage.flow.service.model.dao.ActDeModel;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class ModelQuery extends BaseQuery<ActDeModel> {
private String search;
@Override
public void paramMapping() {
super.doP.put("name", QParam.builder().k(new String[]{"name"}).type(QueryTEnum.LK).build());
}
}

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

@@ -1,5 +1,7 @@
package org.nl.wms.flow_manage.flow.service.model.impl;
import cn.hutool.core.date.DateUtil;
import org.nl.common.utils.SecurityUtils;
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;
@@ -16,5 +18,4 @@ import org.springframework.stereotype.Service;
*/
@Service
public class ActDeModelServiceImpl extends ServiceImpl<ActDeModelMapper, ActDeModel> implements IActDeModelService {
}

1
wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml
View File

@@ -1,5 +1,6 @@
server:
port: 8011
max-http-header-size: 65536
#配置数据源
spring:
datasource: