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

rev:流程引擎

Browse Source
This commit is contained in:
gengby
2024-04-28 14:23:03 +08:00
parent 16f05d5567
commit 5f115921b8
34 changed files with 1028 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wms_pro/hd/.idea/sonarlint/issuestore/0/c/0c6792b66c9573faf6f7f102bb584f282187174b generated
View File

@@ -1,11 +0,0 @@
u java:S116%"[Rename this field "local_table_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
p java:S116*"VRename this field "api_address" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>ԛ<EFBFBD><D49B><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
n java:S116/"TRename this field "sync_type" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
t java:S1164"ZRename this field "external_system" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>Ĥ<EFBFBD><C4A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
q java:S1169"WRename this field "mapping_json" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>Ύ<EFBFBD><CE8E><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
s java:S116>"YRename this field "last_update_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
p java:S116C"[Rename this field "last_update_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>Ȯ<EFBFBD>
u java:S116H"[Rename this field "last_update_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28><>Λ<EFBFBD><CE9B><EFBFBD><EFBFBD><EFBFBD>
B
java:S1948N"&Make "dtos" transient or serializable.(<28><><EFBFBD>d8<64><38><EFBFBD><EFBFBD><EFBFBD>1

0
wms_pro/hd/.idea/sonarlint/issuestore/3/8/3828de74f3f9d1252984dd2c3524e61bc6632160 generated
View File

3
wms_pro/hd/.idea/sonarlint/issuestore/4/9/491288c6a971edd368823e6e6d6a676827d0d7b8 generated
View File

@@ -1,3 +0,0 @@
k java:S117I"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
k java:S117N"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28><>Ђ<EFBFBD><D082><EFBFBD><EFBFBD><EFBFBD>

2
wms_pro/hd/.idea/sonarlint/issuestore/6/3/6380d92563f750329b625bda0586fc4ba3b71943 generated
View File

@@ -1,2 +0,0 @@
r java:S117A"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>̘<EFBFBD><CC98><EFBFBD><EFBFBD><EFBFBD><EFBFBD>8<><38><EFBFBD><EFBFBD><EFBFBD>1

0
wms_pro/hd/.idea/sonarlint/issuestore/8/5/8579f2942008652ebd59f8eed6fafca608a42516 generated
View File

2
wms_pro/hd/.idea/sonarlint/issuestore/8/6/866203b5eb8727cc6dfd1175f534632b5b301cf2 generated
View File

@@ -1,2 +0,0 @@
u java:S116"[Rename this field "local_table_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

5
wms_pro/hd/.idea/sonarlint/issuestore/9/0/9019fde59766868f22fd17bff1ddac61f4908ef3 generated
View File

@@ -1,5 +0,0 @@
k java:S117]"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
f java:S117a"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>쁵
d
java:S3252b"OUse static access with "cn.hutool.core.text.CharSequenceUtil" for "isNotBlank".(<28><><EFBFBD>q

3
wms_pro/hd/.idea/sonarlint/issuestore/b/9/b9d6f798f97296813c3841cfa2a60c772c87530a generated
View File

@@ -1,3 +0,0 @@
N
java:S1135 "2Complete the task associated to this TODO comment.(<28><><EFBFBD>\8䇦<38><E487A6>1

5
wms_pro/hd/.idea/sonarlint/issuestore/e/4/e4d40d63f40ac834a65cd47f2b9ab2436efb39d1 generated
View File

@@ -1,5 +0,0 @@
u java:S116 "[Rename this field "local_field_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>߲<EFBFBD><DFB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
y java:S116
"^Rename this field "external_field_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>͏L8<4C><38><EFBFBD><EFBFBD><EFBFBD>1
G

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

@@ -33,12 +33,6 @@ 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
<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/MappingDto.java,e/4/e4d40d63f40ac834a65cd47f2b9ab2436efb39d1
<EFBFBD>
ynladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/xml/BmExternalFieldMappingMapper.xml,8/5/8579f2942008652ebd59f8eed6fafca608a42516
_
/nladmin-system/src/main/java/org/nl/AppRun.java,1/0/10e40d67bd7d0818c5483704f020703d1bef8378
<EFBFBD>
@@ -53,10 +47,6 @@ Xnladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dao/BmMate
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>
vnladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/mapper/BmExternalFieldMappingMapper.java,3/8/3828de74f3f9d1252984dd2c3524e61bc6632160
<EFBFBD>
inladmin-system/src/main/java/org/nl/wms/base_manage/field_mapping/service/dao/BmExternalFieldMapping.java,0/c/0c6792b66c9573faf6f7f102bb584f282187174b
<EFBFBD>
anladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java,8/9/89eeb13258719f34694cb541337f127c3bcaeda1
<EFBFBD>
@@ -127,12 +117,6 @@ gnladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/dto/
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>
@@ -143,13 +127,17 @@ cnladmin-system/src/main/java/org/nl/wms/system_manage/controller/login/Authoriz
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>
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>
fnladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java,0/4/04a9b66d50a0df59977636c2584c0b33c3c80690
<EFBFBD>
Xnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/enums/TaskTypeEnum.java,9/a/9a80ba3c6d691004cb168b6bef614f1678af32d6
<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/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854

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

@@ -7,12 +7,14 @@ 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;
import org.nl.wms.flow_manage.flow.framework.entity.ExecutionEntity;
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.enums.TaskTypeEnum;
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;
@@ -25,6 +27,11 @@ import org.springframework.web.bind.annotation.*;
import java.io.File;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* <p>
@@ -56,6 +63,7 @@ public class ActDeModelController {
dto.setCreate_id(SecurityUtils.getCurrentUserId());
dto.setCreate_time(DateUtil.now());
dto.setId(IdUtil.getStringId());
dto.setModel_key(IdUtil.getStringId());
modelService.save(dto);
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -101,5 +109,26 @@ public class ActDeModelController {
return new ResponseEntity<>(HttpStatus.OK);
}
@GetMapping(value = "/getTaskTypes", produces = "application/json")
public ResponseEntity<Object> startByModelId() {
List<Map<String, String>> list = Stream.of(TaskTypeEnum.values())
.map(enumItem -> {
Map<String, String> map = new HashMap<>();
map.put("value", enumItem.getValue());
map.put("label", enumItem.getLabel());
return map;
})
.collect(Collectors.toList());
return new ResponseEntity<>(list, HttpStatus.OK);
}
@GetMapping(value = "/getStrategyList", produces = "application/json")
public ResponseEntity<Object> getStrategyList() {
//TODO 需要从出入库策略表查询返回value和label
return new ResponseEntity<>(null, HttpStatus.OK);
}
}

21
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/enums/TaskTypeEnum.java Normal file
View File

@@ -0,0 +1,21 @@
package org.nl.wms.flow_manage.flow.service.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @Description TODO
* @Author Gengby
* @Date 2024/4/19
*/
@Getter
@AllArgsConstructor
public enum TaskTypeEnum {
EXPRESSION("1", "表达式"),
CLASS("2", "类"),
MAPPING("3", "映射"),
STRATEGY("4", "策略");
private final String value;
private final String label;
}

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

@@ -9,7 +9,7 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
username: ${DB_USER:root}
password: ${DB_PWD:123456}
password: ${DB_PWD:password}
# 初始连接数
initial-size: 5