From 7df1d61319149a666e8b2801a3c89c1d80900d2e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 四月 2023 17:57:46 +0800
Subject: [PATCH] 编码规则相关代码上传
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeButtonDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java | 8
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/po/CodeClassifyPO.java | 11
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntAuthorityDTO.java | 2
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/CommonConstant.java | 10
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntAuthorityVO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java | 53
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/enumpck/UserSecretEnum.java | 90
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrRangeDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeFixedValueVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeClassifyDTO.java | 20
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/BeanUtilForVCI.java | 163
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/MessageUtils.java | 37
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java | 3
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/Lunar.java | 194 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java | 260
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java | 124
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/exception/VciBaseException.java | 80
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeFixedValue.java | 91
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeKeyAttrRepeatRuleDTO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java | 50
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyWrapper.java | 23
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoDTO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeFixedValueMapper.java | 120
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateDTO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml | 131
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTempMapItemDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 224 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeFixedValueService.java | 15
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/service/VciRevisionServiceI.java | 36
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java | 51
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/pagemodel/SessionInfo.java | 421 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml | 11
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java | 153
Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml | 36
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeResembleRuleDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyValueVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntInfoVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/enumpck/BaseEnumInt.java | 14
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml | 1
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java | 8
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/WebThreadLocalUtil.java | 35
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValue.java | 51
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeDataDTO.java | 8
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntBaseVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeResembleRuleVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/annotation/Transient.java | 16
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java | 12
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java | 25
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataInfoDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateMapDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java | 275 +
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrRangeVO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java | 21
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeRuleDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingTaskDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java | 475 --
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java | 89
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/model/ReleasedObjDO.java | 58
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/VciDateUtil.java | 639 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java | 7
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java | 14
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java | 90
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java | 20
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/ICodeClassifyServiceImpl.java | 30
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml | 11
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTempMapItemVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrMappingVO.java | 2
Source/UBCS.zip | 0
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/model/RevisionInfo.java | 147
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 87
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java | 125
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyValueDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java | 56
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 42
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/ValueRangeMapper.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodePhaseAttrDTO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java | 18
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeSynonymVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java | 328 +
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 866 +---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/BaseModel.java | 354 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java | 62
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/BaseModelDTO.java | 150
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/service/RevisionModelUtil.java | 31
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/CodeApplication.java | 12
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java | 254
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/FrameWorkLangCodeConstant.java | 321 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java | 40
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java | 7
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java | 34
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateMapVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataInfoVO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 881 ----
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyAttributeVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeDataDTO.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/service/VciSecretServiceI.java | 28
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/VciBaseUtil.java | 1098 +++++
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeRuleVO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/BaseEnum.java | 7
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingDataDTO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java | 19
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataDTO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeRuleMapper.xml | 73
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/util/VciBaseUtil.java | 1101 +++++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/FrameWorkDefaultValueConstant.java | 169
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java | 366 -
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/annotation/VciEnum.java | 24
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeRuleDTO.java | 60
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrMappingDTO.java | 2
/dev/null | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeRuleLC.java | 11
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeSynonymDTO.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java | 34
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntBaseDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeKeyAttrRepeatRuleVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodePhaseAttrVO.java | 2
142 files changed, 7,854 insertions(+), 3,401 deletions(-)
diff --git a/Source/UBCS.zip b/Source/UBCS.zip
new file mode 100644
index 0000000..47a21fa
--- /dev/null
+++ b/Source/UBCS.zip
Binary files differ
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/CommonConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/CommonConstant.java
index 9b6dffa..e89af3a 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/CommonConstant.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/CommonConstant.java
@@ -49,6 +49,16 @@
Integer NOT_SEALED_ID = 0;
/**
+ * 鏄粯璁ゅ瘑鐮佺瓥鐣ュ��
+ */
+ Integer IS_DEFAULT = 1;
+
+ /**
+ * 涓嶆槸榛樿瀵嗙爜绛栫暐鍊�
+ */
+ Integer NOT_DEFAULT = 0;
+
+ /**
* 榛樿瀵嗙爜
*/
String DEFAULT_PASSWORD = "123456";
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
index c372f84..50660ae 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
@@ -41,7 +41,7 @@
* nacos dev 鍦板潃
*/
//String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
- String NACOS_DEV_ADDR = "192.168.93.133:38848";
+ String NACOS_DEV_ADDR = "192.168.93.140:38848";
/**
* nacos prod 鍦板潃
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
index db76215..05b7282 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
@@ -13,22 +13,32 @@
<version>${bladex.project.version}</version>
<dependencies>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-starter-poi</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.thoughtworks.xstream</groupId>-->
+<!-- <artifactId>xstream</artifactId>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.vci</groupId>-->
+<!-- <artifactId>vci-starter-poi</artifactId>-->
+<!-- <version>1.0-SNAPSHOT</version>-->
+<!-- <scope>compile</scope>-->
+<!-- </dependency>-->
- <dependency>
+ <!--<dependency>
<groupId>com.vci</groupId>
<artifactId>vci-platform-web</artifactId>
<version>2022.1-SNAPSHOT</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>vci-starter-web</artifactId>
+ <groupId>com.vci</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.vci</groupId>
+ <artifactId>vci-starter-corba</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -47,6 +57,10 @@
<groupId>de.odysseus.staxon</groupId>
<artifactId>staxon</artifactId>
<version>1.3</version>
+ </dependency>-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
</dependency>
</dependencies>
<packaging>jar</packaging>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java
index 188bd00..86e167b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/bo/CodeTemplateAttrSqlBO.java
@@ -1,7 +1,5 @@
package com.vci.ubcs.code.bo;
-import com.vci.starter.web.pagemodel.PageHelper;
-
import java.util.List;
import java.util.Map;
@@ -30,7 +28,7 @@
/**
* 鍒嗛〉瀵硅薄
*/
- private PageHelper pageHelper;
+ //private PageHelper pageHelper;
/**
* 鍖呭惈鍒嗛〉鐨剆ql璇彞
@@ -76,13 +74,13 @@
this.joinTable = joinTable;
}
- public PageHelper getPageHelper() {
- return pageHelper;
- }
-
- public void setPageHelper(PageHelper pageHelper) {
- this.pageHelper = pageHelper;
- }
+// public PageHelper getPageHelper() {
+// return pageHelper;
+// }
+//
+// public void setPageHelper(PageHelper pageHelper) {
+// this.pageHelper = pageHelper;
+// }
public String getSqlHasPage() {
return sqlHasPage;
@@ -122,7 +120,7 @@
"tableName='" + tableName + '\'' +
", nickName='" + nickName + '\'' +
", joinTable=" + joinTable +
- ", pageHelper=" + pageHelper +
+ //", pageHelper=" + pageHelper +
", sqlHasPage='" + sqlHasPage + '\'' +
", sqlUnPage='" + sqlUnPage + '\'' +
", sqlCount='" + sqlCount + '\'' +
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
index 26a0a2c..f2b43df 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeBasicSecDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeButtonDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeButtonDTO.java
index 4d48ffa..637bb75 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeButtonDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeButtonDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java
index 8a4f0f5..010bfd2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java
index 50bb9b2..81972c6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyProcessTempDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTempMapItemDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTempMapItemDTO.java
index 786d4ca..10c6066 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTempMapItemDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTempMapItemDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
index d764fd2..53b5331 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
@@ -1,8 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
@@ -262,31 +261,26 @@
/**
* 璇存槑
*/
- @Column(columnDefinition = "璇存槑")
private String explain;
/**
* 閫夋嫨搴撴爣璇�
*/
- @Column(columnDefinition = "閫夋嫨搴撴爣璇�")
private String libraryIdentification;
/**
* 绾ц仈灞炴�х紪鍙�
*/
- @Column(columnDefinition = "绾ц仈灞炴�х紪鍙�")
private String parentCode;
/**
* 绾ц仈灞炴�у悕绉�
*/
- @Column(columnDefinition = "绾ц仈灞炴�у悕绉�")
private String parentName;
/**
* 绾ц仈鏌ヨ灞炴��
*/
- @Column(columnDefinition = "绾ц仈鏌ヨ灞炴��")
private String parentQueryAttr;
public String getExplain() {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java
index 725bdfd..bf77cfb 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateButtonDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateDTO.java
index 11db13e..a733c4c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateMapDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateMapDTO.java
index c4896d6..333103b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateMapDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateMapDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyValueDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyValueDTO.java
index 72ecc2e..9d106fd 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyValueDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyValueDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java
index d61653c..3e30710 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeFixedValueDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeKeyAttrRepeatRuleDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeKeyAttrRepeatRuleDTO.java
index 9da8c7e..4dc25fb 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeKeyAttrRepeatRuleDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeKeyAttrRepeatRuleDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodePhaseAttrDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodePhaseAttrDTO.java
index bf7ebf2..f112ecb 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodePhaseAttrDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodePhaseAttrDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeResembleRuleDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeResembleRuleDTO.java
index 126b597..0028abe 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeResembleRuleDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeResembleRuleDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeRuleDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeRuleDTO.java
index 293a9a2..46aafe1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeRuleDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeRuleDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeSynonymDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeSynonymDTO.java
index 90ad197..c4d6716 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeSynonymDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeSynonymDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java
index 225b060..994d025 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeTemplatePhaseDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingDataDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingDataDTO.java
index 2edeb0e..fbf62ab 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingDataDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingDataDTO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.model.BaseModel;
+import com.vci.ubcs.code.entity.BaseModel;
/**
* 瑕佹帹閫佸緱鏁版嵁
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java
index 3460ca9..0425044 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇楁暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataDTO.java
index 6bedafb..71d75ea 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataInfoDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataInfoDTO.java
index bcb7de6..080a6ec 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataInfoDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyDataInfoDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrMappingDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrMappingDTO.java
index e54f5a6..165a97d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrMappingDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrMappingDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrRangeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrRangeDTO.java
index 7fdb561..fed8e76 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrRangeDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrRangeDTO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
public class DockingPreAttrRangeDTO extends BaseModelVO {
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingTaskDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingTaskDTO.java
index 21d6be8..57129ee 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingTaskDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingTaskDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntAuthorityDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntAuthorityDTO.java
index 2fc60fd..ae148f9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntAuthorityDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntAuthorityDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntBaseDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntBaseDTO.java
index 2c024b8..38cc7e3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntBaseDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntBaseDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java
index 97862a8..93564da 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
index 1c49665..47f0387 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoDTO.java
index 3a03ac5..a238354 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java
index 83b678b..17cb303 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.dto;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/BaseModelDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/BaseModelDTO.java
new file mode 100644
index 0000000..d14778e
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/BaseModelDTO.java
@@ -0,0 +1,150 @@
+package com.vci.web.dto;
+
+
+import com.vci.ubcs.code.entity.BaseModel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 缂栬緫鐨勬暟鎹�,鍦ㄥ崟鏉℃暟鎹鍔犲拰淇敼鐨勬椂鍊欎娇鐢�
+ * @author weidy
+ * @date 2021-2-12
+ */
+public class BaseModelDTO extends BaseModel {
+
+ /**
+ * 鏁版嵁
+ */
+ private Map<String,String> data = new HashMap<>();
+ /**
+ * 瀛愯〃鐨勪笟鍔＄被鍨�
+ */
+ private String subBtmType;
+
+ /**
+ * 瀛愯〃鐨勬暟鎹�
+ */
+ private List<Map<String,String>> subTableData = new ArrayList<Map<String,String>>();
+
+ /**
+ * 鍓嶇疆浜嬩欢
+ */
+ private String preEvent;
+
+ /**
+ * 鍚庣疆浜嬩欢
+ */
+ private String postEvent;
+
+ /**
+ * 瑕佸彂甯冪殑鏂囦欢鐨勪富閿�
+ */
+ private List<String> releaseFileOids = new ArrayList<>();
+
+ /**
+ * 鍗囩増娆�
+ */
+ private boolean upVersion = false;
+
+ /**
+ * 鏉ユ簮鏁版嵁
+ */
+ private List<Map<String,String>> sourceData = new ArrayList<>();
+
+ /**
+ * 閫夋嫨鏁版嵁
+ */
+ private List<Map<String,String>> selectData = new ArrayList<>();
+
+ public List<Map<String, String>> getSourceData() {
+ return sourceData;
+ }
+
+ public void setSourceData(List<Map<String, String>> sourceData) {
+ this.sourceData = sourceData;
+ }
+
+ public List<Map<String, String>> getSelectData() {
+ return selectData;
+ }
+
+ public void setSelectData(List<Map<String, String>> selectData) {
+ this.selectData = selectData;
+ }
+
+ public boolean isUpVersion() {
+ return upVersion;
+ }
+
+ public void setUpVersion(boolean upVersion) {
+ this.upVersion = upVersion;
+ }
+
+ public String getPreEvent() {
+ return preEvent;
+ }
+
+ public void setPreEvent(String preEvent) {
+ this.preEvent = preEvent;
+ }
+
+ public String getPostEvent() {
+ return postEvent;
+ }
+
+ public void setPostEvent(String postEvent) {
+ this.postEvent = postEvent;
+ }
+
+ @Override
+ public Map<String, String> getData() {
+ return data;
+ }
+
+ @Override
+ public void setData(Map<String, String> data) {
+ this.data = data;
+ }
+
+ public String getSubBtmType() {
+ return subBtmType;
+ }
+
+ public void setSubBtmType(String subBtmType) {
+ this.subBtmType = subBtmType;
+ }
+
+ public List<Map<String, String>> getSubTableData() {
+ return subTableData;
+ }
+
+ public void setSubTableData(List<Map<String, String>> subTableData) {
+ this.subTableData = subTableData;
+ }
+
+ public List<String> getReleaseFileOids() {
+ return releaseFileOids;
+ }
+
+ public void setReleaseFileOids(List<String> releaseFileOids) {
+ this.releaseFileOids = releaseFileOids;
+ }
+
+ @Override
+ public String toString() {
+ return "BaseModelDTO{" +
+ "data=" + data +
+ ", subBtmType='" + subBtmType + '\'' +
+ ", subTableData=" + subTableData +
+ ", preEvent='" + preEvent + '\'' +
+ ", postEvent='" + postEvent + '\'' +
+ ", releaseFileOids=" + releaseFileOids +
+ ", upVersion=" + upVersion +
+ ", sourceData=" + sourceData +
+ ", selectData=" + selectData +
+ "} " + super.toString();
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeClassifyDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeClassifyDTO.java
index 06d0875..737bf94 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeClassifyDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeClassifyDTO.java
@@ -1,44 +1,44 @@
package com.vci.ubcs.code.dto.datapush.classify;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-@XStreamAlias("classify")
+//@XStreamAlias("classify")
public class NodeClassifyDTO {
/**
* 鍒嗙被id
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String id;
/***
* 鍒嗙被鍚嶇О
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String name;
/***
* 鐖惰妭鐐筰d
*/
- @XStreamAsAttribute
+ // @XStreamAsAttribute
private String pid;
/***
* 鍒嗙被浠ｅ彿
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String classCode;
/***
* 鎻忚堪
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String description;
/***
* 鍒嗙被閾炬帴璺緞
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String fullPathName;
/***
* 鍒嗙被鐘舵��
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String lcStatus;
public String getId() {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeDataDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeDataDTO.java
index 7351eb4..f2c4406 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeDataDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeDataDTO.java
@@ -1,8 +1,8 @@
package com.vci.ubcs.code.dto.datapush.classify;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
-@XStreamAlias("data")
+//@XStreamAlias("data")
public class NodeDataDTO {
private NodeLibraryDTO library;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java
index a6d2ac7..1f0043b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java
@@ -1,18 +1,14 @@
package com.vci.ubcs.code.dto.datapush.classify;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
import java.util.List;
-@XStreamAlias("library")
+//@XStreamAlias("library")
public class NodeLibraryDTO {
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String id;
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String name;
- @XStreamImplicit
+ //@XStreamImplicit
private List<NodeClassifyDTO> classify;
public String getId() {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeJosnDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeJosnDTO.java
deleted file mode 100644
index d2b8e7e..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeJosnDTO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.vci.ubcs.code.dto.datapush.data;
-
-public class NodeJosnDTO {
-
- private NodedataDTO data;
-
- public NodedataDTO getData() {
- return data;
- }
-
- public void setData(NodedataDTO data) {
- this.data = data;
- }
-
- @Override
- public String toString() {
- return "NodeJosnDTO{" +
- "data=" + data +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeObjectDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeObjectDTO.java
deleted file mode 100644
index 8ea3daf..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeObjectDTO.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.vci.ubcs.code.dto.datapush.data;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-@XStreamAlias("object")
-public class NodeObjectDTO {
- @XStreamAsAttribute
- private String code="" ;
- @XStreamAsAttribute
- private String status="" ;
- @XStreamAsAttribute
- private String library="";
- @XStreamAsAttribute
- private String classCode="";
- @XStreamImplicit
- private List<NodeProDTO> pro;
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getLibrary() {
- return library;
- }
-
- public void setLibrary(String library) {
- this.library = library;
- }
-
- public String getClassCode() {
- return classCode;
- }
-
- public void setClassCode(String classCode) {
- this.classCode = classCode;
- }
-
- public List<NodeProDTO> getPro() {
- return pro;
- }
-
- public void setPro(List<NodeProDTO> pro) {
- this.pro = pro;
- }
-
- @Override
- public String toString() {
- return "NodeObjectDTO{" +
- "code='" + code + '\'' +
- ", status='" + status + '\'' +
- ", library='" + library + '\'' +
- ", classCode='" + classCode + '\'' +
- ", pro=" + pro +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeProDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeProDTO.java
deleted file mode 100644
index 1e4c759..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeProDTO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.vci.ubcs.code.dto.datapush.data;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-@XStreamAlias("pro")
-public class NodeProDTO {
- @XStreamAsAttribute
- private String filedName;
- @XStreamAsAttribute
- private String outname;
- @XStreamAsAttribute
- private String filedValue;
-
- public String getFiledName() {
- return filedName;
- }
-
- public void setFiledName(String filedName) {
- this.filedName = filedName;
- }
-
- public String getOutname() {
- return outname;
- }
-
- public void setOutname(String outname) {
- this.outname = outname;
- }
-
- public String getFiledValue() {
- return filedValue;
- }
-
- public void setFiledValue(String filedValue) {
- this.filedValue = filedValue;
- }
-
- @Override
- public String toString() {
- return "NodeProDTO{" +
- "filedName='" + filedName + '\'' +
- ", outname='" + outname + '\'' +
- ", filedValue='" + filedValue + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodedataDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodedataDTO.java
deleted file mode 100644
index fe832e9..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodedataDTO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.vci.ubcs.code.dto.datapush.data;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-@XStreamAlias("data")
-public class NodedataDTO {
- @XStreamImplicit
- private List<NodeObjectDTO> object;
-
- public List<NodeObjectDTO> getObject() {
- return object;
- }
-
- public void setObject(List<NodeObjectDTO> object) {
- this.object = object;
- }
-
- @Override
- public String toString() {
- return "NodedataDTO{" +
- "object=" + object +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.json
deleted file mode 100644
index 3a07164..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
- "data": {
- "object": {
- "code": "0201040133",
- "status": "Released",
- "library": "wupin",
- "classCode": "020104",
- "pro": [
- {
- "filedName": "xbj",
- "outname": "鏍囪"
- },
- {
- "filedName": "xinghaoguige",
- "outname": "瑙勬牸",
- "filedValue": "M4"
- },
- {
- "filedName": "lastmodifier",
- "outname": "鏈�鍚庝慨鏀逛汉",
- "filedValue": "weidy(榄忓ぇ鍕�)"
- },
- {
- "filedName": "cpxs",
- "outname": "浜у搧鍨嬪紡"
- },
- {
- "filedName": "secondfl",
- "outname": "浜岀骇绠＄悊鍒嗙被",
- "filedValue": "绱у浐浠�"
- },
- {
- "filedName": "clph",
- "outname": "鏉愭枡鐗屽彿",
- "filedValue": "HB1-24321"
- },
- {
- "filedName": "thrifl",
- "outname": "涓夌骇绠＄悊鍒嗙被",
- "filedValue": "铻洪拤"
- },
- {
- "filedName": "xbzjbmc",
- "outname": "鏍囧噯绾у埆鍚嶇О"
- },
- {
- "filedName": "firstfl",
- "outname": "涓�绾х鐞嗗垎绫�",
- "filedValue": "鏍囧噯浠�"
- },
- {
- "filedName": "xgzccdgcd",
- "outname": "鍏虫敞灏哄鐨勫叕宸甫"
- },
- {
- "filedName": "zjxh",
- "outname": "瀛愪欢搴忓彿"
- },
- {
- "filedName": "bmcl",
- "outname": "琛ㄩ潰澶勭悊",
- "filedValue": "鐢甸晙"
- },
- {
- "filedName": "id",
- "outname": "鐗╂枡缂栫爜",
- "filedValue": "0201040133"
- },
- {
- "filedName": "createtime",
- "outname": "鍒涘缓鏃堕棿",
- "filedValue": "2022-12-23 17:12:50.635"
- },
- {
- "filedName": "creator",
- "outname": "鍒涘缓浜�",
- "filedValue": "weidy(榄忓ぇ鍕�)"
- },
- {
- "filedName": "xwlwwmc",
- "outname": "鐗╁搧澶栨枃鍚嶇О"
- },
- {
- "filedName": "xxndj",
- "outname": "鎬ц兘绛夌骇"
- },
- {
- "filedName": "xzjmc",
- "outname": "瀛愪欢鍚嶇О"
- },
- {
- "filedName": "beizhushuoming",
- "outname": "澶囨敞璇存槑"
- },
- {
- "filedName": "revisionvalue",
- "outname": "鐗堟湰",
- "filedValue": "1"
- },
- {
- "filedName": "name",
- "outname": "鐗╁搧涓枃鍚嶇О",
- "filedValue": "鍗婂渾澶磋灪閽�1"
- },
- {
- "filedName": "xfjjstj",
- "outname": "闄勫姞鎶�鏈潯浠�"
- },
- {
- "filedName": "xbxkxs",
- "outname": "淇濋櫓瀛斿瀷寮�",
- "filedValue": "鏃�"
- },
- {
- "filedName": "lastmodifytime",
- "outname": "鏈�鍚庝慨鏀规椂闂�",
- "filedValue": "2022-12-23 17:12:50.635"
- },
- {
- "filedName": "zhiliangbz",
- "outname": "鏍囧噯鍙�",
- "filedValue": "HB1-2431-M4*512"
- },
- {
- "filedName": "materialclassify",
- "outname": "鎵�灞炲垎绫讳唬鍙�",
- "filedValue": "020104"
- },
- {
- "filedName": "lcstatus",
- "outname": "鐘舵��",
- "filedValue": "Released"
- }
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.json
deleted file mode 100644
index 18f7d87..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "data": {
- "object": {
- "code": "0201040133",
- "oid": "0000001",
- "erroid": "0",
- "msg": "娴嬭瘯鎴愬姛"
- }
- }
-}
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeDataDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeDataDTO.java
index e07d7a3..139f753 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeDataDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeDataDTO.java
@@ -1,14 +1,14 @@
package com.vci.ubcs.code.dto.datapush.result;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamImplicit;
import java.util.List;
-@XStreamAlias("data")
+//@XStreamAlias("data")
public class ResultNodeDataDTO {
- @XStreamImplicit
+ //@XStreamImplicit
private List<ResultNodeObjectDTO> object;
public List<ResultNodeObjectDTO> getObject() {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
index 70b118d..5a4bf15 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
@@ -1,29 +1,29 @@
package com.vci.ubcs.code.dto.datapush.result;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+//import com.thoughtworks.xstream.annotations.XStreamAlias;
+//import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-@XStreamAlias("object")
+//@XStreamAlias("object")
public class ResultNodeObjectDTO {
/***
* 鏁版嵁缂栫爜
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String code;
/***
* 鏁版嵁oid
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String oid;
/***
* 閿欒鏍囪瘑
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String erroid;
/***
* 閿欒淇℃伅
*/
- @XStreamAsAttribute
+ //@XStreamAsAttribute
private String msg;
public String getCode() {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/BaseModel.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/BaseModel.java
new file mode 100644
index 0000000..66fae4e
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/BaseModel.java
@@ -0,0 +1,354 @@
+package com.vci.ubcs.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.data.annotation.Transient;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+public class BaseModel implements Serializable {
+ @JsonSerialize(
+ using = ToStringSerializer.class
+ )
+ @ApiModelProperty("涓婚敭id")
+ @TableId(value = "OID")
+ private String oid;
+
+ private String id;
+
+ private String name;
+
+ private String description;
+
+ private String revisionOid;
+
+ private String nameOid;
+
+ private String btmname;
+
+ private String lastR;
+
+ private String firstR;
+
+ private String lastV;
+
+ private String firstV;
+
+ private String creator;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date createTime;
+
+ private String lastModifier;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date lastModifyTime;
+
+ private String revisionRule;
+
+ private Integer revisionSeq;
+
+ private String revisionValue;
+
+ private String versionRule;
+
+ private Integer versionSeq;
+
+ private String versionValue;
+
+ @Transient
+ private String lctid;
+
+ private String lcStatus;
+
+ @TableField(exist = false)
+ private String lcStatusText;
+
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
+ private Date ts;
+
+ private String owner;
+
+ private String copyFromVersion;
+
+ // @VciUseEnum(
+// value = "Enumsecretgrade",
+// showTextField = "secretGradeText"
+// )
+ @TableField(exist = false)
+ private Integer secretGrade;
+
+ @Transient
+ @TableField(exist = false)
+ private String secretGradeText;
+
+ @Transient
+ @TableField(exist = false)
+ private Map<String, String> data;
+
+ public BaseModel() {
+ }
+
+ public String getOid() {
+ return this.oid;
+ }
+
+ public void setOid(String oid) {
+ this.oid = oid;
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getRevisionOid() {
+ return this.revisionOid;
+ }
+
+ public void setRevisionOid(String revisionOid) {
+ this.revisionOid = revisionOid;
+ }
+
+ public String getNameOid() {
+ return this.nameOid;
+ }
+
+ public void setNameOid(String nameOid) {
+ this.nameOid = nameOid;
+ }
+
+ public String getBtmname() {
+ return this.btmname;
+ }
+
+ public void setBtmname(String btmname) {
+ this.btmname = btmname;
+ }
+
+ public String getLastR() {
+ return this.lastR;
+ }
+
+ public void setLastR(String lastR) {
+ this.lastR = lastR;
+ }
+
+ public String getFirstR() {
+ return this.firstR;
+ }
+
+ public void setFirstR(String firstR) {
+ this.firstR = firstR;
+ }
+
+ public String getLastV() {
+ return this.lastV;
+ }
+
+ public void setLastV(String lastV) {
+ this.lastV = lastV;
+ }
+
+ public String getFirstV() {
+ return this.firstV;
+ }
+
+ public void setFirstV(String firstV) {
+ this.firstV = firstV;
+ }
+
+ public String getCreator() {
+ return this.creator;
+ }
+
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ public String getLastModifier() {
+ return this.lastModifier;
+ }
+
+ public void setLastModifier(String lastModifier) {
+ this.lastModifier = lastModifier;
+ }
+
+ public Date getLastModifyTime() {
+ return this.lastModifyTime;
+ }
+
+ public void setLastModifyTime(Date lastModifyTime) {
+ this.lastModifyTime = lastModifyTime;
+ }
+
+ public String getRevisionRule() {
+ return this.revisionRule;
+ }
+
+ public void setRevisionRule(String revisionRule) {
+ this.revisionRule = revisionRule;
+ }
+
+ public String getVersionRule() {
+ return this.versionRule;
+ }
+
+ public void setVersionRule(String versionRule) {
+ this.versionRule = versionRule;
+ }
+
+ public Integer getRevisionSeq() {
+ return this.revisionSeq;
+ }
+
+ public void setRevisionSeq(Integer revisionSeq) {
+ this.revisionSeq = revisionSeq;
+ }
+
+ public String getRevisionValue() {
+ return this.revisionValue;
+ }
+
+ public void setRevisionValue(String revisionValue) {
+ this.revisionValue = revisionValue;
+ }
+
+ public Integer getVersionSeq() {
+ return this.versionSeq;
+ }
+
+ public void setVersionSeq(Integer versionSeq) {
+ this.versionSeq = versionSeq;
+ }
+
+ public String getVersionValue() {
+ return this.versionValue;
+ }
+
+ public void setVersionValue(String versionValue) {
+ this.versionValue = versionValue;
+ }
+
+ public String getLcStatus() {
+ return this.lcStatus;
+ }
+
+ public void setLcStatus(String lcStatus) {
+ this.lcStatus = lcStatus;
+ }
+
+ public Date getTs() {
+ return this.ts;
+ }
+
+ public void setTs(Date ts) {
+ this.ts = ts;
+ }
+
+ public String getOwner() {
+ return this.owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+ public String getCopyFromVersion() {
+ return this.copyFromVersion;
+ }
+
+ public void setCopyFromVersion(String copyFromVersion) {
+ this.copyFromVersion = copyFromVersion;
+ }
+
+ public String getLcStatusText() {
+ return this.lcStatusText;
+ }
+
+ public void setLcStatusText(String lcStatusText) {
+ this.lcStatusText = lcStatusText;
+ }
+
+ public Date getCreateTime() {
+ return this.createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Integer getSecretGrade() {
+ return this.secretGrade;
+ }
+
+ public void setSecretGrade(Integer secretGrade) {
+ this.secretGrade = secretGrade;
+ }
+
+ public String getSecretGradeText() {
+ return this.secretGradeText;
+ }
+
+ public void setSecretGradeText(String secretGradeText) {
+ this.secretGradeText = secretGradeText;
+ }
+
+ public String getLctid() {
+ return this.lctid;
+ }
+
+ public void setLctid(String lctid) {
+ this.lctid = lctid;
+ }
+
+ public Map<String, String> getData() {
+ return this.data;
+ }
+
+ public void setData(Map<String, String> data) {
+ this.data = data;
+ }
+
+ @Override
+ public String toString() {
+ return "BaseModel{oid='" + this.oid + '\'' + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmname='" + this.btmname + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", creator='" + this.creator + '\'' + ", createTime=" + this.createTime + ", lastModifier='" + this.lastModifier + '\'' + ", lastModifyTime=" + this.lastModifyTime + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", lctid='" + this.lctid + '\'' + ", lcStatus='" + this.lcStatus + '\'' + ", lcStatusText='" + this.lcStatusText + '\'' + ", ts=" + this.ts + ", owner='" + this.owner + '\'' + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", data=" + this.data + '}';
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java
new file mode 100644
index 0000000..ad6e131
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeAllcode.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.data.annotation.Transient;
+
+/**
+ * 鍏ㄩ儴鐮佸�� 瀹炰綋绫�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+@Data
+@TableName("PL_CODE_ALLCODE")
+@ApiModel(value = "CodeAllcode瀵硅薄", description = "鍏ㄩ儴鐮佸��")
+@EqualsAndHashCode(callSuper = true)
+public class CodeAllcode extends BaseModel {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 5020487634341415429L;
+ /**
+ * 鍒嗙被鐨勪富閿�
+ */
+ private String codeClassifyOid;
+
+ /**
+ * 瑙勫垯鐨勪富閿�
+ */
+ private String codeRuleOid;
+
+ /**
+ * 瑙勫垯鐨勫悕绉�
+ */
+ @Transient
+ @TableField(exist = false)
+ private String codeRuleOidName;
+
+ /**
+ * 瀛樺偍鏁版嵁鐨勬ā鏉�
+ */
+ private String codeClassifyTemplateOid;
+
+ /**
+ * 鐮佸�肩殑鍊�
+ */
+ private String id;
+
+ /**
+ * 鍒涘缓缂栫爜鐨勪笟鍔＄被鍨�
+ */
+ private String createCodeBtm;
+
+ /**
+ * 鍒涘缓缂栫爜鐨勪笟鍔℃暟鎹富閿�
+ */
+ private String createCodeOid;
+
+ /***
+ * 娴佹按渚濊禆
+ */
+ private String serialUnit;
+
+ /**
+ * 娌℃湁濉厖鍓嶇殑娴佹按鍙�
+ */
+ private String unFillSerial;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
new file mode 100644
index 0000000..536c326
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeBasicSec.java
@@ -0,0 +1,275 @@
+package com.vci.ubcs.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.com.vci.starter.annotation.Transient;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 鍩虹鐮佹鐨勪俊鎭�
+ * 鏂逛究鍦ㄥ悓涓�涓〉闈㈤噷鏄剧ず鎵�鏈夌殑鐮佹
+ * @author weidy
+ * @date 2022-1-18
+ */
+@Data
+@TableName("PL_CODE_BASICSEC")
+@ApiModel(value = "CodeBasicSec瀵硅薄", description = "鐮佹鍩虹淇℃伅")
+@EqualsAndHashCode(callSuper = true)
+public class CodeBasicSec extends BaseModel{
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 1803476098497357359L;
+
+ /**
+ * 鐮佹淇℃伅
+ */
+ private String id;
+
+ /**
+ * 鐮佹鍚嶇О
+ */
+ private String name;
+
+ /**
+ * 鐮佹绫诲瀷
+ */
+ private String secType;
+
+ /**
+ * 鐮佹闀垮害绫诲瀷鏄剧ず鏂囨湰
+ */
+ @Transient
+ @TableField(exist = false)
+ private String secTypeText;
+
+ /**
+ * 鎵�灞炵紪鐮佽鍒�
+ */
+ private String pkCodeRule;
+
+ /**
+ * 鐮佹鎺掑簭鍙�
+ */
+ private Integer orderNum;
+
+ /**
+ * 寮曠敤鐨勫睘鎬х殑鏂囨湰
+ */
+ private String referAttributeName;
+
+ /**
+ * 寮曠敤鐨勫睘鎬ц嫳鏂囧悕绉�
+ */
+ private String referAttributeId;
+
+ /**
+ * 鍙栧�艰鍒�
+ */
+ private String getValueClass ;
+
+ //鍓嶇杈撳叆鍚庤嚜鍔ㄥ姞鍏ュ埌鏋氫妇涓�
+ /**
+ * 鏃ユ湡鏍煎紡
+ */
+ private String codeDateFormatStr;
+
+ /**
+ * 鐮佹闀垮害绫诲瀷
+ */
+ private String codeSecLengthType;
+
+ /**
+ * 鐮佹闀垮害绫诲瀷鏄剧ず鏂囨湰
+ */
+ @TableField(exist = false)
+ private String codeSecLengthTypeText;
+
+ /**
+ * 鐮佹鐨勯暱搴�
+ */
+ private String codeSecLength;
+
+ /**
+ * 灞傜骇绫诲瀷
+ */
+ private String codeLevelType;
+
+ /**
+ * 灞傜骇绫诲瀷鏄剧ず鏂囨湰
+ */
+ @TableField(exist = false)
+ private String codeLevelTypeText;
+
+ /**
+ * 灞傜骇鐨勫��
+ */
+ private Integer codeLevelValue;
+
+ /**
+ * 鍊兼埅鍙栭暱搴�
+ */
+ private Integer valueCutLength;
+
+ /**
+ * 瀛楃鎴彇绫诲瀷
+ */
+ private String valueCutType;
+
+ /**
+ * 瀛楃涓叉埅鍙栫被鍨嬫樉绀烘枃鏈�
+ */
+ @Transient
+ @TableField(exist = false)
+ private String valueCutTypeText;
+
+ /**
+ * 鍙栧�肩被鍨�
+ */
+ private String codeGetValueType;
+
+ /**
+ * 鍙栧�肩被鍨嬫樉绀烘枃鏈�
+ */
+ @Transient
+ @TableField(exist = false)
+ private String codeGetValueTypeText;
+
+ /**
+ * 寮曠敤鐨勫睘鎬ф墍灞炵殑搴撳垎绫�
+ */
+ private String referCodeClassifyOid;
+
+ /**
+ * 寮曠敤鐨勫睘鎬ф墍灞炲簱鍒嗙被鐨勫悕绉�
+ */
+ @Transient(referColumn = "referCodeClassifyOid.name")
+ @TableField(exist = false)
+ private String referCodeClassifyOidName;
+
+ /**
+ * 寮曠敤鐨勪笟鍔＄被鍨�
+ */
+ private String referBtmId;
+
+ /**
+ * 寮曠敤鐨勪笟鍔＄被鍨嬪悕绉�
+ */
+ private String referBtmName;
+
+ /**
+ * 鍙傜収鐨勭獥鍙ｉ厤缃�
+ */
+ private String referConfig;
+
+ /**
+ * 鏄剧ず淇℃伅
+ */
+ private String referValueInfo;
+
+ /**
+ * 杩囨护鐨剆ql鍐呭
+ */
+ private String filterSql ;
+
+
+ /**
+ * 娴佹按鍙疯捣濮嬪��
+ */
+ private String serialStart;
+
+ /**
+ * 娴佹按鐨勬闀�
+ */
+ private Integer serialStep;
+
+
+ /**
+ * 缂栫爜琛ヤ綅鏂瑰紡
+ */
+ //@VciUseEnum(value = EnumIdConstant.CODE_FILL_TYPE,showTextField = "codeFillTypeText")
+ private String codeFillType;
+
+ /**
+ * 缂栫爜琛ヤ綅鏂瑰紡鏄剧ず鏂囨湰
+ */
+ private String codeFillTypeText;
+
+ /**
+ * 琛ヤ綅鏃剁殑瀛楃
+ */
+ private String codeFillSeparator;
+
+ /**
+ * 濉厖闀垮害
+ */
+ private String codeFillLength;
+
+ /**
+ * 涓婇檺
+ */
+ private Integer codeFillLimit;
+
+ /**
+ * 娴佹按鏄惁琛ョ爜
+ */
+ //@VciFieldType(VciFieldTypeEnum.VTBoolean)
+ private String codeFillFlag;
+
+ /**
+ * 鑷畾涔夌殑娴佹按绠楁硶绫�
+ */
+ private String customCodeSerialClass;
+
+ /**
+ * 鏄惁鑷姩鍖归厤鍒嗙被鍊�
+ */
+ //@VciFieldType(VciFieldTypeEnum.VTBoolean)
+ private String matchClassifyValueFlag;
+
+ /**
+ * 鐖跺垎绫荤爜娈典富閿�
+ */
+ private String parentClassifySecOid;
+
+ /**
+ * 鐖跺垎绫荤爜娈靛悕绉�
+ */
+ //@Transient(referColumn = "parentClassifySecOid.name")
+ @Transient
+ @TableField(exist = false)
+ private String parentClassifySecText;
+
+ /**
+ * 鏄惁鍙互涓虹┖
+ */
+ //@VciFieldType(VciFieldTypeEnum.VTBoolean)
+ private String nullableFlag;
+
+ /**
+ * 鏄惁鍙備笌缂栫爜
+ */
+ //@VciFieldType(VciFieldTypeEnum.VTBoolean)
+ private String componentCodeFlag;
+
+ /**
+ * 鏄惁娴佹按渚濊禆
+ */
+ //@VciFieldType(VciFieldTypeEnum.VTBoolean)
+ private String serialDependFlag;
+
+ /**
+ * 鏄惁鏄剧ず
+ */
+ //@VciFieldType(VciFieldTypeEnum.VTBoolean)
+ private String displayFlag;
+
+ /**
+ * 娴佹按渚濊禆椤哄簭
+ */
+ private Integer serialDependOrder;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
new file mode 100644
index 0000000..24530a6
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java
@@ -0,0 +1,124 @@
+package com.vci.ubcs.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.vci.ubcs.com.vci.starter.annotation.Transient;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 涓婚搴撶殑鍒嗙被
+ * @author weidy
+ * @date 2022-1-14
+ */
+//@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY,text = "涓婚搴撳垎绫�",lifeCycle = FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME)
+@Data
+@TableName("PL_CODE_CLASSIFY")
+@ApiModel(value = "CodeClassify瀵硅薄", description = "涓婚搴撶殑鍒嗙被")
+@EqualsAndHashCode(callSuper = true)
+public class CodeClassify extends BaseModel {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 2217599544701726951L;
+
+ /**
+ * 鍒嗙被鐨勭紪鍙�
+ */
+ private String id;
+
+ /**
+ * 鍒嗙被鐨勫悕绉�
+ */
+ private String name;
+
+ /**
+ * 涓婄骇鐨勪富閿�
+ */
+ private String parentCodeClassifyOid;
+
+ /**
+ * 鎺掑簭鍙�
+ */
+ private Integer orderNum;
+
+ /**
+ * 瀛樺偍鐨勪笟鍔＄被鍨�
+ */
+ private String btmTypeId;
+
+ /**
+ * 瀛樺偍鐨勪笟鍔＄被鍨嬬殑涓枃鍚嶇О
+ */
+ private String btmTypeName;
+
+ /**
+ * 缂栫爜瑙勫垯鐨勪富閿�
+ */
+ //@VciUseRefer(MdmBtmTypeConstant.CODE_RULE)
+ private String codeRuleOid;
+
+ /**
+ * 缂栫爜瑙勫垯鐨勫悕绉�
+ */
+ @Transient(referColumn = "codeRuleOid.name")
+ @TableField(exist = false)
+ private String codeRuleOidName;
+
+ /**
+ * 鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯
+ */
+ //@VciUseRefer(MdmBtmTypeConstant.CODE_KEY_ATTR_REPEAT_RULE)
+ private String codeKeyAttrRepeatOid;
+
+ /**
+ * 鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯鍚嶇О
+ */
+ @Transient(referColumn = "codeKeyAttrRepeatOid.name")
+ @TableField(exist = false)
+ private String codeKeyAttrRepeatOidName;
+
+ /**
+ * 鐩镐技椤规煡璇㈢殑瑙勫垯涓婚敭
+ */
+ //@VciUseRefer(MdmBtmTypeConstant.CODE_RESEMBLE_RULE)
+ private String codeResembleRuleOid;
+
+ /**
+ * 鐩镐技椤规煡璇㈣鍒欏悕绉�
+ */
+ @Transient(referColumn = "codeResembleRuleOid.name")
+ @TableField(exist = false)
+ private String codeResembleRuleOidName;
+
+ /**
+ * 鏁版嵁鎵�鍦ㄧ殑灞傜骇
+ */
+ @Transient
+ @TableField(exist = false)
+ private Integer dataLevel;
+
+ /**
+ * 璺緞
+ */
+ @Transient
+ @TableField(exist = false)
+ private String path;
+
+ /***
+ * 鍚嶇О璺緞
+ */
+ @Transient
+ @TableField(exist = false)
+ private String namePath;
+
+ /***
+ * 浠ｇ爜璺緞
+ */
+ @Transient
+ @TableField(exist = false)
+ private String idPath;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValue.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValue.java
new file mode 100644
index 0000000..3ec9702
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValue.java
@@ -0,0 +1,51 @@
+package com.vci.ubcs.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 鍒嗙被鐮佹鐨勭爜鍊�
+ * 鐩稿綋浜庣骇鑱旂殑涓嬫媺妗�
+ * @author weidy
+ * @date 2022-1-18
+ */
+@Data
+@TableName("PL_CODE_CLASSIFYVALUE")
+@ApiModel(value = "CodeClassify瀵硅薄", description = "鍒嗙被鐮佹鐨勭爜鍊�")
+@EqualsAndHashCode(callSuper = true)
+public class CodeClassifyValue extends BaseModel {
+
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 5238387322464830032L;
+ /**
+ * 鍒嗙被鐮佹涓婚敭
+ */
+ //@VciUseRefer(MdmBtmTypeConstant.CODE_BASIC_SEC)
+ private String codeClassifySecOid;
+
+ /**
+ * 鍒嗙被鐮佸��
+ */
+ private String id;
+
+ /**
+ * 鍒嗙被鍚嶇О
+ */
+ private String name;
+
+ /**
+ * 鐮佸�煎簭鍙�
+ */
+ private Integer orderNum;
+
+ /**
+ * 涓婄骇鍒嗙被鐮佸�间富閿�
+ */
+ private String parentClassifyValueOid;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeFixedValue.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeFixedValue.java
new file mode 100644
index 0000000..e9993c1
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeFixedValue.java
@@ -0,0 +1,91 @@
+package com.vci.ubcs.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 鍥哄畾鐮佹鐨勭爜鍊�
+ * 鐩稿綋浜庡湪鏋氫妇鐨勪綔鐢紝浼氭湁澶氫釜
+ * @author weidy
+ * @date 2022-1-18
+ */
+@Data
+@TableName("PL_CODE_FIXEDVALUE")
+@ApiModel(value = "CodeFixedValue瀵硅薄", description = "鍥哄畾鐮佹鐨勭爜鍊�")
+@EqualsAndHashCode(callSuper = true)
+public class CodeFixedValue extends BaseModel {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = 3392365440606832597L;
+ /**
+ * 鍥哄畾鐮佹涓婚敭
+ */
+ //@VciUseRefer(MdmBtmTypeConstant.CODE_BASIC_SEC)
+ private String codeFixedSecOid;
+
+ /**
+ * 鍥哄畾鐮佹鐨勭爜鍊�
+ */
+ private String id;
+
+ /**
+ * 鍥哄畾鐮佹鐮佸�肩殑鎻忚堪
+ */
+ private String name;
+
+ /**
+ * 灞炴�ф帓搴忓彿
+ */
+ private Integer orderNum;
+
+ @Override
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @Override
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCodeFixedSecOid() {
+ return codeFixedSecOid;
+ }
+
+ public void setCodeFixedSecOid(String codeFixedSecOid) {
+ this.codeFixedSecOid = codeFixedSecOid;
+ }
+
+ public Integer getOrderNum() {
+ return orderNum;
+ }
+
+ public void setOrderNum(Integer orderNum) {
+ this.orderNum = orderNum;
+ }
+
+ @Override
+ public String toString() {
+ return "CodeFixedValueDO{" +
+ "codeFixedSecOid='" + codeFixedSecOid + '\'' +
+ ", id='" + id + '\'' +
+ ", name='" + name + '\'' +
+ ", orderNum=" + orderNum +
+ "} " + super.toString();
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
new file mode 100644
index 0000000..0292e2c
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 缂栫爜瑙勫垯 瀹炰綋绫�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+@Data
+@TableName("PL_CODE_RULE")
+@ApiModel(value = "CodeRule瀵硅薄", description = "缂栫爜瑙勫垯")
+@EqualsAndHashCode(callSuper = true)
+public class CodeRule extends BaseModel {
+
+ /**
+ * 搴忓垪鍖�
+ */
+ private static final long serialVersionUID = -7142347409110551299L;
+
+ /**
+ * 瑙勫垯缂栧彿
+ */
+ private String id;
+
+ /**
+ * 瑙勫垯鐨勫悕绉�
+ */
+ private String name;
+
+ /**
+ * 瑙勫垯鐨勬弿杩�
+ */
+ private String description;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/po/CodeClassifyPO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/po/CodeClassifyPO.java
index 613af71..43491eb 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/po/CodeClassifyPO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/po/CodeClassifyPO.java
@@ -1,7 +1,5 @@
package com.vci.ubcs.code.po;
-import com.vci.starter.poi.annotation.ExcelColumn;
-
/**
* 涓婚搴撳垎绫荤殑瀵煎叆瀵煎嚭瀵硅薄
* @author weidy
@@ -15,55 +13,46 @@
/**
* 鎵�鍦ㄦ暟鎹
*/
- @ExcelColumn(rowIndexColumn = true,value = "")
private String rowIndex;
/**
* 鍒嗙被缂栧彿
*/
- @ExcelColumn(value="鍒嗙被缂栧彿",nullable = false)
private String id;
/**
* 鍒嗙被鍚嶇О
*/
- @ExcelColumn(value="鍒嗙被鍚嶇О",nullable = false)
private String name;
/**
* 鎻忚堪
*/
- @ExcelColumn(value = "鎻忚堪")
private String description;
/**
* 缂栫爜瑙勫垯缂栧彿
*/
- @ExcelColumn(value = "缂栫爜瑙勫垯缂栧彿")
private String codeRuleId;
/**
* 涓氬姟绫诲瀷缂栧彿
*/
- @ExcelColumn(value = "涓氬姟绫诲瀷缂栧彿")
private String btmTypeId;
/**
* 鏌ラ噸瑙勫垯缂栧彿
*/
- @ExcelColumn(value = "鏌ラ噸瑙勫垯缂栧彿")
private String keyRepeatRuleId;
/**
* 鍒嗙被璺緞
*/
- @ExcelColumn(value = "鍒嗙被璺緞",nullable = false)
private String path;
/**
* 鐘舵�佹枃鏈�
*/
- @ExcelColumn(value = "鐘舵��")
private String lcStatusText;
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java
new file mode 100644
index 0000000..1d75ce0
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/BaseModelVO.java
@@ -0,0 +1,328 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+package com.vci.ubcs.code.vo.pagemodel;
+
+import org.springframework.data.annotation.Transient;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+public class BaseModelVO implements Serializable {
+ private String oid;
+ private String id;
+ private String name;
+ private String description;
+ private String revisionOid;
+ private String nameOid;
+ private String btmname;
+ private String lastR;
+ private String firstR;
+ private String lastV;
+ private String firstV;
+ private String creator;
+ private Date createTime;
+ private String lastModifier;
+ private Date lastModifyTime;
+ private String revisionRule;
+ private int revisionSeq;
+ private String revisionValue;
+ private String versionRule;
+ private int versionSeq;
+ private String versionValue;
+ private String lcStatus;
+ private String lcStatusText;
+ private Date ts;
+ private String owner;
+ private String checkInBy;
+ private Date checkInTime;
+ private String checkOutBy;
+ private Date checkOutTime;
+ private String copyFromVersion;
+ private Integer secretGrade;
+ private String secretGradeText;
+ private String lctid;
+ @Transient
+ private Map<String, String> data;
+
+ public BaseModelVO() {
+ }
+
+ public String getOid() {
+ return this.oid;
+ }
+
+ public void setOid(String oid) {
+ this.oid = oid;
+ }
+
+ public String getId() {
+ return this.id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getRevisionOid() {
+ return this.revisionOid;
+ }
+
+ public void setRevisionOid(String revisionOid) {
+ this.revisionOid = revisionOid;
+ }
+
+ public String getNameOid() {
+ return this.nameOid;
+ }
+
+ public void setNameOid(String nameOid) {
+ this.nameOid = nameOid;
+ }
+
+ public String getBtmname() {
+ return this.btmname;
+ }
+
+ public void setBtmname(String btmname) {
+ this.btmname = btmname;
+ }
+
+ public String getLastR() {
+ return this.lastR;
+ }
+
+ public void setLastR(String lastR) {
+ this.lastR = lastR;
+ }
+
+ public String getFirstR() {
+ return this.firstR;
+ }
+
+ public void setFirstR(String firstR) {
+ this.firstR = firstR;
+ }
+
+ public String getLastV() {
+ return this.lastV;
+ }
+
+ public void setLastV(String lastV) {
+ this.lastV = lastV;
+ }
+
+ public String getFirstV() {
+ return this.firstV;
+ }
+
+ public void setFirstV(String firstV) {
+ this.firstV = firstV;
+ }
+
+ public String getCreator() {
+ return this.creator;
+ }
+
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ public String getLastModifier() {
+ return this.lastModifier;
+ }
+
+ public void setLastModifier(String lastModifier) {
+ this.lastModifier = lastModifier;
+ }
+
+ public Date getLastModifyTime() {
+ return this.lastModifyTime;
+ }
+
+ public void setLastModifyTime(Date lastModifyTime) {
+ this.lastModifyTime = lastModifyTime;
+ }
+
+ public String getRevisionRule() {
+ return this.revisionRule;
+ }
+
+ public void setRevisionRule(String revisionRule) {
+ this.revisionRule = revisionRule;
+ }
+
+ public String getVersionRule() {
+ return this.versionRule;
+ }
+
+ public void setVersionRule(String versionRule) {
+ this.versionRule = versionRule;
+ }
+
+ public int getRevisionSeq() {
+ return this.revisionSeq;
+ }
+
+ public void setRevisionSeq(int revisionSeq) {
+ this.revisionSeq = revisionSeq;
+ }
+
+ public String getRevisionValue() {
+ return this.revisionValue;
+ }
+
+ public void setRevisionValue(String revisionValue) {
+ this.revisionValue = revisionValue;
+ }
+
+ public int getVersionSeq() {
+ return this.versionSeq;
+ }
+
+ public void setVersionSeq(int versionSeq) {
+ this.versionSeq = versionSeq;
+ }
+
+ public String getVersionValue() {
+ return this.versionValue;
+ }
+
+ public void setVersionValue(String versionValue) {
+ this.versionValue = versionValue;
+ }
+
+ public String getLcStatus() {
+ return this.lcStatus;
+ }
+
+ public void setLcStatus(String lcStatus) {
+ this.lcStatus = lcStatus;
+ }
+
+ public Date getTs() {
+ return this.ts;
+ }
+
+ public void setTs(Date ts) {
+ this.ts = ts;
+ }
+
+ public String getOwner() {
+ return this.owner;
+ }
+
+ public void setOwner(String owner) {
+ this.owner = owner;
+ }
+
+ public String getCheckInBy() {
+ return this.checkInBy;
+ }
+
+ public void setCheckInBy(String checkInBy) {
+ this.checkInBy = checkInBy;
+ }
+
+ public Date getCheckInTime() {
+ return this.checkInTime;
+ }
+
+ public void setCheckInTime(Date checkInTime) {
+ this.checkInTime = checkInTime;
+ }
+
+ public String getCheckOutBy() {
+ return this.checkOutBy;
+ }
+
+ public void setCheckOutBy(String checkOutBy) {
+ this.checkOutBy = checkOutBy;
+ }
+
+ public Date getCheckOutTime() {
+ return this.checkOutTime;
+ }
+
+ public void setCheckOutTime(Date checkOutTime) {
+ this.checkOutTime = checkOutTime;
+ }
+
+ public String getCopyFromVersion() {
+ return this.copyFromVersion;
+ }
+
+ public void setCopyFromVersion(String copyFromVersion) {
+ this.copyFromVersion = copyFromVersion;
+ }
+
+ public String getLcStatusText() {
+ return this.lcStatusText;
+ }
+
+ public void setLcStatusText(String lcStatusText) {
+ this.lcStatusText = lcStatusText;
+ }
+
+ public Date getCreateTime() {
+ return this.createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Integer getSecretGrade() {
+ return this.secretGrade;
+ }
+
+ public void setSecretGrade(Integer secretGrade) {
+ this.secretGrade = secretGrade;
+ }
+
+ public String getSecretGradeText() {
+ return this.secretGradeText;
+ }
+
+ public void setSecretGradeText(String secretGradeText) {
+ this.secretGradeText = secretGradeText;
+ }
+
+ public String getLctid() {
+ return this.lctid;
+ }
+
+ public void setLctid(String lctid) {
+ this.lctid = lctid;
+ }
+
+ public Map<String, String> getData() {
+ return this.data;
+ }
+
+ public void setData(Map<String, String> data) {
+ this.data = data;
+ }
+
+ @Override
+ public String toString() {
+ return "BaseModelVO{oid='" + this.oid + '\'' + ", id='" + this.id + '\'' + ", name='" + this.name + '\'' + ", description='" + this.description + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmname='" + this.btmname + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", creator='" + this.creator + '\'' + ", createTime=" + this.createTime + ", lastModifier='" + this.lastModifier + '\'' + ", lastModifyTime=" + this.lastModifyTime + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", lcStatus='" + this.lcStatus + '\'' + ", lcStatusText='" + this.lcStatusText + '\'' + ", ts=" + this.ts + ", owner='" + this.owner + '\'' + ", checkInBy='" + this.checkInBy + '\'' + ", checkInTime=" + this.checkInTime + ", checkOutBy='" + this.checkOutBy + '\'' + ", checkOutTime=" + this.checkOutTime + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", lctid='" + this.lctid + '\'' + ", data=" + this.data + '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java
new file mode 100644
index 0000000..818ad09
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeAllcodeVO.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.vo.pagemodel;
+
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 鍏ㄩ儴鐮佸�� 瑙嗗浘瀹炰綋绫�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CodeAllcodeVO extends BaseModelVO {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
index f128e54..322175e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeBasicSecVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java
index 8c12ef6..fcfe7c4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeButtonVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyAttributeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyAttributeVO.java
index 0d040e1..755c866 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyAttributeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyAttributeVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 涓婚搴撳垎绫绘墍闇�灞炴�ч泦鏄剧ず瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java
index 4cafaba..d9142bc 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyProcessTempVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTempMapItemVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTempMapItemVO.java
index 737d1cb..568b9dc 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTempMapItemVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTempMapItemVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
index bf9b047..caabe2b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateAttrVO.java
@@ -1,8 +1,5 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.pagemodel.BaseModelVO;
-
/**
* 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
*
@@ -311,31 +308,26 @@
/**
* 璇存槑
*/
- @Column(columnDefinition = "璇存槑")
private String explain;
/**
* 閫夋嫨搴撴爣璇�
*/
- @Column(columnDefinition = "閫夋嫨搴撴爣璇�")
private String libraryIdentification;
/**
* 绾ц仈灞炴�х紪鍙�
*/
- @Column(columnDefinition = "绾ц仈灞炴�х紪鍙�")
private String parentCode;
/**
* 绾ц仈灞炴�у悕绉�
*/
- @Column(columnDefinition = "绾ц仈灞炴�у悕绉�")
private String parentName;
/**
* 绾ц仈鏌ヨ灞炴��
*/
- @Column(columnDefinition = "绾ц仈鏌ヨ灞炴��")
private String parentQueryAttr;
public String getExplain() {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java
index a4a0926..d999e97 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateButtonVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateMapVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateMapVO.java
index 87c4828..f628346 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateMapVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateMapVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateVO.java
index 2a22128..b71c56f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyTemplateVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
index c143673..44647d6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java
@@ -1,8 +1,5 @@
package com.vci.ubcs.code.vo.pagemodel;
-
-import com.vci.starter.web.pagemodel.BaseModelVO;
-
/**
* 涓婚搴撳垎绫绘樉绀哄璞�
*
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyValueVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyValueVO.java
index 65ffcfc..0af56ff 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyValueVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyValueVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍒嗙被鐮佹鐨勭爜鍊兼樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeFixedValueVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeFixedValueVO.java
index 623b01c..caf497e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeFixedValueVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeFixedValueVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java
index 74c749f..93f152f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImportResultVO.java
@@ -1,6 +1,5 @@
package com.vci.ubcs.code.vo.pagemodel;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import java.util.*;
@@ -33,7 +32,7 @@
/***
* 鏍规嵁鍏抽敭鐔熸倝鏌ヨ鐨勯噸澶嶇殑鏁版嵁瀵硅薄
*/
- private Map<String, List<ClientBusinessObject>> indexTODataMap=new HashMap<>();
+ //private Map<String, List<ClientBusinessObject>> indexTODataMap=new HashMap<>();
/**
* excel鑷韩閲嶅鐨勮鍙�
@@ -90,7 +89,7 @@
this.selfRepeatRowIndexList = selfRepeatRowIndexList;
}
- public Map<String,List<ClientBusinessObject>> getIndexTODataMap() {
+ /*public Map<String,List<ClientBusinessObject>> getIndexTODataMap() {
return indexTODataMap;
}
@@ -117,7 +116,7 @@
", nullRowIndexList=" + nullRowIndexList +
", unPassVerifyRowIndexSet=" + unPassVerifyRowIndexSet +
'}';
- }
+ }*/
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeKeyAttrRepeatRuleVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeKeyAttrRepeatRuleVO.java
index 56f6e33..b39bd97 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeKeyAttrRepeatRuleVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeKeyAttrRepeatRuleVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodePhaseAttrVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodePhaseAttrVO.java
index 065e5d9..81d62ac 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodePhaseAttrVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodePhaseAttrVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 闃舵鐨勫睘鎬ф樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeResembleRuleVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeResembleRuleVO.java
index 78aa958..795f6a3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeResembleRuleVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeResembleRuleVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeRuleVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeRuleVO.java
index 57bceaf..87c3f08 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeRuleVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeRuleVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeSynonymVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeSynonymVO.java
index ed629df..4fa063e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeSynonymVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeSynonymVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 鍚屼箟璇嶉厤缃樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java
index 9f39e97..04ed437 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeTemplatePhaseVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 妯℃澘闃舵鏄剧ず瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java
index e347c95..1c0f61d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingDataVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.model.BaseModel;
+import com.vci.ubcs.code.entity.BaseModel;
/**
* 瑕佹帹閫佸緱鏁版嵁
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
index f743ebc..1f20eee 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇楁樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataInfoVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataInfoVO.java
index e480cfc..30fb05a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataInfoVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataInfoVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataVO.java
index d684d82..afa3a09 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyDataVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrMappingVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrMappingVO.java
index 95626b5..22a3f38 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrMappingVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrMappingVO.java
@@ -1,7 +1,7 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrRangeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrRangeVO.java
index c2e11ba..9104bc9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrRangeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrRangeVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
public class DockingPreAttrRangeVO extends BaseModelVO {
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java
index 144bc70..01d4638 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingTaskVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/MdmUIInfoVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/MdmUIInfoVO.java
deleted file mode 100644
index 8aff07b..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/MdmUIInfoVO.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.vci.ubcs.code.vo.pagemodel;
-
-import com.vci.web.pageModel.SmOperationVO;
-import com.vci.web.pageModel.UIFormDefineVO;
-import com.vci.web.pageModel.UITableDefineVO;
-
-import java.util.List;
-
-/**
- * 涓绘暟鎹殑UI淇℃伅
- * @author weidy
- * @date 2022-2-21
- */
-public class MdmUIInfoVO implements java.io.Serializable {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 4192521596336111375L;
- /**
- * 妯℃澘鐨勪俊鎭�
- */
- private CodeClassifyTemplateVO templateVO;
-
- /**
- * 琛ㄦ牸鐨勪俊鎭�
- */
- private UITableDefineVO tableDefineVO;
-
- /**
- * 琛ㄥ崟鐨勪俊鎭�
- */
- private UIFormDefineVO formDefineVO;
-
- /**
- * 鏌ラ噸灞炴�х殑鐩稿叧琛ㄦ牸鐨勪俊鎭�
- */
- private UITableDefineVO resembleTableVO;
-
- /**
- * 鎸夐挳鐨勫唴瀹�
- */
- private List<SmOperationVO> buttons;
-
- /**
- * 褰撳墠鍒嗙被鏄惁涓哄彾瀛愯妭鐐�
- */
- private boolean leaf;
-
- public List<SmOperationVO> getButtons() {
- return buttons;
- }
-
- public void setButtons(List<SmOperationVO> buttons) {
- this.buttons = buttons;
- }
-
- public CodeClassifyTemplateVO getTemplateVO() {
- return templateVO;
- }
-
- public void setTemplateVO(CodeClassifyTemplateVO templateVO) {
- this.templateVO = templateVO;
- }
-
- public UITableDefineVO getTableDefineVO() {
- return tableDefineVO;
- }
-
- public void setTableDefineVO(UITableDefineVO tableDefineVO) {
- this.tableDefineVO = tableDefineVO;
- }
-
- public UIFormDefineVO getFormDefineVO() {
- return formDefineVO;
- }
-
- public void setFormDefineVO(UIFormDefineVO formDefineVO) {
- this.formDefineVO = formDefineVO;
- }
-
- public boolean isLeaf() {
- return leaf;
- }
-
- public void setLeaf(boolean leaf) {
- this.leaf = leaf;
- }
-
- public UITableDefineVO getResembleTableVO() {
- return resembleTableVO;
- }
-
- public void setResembleTableVO(UITableDefineVO resembleTableVO) {
- this.resembleTableVO = resembleTableVO;
- }
-
- @Override
- public String toString() {
- return "MdmUIInfoVO{" +
- "templateVO=" + templateVO +
- ", tableDefineVO=" + tableDefineVO +
- ", formDefineVO=" + formDefineVO +
- ", resembleTableVO=" + resembleTableVO +
- ", buttons=" + buttons +
- ", leaf=" + leaf +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntAuthorityVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntAuthorityVO.java
index a091113..556755d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntAuthorityVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntAuthorityVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntBaseVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntBaseVO.java
index 679b89e..7ac7eb1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntBaseVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntBaseVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java
index c3ddf8f..fc5232a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntInfoVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntInfoVO.java
index 9e6e96a..49027d5 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntInfoVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntInfoVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java
index f71efe1..5365cb7 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java
@@ -1,6 +1,6 @@
package com.vci.ubcs.code.vo.pagemodel;
-import com.vci.starter.web.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
/**
* 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ApplyDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ApplyDataVO.java
deleted file mode 100644
index 998269f..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ApplyDataVO.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-/**
- * 鍒嗙被鏁版嵁淇℃伅
- */
-@XStreamAlias("object")
-public class ApplyDataVO {
- /***
- * 杈撳叆涓婚敭
- */
- @XStreamAsAttribute
- private String id;
- /**
- * 缂栫爜
- */
- @XStreamAsAttribute
- private String code;
- /**
- * 鐘舵��
- */
- @XStreamAsAttribute
- private String status;
- /**
- * 鏁版嵁鎿嶄綔绫诲瀷
- */
- @XStreamAsAttribute
- private String operate;
- /***
- * 鍒涘缓鑰�
- */
- @XStreamAsAttribute
- private String creator;
-
- /**
- * 鏇存敼鑰�
- */
- @XStreamAsAttribute
- private String editor;
- /***
- * 鏁版嵁灞炴�у璞�
- */
- @XStreamImplicit
- private List<ProppertyVO> prop;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getOperate() {
- return operate;
- }
-
- public void setOperate(String operate) {
- this.operate = operate;
- }
-
- public List<ProppertyVO> getProp() {
- return prop;
- }
-
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- public String getEditor() {
- return editor;
- }
-
- public void setEditor(String editor) {
- this.editor = editor;
- }
-
- public void setProp(List<ProppertyVO> prop) {
- this.prop = prop;
- }
-
- @Override
- public String toString() {
- return "ApplyDataVO{" +
- "id='" + id + '\'' +
- ", code='" + code + '\'' +
- ", status='" + status + '\'' +
- ", operate='" + operate + '\'' +
- ", creator='" + creator + '\'' +
- ", editor='" + editor + '\'' +
- ", prop=" + prop +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ApplyDatasVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ApplyDatasVO.java
deleted file mode 100644
index 6b7a8e9..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ApplyDatasVO.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-@XStreamAlias("objects")
-public class ApplyDatasVO {
- @XStreamImplicit
- private List<ApplyDataVO> object;
-
- public List<ApplyDataVO> getObject() {
- return object;
- }
-
- public void setObject(List<ApplyDataVO> object) {
- this.object = object;
- }
-
- @Override
- public String toString() {
- return "ApplyDatasVO{" +
- "object=" + object +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ClassfyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ClassfyVO.java
deleted file mode 100644
index 3428a1e..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ClassfyVO.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-/**
- * 鍒嗙被淇℃伅
- */
-@XStreamAlias("classify")
-public class ClassfyVO {
- /**
- * 鍒嗙被浠ｅ彿
- */
- @XStreamAsAttribute
- private String classCode;
- /**
- * 搴撲唬鍙�
- */
- @XStreamAsAttribute
- private String library;
- /**
- * 绫昏矾寰�
- */
- @XStreamAsAttribute
- private String fullclsfNamePath;
- /**
- * 鐮佹淇℃伅
- */
- private SectionsVO sections;
-
- private ApplyDatasVO objects;
-
- public String getClassCode() {
- return classCode;
- }
-
- public void setClassCode(String classCode) {
- this.classCode = classCode;
- }
-
- public String getLibrary() {
- return library;
- }
-
- public void setLibrary(String library) {
- this.library = library;
- }
-
- public String getFullclsfNamePath() {
- return fullclsfNamePath;
- }
-
- public void setFullclsfNamePath(String fullclsfNamePath) {
- this.fullclsfNamePath = fullclsfNamePath;
- }
-
- public SectionsVO getSections() {
- return sections;
- }
-
- public void setSections(SectionsVO sections) {
- this.sections = sections;
- }
-
- public ApplyDatasVO getObjects() {
- return objects;
- }
-
- public void setObjects(ApplyDatasVO objects) {
- this.objects = objects;
- }
-
- @Override
- public String toString() {
- return "ClassVO{" +
- "classCode='" + classCode + '\'' +
- ", library='" + library + '\'' +
- ", fullclsfNamePath='" + fullclsfNamePath + '\'' +
- ", sections=" + sections +
- ", objects=" + objects +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ClassfysVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ClassfysVO.java
deleted file mode 100644
index 1435d12..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ClassfysVO.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-@XStreamAlias("classifys")
-public class ClassfysVO {
- /**
- *鍒嗙被淇℃伅
- */
- @XStreamImplicit
- private List<ClassfyVO> classify;
-
- public List<ClassfyVO> getClassify() {
- return classify;
- }
-
- public void setClassify(List<ClassfyVO> classify) {
- this.classify = classify;
- }
-
- @Override
- public String toString() {
- return "ClassfysVO{" +
- "classify=" + classify +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/InterParameterVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/InterParameterVO.java
deleted file mode 100644
index a41591e..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/InterParameterVO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-/***
- * 闆嗘垚鎺ュ彛鍙傛暟锛堢敵璇�/鏇存柊锛岀姸鎬侊級
- */
-public class InterParameterVO {
- private RootDataVO data;
- public RootDataVO getData() {
- return data;
- }
- public void setData(RootDataVO data) {
- this.data = data;
- }
-
- @Override
- public String toString() {
- return "InterParameterVO{" +
- "data=" + data +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ProppertyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ProppertyVO.java
deleted file mode 100644
index b5f9e3c..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/ProppertyVO.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-@XStreamAlias("prop")
-public class ProppertyVO {
- /**
- * 灞炴�у瓧娈�
- */
- @XStreamAsAttribute
- private String key;
- /**
- * 灞炴�ф樉绀哄悕绉�
- */
- @XStreamAsAttribute
- private String text;
- /**
- * 灞炴�у��
- */
- @XStreamAsAttribute
- private String value;
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "ProppertyVO{" +
- "key='" + key + '\'' +
- ", text='" + text + '\'' +
- ", value='" + value + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/RootDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/RootDataVO.java
deleted file mode 100644
index 780777a..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/RootDataVO.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-/**
- *鏁版嵁淇℃伅
- */
-@XStreamAlias("data")
-public class RootDataVO {
- /***
- * 闆嗘垚绯荤粺鏍囪瘑
- */
- @XStreamAsAttribute
- private String systemId;
- /**
- * 鎿嶄綔鐢ㄦ埛淇℃伅
- */
- private UserVO user;
- /***
- * 鏁版嵁淇℃伅
- */
- private ClassfysVO classifys;
-
-
- public String getSystemId() {
- return systemId;
- }
-
- public void setSystemId(String systemId) {
- this.systemId = systemId;
- }
-
- public UserVO getUser() {
- return user;
- }
-
- public void setUser(UserVO user) {
- this.user = user;
- }
-
- public ClassfysVO getClassifys() {
- return classifys;
- }
-
- public void setClassifys(ClassfysVO classifys) {
- this.classifys = classifys;
- }
-
- @Override
- public String toString() {
- return "InterParameterVO{" +
- "systemId='" + systemId + '\'' +
- ", user=" + user +
- ", classifys=" + classifys +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/SectionVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/SectionVO.java
deleted file mode 100644
index f749e12..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/SectionVO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-@XStreamAlias("section")
-public class SectionVO {
- /**
- * 鐮佹鍚嶇О
- */
- @XStreamAsAttribute
- private String name;
- /***
- * 鐮佹鍊�
- */
- @XStreamAsAttribute
- private String value;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "SectionVO{" +
- "name='" + name + '\'' +
- ", value='" + value + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/SectionsVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/SectionsVO.java
deleted file mode 100644
index bf3da16..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/SectionsVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-@XStreamAlias("sections")
-public class SectionsVO {
- @XStreamImplicit
- private List<SectionVO> section;
- public List<SectionVO> getSection() {
- return section;
- }
-
- public void setSection(List<SectionVO> section) {
- this.section = section;
- }
-
- @Override
- public String toString() {
- return "SectionsVO{" +
- "section=" + section +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/UserVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/UserVO.java
deleted file mode 100644
index 09dd685..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/apply/UserVO.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.apply;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-@XStreamAlias("user")
-public class UserVO {
- /**
- * 鍒涘缓/鏇存敼浜鸿处鍙�
- */
- @XStreamAsAttribute
- private String userName;
- /**
- * 鍒涘缓/鏇存敼浜烘樉绀哄悕绉�
- */
- @XStreamAsAttribute
- private String trueName;
- /**
- * 鍒涘缓/鏇存敼浜烘搷浣滄満鍣╥p
- */
- @XStreamAsAttribute
- private String ip;
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getTrueName() {
- return trueName;
- }
-
- public void setTrueName(String trueName) {
- this.trueName = trueName;
- }
-
- public String getIp() {
- return ip;
- }
-
- public void setIp(String ip) {
- this.ip = ip;
- }
-
- @Override
- public String toString() {
- return "UserVO{" +
- "userName='" + userName + '\'' +
- ", trueName='" + trueName + '\'' +
- ", ip='" + ip + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/ClsfAttrMappingDO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/ClsfAttrMappingDO.java
deleted file mode 100644
index b824ce1..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/ClsfAttrMappingDO.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.attrmap;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-/**
- * 灞炴�ф槧灏�
- */
-@XStreamAlias("clsf")
-public class ClsfAttrMappingDO {
- /***
- * 鏁版嵁婧愮郴缁熷唴閮ㄥ瓧娈�
- */
- @XStreamAsAttribute
- private String sourceKey="";
- /***
- * 鏁版嵁婧愮郴缁熷悕绉�
- */
- @XStreamAsAttribute
- private String sourceName="";
- /***
- * 鐩爣绯荤粺鍐呴儴瀛楁
- */
- @XStreamAsAttribute
- private String targetKey="" ;
- /***
- * 鐩爣绯荤粺鍐呴儴鍚嶇О
- */
- @XStreamAsAttribute
- private String targetName="";
-
- public String getSourceKey() {
- return sourceKey;
- }
-
- public void setSourceKey(String sourceKey) {
- this.sourceKey = sourceKey;
- }
-
- public String getSourceName() {
- return sourceName;
- }
-
- public void setSourceName(String sourceName) {
- this.sourceName = sourceName;
- }
-
- public String getTargetKey() {
- return targetKey;
- }
-
- public void setTargetKey(String targetKey) {
- this.targetKey = targetKey;
- }
-
- public String getTargetName() {
- return targetName;
- }
-
- public void setTargetName(String targetName) {
- this.targetName = targetName;
- }
-
- @Override
- public String toString() {
- return "ClsfAttrMappingDO{" +
- "sourceKey='" + sourceKey + '\'' +
- ", sourceName='" + sourceName + '\'' +
- ", targetKey='" + targetKey + '\'' +
- ", targetName='" + targetName + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/DataAttributeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/DataAttributeVO.java
deleted file mode 100644
index 91860a3..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/DataAttributeVO.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.attrmap;
-
-public class DataAttributeVO {
- /**
- * 瀛楁鍚�
- */
- private String field;
- /***
- * 灞炴�ф樉绀哄悕绉�
- */
- private String text;
-
- /**
- * 蹇呭～
- */
- private boolean required;
-
- /**
- * 鍏抽敭灞炴��
- */
- private boolean keyAttr;
-
-
- /**
- * 榛樿鍊�
- */
- private String defaultValue;
-
- /**
- * 鍊�
- */
- private String value;
-
- /**
- * 鍓嶇紑
- */
- private String prefix;
-
- /**
- * 鍓嶇紑
- */
- private String suffix;
-
- public String getField() {
- return field;
- }
-
- public void setField(String field) {
- this.field = field;
- }
-
- public boolean isRequired() {
- return required;
- }
-
- public void setRequired(boolean required) {
- this.required = required;
- }
-
- public boolean isKeyAttr() {
- return keyAttr;
- }
-
- public void setKeyAttr(boolean keyAttr) {
- this.keyAttr = keyAttr;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public String getPrefix() {
- return prefix;
- }
-
- public void setPrefix(String prefix) {
- this.prefix = prefix;
- }
-
- public String getSuffix() {
- return suffix;
- }
-
- public void setSuffix(String suffix) {
- this.suffix = suffix;
- }
-
- @Override
- public String toString() {
- return "DataObjectVO{" +
- "field='" + field + '\'' +
- ", required=" + required +
- ", keyAttr=" + keyAttr +
- ", defaultValue='" + defaultValue + '\'' +
- ", value='" + value + '\'' +
- ", prefix='" + prefix + '\'' +
- ", suffix='" + suffix + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/DataObjectVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/DataObjectVO.java
deleted file mode 100644
index 4d2071e..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/DataObjectVO.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.attrmap;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DataObjectVO {
- private List<String> colName = new ArrayList();
- private List<RowDatas> rowData = new ArrayList();
-
- public List<String> getColName() {
- return colName;
- }
-
- public void setColName(List<String> colName) {
- this.colName = colName;
- }
- public List<RowDatas> getRowData() {
- return rowData;
- }
-
- public void setRowData(List<RowDatas> rowData) {
- this.rowData = rowData;
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/GeneralMappingUtil.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/GeneralMappingUtil.java
deleted file mode 100644
index 8be4a6f..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/GeneralMappingUtil.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.attrmap;
-
-public class GeneralMappingUtil {
-
- private static GeneralMappingUtil newInstance=null;
- public static GeneralMappingUtil getNewInstance() {
- if(newInstance==null){
- newInstance=new GeneralMappingUtil();
- }
- return newInstance;
- }
-
- /***
- * 閫氳繃绯荤粺鏍囪瘑鑾峰彇瀵瑰簲鐨勯泦鎴愬睘鎬ф槧灏�
- * @param system
- */
- private void getLibraryClsfAttrMapping(String system){
- try {
- /** String fileNamePath=LocalFileUtil.getProjectFolder();
- fileNamePath+=File.separator+"mdmInMapXml"+File.separator+"clsfAttrMap.xml";
- String clasAttrXml= LocalFileUtil.readContentForFile(fileNamePath);
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(ApplyCodeDO.class);
- xStream.autodetectAnnotations(true);
- ApplyCodeDO applyCodeDO = (ApplyCodeDO) xStream.fromXML(clasAttrXml);**/
- }catch (Throwable e){
- new Throwable("璇诲彇灞炴�ф槧灏勬枃浠跺嚭閿�!");
- }
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/LibraryClsfDO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/LibraryClsfDO.java
deleted file mode 100644
index 00f1794..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/LibraryClsfDO.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.attrmap;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-/***
- * 搴撹妭鐐�
- */
-@XStreamAlias("clsf")
-public class LibraryClsfDO {
- @XStreamAsAttribute
- private String library;
- @XStreamImplicit(itemFieldName="prop")
- private List<ClsfAttrMappingDO> prop;
-
-
- public String getLibrary() {
- return library;
- }
-
- public void setLibrary(String library) {
- this.library = library;
- }
- public List<ClsfAttrMappingDO> getProp() {
- return prop;
- }
-
- public void setProp(List<ClsfAttrMappingDO> prop) {
- this.prop = prop;
- }
-
- @Override
- public String toString() {
- return "LibraryClsfDO{" +
- "library='" + library + '\'' +
- ", prop=" + prop +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/LibraryDO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/LibraryDO.java
deleted file mode 100644
index 05514a2..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/LibraryDO.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.attrmap;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-/***
- * 搴撹妭鐐�
- */
-@XStreamAlias("clsfs")
-public class LibraryDO {
- /***
- * 搴撹妭鐐�
- */
- @XStreamImplicit(itemFieldName="clsf")
- private List<LibraryClsfDO> clsf;
-
- public List<LibraryClsfDO> getClsf() {
- return clsf;
- }
-
- public void setClsf(List<LibraryClsfDO> clsf) {
- this.clsf = clsf;
- }
-
- @Override
- public String toString() {
- return "LibraryDO{" +
- "clsf=" + clsf +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/RowDatas.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/RowDatas.java
deleted file mode 100644
index a93a87d..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/RowDatas.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.attrmap;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class RowDatas {
- /**
- * 鏁版嵁id
- */
- private String oid;
- /***
- * 鍒涘缓鑰�
- */
- private String creator;
- /***
- * 鏇存敼鑰�
- */
- private String editor;
- /**
- * 鏁版嵁浣嶇疆
- */
- private String rowIndex;
- /***
- * 鎿嶄綔绫诲瀷
- */
- private String operation;
- /**
- * 鏁版嵁鐘舵��
- */
- private String status;
- /***
- * 缂栫爜
- */
- private String code;
-
- private Map<Integer, String> data = new HashMap();
-
- private Map<String, String> filedValue = new HashMap();
-
- public String getOid() {
- return oid;
- }
-
- public void setOid(String oid) {
- this.oid = oid;
- }
-
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- public String getEditor() {
- return editor;
- }
-
- public void setEditor(String editor) {
- this.editor = editor;
- }
-
- public String getOperation() {
- return operation;
- }
-
- public void setOperation(String operation) {
- this.operation = operation;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getRowIndex() {
- return rowIndex;
- }
-
- public void setRowIndex(String rowIndex) {
- this.rowIndex = rowIndex;
- }
-
- public Map<Integer, String> getData() {
- return data;
- }
-
- public void setData(Map<Integer, String> data) {
- this.data = data;
- }
-
- public Map<String, String> getFiledValue() {
- return filedValue;
- }
-
- public void setFiledValue(Map<String, String> filedValue) {
- this.filedValue = filedValue;
- }
-
- @Override
- public String toString() {
- return "RowDatas{" +
- "oid='" + oid + '\'' +
- ", creator='" + creator + '\'' +
- ", editor='" + editor + '\'' +
- ", rowIndex='" + rowIndex + '\'' +
- ", operation='" + operation + '\'' +
- ", status='" + status + '\'' +
- ", code='" + code + '\'' +
- ", data=" + data +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/appcode.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/appcode.xml
deleted file mode 100644
index 9fa5094..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/appcode.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<data systemId="MPM">
- <user userName="weidy" trueName="" ip="127.0.0.1"/>
- <classifys>
- <classify classCode="020101" library="wupin" fullclsfNamePath="鐗╁搧##VCI##鏍囧噯浠�##VCI##铻烘爴">
- <sections>
- <section name="灞傜骇鐮佹" value="020101"></section>
- </sections>
- <objects>
- <object code="" id="0023401" status="Editing" operate="create" creator="weidy" >
- <prop key="name" text="鍚嶇О" value="娓╁害璋冭妭鍣�2333"/>
- <prop key="use" text="瑙勬牸" value="GB-002599"/>
- </object>
- <object code="" id="0023402" status="Editing" operate="create" creator="weidy">
- <prop key="name" text="鎵�灞炵粨鏋�" value="娓╁害璋冭妭鍣�"/>
- <prop key="use" text="瑙勬牸" value="GB-00257"/>
- </object>
- </objects>
- </classify>
- <classify classCode="020102" library="wupin" fullclsfNamePath="鐗╁搧##VCI##鏍囧噯浠�##VCI##铻烘瘝">
- <sections>
- <section name="灞傜骇鐮佹" value="020102"></section>
- </sections>
- <objects>
- <object code="" id="0023403" status="Editing" operate="create" creator="weidy">
- <prop key="name" text="鍚嶇О" value="娓╁害璋冭妭鍣�2"/>
- <prop key="use" text="瑙勬牸" value="GB-00255"/>
- </object>
- <object code="" id="0023404" status="Editing" operate="create" creator="weidy">
- <prop key="name" text="鎵�灞炵粨鏋�" value="qwqw"/>
- <prop key="use" text="瑙勬牸" value="GB-0026"/>
- </object>
- </objects>
- </classify>
- </classifys>
-</data>
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/clsfAttrMap.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/clsfAttrMap.xml
deleted file mode 100644
index 854294d..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/clsfAttrMap.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<clsfs>
- <clsf library="StdLib">
- <prop sourceKey="lcstatus" sourceName="鐘舵��" targetKey="lcstatus" targetName="鐘舵��"/>
- <prop sourceKey="id" sourceName="鐗╂枡缂栫爜" targetKey="id" targetName="鐗╂枡缂栫爜"/>
- <prop sourceKey="partName" sourceName="鍚嶇О" targetKey="name" targetName="鐗╁搧涓枃鍚嶇О"/>
- <prop sourceKey="materialclassify" sourceName="鎵�灞炲垎绫讳唬鍙�" targetKey=" materialclassify" targetName="鎵�灞炲垎绫讳唬鍙�"/>
- <prop sourceKey="firstfl" sourceName="涓�绾х鐞嗗垎绫�" targetKey="firstfl" targetName="涓�绾х鐞嗗垎绫�"/>
- <prop sourceKey="secondfl" sourceName="浜岀骇绠＄悊鍒嗙被" targetKey="secondfl" targetName="浜岀骇绠＄悊鍒嗙被"/>
- <prop sourceKey="thrifl" sourceName="涓夌骇绠＄悊鍒嗙被" targetKey="thrifl" targetName="涓夌骇绠＄悊鍒嗙被"/>
- <prop sourceKey="瑙勬牸" sourceName="瑙勬牸" targetKey="xinghaoguige" targetName="瑙勬牸"/>
- <prop sourceKey="zhiliangbz" sourceName="鏍囧噯鍙�" targetKey="zhiliangbz" targetName="鏍囧噯鍙�"/>
- <prop sourceKey="beizhushuoming" sourceName="澶囨敞璇存槑" targetKey="beizhushuoming" targetName="澶囨敞璇存槑"/>
- <prop sourceKey="revisionvalue" sourceName="鐗堟湰" targetKey="revisionvalue" targetName="鐗堟湰"/>
- <prop sourceKey="creator" sourceName="鍒涘缓浜�" targetKey=" creator " targetName="鍒涘缓浜�"/>
- <prop sourceKey="createtime" sourceName="鍒涘缓鏃堕棿" targetKey="createtime" targetName="鍒涘缓鏃堕棿"/>
- <prop sourceKey="lastmodifier" sourceName="鏈�鍚庝慨鏀逛汉" targetKey="lastmodifier" targetName="鏈�鍚庝慨鏀逛汉"/>
- <prop sourceKey="lastmodifytime" sourceName="鏈�鍚庝慨鏀规椂闂�" targetKey="lastmodifytime" targetName="鏈�鍚庝慨鏀规椂闂�"/>
- <prop sourceKey="琛ㄩ潰澶勭悊" sourceName="琛ㄩ潰澶勭悊" targetKey="bmcl" targetName="琛ㄩ潰澶勭悊"/>
- <prop sourceKey="partNo" sourceName="鐗屽彿" targetKey="clph" targetName="鏉愭枡鐗屽彿"/>
- <prop sourceKey="cpxs" sourceName="浜у搧鍨嬪紡" targetKey="cpxs" targetName="浜у搧鍨嬪紡"/>
- <prop sourceKey="xbj" sourceName="鏍囪 " targetKey="xbj" targetName="鏍囪"/>
- <prop sourceKey="淇濋櫓瀛斿瀷寮�" sourceName="淇濋櫓瀛斿瀷寮�" targetKey="xbxkxs" targetName="淇濋櫓瀛斿瀷寮�"/>
- <prop sourceKey="xbzjbmc" sourceName="鏍囧噯绾у埆鍚嶇О" targetKey="xbzjbmc" targetName="鏍囧噯绾у埆鍚嶇О"/>
- <prop sourceKey="xfjjstj" sourceName="闄勫姞鎶�鏈潯浠�" targetKey="xfjjstj" targetName="闄勫姞鎶�鏈潯浠� "/>
- <prop sourceKey="xgzccdgcd" sourceName="鍏虫敞灏哄鐨勫叕宸甫" targetKey="xgzccdgcd" targetName="鍏虫敞灏哄鐨勫叕宸甫"/>
- <prop sourceKey="xwlwwmc" sourceName="鐗╁搧澶栨枃鍚嶇О" targetKey="xwlwwmc" targetName="鐗╁搧澶栨枃鍚嶇О"/>
- <prop sourceKey="xxndj" sourceName="鎬ц兘绛夌骇" targetKey="xxndj" targetName="鎬ц兘绛夌骇"/>
- <prop sourceKey="xzjmc" sourceName="瀛愪欢鍚嶇О" targetKey="xzjmc" targetName="瀛愪欢鍚嶇О"/>
- <prop sourceKey="zjxh" sourceName="瀛愪欢搴忓彿" targetKey="zjxh" targetName="瀛愪欢搴忓彿"/>
- </clsf>
- <clsf library="CP">
- <prop sourceKey= "lcstatus" sourceName= "鐘舵��" targetKey= "lcstatus" targetName= "鐘舵��" />
- <prop sourceKey= "id" sourceName= "鐗╁搧缂栫爜" targetKey= "id" targetName= "鐗╁搧缂栫爜" />
- <prop sourceKey= "firstfl" sourceName= "涓�绾х鐞嗗垎绫�" targetKey= "firstfl" targetName= "涓�绾х鐞嗗垎绫�" />
- <prop sourceKey= "secondfl" sourceName= "浜岀骇绠＄悊鍒嗙被" targetKey= "secondfl" targetName= "浜岀骇绠＄悊鍒嗙被" />
- <prop sourceKey= "thrifl" sourceName= "涓夌骇绠＄悊鍒嗙被" targetKey= "thrifl" targetName= "涓夌骇绠＄悊鍒嗙被" />
- <prop sourceKey= "description" sourceName= "澶囨敞璇存槑" targetKey= "description" targetName= "澶囨敞璇存槑" />
- <prop sourceKey= "revisionvalue" sourceName= "鐗堟湰" targetKey= "revisionvalue" targetName= "鐗堟湰" />
- <prop sourceKey= "creator" sourceName= "鍒涘缓浜�" targetKey= "creator" targetName= "鍒涘缓浜�" />
- <prop sourceKey= "createtime" sourceName= "鍒涘缓鏃堕棿" targetKey= "createtime" targetName= "鍒涘缓鏃堕棿" />
- <prop sourceKey= "lastmodifier" sourceName= "鏈�鍚庝慨鏀逛汉" targetKey= "lastmodifier" targetName= "鏈�鍚庝慨鏀逛汉" />
- <prop sourceKey= "lastmodifytime" sourceName= "鏈�鍚庝慨鏀规椂闂�" targetKey= "lastmodifytime" targetName= "鏈�鍚庝慨鏀规椂闂�" />
- <prop sourceKey= "jsbmc" sourceName= "璁惧鍚嶇О" targetKey= "jsbmc" targetName= "璁惧鍚嶇О" />
- <prop sourceKey= "jsbxh" sourceName= "璁惧鍨嬪彿" targetKey= "jsbxh" targetName= "璁惧鍨嬪彿" />
- <prop sourceKey= "jsccj" sourceName= "鐢熶骇鍘傚" targetKey= "jsccj" targetName= "鐢熶骇鍘傚" />
- <prop sourceKey= "jssxt" sourceName= "鎵�灞炵郴缁�" targetKey= "jssxt" targetName= "鎵�灞炵郴缁�" />
- <prop sourceKey= "jszgl" sourceName= "涓夎酱鎯噺" targetKey= "jszgl" targetName= "涓夎酱鎯噺" />
- <prop sourceKey= "jzl" sourceName= "閲嶉噺" targetKey= "jzl" targetName= "閲嶉噺" />
- <prop sourceKey= "jzrxx" sourceName= "璐ｄ换淇℃伅" targetKey= "jzrxx" targetName= "璐ｄ换淇℃伅" />
- <prop sourceKey= "jzxzb" sourceName= "閲嶅績鍧愭爣" targetKey= "jzxzb" targetName= "閲嶅績鍧愭爣" />
- <prop sourceKey= "jjzyq" sourceName= "鍑忛渿瑕佹眰" targetKey= "jjzyq" targetName= "鍑忛渿瑕佹眰" />
- </clsf>
-</clsfs>
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/tt.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/tt.xml
deleted file mode 100644
index 1323403..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/tt.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<data systemId="MPM">
- <user userName="weidy" trueName="榄忓ぇ鍕�" ip="127.0.0.1"/>
- <classifys>
- <classify classCode="020101" library="wupin" fullclsfNamePath="鐗╁搧##VCI##鏍囧噯浠�##VCI##铻烘爴">
- <objects>
- <object code="02010100013" id="02010100013" status="TakeBack" operate="editstatus" editor="weidy" >
- <prop key="name" text="鍚嶇О" value="娓╁害璋冭妭鍣�1"/>
- <prop key="use" text="涓昏鍔熻兘" value="瀵肩數杩炴帴1"/>
- </object>
- <object code="02010100012" id="02010100012" status="TakeBack" operate="editstatus" editor="weidy">
- <prop key="name" text="鎵�灞炵粨鏋�" value="娓╁害璋冭妭鍣�2"/>
- <prop key="use" text="涓昏鍔熻兘" value="瀵肩數杩炴帴2"/>
- </object>
- </objects>
- </classify>
- </classifys>
-</data>
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/xxx.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/xxx.json
deleted file mode 100644
index 67100ad..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/xxx.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "condtions": {
- "systemId": "MPM",
- "user": {
- "userName": "weidy",
- "ip": "127.0.0.1"
- },
- "condtion": {
- "classCode": "020101",
- "library": "wupin",
- "queryFileds": "id,name,zhiliangbz,clph,firstfl,secondfl,thrifl",
- "pro": [
- {
- "filedName": "name",
- "filedValue": "鍙戝姩鏈�"
- },
- {
- "filedName": "zhiliangbz",
- "filedValue": "223"
- }
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/xxxxxxxxx.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/xxxxxxxxx.json
deleted file mode 100644
index 3b2d5e7..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/attrmap/xxxxxxxxx.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- "data": {
- "classifys": {
- "classify": [
- {
- "classCode": "020104",
- "fullclsfNamePath": "",
- "library": "StdLib",
- "objects": {
- "object": [
- {
- "code": "",
- "creator": "weidy",
- "id": "201",
- "operate": "create",
- "prop": [
- {
- "key": "partNo",
- "text": "鐗屽彿",
- "value": "HB1-221"
- },
- {
- "key": "partName",
- "text": "鍚嶇О",
- "value": "鍗婂渾澶磋灪閽�"
- },
- {
- "key": "PartNumber",
- "text": "",
- "value": "HB1-221-M4*5"
- },
- {
- "key": "鐗屽彿",
- "text": "",
- "value": "HB1-221"
- },
- {
- "key": "瑙勬牸",
- "text": "",
- "value": "M4"
- },
- {
- "key": "琛ㄩ潰澶勭悊",
- "text": "",
- "value": "鐢甸晙"
- },
- {
- "key": "淇濋櫓瀛斿瀷寮�",
- "text": "",
- "value": "鏃�"
- }
- ],
- "status": "Published"
- }
- ]
- },
- "sections": {
- "section": [
- {
- "name": "灞傜骇鐮佹",
- "value": "020104"
- }
- ]
- }
- }
- ]
- },
- "systemId": "RLM",
- "user": {
- "ip": "0:0:0:0:0:0:0:1",
- "trueName": "weidy",
- "userName": "weidy"
- }
- }
-}
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/ClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/ClassifyVO.java
deleted file mode 100644
index 9b51c6a..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/ClassifyVO.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.classify;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-@XStreamAlias("classify")
-public class ClassifyVO {
- /**
- * 鍒嗙被id
- */
- @XStreamAsAttribute
- private String id;
- /***
- * 鍒嗙被鍚嶇О
- */
- @XStreamAsAttribute
- private String name;
- /***
- * 鐖惰妭鐐筰d
- */
- @XStreamAsAttribute
- private String pid;
- /***
- * 鍒嗙被浠ｅ彿
- */
- @XStreamAsAttribute
- private String classCode;
- /***
- * 鎻忚堪
- */
- @XStreamAsAttribute
- private String description;
- /***
- * 鍒嗙被閾炬帴璺緞
- */
- @XStreamAsAttribute
- private String fullPathName;
- /***
- * 鍒嗙被鐘舵��
- */
- @XStreamAsAttribute
- private String lcStatus;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPid() {
- return pid;
- }
-
- public void setPid(String pid) {
- this.pid = pid;
- }
-
- public String getClassCode() {
- return classCode;
- }
-
- public void setClassCode(String classCode) {
- this.classCode = classCode;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getFullPathName() {
- return fullPathName;
- }
-
- public void setFullPathName(String fullPathName) {
- this.fullPathName = fullPathName;
- }
-
- public String getLcStatus() {
- return lcStatus;
- }
-
- public void setLcStatus(String lcStatus) {
- this.lcStatus = lcStatus;
- }
-
- @Override
- public String toString() {
- return "ClassifyVO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", pid='" + pid + '\'' +
- ", classCode='" + classCode + '\'' +
- ", description='" + description + '\'' +
- ", fullPathName='" + fullPathName + '\'' +
- ", lcStatus='" + lcStatus + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/LibraryVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/LibraryVO.java
deleted file mode 100644
index 0373bf8..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/LibraryVO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.classify;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-@XStreamAlias("library ")
-public class LibraryVO {
- @XStreamAsAttribute
- private String id;
- @XStreamAsAttribute
- private String name;
- @XStreamImplicit
- private List<ClassifyVO>classify;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public List<ClassifyVO> getClassify() {
- return classify;
- }
-
- public void setClassify(List<ClassifyVO> classify) {
- this.classify = classify;
- }
-
- @Override
- public String toString() {
- return "LibraryVO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", classify=" + classify +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/QueryClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/QueryClassifyVO.java
deleted file mode 100644
index 5d6e451..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/QueryClassifyVO.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.classify;
-
-public class QueryClassifyVO {
- /***
- *
- */
- private QueryData data;
-
- public QueryData getData() {
- return data;
- }
-
- public void setData(QueryData data) {
- this.data = data;
- }
-
- @Override
- public String toString() {
- return "QueryClassifyVO{" +
- "data=" + data +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/QueryData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/QueryData.java
deleted file mode 100644
index 4134a08..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/QueryData.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.classify;
-
-import com.vci.ubcs.code.vo.universalInter.apply.UserVO;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-@XStreamAlias("data")
-public class QueryData {
- @XStreamAsAttribute
- private String systemId;
- private UserVO userVo;
- private QueryLibraryVO library ;
- public QueryLibraryVO getLibrary() {
- return library;
- }
-
- public void setLibrary(QueryLibraryVO library) {
- this.library = library;
- }
-
- public String getSystemId() {
- return systemId;
- }
-
- public void setSystemId(String systemId) {
- this.systemId = systemId;
- }
-
- public UserVO getUserVo() {
- return userVo;
- }
-
- public void setUserVo(UserVO userVo) {
- this.userVo = userVo;
- }
-
- @Override
- public String toString() {
- return "QueryData{" +
- "systemId='" + systemId + '\'' +
- ", library=" + library +
- '}';
- }
-}
-
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/QueryLibraryVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/QueryLibraryVO.java
deleted file mode 100644
index 28c0d19..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/QueryLibraryVO.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.classify;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-@XStreamAlias("library")
-public class QueryLibraryVO {
- @XStreamAsAttribute
- private String id;
- @XStreamImplicit
- private List<String> classifyid;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public List<String> getClassifyid() {
- return classifyid;
- }
-
- public void setClassifyid(List<String> classifyid) {
- this.classifyid = classifyid;
- }
-
- @Override
- public String toString() {
- return "LibraryVO{" +
- "id='" + id + '\'' +
- ", classifyid=" + classifyid +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/ResultClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/ResultClassifyVO.java
deleted file mode 100644
index 630729f..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/ResultClassifyVO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.classify;
-
-public class ResultClassifyVO {
-
- private ResultData resultData;
-
- public ResultData getResultData() {
- return resultData;
- }
-
- public void setResultData(ResultData resultData) {
- this.resultData = resultData;
- }
-
- @Override
- public String toString() {
- return "ResultClassifyVO{" +
- "resultData=" + resultData +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/ResultData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/ResultData.java
deleted file mode 100644
index 742a140..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/ResultData.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.classify;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-
-@XStreamAlias("data")
-public class ResultData {
- @XStreamAlias("errorid")
- private String errorid;
- @XStreamAlias("msg")
- private String msg;
- private LibraryVO library ;
-
- public LibraryVO getLibrary() {
- return library;
- }
-
- public void setLibrary(LibraryVO library) {
- this.library = library;
- }
-
- public String getErrorid() {
- return errorid;
- }
-
- public void setErrorid(String errorid) {
- this.errorid = errorid;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- @Override
- public String toString() {
- return "ResultData{" +
- "code='" + errorid + '\'' +
- ", msg='" + msg + '\'' +
- ", library=" + library +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/classify.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/classify.xml
deleted file mode 100644
index 6c0fd68..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/classify.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<data>
- <code>0</code>
- <msg>鎴愬姛!</msg>
- <library id="wupin" name="">
- <classify id="535FC9B6-FE27-241F-5FCA-ED4DC17CF95B" name="浜у搧" pid="D9CF223F-317D-71EB-BD11-433A94CAD9F3" classCode="01" description="浜у搧" lcStatus="Enabled"/>
- <classify id="8EB35A1D-AB8B-2255-565C-84D309E0C62B" name="涓绘満浜у搧" pid="535FC9B6-FE27-241F-5FCA-ED4DC17CF95B" classCode="0101" description="涓绘満浜у搧" lcStatus="Enabled"/>
- <classify id="4524E801-6CC6-92E8-1AC3-2AB9604E8F96" name="涓绘満浜у搧" pid="8EB35A1D-AB8B-2255-565C-84D309E0C62B" classCode="010100" description="涓绘満浜у搧" lcStatus="Enabled"/>
- <classify id="5B72F92C-39EF-3CEB-8474-6B561DC8402B" name="鍦伴潰绔�" pid="535FC9B6-FE27-241F-5FCA-ED4DC17CF95B" classCode="0102" description="鍦伴潰绔�" lcStatus="Enabled"/>
- <classify id="56AE339C-9B2F-4298-6F9B-9F0615993DB1" name="CCS" pid="5B72F92C-39EF-3CEB-8474-6B561DC8402B" classCode="010201" description="CCS" lcStatus="Enabled"/>
- <classify id="FDB76D0A-D52B-45B6-47B4-89FE9C004ACD" name="DLS" pid="5B72F92C-39EF-3CEB-8474-6B561DC8402B" classCode="010202" description="DLS" lcStatus="Enabled"/>
- <classify id="AB557DD1-44F7-6256-C772-254605D9E554" name="SGDT" pid="5B72F92C-39EF-3CEB-8474-6B561DC8402B" classCode="010203" description="SGDT" lcStatus="Enabled"/>
- </library>
-</data>
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/xxx.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/xxx.json
deleted file mode 100644
index 8fcaf13..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/classify/xxx.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "resultData": {
- "msg": "鎴愬姛!",
- "code": "0",
- "library": {
- "classify": [
- {
- "classCode": "01",
- "lcStatus": "Enabled",
- "name": "浜у搧",
- "description": "浜у搧",
- "pid": "D9CF223F-317D-71EB-BD11-433A94CAD9F3",
- "id": "535FC9B6-FE27-241F-5FCA-ED4DC17CF95B"
- },
- {
- "classCode": "0101",
- "lcStatus": "Enabled",
- "name": "涓绘満浜у搧",
- "description": "涓绘満浜у搧",
- "pid": "535FC9B6-FE27-241F-5FCA-ED4DC17CF95B",
- "id": "8EB35A1D-AB8B-2255-565C-84D309E0C62B"
- },
- {
- "classCode": "010100",
- "lcStatus": "Enabled",
- "name": "涓绘満浜у搧",
- "description": "涓绘満浜у搧",
- "pid": "8EB35A1D-AB8B-2255-565C-84D309E0C62B",
- "id": "4524E801-6CC6-92E8-1AC3-2AB9604E8F96"
- },
- {
- "classCode": "0102",
- "lcStatus": "Enabled",
- "name": "鍦伴潰绔�",
- "description": "鍦伴潰绔�",
- "pid": "535FC9B6-FE27-241F-5FCA-ED4DC17CF95B",
- "id": "5B72F92C-39EF-3CEB-8474-6B561DC8402B"
- },
- {
- "classCode": "010201",
- "lcStatus": "Enabled",
- "name": "CCS",
- "description": "CCS",
- "pid": "5B72F92C-39EF-3CEB-8474-6B561DC8402B",
- "id": "56AE339C-9B2F-4298-6F9B-9F0615993DB1"
- },
- {
- "classCode": "010202",
- "lcStatus": "Enabled",
- "name": "DLS",
- "description": "DLS",
- "pid": "5B72F92C-39EF-3CEB-8474-6B561DC8402B",
- "id": "FDB76D0A-D52B-45B6-47B4-89FE9C004ACD"
- },
- {
- "classCode": "010203",
- "lcStatus": "Enabled",
- "name": "SGDT",
- "description": "SGDT",
- "pid": "5B72F92C-39EF-3CEB-8474-6B561DC8402B",
- "id": "AB557DD1-44F7-6256-C772-254605D9E554"
- }
- ],
- "name": "",
- "id": "wupin"
- }
- }
-}
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/CondtionVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/CondtionVO.java
deleted file mode 100644
index a296ae4..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/CondtionVO.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.data;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-@XStreamAlias("condtion")
-public class CondtionVO {
- @XStreamAsAttribute
- private String classCode;
- @XStreamAsAttribute
- private String library;
- @XStreamAsAttribute
- private String queryFileds;
- @XStreamImplicit
- private List<PropertyVO> pro;
- public String getClassCode() {
- return classCode;
- }
-
- public void setClassCode(String classCode) {
- this.classCode = classCode;
- }
-
- public String getLibrary() {
- return library;
- }
-
- public void setLibrary(String library) {
- this.library = library;
- }
-
- public String getQueryFileds() {
- return queryFileds;
- }
-
- public void setQueryFileds(String queryFileds) {
- this.queryFileds = queryFileds;
- }
-
- public List<PropertyVO> getPro() {
- return pro;
- }
-
- public void setPro(List<PropertyVO> pro) {
- this.pro = pro;
- }
-
- @Override
- public String toString() {
- return "CondtionVO{" +
- "classCode='" + classCode + '\'' +
- ", library='" + library + '\'' +
- ", queryFileds='" + queryFileds + '\'' +
- ", pro=" + pro +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/CondtionsVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/CondtionsVO.java
deleted file mode 100644
index e327212..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/CondtionsVO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.data;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.vci.ubcs.code.vo.universalInter.apply.UserVO;
-
-@XStreamAlias("condtions")
-public class CondtionsVO {
- @XStreamAsAttribute
- private String systemId;
-
- private UserVO user;
-
- private CondtionVO condtion;
-
- public String getSystemId() {
- return systemId;
- }
-
- public void setSystemId(String systemId) {
- this.systemId = systemId;
- }
-
- public UserVO getUser() {
- return user;
- }
-
- public void setUser(UserVO user) {
- this.user = user;
- }
-
- public CondtionVO getCondtion() {
- return condtion;
- }
-
- public void setCondtion(CondtionVO condtion) {
- this.condtion = condtion;
- }
-
- @Override
- public String toString() {
- return "CondtionsVO{" +
- "systemId='" + systemId + '\'' +
- ", user=" + user +
- ", condtion=" + condtion +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/DataCondtionsVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/DataCondtionsVO.java
deleted file mode 100644
index 7ba8788..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/DataCondtionsVO.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.data;
-
-public class DataCondtionsVO {
- private CondtionsVO condtions;
-
- public CondtionsVO getCondtions() {
- return condtions;
- }
-
- public void setCondtions(CondtionsVO condtions) {
- this.condtions = condtions;
- }
-
- @Override
- public String toString() {
- return "DataCondtionsVO{" +
- "condtions=" + condtions +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/DataObjectVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/DataObjectVO.java
deleted file mode 100644
index 5f2792b..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/DataObjectVO.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.data;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-@XStreamAlias("object")
-public class DataObjectVO {
- @XStreamAsAttribute
- private String code;
- @XStreamAsAttribute
- private String status;
- @XStreamAsAttribute
- private String library;
- @XStreamAsAttribute
- private String classCode;
- @XStreamImplicit
- private List<PropertyVO> pro;
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getLibrary() {
- return library;
- }
-
- public void setLibrary(String library) {
- this.library = library;
- }
-
- public String getClassCode() {
- return classCode;
- }
-
- public void setClassCode(String classCode) {
- this.classCode = classCode;
- }
-
- public List<PropertyVO> getPro() {
- return pro;
- }
-
- public void setPro(List<PropertyVO> pro) {
- this.pro = pro;
- }
-
- @Override
- public String toString() {
- return "DataObjectVO{" +
- "code='" + code + '\'' +
- ", status='" + status + '\'' +
- ", library='" + library + '\'' +
- ", classCode='" + classCode + '\'' +
- ", pro=" + pro +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/PropertyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/PropertyVO.java
deleted file mode 100644
index f6ff00f..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/PropertyVO.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.data;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-@XStreamAlias("pro")
-public class PropertyVO {
- @XStreamAsAttribute
- private String filedName;
- @XStreamAsAttribute
- private String outname;
-
- @XStreamAsAttribute
- private String filedValue;
-
- public String getFiledName() {
- return filedName;
- }
-
- public void setFiledName(String filedName) {
- this.filedName = filedName;
- }
-
- public String getFiledValue() {
- return filedValue;
- }
-
- public void setFiledValue(String filedValue) {
- this.filedValue = filedValue;
- }
-
- public String getOutname() {
- return outname;
- }
-
- public void setOutname(String outname) {
- this.outname = outname;
- }
-
- @Override
- public String toString() {
- return "PropertyVO{" +
- "filedName='" + filedName + '\'' +
- ", outname='" + outname + '\'' +
- ", filedValue='" + filedValue + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/ResultDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/ResultDataVO.java
deleted file mode 100644
index 96bfa3c..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/ResultDataVO.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.data;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
-
-import java.util.List;
-
-@XStreamAlias("data")
-public class ResultDataVO {
- private String errorid;
- private String msg;
- @XStreamImplicit
- private List<DataObjectVO> object;
-
- public List<DataObjectVO> getObject() {
- return object;
- }
-
- public void setObject(List<DataObjectVO> object) {
- this.object = object;
- }
-
- public String getErrorid() {
- return errorid;
- }
-
- public void setErrorid(String errorid) {
- this.errorid = errorid;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- @Override
- public String toString() {
- return "ResultDataVO{" +
- "errorid='" + errorid + '\'' +
- ", msg='" + msg + '\'' +
- ", object=" + object +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/ResultVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/ResultVO.java
deleted file mode 100644
index 2126f69..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/ResultVO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.data;
-
-public class ResultVO {
-
- private ResultDataVO data;
-
- public ResultDataVO getData() {
- return data;
- }
-
- public void setData(ResultDataVO data) {
- this.data = data;
- }
-
- @Override
- public String toString() {
- return "ResultVO{" +
- "data=" + data +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/result.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/result.json
deleted file mode 100644
index d9d24f7..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/result.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
- "data": {
- "classifys": {
- "classify": [
- {
- "classCode": "010301",
- "fullclsfNamePath": "",
- "library": "EqpLib",
- "objects": {
- "object": [
- {
- "code": "",
- "creator": "weidy",
- "id": "20",
- "operate": "create",
- "prop": [
- {
- "key": "fpNo",
- "text": "璁惧鍨嬪彿",
- "value": "11sdsa22"
- },
- {
- "key": "fpName",
- "text": "璁惧鍚嶇О",
- "value": "椤堕《椤堕《12"
- },
- {
- "key": "manufacturer",
- "text": "鐢熶骇鍘傚",
- "value": "鍛滃憸鍛滃憸2"
- },
- {
- "key": "belongSystem",
- "text": "鎵�灞炵郴缁�",
- "value": "鍛滃憸鍛滃憸2"
- },
- {
- "key": "responsibilityInfo",
- "text": "璐ｄ换浜轰俊鎭�",
- "value": "鏂囧憙鍛冨憙2"
- },
- {
- "key": "fpWeight",
- "text": "閲嶉噺锛圞G锛�",
- "value": "12"
- },
- {
- "key": "gravityX",
- "text": "閲嶅績X",
- "value": "22"
- },
- {
- "key": "gravityY",
- "text": "閲嶅績Y",
- "value": "32"
- },
- {
- "key": "gravityZ",
- "text": "閲嶅績Z",
- "value": "42"
- },
- {
- "key": "inertiaX",
- "text": "杞姩鎯噺X",
- "value": "52"
- },
- {
- "key": "inertiaY",
- "text": "杞姩鎯噺Y",
- "value": "62"
- },
- {
- "key": "inertiaZ",
- "text": "杞姩鎯噺Z",
- "value": "72"
- },
- {
- "key": "inertiaXY",
- "text": "杞姩鎯噺XY",
- "value": "82"
- },
- {
- "key": "inertiaYZ",
- "text": "杞姩鎯噺YZ",
- "value": "92"
- },
- {
- "key": "inertiaXZ",
- "text": "杞姩鎯噺XZ",
- "value": "102"
- },
- {
- "key": "operatingTemperatureLimit",
- "text": "宸ヤ綔娓╁害闄愬埗",
- "value": "162"
- },
- {
- "key": "equipmentPower",
- "text": "璁惧鍔熺巼锛堜緵鐢靛姛鐜囥�佽緪灏勫姛鐜囷級",
- "value": "172"
- },
- {
- "key": "electricModel",
- "text": "鐢佃繛鎺ュ櫒鍨嬪彿",
- "value": "182"
- },
- {
- "key": "fpAgreement",
- "text": "鎴愬搧鍗忚涔�",
- "value": "192"
- }
- ],
- "status": "Released"
- }
- ]
- },
- "sections": {
- "section": [
- {
- "name": "灞傜骇鐮佹",
- "value": "010301"
- }
- ]
- }
- }
- ]
- },
- "systemId": "RLM",
- "user": {
- "ip": "0:0:0:0:0:0:0:1",
- "trueName": "weidy",
- "userName": "weidy"
- }
- }
-}
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/xx.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/xx.xml
deleted file mode 100644
index 3f4ad46..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/data/xx.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<data>
- <object>
- <code>01001</code>
- <oid>0001</oid>
- <erroid>0</erroid>
- <msg>娴嬭瘯鎴愬姛</msg>
- </object>
-</data>
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultClassfyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultClassfyVO.java
deleted file mode 100644
index d755599..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultClassfyVO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.json;
-
-public class JSONResultClassfyVO {
- private String classCode;
- private String library;
- private String fullclsfNamePath;
- private JSONResultDataObjectDO objects;
- public String getClassCode() {
- return classCode;
- }
-
- public void setClassCode(String classCode) {
- this.classCode = classCode;
- }
-
- public String getLibrary() {
- return library;
- }
-
- public void setLibrary(String library) {
- this.library = library;
- }
-
- public String getFullclsfNamePath() {
- return fullclsfNamePath;
- }
-
- public void setFullclsfNamePath(String fullclsfNamePath) {
- this.fullclsfNamePath = fullclsfNamePath;
- }
-
- public JSONResultDataObjectDO getObjects() {
- return objects;
- }
-
- public void setObjects(JSONResultDataObjectDO objects) {
- this.objects = objects;
- }
-
- @Override
- public String toString() {
- return "ResultClassfyVO{" +
- "classCode='" + classCode + '\'' +
- ", library='" + library + '\'' +
- ", fullclsfNamePath='" + fullclsfNamePath + '\'' +
- ", objects=" + objects +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultClassfysVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultClassfysVO.java
deleted file mode 100644
index bf4d03f..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultClassfysVO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.json;
-
-import java.util.List;
-public class JSONResultClassfysVO {
- private List<JSONResultClassfyVO> classify;
-
- public List<JSONResultClassfyVO> getClassify() {
- return classify;
- }
-
- public void setClassify(List<JSONResultClassfyVO> classify) {
- this.classify = classify;
- }
-
- @Override
- public String toString() {
- return "ResultClassfysVO{" +
- "classfy=" + classify +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultDataObjectDO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultDataObjectDO.java
deleted file mode 100644
index 3aca1e6..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultDataObjectDO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.json;
-
-import java.util.List;
-
-/***
- * objects鑺傜偣
- * @author xj
- */
-public class JSONResultDataObjectDO {
- /***
- * objects涓嬫暟鎹璞�
- */
- private List<JSONResultDataObjectDetailDO> object ;
- public List<JSONResultDataObjectDetailDO> getObject() {
- return object;
- }
- public void setObject(List<JSONResultDataObjectDetailDO> object) {
- this.object = object;
- }
- @Override
- public String toString() {
- return "ResultDataObjectDO{" +
- "object=" + object +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultDataObjectDetailDO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultDataObjectDetailDO.java
deleted file mode 100644
index 050844f..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultDataObjectDetailDO.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.json;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-/***
- * object鑺傜偣
- * @author xj
- */
-@XStreamAlias("obect")
-public class JSONResultDataObjectDetailDO {
- @XStreamAsAttribute
- private String id;
- @XStreamAsAttribute
- private String errorid;
- @XStreamAsAttribute
- private String code;
- @XStreamAlias("msg")
- private String msg;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getErrorid() {
- return errorid;
- }
-
- public void setErrorid(String errorid) {
- this.errorid = errorid;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- @Override
- public String toString() {
- return "ResultDataObjectDetailDO{" +
- "id='" + id + '\'' +
- ", errorid='" + errorid + '\'' +
- ", code='" + code + '\'' +
- ", msg='" + msg + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultDataVO.java
deleted file mode 100644
index 81d58c5..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultDataVO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.json;
-public class JSONResultDataVO {
- private JSONResultSystemVO data;
-
- public JSONResultSystemVO getData() {
- return data;
- }
-
- public void setData(JSONResultSystemVO data) {
- this.data = data;
- }
-
- @Override
- public String toString() {
- return "ResultDataVO{" +
- "data=" + data +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultSystemVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultSystemVO.java
deleted file mode 100644
index a6fdaee..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/JSONResultSystemVO.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.json;
-
-/***
- * 杩斿洖缁撴灉瀵硅薄
- */
-public class JSONResultSystemVO {
- /***
- * 閿欒鏍囪瘑
- */
- private String errorid;
- /***
- * 娑堟伅
- */
- private String msg;
- /**
- * 杩斿洖缁撴灉瀵硅薄
- */
- private JSONResultClassfysVO classifys;
-
- public String getErrorid() {
- return errorid;
- }
-
- public void setErrorid(String errorid) {
- this.errorid = errorid;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public JSONResultClassfysVO getClassifys() {
- return classifys;
- }
-
- public void setClassifys(JSONResultClassfysVO classifys) {
- this.classifys = classifys;
- }
-
- @Override
- public String toString() {
- return "ResultSystemVO{" +
- "errorid='" + errorid + '\'' +
- ", msg='" + msg + '\'' +
- ", classifys=" + classifys +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/tt.json b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/tt.json
deleted file mode 100644
index 848d6d3..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/json/tt.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- "data": {
- "classifys": {
- "classfy": [
- {
- "fullclsfNamePath": "鐗╁搧##VCI##鏍囧噯浠�##VCI##铻烘爴",
- "classCode": "020101",
- "library": "wupin",
- "objecs": {
- "object": [
- {
- "msg": ";鍏抽敭灞炴�ч噸澶�",
- "code": "",
- "errorid": "1",
- "id": "0023401"
- },
- {
- "msg": ";鍏抽敭灞炴�ч噸澶�;灞炴�鐗╂枡绫诲瀷]鐨勫�间笉绗﹀悎涓嬫媺鐨勮姹�;鍙傛暟灞炴�鏍哥畻鍒嗙被]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�璁￠噺鍗曚綅]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�渚涘簲鍟哴鐨勫�煎湪绯荤粺涓笉瀛樺湪;",
- "code": "",
- "errorid": "1",
- "id": "71467898-22DB-0D63-3D27-86FD7A124D25"
- },
- {
- "msg": ";鍏抽敭灞炴�ч噸澶�;灞炴�鐗╂枡绫诲瀷]鐨勫�间笉绗﹀悎涓嬫媺鐨勮姹�;鍙傛暟灞炴�鏍哥畻鍒嗙被]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�璁￠噺鍗曚綅]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�渚涘簲鍟哴鐨勫�煎湪绯荤粺涓笉瀛樺湪;;灞炴�鐗╂枡绫诲瀷]鐨勫�间笉绗﹀悎涓嬫媺鐨勮姹�;鍙傛暟灞炴�鏍哥畻鍒嗙被]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�璁￠噺鍗曚綅]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�渚涘簲鍟哴鐨勫�煎湪绯荤粺涓笉瀛樺湪;",
- "code": "",
- "errorid": "1",
- "id": "A9B58A76-751E-C96C-D410-CD4B5DD53800"
- }
- ]
- }
- },
- {
- "fullclsfNamePath": "鐗╁搧##VCI##鏍囧噯浠�##VCI##铻烘瘝",
- "classCode": "020102",
- "library": "wupin",
- "objecs": {
- "object": [
- {
- "msg": ";鍏抽敭灞炴�ч噸澶�",
- "code": "",
- "errorid": "1",
- "id": "0023401"
- },
- {
- "msg": ";鍏抽敭灞炴�ч噸澶�;灞炴�鐗╂枡绫诲瀷]鐨勫�间笉绗﹀悎涓嬫媺鐨勮姹�;鍙傛暟灞炴�鏍哥畻鍒嗙被]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�璁￠噺鍗曚綅]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�渚涘簲鍟哴鐨勫�煎湪绯荤粺涓笉瀛樺湪;",
- "code": "",
- "errorid": "1",
- "id": "454997A3-2F9F-73FC-3BFB-B33DEC77DC73"
- },
- {
- "msg": ";鍏抽敭灞炴�ч噸澶�;灞炴�鐗╂枡绫诲瀷]鐨勫�间笉绗﹀悎涓嬫媺鐨勮姹�;鍙傛暟灞炴�鏍哥畻鍒嗙被]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�璁￠噺鍗曚綅]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�渚涘簲鍟哴鐨勫�煎湪绯荤粺涓笉瀛樺湪;;灞炴�鐗╂枡绫诲瀷]鐨勫�间笉绗﹀悎涓嬫媺鐨勮姹�;鍙傛暟灞炴�鏍哥畻鍒嗙被]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�璁￠噺鍗曚綅]鐨勫�煎湪绯荤粺涓笉瀛樺湪;鍙傛暟灞炴�渚涘簲鍟哴鐨勫�煎湪绯荤粺涓笉瀛樺湪;",
- "code": "",
- "errorid": "1",
- "id": "39ABD489-177C-2894-EF16-1249F7625FC5"
- }
- ]
- }
- }
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultClassfyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultClassfyVO.java
deleted file mode 100644
index 6fa457e..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultClassfyVO.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.xml;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-import java.util.List;
-
-@XStreamAlias("classfy")
-public class XMLResultClassfyVO {
- @XStreamAsAttribute
- private String classCode;
- @XStreamAsAttribute
- private String library;
- @XStreamAsAttribute
- private String fullclsfNamePath;
- @XStreamAlias("objects")
- private List<XMLResultDataObjectDetailDO> objects;
-
- public String getClassCode() {
- return classCode;
- }
-
- public void setClassCode(String classCode) {
- this.classCode = classCode;
- }
-
- public String getLibrary() {
- return library;
- }
-
- public void setLibrary(String library) {
- this.library = library;
- }
-
- public String getFullclsfNamePath() {
- return fullclsfNamePath;
- }
-
- public void setFullclsfNamePath(String fullclsfNamePath) {
- this.fullclsfNamePath = fullclsfNamePath;
- }
-
- public List<XMLResultDataObjectDetailDO> getObjects() {
- return objects;
- }
-
- public void setObjects(List<XMLResultDataObjectDetailDO> objects) {
- this.objects = objects;
- }
-
- @Override
- public String toString() {
- return "ResultClassfyVO{" +
- "classCode='" + classCode + '\'' +
- ", library='" + library + '\'' +
- ", fullclsfNamePath='" + fullclsfNamePath + '\'' +
- ", objects=" + objects +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultDataObjectDetailDO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultDataObjectDetailDO.java
deleted file mode 100644
index c8d7d4a..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultDataObjectDetailDO.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.xml;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-/***
- * object鑺傜偣
- * @author xj
- */
-@XStreamAlias("object")
-public class XMLResultDataObjectDetailDO {
- @XStreamAsAttribute
- private String id;
- @XStreamAsAttribute
- private String errorid;
- @XStreamAsAttribute
- private String code;
- @XStreamAlias("msg")
- private String msg;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getErrorid() {
- return errorid;
- }
-
- public void setErrorid(String errorid) {
- this.errorid = errorid;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- @Override
- public String toString() {
- return "ResultDataObjectDetailDO{" +
- "id='" + id + '\'' +
- ", errorid='" + errorid + '\'' +
- ", code='" + code + '\'' +
- ", msg='" + msg + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultDataVO.java
deleted file mode 100644
index ffe4e11..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultDataVO.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.xml;
-
-public class XMLResultDataVO {
- private XMLResultSystemVO data;
- public XMLResultSystemVO getData() {
- return data;
- }
-
- public void setData(XMLResultSystemVO data) {
- this.data = data;
- }
-
- @Override
- public String toString() {
- return "ResultDataVO{" +
- "data=" + data +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultSystemVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultSystemVO.java
deleted file mode 100644
index db89fd3..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/universalInter/result/xml/XMLResultSystemVO.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.vci.ubcs.code.vo.universalInter.result.xml;
-
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
-
-import java.util.List;
-
-/***
- * 杩斿洖缁撴灉瀵硅薄
- */
-@XStreamAlias("data")
-public class XMLResultSystemVO {
- /***
- * 閿欒鏍囪瘑
- */
- @XStreamAsAttribute
- private String errorid;
- /***
- * 娑堟伅
- */
- @XStreamAlias("msg")
- private String msg;
- /**
- * 杩斿洖缁撴灉瀵硅薄
- */
- @XStreamAlias("classifys")
- private List<XMLResultClassfyVO> classifys;
-
- public String getErrorid() {
- return errorid;
- }
-
- public void setErrorid(String errorid) {
- this.errorid = errorid;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public List<XMLResultClassfyVO> getClassifys() {
- return classifys;
- }
-
- public void setClassifys(List<XMLResultClassfyVO> classifys) {
- this.classifys = classifys;
- }
-
- @Override
- public String toString() {
- return "ResultSystemVO{" +
- "errorid='" + errorid + '\'' +
- ", msg='" + msg + '\'' +
- ", classifys=" + classifys +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/annotation/Transient.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/annotation/Transient.java
new file mode 100644
index 0000000..8b248b4
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/annotation/Transient.java
@@ -0,0 +1,16 @@
+package com.vci.ubcs.com.vci.starter.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Transient {
+ boolean value() default true;
+
+ String referColumn() default "";
+
+ String valueField() default "oid";
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/annotation/VciEnum.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/annotation/VciEnum.java
new file mode 100644
index 0000000..706be18
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/annotation/VciEnum.java
@@ -0,0 +1,24 @@
+package com.vci.ubcs.com.vci.starter.annotation;
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.web.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface VciEnum {
+ String name() default "";
+
+ Class valueType() default String.class;
+
+ String text() default "";
+
+ String description() default "";
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/exception/VciBaseException.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/exception/VciBaseException.java
new file mode 100644
index 0000000..2c5e599
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/exception/VciBaseException.java
@@ -0,0 +1,80 @@
+package com.vci.ubcs.com.vci.starter.exception;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.vci.ubcs.com.vci.starter.web.util.MessageUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.MessageFormat;
+
+public class VciBaseException extends RuntimeException {
+ private Logger log = LoggerFactory.getLogger(this.getClass());
+ public static final String paramNull = "com.vci.base.paramNull";
+ public static final String fieldValueRepeat = "com.vci.base.fieldValueRepeat";
+ public static final String objectNotFoundInDb = "com.vci.base.objectNotFoundInDb";
+ public static final String tsNotEqual = "com.vci.base.tsNotEqual";
+ public static final String dateValueFormatError = "com.vci.base.dateValueForamtError";
+ public static final String notLogin = "com.vci.base.notLogin";
+ public static final String notRight = "com.vci.base.notRight";
+ public static final String notDataRight = "com.vci.base.notDataRight";
+ public static final String notUIRight = "com.vci.base.notUIRight";
+ public static final String connectCorbaFail = "com.vci.base.connectCorbaFail";
+ public static final String corbaNotConfig = "com.vci.base.corbaNotConfig ";
+ private String code;
+ private Object[] objs = new Object[0];
+
+ public VciBaseException(String code) {
+ this.code = code;
+ }
+
+ public VciBaseException(String code, Object[] objs) {
+ this.code = code;
+ this.objs = objs;
+ }
+
+ public VciBaseException(String code, Object[] objs, Throwable e) {
+ super(e);
+ this.code = code;
+ this.objs = objs;
+ }
+
+ public String getCode() {
+ return this.code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public Object[] getObjs() {
+ return this.objs;
+ }
+
+ public void setObjs(Object[] objs) {
+ this.objs = objs;
+ }
+
+ public String getErrorMsg() {
+ if (!(this instanceof VciBaseException) && !this.getClass().getSuperclass().equals(VciBaseException.class)) {
+ return this instanceof Exception ? this.getMessage() : this.code;
+ } else {
+ if (StringUtils.isNotBlank(this.code)) {
+ this.code = MessageUtils.get(this.code, this.objs);
+ }
+
+ this.code = MessageFormat.format(this.code, this.objs);
+ return this.code;
+ }
+ }
+
+ @Override
+ public String getMessage() {
+ return this.getCode() + "," + this.getErrorMsg();
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/model/ReleasedObjDO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/model/ReleasedObjDO.java
new file mode 100644
index 0000000..65e46bc
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/model/ReleasedObjDO.java
@@ -0,0 +1,58 @@
+package com.vci.ubcs.com.vci.starter.revision.model;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.revision.model;
+
+import java.io.Serializable;
+
+public class ReleasedObjDO implements Serializable {
+ private static final long serialVersionUID = -7258896338253286905L;
+ private String oid;
+ private String revisionOid;
+ private String nameOid;
+ private String btmName;
+
+ public ReleasedObjDO() {
+ }
+
+ public String getOid() {
+ return this.oid;
+ }
+
+ public void setOid(String oid) {
+ this.oid = oid;
+ }
+
+ public String getRevisionOid() {
+ return this.revisionOid;
+ }
+
+ public void setRevisionOid(String revisionOid) {
+ this.revisionOid = revisionOid;
+ }
+
+ public String getNameOid() {
+ return this.nameOid;
+ }
+
+ public void setNameOid(String nameOid) {
+ this.nameOid = nameOid;
+ }
+
+ public String getBtmName() {
+ return this.btmName;
+ }
+
+ public void setBtmName(String btmName) {
+ this.btmName = btmName;
+ }
+
+ @Override
+ public String toString() {
+ return "ReleasedObjDO{oid='" + this.oid + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", btmName='" + this.btmName + '\'' + '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/model/RevisionInfo.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/model/RevisionInfo.java
new file mode 100644
index 0000000..a3c2c3a
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/model/RevisionInfo.java
@@ -0,0 +1,147 @@
+package com.vci.ubcs.com.vci.starter.revision.model;
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.revision.model;
+
+import java.io.Serializable;
+
+public class RevisionInfo implements Serializable {
+ private static final long serialVersionUID = 7167255550437885283L;
+ private String oid;
+ private String nameOid;
+ private String revisionOid;
+ private String lastR;
+ private String firstR;
+ private String lastV;
+ private String firstV;
+ private String revisionRule;
+ private Integer revisionSeq;
+ private String revisionValue;
+ private String versionRule;
+ private Integer versionSeq;
+ private String versionValue;
+ private String btmname;
+
+ public RevisionInfo() {
+ }
+
+ public String getBtmname() {
+ return this.btmname;
+ }
+
+ public void setBtmname(String btmname) {
+ this.btmname = btmname;
+ }
+
+ public String getOid() {
+ return this.oid;
+ }
+
+ public void setOid(String oid) {
+ this.oid = oid;
+ }
+
+ public String getNameOid() {
+ return this.nameOid;
+ }
+
+ public void setNameOid(String nameOid) {
+ this.nameOid = nameOid;
+ }
+
+ public String getRevisionOid() {
+ return this.revisionOid;
+ }
+
+ public void setRevisionOid(String revisionOid) {
+ this.revisionOid = revisionOid;
+ }
+
+ public String getLastR() {
+ return this.lastR;
+ }
+
+ public void setLastR(String lastR) {
+ this.lastR = lastR;
+ }
+
+ public String getFirstR() {
+ return this.firstR;
+ }
+
+ public void setFirstR(String firstR) {
+ this.firstR = firstR;
+ }
+
+ public String getLastV() {
+ return this.lastV;
+ }
+
+ public void setLastV(String lastV) {
+ this.lastV = lastV;
+ }
+
+ public String getFirstV() {
+ return this.firstV;
+ }
+
+ public void setFirstV(String firstV) {
+ this.firstV = firstV;
+ }
+
+ public String getRevisionRule() {
+ return this.revisionRule;
+ }
+
+ public void setRevisionRule(String revisionRule) {
+ this.revisionRule = revisionRule;
+ }
+
+ public int getRevisionSeq() {
+ return this.revisionSeq;
+ }
+
+ public void setRevisionSeq(Integer revisionSeq) {
+ this.revisionSeq = revisionSeq;
+ }
+
+ public String getRevisionValue() {
+ return this.revisionValue;
+ }
+
+ public void setRevisionValue(String revisionValue) {
+ this.revisionValue = revisionValue;
+ }
+
+ public String getVersionRule() {
+ return this.versionRule;
+ }
+
+ public void setVersionRule(String versionRule) {
+ this.versionRule = versionRule;
+ }
+
+ public int getVersionSeq() {
+ return this.versionSeq;
+ }
+
+ public void setVersionSeq(Integer versionSeq) {
+ this.versionSeq = versionSeq;
+ }
+
+ public String getVersionValue() {
+ return this.versionValue;
+ }
+
+ public void setVersionValue(String versionValue) {
+ this.versionValue = versionValue;
+ }
+
+ @Override
+ public String toString() {
+ return "RevisionInfo{oid='" + this.oid + '\'' + ", nameOid='" + this.nameOid + '\'' + ", revisionOid='" + this.revisionOid + '\'' + ", lastR='" + this.lastR + '\'' + ", firstR='" + this.firstR + '\'' + ", lastV='" + this.lastV + '\'' + ", firstV='" + this.firstV + '\'' + ", revisionRule='" + this.revisionRule + '\'' + ", revisionSeq=" + this.revisionSeq + ", revisionValue='" + this.revisionValue + '\'' + ", versionRule='" + this.versionRule + '\'' + ", versionSeq=" + this.versionSeq + ", versionValue='" + this.versionValue + '\'' + ", btmname='" + this.btmname + '\'' + '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/service/RevisionModelUtil.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/service/RevisionModelUtil.java
new file mode 100644
index 0000000..42d044a
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/service/RevisionModelUtil.java
@@ -0,0 +1,31 @@
+package com.vci.ubcs.com.vci.starter.revision.service;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.revision.service;
+
+import com.vci.ubcs.code.entity.BaseModel;
+import com.vci.ubcs.com.vci.starter.util.VciBaseUtil;
+import com.vci.ubcs.com.vci.starter.web.service.VciSecretServiceI;
+import com.vci.ubcs.com.vci.starter.web.util.BeanUtilForVCI;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RevisionModelUtil implements VciSecretServiceI {
+
+ public void copyFromDTOIgnore(Object dto, BaseModel baseModel) {
+ VciBaseUtil.alertNotNull(new Object[]{dto, "鏁版嵁浼犺緭瀵硅薄", baseModel, "鏁版嵁搴撲腑鐨勬暟鎹璞�"});
+ BaseModel tempModel = new BaseModel();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(baseModel, tempModel);
+ BeanUtilForVCI.copyPropertiesIgnoreCase(dto, baseModel);
+ BeanUtilForVCI.copyPropertiesIgnoreCase(tempModel, baseModel);
+ baseModel.setId(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getValueFromField("id", dto)));
+ baseModel.setName(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getValueFromField("name", dto)));
+ baseModel.setDescription(VciBaseUtil.getStringValueFromObject(VciBaseUtil.getValueFromField("description", dto)));
+ tempModel = null;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/service/VciRevisionServiceI.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/service/VciRevisionServiceI.java
new file mode 100644
index 0000000..ea30b16
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/revision/service/VciRevisionServiceI.java
@@ -0,0 +1,36 @@
+package com.vci.ubcs.com.vci.starter.revision.service;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.revision.service;
+
+
+import com.vci.ubcs.com.vci.starter.revision.model.ReleasedObjDO;
+import com.vci.ubcs.com.vci.starter.revision.model.RevisionInfo;
+
+public interface VciRevisionServiceI {
+ RevisionInfo selectLastRevision(String var1, String var2);
+
+ RevisionInfo selectLastVersion(String var1, String var2, String var3);
+
+ RevisionInfo selectRelease(String var1, String var2, String var3);
+
+ int saveReleased(ReleasedObjDO var1);
+
+ int resetLastRevision(String var1, String var2);
+
+ int resetOldRevision(String var1, String var2);
+
+ RevisionInfo selectByOid(String var1, String var2);
+
+ int resetLastVersion(String var1, String var2, String var3);
+
+ int resetOldVersion(String var1, String var2);
+
+ int countByProperties(String var1, Object var2, String var3);
+
+ int countByPropertiesNotIncludeSelf(String var1, Object var2, String var3, String var4);
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/util/VciBaseUtil.java
new file mode 100644
index 0000000..657b225
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/util/VciBaseUtil.java
@@ -0,0 +1,1101 @@
+package com.vci.ubcs.com.vci.starter.util;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.vci.ubcs.com.vci.starter.exception.VciBaseException;
+import com.vci.ubcs.com.vci.starter.web.pagemodel.SessionInfo;
+import com.vci.ubcs.com.vci.starter.web.util.VciDateUtil;
+import com.vci.ubcs.com.vci.starter.web.util.WebThreadLocalUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ResourceUtils;
+
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.io.File;
+import java.io.IOException;
+import java.lang.Character.UnicodeBlock;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public class VciBaseUtil {
+ private static Logger log = LoggerFactory.getLogger(VciBaseUtil.class);
+ public static final String NOTIN = "not in";
+ private static String localIp = null;
+
+ public VciBaseUtil() {
+ }
+
+ public static String getPk() {
+ return UUID.randomUUID().toString();
+ }
+
+ public static int getIntForBoolean(boolean b) {
+ return b ? 1 : 0;
+ }
+
+ public static int getIntFromHibernateResult(Object obj) {
+ if (obj == null) {
+ return 0;
+ } else if (obj instanceof BigDecimal) {
+ return ((BigDecimal)obj).intValue();
+ } else if (obj instanceof BigInteger) {
+ return ((BigInteger)obj).intValue();
+ } else if (obj instanceof Double) {
+ return ((Double)obj).intValue();
+ } else if (obj instanceof Long) {
+ return ((Long)obj).intValue();
+ } else if (obj instanceof Short) {
+ return ((Short)obj).intValue();
+ } else if (obj instanceof Float) {
+ return ((Float)obj).intValue();
+ } else if (obj instanceof String) {
+ try {
+ return Integer.valueOf(obj.toString());
+ } catch (Exception var2) {
+ return 0;
+ }
+ } else {
+ return 0;
+ }
+ }
+
+ public static long getLong(String s) {
+ long l = 0L;
+ if (s == null) {
+ return 0L;
+ } else {
+ try {
+ l = Long.parseLong(s);
+ return l;
+ } catch (Exception var4) {
+ return 0L;
+ }
+ }
+ }
+
+ public static float getFloat(String s) {
+ float f = 0.0F;
+ if (s == null) {
+ return 0.0F;
+ } else {
+ try {
+ f = Float.parseFloat(s);
+ return f;
+ } catch (Exception var3) {
+ return 0.0F;
+ }
+ }
+ }
+
+ public static int getInt(String string) {
+ //int i = false;
+ if (string != null && !"".equals(string.trim())) {
+ if (string.contains(".")) {
+ string = string.substring(0, string.indexOf("."));
+ }
+
+ try {
+ int i = Integer.parseInt(string);
+ return i;
+ } catch (Exception var3) {
+ return 0;
+ }
+ } else {
+ return 0;
+ }
+ }
+
+ public static double getDouble(String s) {
+ double d = 0.0D;
+ if (isNull(s)) {
+ return 0.0D;
+ } else {
+ try {
+ d = Double.parseDouble(s);
+ return d;
+ } catch (Exception var4) {
+ return 0.0D;
+ }
+ }
+ }
+
+ public static String removeComma(String s) {
+ if (s != null && s.trim().length() != 0) {
+ if (s.startsWith(",")) {
+ s = s.substring(1, s.length());
+ }
+
+ if (s.endsWith(",")) {
+ s = s.substring(0, s.length() - 1);
+ }
+
+ return s;
+ } else {
+ return s;
+ }
+ }
+
+ public static String toInSql(String s) {
+ s = removeComma(s);
+ if (s != null && s.trim().length() != 0) {
+ String[] temp = s.split(",");
+ return toInSql(temp);
+ } else {
+ return "";
+ }
+ }
+
+ public static String toInSql(String[] s) {
+ if (s != null && s.length > 0) {
+ StringBuilder sb = new StringBuilder();
+ if (s != null && s.length > 0) {
+ for(int i = 0; i < s.length; ++i) {
+ if (s[i] != null && s[i].trim().length() > 0 && !s[i].startsWith("'")) {
+ sb.append("'").append(s[i]).append("',");
+ }
+ }
+ }
+
+ return removeComma(sb.toString());
+ } else {
+ return "";
+ }
+ }
+
+ public static String toInSql(String field, String s) {
+ return !StringUtils.isBlank(field) && !StringUtils.isBlank(s) ? toInSql(field, removeComma(s).split(","), "") : "";
+ }
+
+ public static String toInSql(String field, String[] s) {
+ return toInSql(field, s, "in");
+ }
+
+ public static String toInSql(String field, String[] s, String operation) {
+ if (!StringUtils.isBlank(field) && s != null && s.length != 0) {
+ StringBuilder sb = new StringBuilder();
+ if (s != null && s.length > 0) {
+ String andOr = "or";
+ if (operation.trim().toLowerCase().equals("not in")) {
+ andOr = "and";
+ }
+
+ for(int i = 0; i < s.length; ++i) {
+ if (s[i] != null && s[i].trim().length() > 0 && !s[i].startsWith("'")) {
+ if (i == 0) {
+ sb.append(field).append(" ").append(operation).append(" (");
+ }
+
+ if (i % 500 == 0 && i != 0) {
+ sb.append(" ").append(andOr).append(" ").append(field).append(" ").append(operation).append(" (");
+ }
+
+ sb.append("'").append(s[i]).append("'");
+ if (i % 500 != 499 && i != s.length - 1) {
+ sb.append(",");
+ }
+
+ if (i % 500 == 499 || i == s.length - 1) {
+ sb.append(") ");
+ }
+ }
+ }
+ }
+
+ return sb.toString();
+ } else {
+ return "";
+ }
+ }
+
+ /** @deprecated */
+ @Deprecated
+ public static String arrayToString(String[] array) {
+ if (array != null && array.length > 0) {
+ StringBuilder sb = new StringBuilder();
+
+ for(int i = 0; i < array.length; ++i) {
+ String record = array[i];
+ if (StringUtils.isNotBlank(record)) {
+ sb.append(record).append(",");
+ }
+ }
+
+ return removeComma(sb.toString());
+ } else {
+ return "";
+ }
+ }
+
+ public static String collectionToString(Collection collection) {
+ if (CollectionUtils.isEmpty(collection)) {
+ return "";
+ } else {
+ StringBuilder sb = new StringBuilder();
+ Iterator it = collection.iterator();
+
+ while(true) {
+ Object record;
+ do {
+ do {
+ if (!it.hasNext()) {
+ return removeComma(sb.toString());
+ }
+
+ record = it.next();
+ } while(record == null);
+ } while(record instanceof String && !StringUtils.isNotBlank((String)record));
+
+ sb.append(record.toString()).append(",");
+ }
+ }
+ }
+
+ public static String toUpForFirst(String s) {
+ if (s != null && s.trim().length() != 0) {
+ String temp = s.substring(0, 1);
+ temp = temp.toUpperCase();
+ return temp + s.substring(1, s.length());
+ } else {
+ return "";
+ }
+ }
+
+ public static String toLowForFirst(String s) {
+ if (s != null && s.trim().length() != 0) {
+ String temp = s.substring(0, 1);
+ temp = temp.toLowerCase();
+ return temp + s.substring(1, s.length());
+ } else {
+ return "";
+ }
+ }
+
+ public static int countOfString(String s, char findC) {
+ Map<String, Integer> charMap = new HashMap();
+ char[] cs = s.toCharArray();
+ char[] var4 = cs;
+ int var5 = cs.length;
+
+ for(int var6 = 0; var6 < var5; ++var6) {
+ char c = var4[var6];
+ charMap.put(String.valueOf(c), !charMap.containsKey(String.valueOf(c)) ? 1 : (Integer)charMap.get(String.valueOf(c)) + 1);
+ }
+
+ return (Integer)charMap.get(String.valueOf(findC));
+ }
+
+ public static List<String> str2List(String s) {
+ if (isNull(s)) {
+ return null;
+ } else {
+ List<String> l = new ArrayList();
+ Collections.addAll(l, removeComma(s).split(","));
+ return l;
+ }
+ }
+
+ public static String list2String(List<String> ls) {
+ return ls != null && ls.size() != 0 ? (String)ls.stream().collect(Collectors.joining(",")) : "";
+ }
+
+ public static boolean isNull(String o) {
+ return StringUtils.isEmpty(o);
+ }
+
+ public static boolean isNotNull(String o) {
+ return !isNull(o);
+ }
+
+ public static boolean isNullOrNullString(String o) {
+ return StringUtils.isBlank(o);
+ }
+
+ public static boolean inArray(String[] arr, String s) {
+ if (arr != null && s != null) {
+ String[] var2 = arr;
+ int var3 = arr.length;
+
+ for(int var4 = 0; var4 < var3; ++var4) {
+ String a = var2[var4];
+ if (s.trim().equalsIgnoreCase(a)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public static boolean inArray(Object[] arr, Object o) {
+ if (arr != null && o != null) {
+ Object[] var2 = arr;
+ int var3 = arr.length;
+
+ for(int var4 = 0; var4 < var3; ++var4) {
+ Object a = var2[var4];
+ if (a.equals(o)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public static double round(double value, int scale, int roundingMode) {
+ BigDecimal bd = new BigDecimal(value);
+ bd = bd.setScale(scale, roundingMode);
+ double d = bd.doubleValue();
+ bd = null;
+ return d;
+ }
+
+ public static double round(double value, int scale) {
+ return round(value, scale, 4);
+ }
+
+ public static boolean isEmail(String string) {
+ if (StringUtils.isBlank(string)) {
+ return false;
+ } else {
+ String regEx1 = "^([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$";
+ Pattern p = Pattern.compile(regEx1);
+ Matcher m = p.matcher(string);
+ return m.matches();
+ }
+ }
+
+ public static boolean isNumber(String s) {
+ return StringUtils.isNotBlank(s) && s.matches("\\d+\\.?\\d*");
+ }
+
+ public static Field getFieldForObject(String fieldName, List<Field> fieldsList) {
+ if (StringUtils.isBlank(fieldName)) {
+ return null;
+ } else {
+ if (fieldsList != null && fieldsList.size() > 0) {
+ Iterator var2 = fieldsList.iterator();
+
+ while(var2.hasNext()) {
+ Field field = (Field)var2.next();
+ if (field.getName().toLowerCase().equals(fieldName.toLowerCase())) {
+ return field;
+ }
+ }
+ }
+
+ return null;
+ }
+ }
+
+ public static Method getSetmethod(Class c, String fieldName) {
+ if (c != null && StringUtils.isNotBlank(fieldName)) {
+ try {
+ PropertyDescriptor pd = new PropertyDescriptor(fieldName, c);
+ return pd.getWriteMethod();
+ } catch (SecurityException var3) {
+ if (log.isErrorEnabled()) {
+ log.error("鑾峰彇getter鍑洪敊", var3);
+ }
+ } catch (IntrospectionException var4) {
+ if (log.isErrorEnabled()) {
+ log.error("鑾峰彇getter鍑洪敊", var4);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static Method getGetmethod(Class c, String fieldName) {
+ if (c != null && StringUtils.isNotBlank(fieldName)) {
+ try {
+ PropertyDescriptor pd = new PropertyDescriptor(fieldName, c);
+ return pd.getReadMethod();
+ } catch (SecurityException var3) {
+ if (log.isErrorEnabled()) {
+ log.error("鑾峰彇getter鍑洪敊", var3);
+ }
+ } catch (IntrospectionException var4) {
+ if (log.isErrorEnabled()) {
+ log.error("鑾峰彇getter鍑洪敊", var4);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static String getColumnAnnotaionNameValue(Annotation[] fieldAnnotaions) {
+ return getAnnotationValue("com.vci.starter.web.annotation.Column,javax.persistence.Column", "name", fieldAnnotaions);
+ }
+
+ public static String getAnnotationValue(String annotationName, String methodName, Annotation[] fieldAnnotaions) {
+ String[] annotaionNameArray = annotationName.split(",");
+ Annotation[] var4 = fieldAnnotaions;
+ int var5 = fieldAnnotaions.length;
+
+ for(int var6 = 0; var6 < var5; ++var6) {
+ Annotation annotation = var4[var6];
+ String anname = annotation.annotationType().getName();
+ if (inArray(annotaionNameArray, anname)) {
+ String name = null;
+
+ try {
+ name = (String)annotation.getClass().getMethod(methodName).invoke(annotation);
+ } catch (IllegalAccessException var11) {
+ var11.printStackTrace();
+ } catch (InvocationTargetException var12) {
+ var12.printStackTrace();
+ } catch (NoSuchMethodException var13) {
+ var13.printStackTrace();
+ }
+
+ return name;
+ }
+ }
+
+ return null;
+ }
+
+ public static Object getValueFromField(String fieldName, Object sourceObject) {
+ if (StringUtils.isNotBlank(fieldName)) {
+ try {
+ Method getMethod = getGetmethod(sourceObject.getClass(), fieldName);
+ if (getMethod != null) {
+ return getMethod.invoke(sourceObject);
+ }
+
+ Field field = getFieldForObject(fieldName, sourceObject);
+ if (field != null) {
+ field.setAccessible(true);
+ return field.get(sourceObject);
+ }
+ } catch (SecurityException var4) {
+ if (log.isErrorEnabled()) {
+ log.error("浠庡睘鎬т笂鑾峰彇鍊�", var4);
+ }
+ } catch (IllegalAccessException var5) {
+ if (log.isErrorEnabled()) {
+ log.error("浠庡睘鎬т笂鑾峰彇鍊�", var5);
+ }
+ } catch (IllegalArgumentException var6) {
+ if (log.isErrorEnabled()) {
+ log.error("浠庡睘鎬т笂鑾峰彇鍊�", var6);
+ }
+ } catch (InvocationTargetException var7) {
+ if (log.isErrorEnabled()) {
+ log.error("浠庡睘鎬т笂鑾峰彇鍊�", var7);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static void setValueForMethod(Field field, Object obj, Object value) {
+ try {
+ if (field != null) {
+ field.setAccessible(true);
+ Method setMethod = getSetmethod(field.getDeclaringClass(), field.getName());
+ setMethod.invoke(obj, value);
+ }
+ } catch (Exception var4) {
+ log.error("鍙嶅皠璋冪敤鏂规硶鍑虹幇浜嗛敊璇�,", var4);
+ }
+
+ }
+
+ public static void alertNotNull(Object... s) throws VciBaseException {
+ if (s != null && s.length > 0) {
+ for(int i = 0; i < s.length; ++i) {
+ Object obj = s[i];
+ String param = "";
+
+ try {
+ ++i;
+ param = s[i].toString();
+ } catch (Exception var5) {
+ }
+
+ if (obj == null) {
+ throw new VciBaseException("鍙傛暟[{0}]涓嶈兘涓虹┖", new String[]{param});
+ }
+
+ if (obj instanceof Collection) {
+ if (CollectionUtils.isEmpty((Collection)obj)) {
+ throw new VciBaseException("鍙傛暟[{0}]涓嶈兘涓虹┖", new String[]{param});
+ }
+ } else if (StringUtils.isBlank(obj.toString())) {
+ throw new VciBaseException("鍙傛暟[{0}]涓嶈兘涓虹┖", new String[]{param});
+ }
+ }
+ }
+
+ }
+
+ /** @deprecated */
+ @Deprecated
+ public static void alertCollectionNotNull(String param, Collection collections) throws VciBaseException {
+ if (CollectionUtils.isEmpty(collections)) {
+ throw new VciBaseException("鍙傛暟{0}涓嶈兘涓虹┖", new String[]{param});
+ }
+ }
+
+ public static <T> Set<Set<T>> switchSetForOracleIn(Set<T> set) {
+ Set<Set<T>> listHasList = new HashSet();
+ if (set == null) {
+ return listHasList;
+ } else {
+ int muti = 1;
+ if (set.size() > 500) {
+ int balance = set.size() % 500;
+ muti = (set.size() - balance) / 500 + (balance == 0 ? 0 : 1);
+ }
+
+ List list = new ArrayList();
+ Iterator it = set.iterator();
+
+ while(it.hasNext()) {
+ list.add(it.next());
+ }
+
+ for(int i = 0; i < muti; ++i) {
+ int start = i * 500;
+ int end = start + 500;
+ if (i == muti - 1 || end > set.size()) {
+ end = set.size();
+ }
+
+ List subList = list.subList(start, end);
+ Set subSet = new HashSet();
+ Iterator var10 = subList.iterator();
+
+ while(var10.hasNext()) {
+ Object obj = var10.next();
+ subSet.add(obj);
+ }
+
+ listHasList.add(subSet);
+ }
+
+ return listHasList;
+ }
+ }
+
+ public static <T> Vector<Vector<T>> switchVectorForOracleIn(Vector<T> vector) {
+ Vector<Vector<T>> listHasList = new Vector();
+ if (vector == null) {
+ return listHasList;
+ } else {
+ int muti = 1;
+ if (vector.size() > 500) {
+ int balance = vector.size() % 500;
+ muti = (vector.size() - balance) / 500 + (balance == 0 ? 0 : 1);
+ }
+
+ List list = new ArrayList();
+ Iterator it = vector.iterator();
+
+ while(it.hasNext()) {
+ list.add(it.next());
+ }
+
+ for(int i = 0; i < muti; ++i) {
+ int start = i * 500;
+ int end = start + 500;
+ if (i == muti - 1 || end > vector.size()) {
+ end = vector.size();
+ }
+
+ List subList = list.subList(start, end);
+ Vector subSet = new Vector();
+ Iterator var10 = subList.iterator();
+
+ while(var10.hasNext()) {
+ Object obj = var10.next();
+ subSet.add(obj);
+ }
+
+ listHasList.add(subSet);
+ }
+
+ return listHasList;
+ }
+ }
+
+ public static <T> T jsonString2JavaBean(String jsonString, Class<T> beanClass) {
+ return JSONObject.parseObject(jsonString, beanClass);
+ }
+
+ public static void ifNullSetDefautl(String str, String defaultValue) {
+ if (isNull(str)) {
+ ;
+ }
+
+ }
+
+ public static <T> T getFristObjectFromJson(String jsonString, Class<T> beanClass) {
+ return !isNull(jsonString) ? JSONObject.parseArray(jsonString, beanClass).get(0) : null;
+ }
+
+ public static String getJSONStringWithDateFormat(Object obj) {
+ return JSONObject.toJSONStringWithDateFormat(obj, "yyyy-MM-dd HH:mm:ss.SSS", new SerializerFeature[]{SerializerFeature.WriteDateUseDateFormat});
+ }
+
+ public static Map<String, Object> objectToMap(Object o) {
+ Map<String, Object> map = new HashMap();
+ if (o != null) {
+ String jsonString = JSONObject.toJSONStringWithDateFormat(o, "yyyy-MM-dd HH:mm:ss.SSS", new SerializerFeature[]{SerializerFeature.WriteDateUseDateFormat});
+ if (StringUtils.isNotBlank(jsonString)) {
+ JSONObject jsonObject = JSONObject.parseObject(jsonString);
+ if (jsonObject != null) {
+ Iterator var4 = jsonObject.keySet().iterator();
+
+ while(var4.hasNext()) {
+ String key = (String)var4.next();
+ map.put(key, jsonObject.get(key));
+ }
+ }
+ }
+ }
+
+ return map;
+ }
+
+ public static Map<String, String> objectToMapString(Object o) {
+ Map<String, String> map = new HashMap();
+ if (o != null) {
+ String jsonString = JSONObject.toJSONStringWithDateFormat(o, "yyyy-MM-dd HH:mm:ss.SSS", new SerializerFeature[]{SerializerFeature.WriteDateUseDateFormat});
+ if (StringUtils.isNotBlank(jsonString)) {
+ JSONObject jsonObject = JSONObject.parseObject(jsonString);
+ if (jsonObject != null) {
+ Iterator var4 = jsonObject.keySet().iterator();
+
+ while(var4.hasNext()) {
+ String key = (String)var4.next();
+ map.put(key, jsonObject.getString(key));
+ }
+ }
+ }
+ }
+
+ return map;
+ }
+
+ public static boolean isNotNullForField(Object obj, Field f) {
+ return !"serialVersionUID".equalsIgnoreCase(f.getName()) && !"DEFAULT_INITIAL_CAPACITY".equalsIgnoreCase(f.getName()) && null != obj && !isNullOrNullString(obj.toString());
+ }
+
+ public static String array2String(String[] array) {
+ if (null != array && array.length != 0) {
+ String ss = "";
+ String[] var2 = array;
+ int var3 = array.length;
+
+ for(int var4 = 0; var4 < var3; ++var4) {
+ String s = var2[var4];
+ ss = ss + s + ",";
+ }
+
+ return removeComma(ss);
+ } else {
+ return "";
+ }
+ }
+
+ public static void copyValueForMap(Map source, Map target, String[] copyField) {
+ Map<String, String> copyFieldMap = new HashMap();
+ String[] var4 = copyField;
+ int var5 = copyField.length;
+
+ for(int var6 = 0; var6 < var5; ++var6) {
+ String field = var4[var6];
+ copyFieldMap.put(field, field);
+ }
+
+ copyValueForMap(source, target, (Map)copyFieldMap);
+ }
+
+ public static void copyValueForMap(Map source, Map target, Map<String, String> copyField) {
+ try {
+ Iterator it = copyField.keySet().iterator();
+
+ while(it.hasNext()) {
+ String field = (String)it.next();
+ target.put(field, source.get(copyField.get(field)));
+ }
+ } catch (Exception var5) {
+ }
+
+ }
+
+ public static Double getDoubleFromMap(String field, Map<String, Object> record) {
+ if (!isNullOrNullString(field) && record != null && record.containsKey(field)) {
+ Object v = record.get(field);
+ if (v instanceof BigDecimal) {
+ return ((BigDecimal)v).doubleValue();
+ } else {
+ return v instanceof Double ? (Double)v : getDouble((String)v);
+ }
+ } else {
+ return null;
+ }
+ }
+
+ public static String getDataByKey(String key, Map<String, Object> data) {
+ String value = "";
+ if (data.containsKey(key)) {
+ value = (String)data.get(key);
+ }
+
+ if (value == null) {
+ value = "";
+ }
+
+ return value;
+ }
+
+ public static Map getNotNullMap(Map map) {
+ if (map == null) {
+ return new HashMap();
+ } else {
+ Iterator it = map.keySet().iterator();
+ HashMap unNullMap = new HashMap();
+
+ while(true) {
+ while(true) {
+ String newKey;
+ Object value;
+ do {
+ if (!it.hasNext()) {
+ return unNullMap;
+ }
+
+ Object key = it.next();
+ newKey = key.toString().toLowerCase();
+ value = map.get(key);
+ } while(value == null);
+
+ if (value instanceof String && isNotNull(value.toString())) {
+ unNullMap.put(newKey, value);
+ } else if (!(value instanceof String)) {
+ unNullMap.put(newKey, value);
+ }
+ }
+ }
+ }
+ }
+
+ public static List<Field> getAllFieldForObj(Class c) {
+ List<Field> allField = new ArrayList();
+ Set<String> fieldNameSet = new HashSet();
+
+ for(Class classz = c; classz != Object.class; classz = classz.getSuperclass()) {
+ Field[] thisClassField = classz.getDeclaredFields();
+ Field[] var5 = thisClassField;
+ int var6 = thisClassField.length;
+
+ for(int var7 = 0; var7 < var6; ++var7) {
+ Field field = var5[var7];
+ if (!field.getName().equals("serialVersionUID")) {
+ String fieldLowerName = field.getName().toLowerCase();
+ if (!fieldNameSet.contains(fieldLowerName)) {
+ fieldNameSet.add(fieldLowerName);
+ allField.add(field);
+ }
+ }
+ }
+ }
+
+ return allField;
+ }
+
+ public static Field getTsField(Class c) {
+ List<Field> allField = getAllFieldForObj(c);
+ if (allField != null && allField.size() > 0) {
+ Iterator var2 = allField.iterator();
+
+ while(var2.hasNext()) {
+ Field field = (Field)var2.next();
+ if (field.getName().equals("ts")) {
+ return field;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static Field getFieldForObject(String fieldName, Object obj) {
+ return obj == null ? null : getFieldForObject(fieldName, obj.getClass());
+ }
+
+ public static Field getFieldForObject(String fieldName, Class c) {
+ List<Field> allField = getAllFieldForObj(c);
+ if (allField != null && allField.size() > 0) {
+ Iterator var3 = allField.iterator();
+
+ while(var3.hasNext()) {
+ Field field = (Field)var3.next();
+ if (field.getName().toLowerCase().equalsIgnoreCase(fieldName.toLowerCase())) {
+ return field;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static Method getSetmethod(Class c, Field field) {
+ return getSetmethod(c, field.getName());
+ }
+
+ public static Method getGetmethod(Class c, Field field) {
+ return getGetmethod(c, field.getName());
+ }
+
+ public static Method getMethodByName(Class<?> classObj, String methodName) {
+ alertNotNull(classObj, "鑾峰彇鏂规硶鐨勫璞℃墍灞炵殑绫�", methodName, "鏂规硶鐨勫悕瀛�");
+ Method[] methods = classObj.getMethods();
+ List<Method> sameMethods = (List)Arrays.stream(methods).filter((method) -> {
+ return method.getName().equalsIgnoreCase(methodName);
+ }).collect(Collectors.toList());
+ return !CollectionUtils.isEmpty(sameMethods) ? (Method)sameMethods.get(0) : null;
+ }
+
+ public static Map<String, String> whereSql2Map(String whereSql) {
+ Map<String, String> map = new HashMap();
+ if (isNotNull(whereSql)) {
+ String[] selects = whereSql.split("and");
+ if (selects != null && selects.length > 0) {
+ String[] var3 = selects;
+ int var4 = selects.length;
+
+ for(int var5 = 0; var5 < var4; ++var5) {
+ String s = var3[var5];
+ s = s.trim();
+ map.put(s.substring(0, s.indexOf(" ")).trim(), s.substring(s.indexOf(" ") + 1).trim());
+ }
+ }
+ }
+
+ return map;
+ }
+
+ public static synchronized String getRoundFilename(String prefix) {
+ if (prefix == null) {
+ prefix = "";
+ }
+
+ return prefix + System.currentTimeMillis();
+ }
+
+ public static String getLocalIp() {
+ if (localIp == null) {
+ try {
+ InetAddress inetAddress = getLocalHostLANAddress();
+ if (inetAddress == null) {
+ localIp = "127.0.0.1";
+ } else {
+ localIp = inetAddress.getHostAddress();
+ }
+ } catch (Exception var1) {
+ localIp = "127.0.0.1";
+ }
+ }
+
+ return localIp;
+ }
+
+ private static InetAddress getLocalHostLANAddress() throws Exception {
+ try {
+ InetAddress candidateAddress = null;
+ Enumeration ifaces = NetworkInterface.getNetworkInterfaces();
+
+ while(ifaces.hasMoreElements()) {
+ NetworkInterface iface = (NetworkInterface)ifaces.nextElement();
+ Enumeration inetAddrs = iface.getInetAddresses();
+
+ while(inetAddrs.hasMoreElements()) {
+ InetAddress inetAddr = (InetAddress)inetAddrs.nextElement();
+ if (!inetAddr.isLoopbackAddress()) {
+ if (inetAddr.isSiteLocalAddress()) {
+ return inetAddr;
+ }
+
+ if (candidateAddress == null) {
+ candidateAddress = inetAddr;
+ }
+ }
+ }
+ }
+
+ if (candidateAddress != null) {
+ return candidateAddress;
+ } else {
+ InetAddress jdkSuppliedAddress = InetAddress.getLocalHost();
+ return jdkSuppliedAddress;
+ }
+ } catch (Exception var5) {
+ var5.printStackTrace();
+ return null;
+ }
+ }
+
+ public static String getProjectPath() {
+ String path = "";
+
+ try {
+ String jarFilePath = ResourceUtils.getURL("classpath:").getPath();
+ if (jarFilePath.contains("!")) {
+ path = (new File(jarFilePath)).getParentFile().getParentFile().getParent();
+ } else {
+ path = (new File(jarFilePath)).getParent();
+ }
+ } catch (IOException var2) {
+ throw new VciBaseException("鑾峰彇褰撳墠鏈嶅姟鎵�鍦ㄧ殑鏂囦欢澶瑰嚭鐜颁簡閿欒");
+ }
+
+ if (path.startsWith("file:\\")) {
+ path = path.substring(6);
+ }
+
+ return path;
+ }
+
+ public static Map<String, String> getParamsByUrl(String url) {
+ if (StringUtils.isBlank(url)) {
+ return new HashMap();
+ } else {
+ String[] array = url.split("&");
+ Map<String, String> params = new HashMap();
+ String[] var3 = array;
+ int var4 = array.length;
+
+ for(int var5 = 0; var5 < var4; ++var5) {
+ String temp = var3[var5];
+ if (temp.contains("=")) {
+ String[] keyValues = temp.split("=");
+ params.put(keyValues[0], keyValues[1]);
+ } else {
+ params.put(temp, "");
+ }
+ }
+
+ return params;
+ }
+ }
+
+ public static boolean isChinese(char c) {
+ UnicodeBlock ub = UnicodeBlock.of(c);
+ return ub == UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS || ub == UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS || ub == UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A || ub == UnicodeBlock.GENERAL_PUNCTUATION || ub == UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION || ub == UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS;
+ }
+
+ public static boolean containsKeyUnCaseForMap(Map map, String key) {
+ if (!CollectionUtils.isEmpty(map)) {
+ boolean[] finded = new boolean[]{false};
+ map.forEach((k, value) -> {
+ if (k instanceof String && k.toString().toLowerCase(Locale.ROOT).equalsIgnoreCase(key)) {
+ finded[0] = true;
+ }
+ });
+ return finded[0];
+ } else {
+ return false;
+ }
+ }
+
+ public static boolean isChinese(String str) {
+ char[] ch = str.toCharArray();
+ char[] var2 = ch;
+ int var3 = ch.length;
+
+ for(int var4 = 0; var4 < var3; ++var4) {
+ char c = var2[var4];
+ if (isChinese(c)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static String toDBC(String input) {
+ if (StringUtils.isBlank(input)) {
+ return input;
+ } else {
+ char[] c = input.toCharArray();
+
+ for(int i = 0; i < c.length; ++i) {
+ if (c[i] == 12288) {
+ c[i] = ' ';
+ } else if (c[i] > '\uff00' && c[i] < '锝�') {
+ c[i] -= '锘�';
+ }
+ }
+
+ return new String(c);
+ }
+ }
+
+ public static String toSBC(String input) {
+ if (StringUtils.isBlank(input)) {
+ return input;
+ } else {
+ char[] c = input.toCharArray();
+
+ for(int i = 0; i < c.length; ++i) {
+ if (c[i] == 12288) {
+ c[i] = ' ';
+ } else if (c[i] > '\uff00' && c[i] < '锝�') {
+ c[i] += '锘�';
+ }
+ }
+
+ return new String(c);
+ }
+ }
+
+ public static SessionInfo getCurrentUserSessionInfoNotException() {
+ return (SessionInfo) WebThreadLocalUtil.getCurrentUserSessionInfoInThread().get();
+ }
+
+ public static String getStringValueFromObject(Object obj) {
+ if (obj == null) {
+ return "";
+ } else if (!(obj instanceof Integer) && !(obj instanceof Float) && !(obj instanceof Long) && !(obj instanceof Double)) {
+ return obj instanceof Date ? VciDateUtil.date2Str((Date)obj, "yyyy-MM-dd HH:mm:ss.SSS") : obj.toString();
+ } else {
+ if (obj instanceof Double) {
+ Double aDouble = (Double)obj;
+ if (aDouble != null && aDouble % 1.0D == 0.0D) {
+ return String.valueOf(aDouble.intValue());
+ }
+ }
+
+ return String.valueOf(obj);
+ }
+ }
+
+}
+
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/enumpck/BaseEnumInt.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/enumpck/BaseEnumInt.java
new file mode 100644
index 0000000..a1a86e7
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/enumpck/BaseEnumInt.java
@@ -0,0 +1,14 @@
+package com.vci.ubcs.com.vci.starter.web.enumpck;
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.web.enumpck;
+
+public interface BaseEnumInt {
+
+ int getValue();
+
+ String getText();
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/enumpck/UserSecretEnum.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/enumpck/UserSecretEnum.java
new file mode 100644
index 0000000..c9cccee
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/enumpck/UserSecretEnum.java
@@ -0,0 +1,90 @@
+package com.vci.ubcs.com.vci.starter.web.enumpck;
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.web.enumpck;
+
+//import com.vci.starter.web.annotation.VciEnum;
+
+import com.vci.ubcs.com.vci.starter.annotation.VciEnum;
+
+@VciEnum(
+ name = "usersecurityenum",
+ text = "浜哄憳瀵嗙骇",
+ description = "鐢ㄦ埛锛屼汉鍛樼殑瀵嗙骇"
+)
+public enum UserSecretEnum implements BaseEnumInt {
+ NONE(10, "鍐呴儴"),
+ SECRET(20, "涓�鑸�"),
+ PRIVACY(30, "閲嶈");
+
+ private int value;
+ private String text;
+
+ @Override
+ public int getValue() {
+ return this.value;
+ }
+
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ @Override
+ public String getText() {
+ return this.text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ private UserSecretEnum(int secret, String secretText) {
+ this.value = secret;
+ this.text = secretText;
+ }
+
+ public static String getSecretText(int secret) {
+ UserSecretEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ UserSecretEnum eu = var1[var3];
+ if (eu.value == secret) {
+ return eu.text;
+ }
+ }
+
+ return NONE.text;
+ }
+
+ public static boolean isValid(int secret) {
+ UserSecretEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ UserSecretEnum eu = var1[var3];
+ if (eu.value == secret) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static int getSecretValueByText(String text) {
+ UserSecretEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ UserSecretEnum eu = var1[var3];
+ if (eu.text.equalsIgnoreCase(text)) {
+ return eu.value;
+ }
+ }
+
+ return NONE.value;
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/pagemodel/SessionInfo.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/pagemodel/SessionInfo.java
new file mode 100644
index 0000000..375417d
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/pagemodel/SessionInfo.java
@@ -0,0 +1,421 @@
+package com.vci.ubcs.com.vci.starter.web.pagemodel;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.web.pagemodel;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SessionInfo implements Serializable {
+ private static final long serialVersionUID = 7950268190988911233L;
+ private String orgsOid;
+ private String orgsName;
+ private String deptOid;
+ private String deptName;
+ private String userOid;
+ private String userId;
+ private String userName;
+ private String personOid;
+ private String personId;
+ private String personName;
+ private String dutyOid;
+ private String dutyName;
+ private String workgroupOid;
+ private String workgroupName;
+ private String workTypeOid;
+ private String workTypeName;
+ private String usertype;
+ private String usertypeText;
+ private String sex;
+ private String sexText;
+ private Map<String, String> rolesName;
+ private List<String> functionOids;
+ private String photoUrl;
+ private String ip;
+ private String language;
+ private String userSecret;
+ private String userSecretText;
+ private String ipSecret;
+ private String ipSecretText;
+ private String machine;
+ private String os;
+ private String browser;
+ private String osUser;
+ private List<String> deviceInfo = new ArrayList();
+ private String email;
+ private String phoneNo;
+ private String rtxNo;
+ private String portalId;
+ private String IMId;
+ private boolean sso;
+ private String ssoServiceName;
+ private String token;
+ private Map<String, String> globalAttributeMap = new HashMap();
+ private String workNo;
+
+ public SessionInfo() {
+ }
+
+ public String getDutyOid() {
+ return this.dutyOid;
+ }
+
+ public void setDutyOid(String dutyOid) {
+ this.dutyOid = dutyOid;
+ }
+
+ public String getDutyName() {
+ return this.dutyName;
+ }
+
+ public void setDutyName(String dutyName) {
+ this.dutyName = dutyName;
+ }
+
+ public String getOrgsOid() {
+ return this.orgsOid;
+ }
+
+ public void setOrgsOid(String orgsOid) {
+ this.orgsOid = orgsOid;
+ }
+
+ public String getOrgsName() {
+ return this.orgsName;
+ }
+
+ public void setOrgsName(String orgsName) {
+ this.orgsName = orgsName;
+ }
+
+ public String getDeptOid() {
+ return this.deptOid;
+ }
+
+ public void setDeptOid(String deptOid) {
+ this.deptOid = deptOid;
+ }
+
+ public String getDeptName() {
+ return this.deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public String getUserOid() {
+ return this.userOid;
+ }
+
+ public void setUserOid(String userOid) {
+ this.userOid = userOid;
+ }
+
+ public String getUserId() {
+ return this.userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getUserName() {
+ return this.userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getPersonOid() {
+ return this.personOid;
+ }
+
+ public void setPersonOid(String personOid) {
+ this.personOid = personOid;
+ }
+
+ public String getPersonName() {
+ return this.personName;
+ }
+
+ public void setPersonName(String personName) {
+ this.personName = personName;
+ }
+
+ public String getWorkgroupOid() {
+ return this.workgroupOid;
+ }
+
+ public void setWorkgroupOid(String workgroupOid) {
+ this.workgroupOid = workgroupOid;
+ }
+
+ public String getWorkgroupName() {
+ return this.workgroupName;
+ }
+
+ public void setWorkgroupName(String workgroupName) {
+ this.workgroupName = workgroupName;
+ }
+
+ public String getUsertype() {
+ return this.usertype;
+ }
+
+ public void setUsertype(String usertype) {
+ this.usertype = usertype;
+ }
+
+ public String getUsertypeText() {
+ return this.usertypeText;
+ }
+
+ public void setUsertypeText(String usertypeText) {
+ this.usertypeText = usertypeText;
+ }
+
+ public String getSex() {
+ return this.sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public List<String> getFunctionOids() {
+ return this.functionOids;
+ }
+
+ public void setFunctionOids(List<String> functionOids) {
+ this.functionOids = functionOids;
+ }
+
+ public String getPhotoUrl() {
+ return this.photoUrl;
+ }
+
+ public void setPhotoUrl(String photoUrl) {
+ this.photoUrl = photoUrl;
+ }
+
+ public String getIp() {
+ return this.ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public String getLanguage() {
+ return this.language;
+ }
+
+ public void setLanguage(String language) {
+ this.language = language;
+ }
+
+ public String getUserSecret() {
+ return this.userSecret;
+ }
+
+ public void setUserSecret(String userSecret) {
+ this.userSecret = userSecret;
+ }
+
+ public String getUserSecretText() {
+ return this.userSecretText;
+ }
+
+ public void setUserSecretText(String userSecretText) {
+ this.userSecretText = userSecretText;
+ }
+
+ public String getIpSecret() {
+ return this.ipSecret;
+ }
+
+ public void setIpSecret(String ipSecret) {
+ this.ipSecret = ipSecret;
+ }
+
+ public String getIpSecretText() {
+ return this.ipSecretText;
+ }
+
+ public void setIpSecretText(String ipSecretText) {
+ this.ipSecretText = ipSecretText;
+ }
+
+ public String getMachine() {
+ return this.machine;
+ }
+
+ public void setMachine(String machine) {
+ this.machine = machine;
+ }
+
+ public String getOs() {
+ return this.os;
+ }
+
+ public void setOs(String os) {
+ this.os = os;
+ }
+
+ public String getBrowser() {
+ return this.browser;
+ }
+
+ public void setBrowser(String browser) {
+ this.browser = browser;
+ }
+
+ public String getOsUser() {
+ return this.osUser;
+ }
+
+ public void setOsUser(String osUser) {
+ this.osUser = osUser;
+ }
+
+ public List<String> getDeviceInfo() {
+ return this.deviceInfo;
+ }
+
+ public void setDeviceInfo(List<String> deviceInfo) {
+ this.deviceInfo = deviceInfo;
+ }
+
+ public String getEmail() {
+ return this.email;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public String getPhoneNo() {
+ return this.phoneNo;
+ }
+
+ public void setPhoneNo(String phoneNo) {
+ this.phoneNo = phoneNo;
+ }
+
+ public String getRtxNo() {
+ return this.rtxNo;
+ }
+
+ public void setRtxNo(String rtxNo) {
+ this.rtxNo = rtxNo;
+ }
+
+ public String getPortalId() {
+ return this.portalId;
+ }
+
+ public void setPortalId(String portalId) {
+ this.portalId = portalId;
+ }
+
+ public String getIMId() {
+ return this.IMId;
+ }
+
+ public void setIMId(String IMId) {
+ this.IMId = IMId;
+ }
+
+ public boolean isSso() {
+ return this.sso;
+ }
+
+ public void setSso(boolean sso) {
+ this.sso = sso;
+ }
+
+ public String getSsoServiceName() {
+ return this.ssoServiceName;
+ }
+
+ public void setSsoServiceName(String ssoServiceName) {
+ this.ssoServiceName = ssoServiceName;
+ }
+
+ public String getToken() {
+ return this.token;
+ }
+
+ public void setToken(String token) {
+ this.token = token;
+ }
+
+ public Map<String, String> getGlobalAttributeMap() {
+ return this.globalAttributeMap;
+ }
+
+ public void setGlobalAttributeMap(Map<String, String> globalAttributeMap) {
+ this.globalAttributeMap = globalAttributeMap;
+ }
+
+ public String getPersonId() {
+ return this.personId;
+ }
+
+ public void setPersonId(String personId) {
+ this.personId = personId;
+ }
+
+ public String getSexText() {
+ return this.sexText;
+ }
+
+ public void setSexText(String sexText) {
+ this.sexText = sexText;
+ }
+
+ public Map<String, String> getRolesName() {
+ return this.rolesName;
+ }
+
+ public void setRolesName(Map<String, String> rolesName) {
+ this.rolesName = rolesName;
+ }
+
+ public String getWorkNo() {
+ return this.workNo;
+ }
+
+ public void setWorkNo(String workNo) {
+ this.workNo = workNo;
+ }
+
+ public String getWorkTypeOid() {
+ return this.workTypeOid;
+ }
+
+ public void setWorkTypeOid(String workTypeOid) {
+ this.workTypeOid = workTypeOid;
+ }
+
+ public String getWorkTypeName() {
+ return this.workTypeName;
+ }
+
+ public void setWorkTypeName(String workTypeName) {
+ this.workTypeName = workTypeName;
+ }
+
+ public String toString() {
+ return "SessionInfo{orgsOid='" + this.orgsOid + '\'' + ", orgsName='" + this.orgsName + '\'' + ", deptOid='" + this.deptOid + '\'' + ", deptName='" + this.deptName + '\'' + ", userOid='" + this.userOid + '\'' + ", userId='" + this.userId + '\'' + ", userName='" + this.userName + '\'' + ", personOid='" + this.personOid + '\'' + ", personId='" + this.personId + '\'' + ", personName='" + this.personName + '\'' + ", dutyOid='" + this.dutyOid + '\'' + ", dutyName='" + this.dutyName + '\'' + ", workgroupOid='" + this.workgroupOid + '\'' + ", workgroupName='" + this.workgroupName + '\'' + ", workTypeOid='" + this.workTypeOid + '\'' + ", workTypeName='" + this.workTypeName + '\'' + ", usertype='" + this.usertype + '\'' + ", usertypeText='" + this.usertypeText + '\'' + ", sex='" + this.sex + '\'' + ", sexText='" + this.sexText + '\'' + ", rolesName=" + this.rolesName + ", functionOids=" + this.functionOids + ", photoUrl='" + this.photoUrl + '\'' + ", ip='" + this.ip + '\'' + ", language='" + this.language + '\'' + ", userSecret='" + this.userSecret + '\'' + ", userSecretText='" + this.userSecretText + '\'' + ", ipSecret='" + this.ipSecret + '\'' + ", ipSecretText='" + this.ipSecretText + '\'' + ", machine='" + this.machine + '\'' + ", os='" + this.os + '\'' + ", browser='" + this.browser + '\'' + ", osUser='" + this.osUser + '\'' + ", deviceInfo=" + this.deviceInfo + ", email='" + this.email + '\'' + ", phoneNo='" + this.phoneNo + '\'' + ", rtxNo='" + this.rtxNo + '\'' + ", portalId='" + this.portalId + '\'' + ", IMId='" + this.IMId + '\'' + ", sso=" + this.sso + ", ssoServiceName='" + this.ssoServiceName + '\'' + ", token='" + this.token + '\'' + ", globalAttributeMap=" + this.globalAttributeMap + ", workNo='" + this.workNo + '\'' + '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/service/VciSecretServiceI.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/service/VciSecretServiceI.java
new file mode 100644
index 0000000..7eb3f0a
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/service/VciSecretServiceI.java
@@ -0,0 +1,28 @@
+package com.vci.ubcs.com.vci.starter.web.service;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.vci.ubcs.com.vci.starter.util.VciBaseUtil;
+import com.vci.ubcs.com.vci.starter.web.enumpck.UserSecretEnum;
+import com.vci.ubcs.com.vci.starter.web.pagemodel.SessionInfo;
+
+public interface VciSecretServiceI {
+
+ default String getLessThanUserSecretSql() {
+ SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfoNotException();
+ return sessionInfo != null ? sessionInfo.getUserSecret() : "";
+ }
+
+ default boolean checkUserSecret(int dataSecret) {
+ SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfoNotException();
+ if (sessionInfo != null) {
+ if (StringUtils.isBlank(sessionInfo.getUserSecret())) {
+ sessionInfo.setUserSecret(UserSecretEnum.NONE.getValue() + "");
+ }
+
+ return VciBaseUtil.getInt(sessionInfo.getUserSecret()) >= dataSecret;
+ } else {
+ return false;
+ }
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/BeanUtilForVCI.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/BeanUtilForVCI.java
new file mode 100644
index 0000000..a95871d
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/BeanUtilForVCI.java
@@ -0,0 +1,163 @@
+package com.vci.ubcs.com.vci.starter.web.util;
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.vci.ubcs.com.vci.starter.util.VciBaseUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.CollectionUtils;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+public class BeanUtilForVCI {
+ private static Logger logger = LoggerFactory.getLogger(BeanUtilForVCI.class);
+
+ public BeanUtilForVCI() {
+ }
+
+ public static void copyPropertiesIgnoreCase(Object source, Object target) {
+ copyPropertiesIgnoreCase(source, target, false);
+ }
+
+ public static void copyPropertiesIgnoreCase(Object source, Object target, Map<String, String> fieldMap) {
+ copyPropertiesIgnoreCase(source, target, false, fieldMap);
+ }
+
+ public static void copyPropertiesIgnoreCase(Object source, Object target, boolean ignoreNull) {
+ copyPropertiesIgnoreCase(source, target, ignoreNull, (Map)null);
+ }
+
+ public static void copyDeclaredIgnoreCase(Object source, Object target) {
+ copyDeclaredIgnoreCase(source, target, false);
+ }
+
+ public static void copyDeclaredIgnoreCase(Object source, Object target, boolean ignoreNull) {
+ copyDeclaredIgnoreCase(source, target, ignoreNull, (Map)null);
+ }
+
+ public static void copyDeclaredIgnoreCase(Object source, Object target, boolean ignoreNull, Map<String, String> fieldMap) {
+ copyDeclaredIgnoreCase(source, target, ignoreNull, fieldMap, (Collection)null);
+ }
+
+ public static void copyDeclaredIgnoreCase(Object source, Object target, boolean ignoreNull, Map<String, String> fieldMap, Collection<String> ignoreField) {
+ Map<String, Field> sourceMap = BeanUtilForVCI.CacheFieldMap.getDeclaredFieldMap(source.getClass());
+ Map<String, Field> targetMap = BeanUtilForVCI.CacheFieldMap.getDeclaredFieldMap(target.getClass());
+ copyPropertiesIgnoreCase(source, target, ignoreNull, fieldMap, ignoreField, sourceMap, targetMap);
+ }
+
+ public static void copyPropertiesIgnoreCase(Object source, Object target, boolean ignoreNull, Map<String, String> fieldMap, Collection<String> ignoreField) {
+ Map<String, Field> sourceMap = BeanUtilForVCI.CacheFieldMap.getFieldMap(source.getClass());
+ Map<String, Field> targetMap = BeanUtilForVCI.CacheFieldMap.getFieldMap(target.getClass());
+ copyPropertiesIgnoreCase(source, target, ignoreNull, fieldMap, ignoreField, sourceMap, targetMap);
+ }
+
+ public static void copyPropertiesIgnoreCase(Object source, Object target, boolean ignoreNull, Map<String, String> fieldMap, Collection<String> ignoreField, Map<String, Field> sourceMap, Map<String, Field> targetMap) {
+ if (fieldMap == null) {
+ fieldMap = new HashMap();
+ }
+
+ Map<String, String> finalFieldMap = fieldMap;
+ targetMap.values().forEach((it) -> {
+ boolean not = false;
+ if (ignoreField != null && ignoreField.contains(it.getName())) {
+ not = true;
+ }
+
+ if (!not) {
+ String itFieldName = it.getName().toLowerCase().replace("_", "");
+ itFieldName = (String) finalFieldMap.getOrDefault(itFieldName, itFieldName);
+ Field field = (Field)sourceMap.getOrDefault(itFieldName, (Field) null);
+ if (field != null) {
+ it.setAccessible(true);
+ field.setAccessible(true);
+
+ try {
+ String sourceClassName = field.getClass().getName();
+ String targetClassName = it.getClass().getName();
+ if ((sourceClassName.equalsIgnoreCase(Boolean.class.getName()) || sourceClassName.equalsIgnoreCase(Boolean.TYPE.getName())) && targetClassName.equalsIgnoreCase(String.class.getName()) || (targetClassName.equalsIgnoreCase(Boolean.class.getName()) || targetClassName.equalsIgnoreCase(Boolean.TYPE.getName())) && sourceClassName.equalsIgnoreCase(String.class.getName())) {
+ if (targetClassName.equalsIgnoreCase(String.class.getName())) {
+ it.set(target, String.valueOf((Boolean)field.get(source)));
+ } else {
+ it.set(target, Boolean.valueOf((String)field.get(source)));
+ }
+ } else if (!ignoreNull) {
+ it.set(target, field.get(source));
+ } else {
+ Object sourceValue = field.get(source);
+ if (sourceValue != null && StringUtils.isNotBlank(sourceValue.toString())) {
+ it.set(target, sourceValue);
+ }
+ }
+ } catch (IllegalAccessException var13) {
+ if (logger.isErrorEnabled()) {
+ logger.error("鎷疯礉灞炴�у嚭閿�" + var13);
+ }
+ }
+ }
+ }
+
+ });
+ }
+
+ public static void copyPropertiesIgnoreCase(Object source, Object target, boolean ignoreNull, Map<String, String> fieldMap) {
+ copyPropertiesIgnoreCase(source, target, ignoreNull, fieldMap, (Collection)null);
+ }
+
+ private static class CacheFieldMap {
+ private static Map<String, Map<String, Field>> cacheMap = new HashMap();
+ private static Map<String, Map<String, Field>> declaredCacheMap = new HashMap();
+
+ private CacheFieldMap() {
+ }
+
+ private static Map<String, Field> getFieldMap(Class clazz) {
+ Map<String, Field> result = (Map)cacheMap.get(clazz.getName());
+ if (result == null) {
+ Class var2 = BeanUtilForVCI.CacheFieldMap.class;
+ synchronized(BeanUtilForVCI.CacheFieldMap.class) {
+ if (result == null) {
+ Map<String, Field> fieldMap = new HashMap();
+ List<Field> allFields = VciBaseUtil.getAllFieldForObj(clazz);
+ if (!CollectionUtils.isEmpty(allFields)) {
+ allFields.stream().forEach((field) -> {
+ fieldMap.put(field.getName().toLowerCase().replace("_", ""), field);
+ });
+ }
+
+ cacheMap.put(clazz.getName(), fieldMap);
+ result = (Map)cacheMap.get(clazz.getName());
+ }
+ }
+ }
+
+ return result;
+ }
+
+ private static Map<String, Field> getDeclaredFieldMap(Class clazz) {
+ Map<String, Field> result = (Map)declaredCacheMap.get(clazz.getName());
+ if (result == null) {
+ Class var2 = BeanUtilForVCI.CacheFieldMap.class;
+ synchronized(BeanUtilForVCI.CacheFieldMap.class) {
+ if (result == null) {
+ Map<String, Field> fieldMap = new HashMap();
+ Field[] allFields = clazz.getDeclaredFields();
+ if (allFields != null && allFields.length > 0) {
+ Arrays.stream(allFields).forEach((field) -> {
+ fieldMap.put(field.getName().toLowerCase().replace("_", ""), field);
+ });
+ }
+
+ declaredCacheMap.put(clazz.getName(), fieldMap);
+ result = (Map)declaredCacheMap.get(clazz.getName());
+ }
+ }
+ }
+
+ return result;
+ }
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/Lunar.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/Lunar.java
new file mode 100644
index 0000000..eb7454b
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/Lunar.java
@@ -0,0 +1,194 @@
+package com.vci.ubcs.com.vci.starter.web.util;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.web.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class Lunar {
+ private int year;
+ private int month;
+ private int day;
+ private boolean leap;
+ static final String[] chineseNumber = new String[]{"涓�", "浜�", "涓�", "鍥�", "浜�", "鍏�", "涓�", "鍏�", "涔�", "鍗�", "鍗佷竴", "鍗佷簩"};
+ static SimpleDateFormat chineseDateFormat = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�");
+ static final long[] lunarInfo = new long[]{19416L, 19168L, 42352L, 21717L, 53856L, 55632L, 91476L, 22176L, 39632L, 21970L, 19168L, 42422L, 42192L, 53840L, 119381L, 46400L, 54944L, 44450L, 38320L, 84343L, 18800L, 42160L, 46261L, 27216L, 27968L, 109396L, 11104L, 38256L, 21234L, 18800L, 25958L, 54432L, 59984L, 28309L, 23248L, 11104L, 100067L, 37600L, 116951L, 51536L, 54432L, 120998L, 46416L, 22176L, 107956L, 9680L, 37584L, 53938L, 43344L, 46423L, 27808L, 46416L, 86869L, 19872L, 42448L, 83315L, 21200L, 43432L, 59728L, 27296L, 44710L, 43856L, 19296L, 43748L, 42352L, 21088L, 62051L, 55632L, 23383L, 22176L, 38608L, 19925L, 19152L, 42192L, 54484L, 53840L, 54616L, 46400L, 46496L, 103846L, 38320L, 18864L, 43380L, 42160L, 45690L, 27216L, 27968L, 44870L, 43872L, 38256L, 19189L, 18800L, 25776L, 29859L, 59984L, 27480L, 21952L, 43872L, 38613L, 37600L, 51552L, 55636L, 54432L, 55888L, 30034L, 22176L, 43959L, 9680L, 37584L, 51893L, 43344L, 46240L, 47780L, 44368L, 21977L, 19360L, 42416L, 86390L, 21168L, 43312L, 31060L, 27296L, 44368L, 23378L, 19296L, 42726L, 42208L, 53856L, 60005L, 54576L, 23200L, 30371L, 38608L, 19415L, 19152L, 42192L, 118966L, 53840L, 54560L, 56645L, 46496L, 22224L, 21938L, 18864L, 42359L, 42160L, 43600L, 111189L, 27936L, 44448L};
+
+ private static final int yearDays(int y) {
+ int sum = 348;
+
+ for(int i = 32768; i > 8; i >>= 1) {
+ if ((lunarInfo[y - 1900] & (long)i) != 0L) {
+ ++sum;
+ }
+ }
+
+ return sum + leapDays(y);
+ }
+
+ private static final int leapDays(int y) {
+ if (leapMonth(y) != 0) {
+ return (lunarInfo[y - 1900] & 65536L) != 0L ? 30 : 29;
+ } else {
+ return 0;
+ }
+ }
+
+ private static final int leapMonth(int y) {
+ return (int)(lunarInfo[y - 1900] & 15L);
+ }
+
+ private static final int monthDays(int y, int m) {
+ return (lunarInfo[y - 1900] & (long)(65536 >> m)) == 0L ? 29 : 30;
+ }
+
+ public final String animalsYear() {
+ String[] Animals = new String[]{"榧�", "鐗�", "铏�", "鍏�", "榫�", "铔�", "椹�", "缇�", "鐚�", "楦�", "鐙�", "鐚�"};
+ return Animals[(this.year - 4) % 12];
+ }
+
+ private static final String cyclicalm(int num) {
+ String[] Gan = new String[]{"鐢�", "涔�", "涓�", "涓�", "鎴�", "宸�", "搴�", "杈�", "澹�", "鐧�"};
+ String[] Zhi = new String[]{"瀛�", "涓�", "瀵�", "鍗�", "杈�", "宸�", "鍗�", "鏈�", "鐢�", "閰�", "鎴�", "浜�"};
+ return Gan[num % 10] + Zhi[num % 12];
+ }
+
+ public final String cyclical() {
+ int num = this.year - 1900 + 36;
+ return cyclicalm(num);
+ }
+
+ public Lunar(Calendar cal) {
+ //int leapMonth = false;
+ Date baseDate = null;
+
+ try {
+ baseDate = chineseDateFormat.parse("1900骞�1鏈�31鏃�");
+ } catch (ParseException var12) {
+ var12.printStackTrace();
+ }
+
+ int offset = (int)((cal.getTime().getTime() - baseDate.getTime()) / 86400000L);
+ int dayCyl = offset + 40;
+ int monCyl = 14;
+ int daysOfYear = 0;
+
+ int iYear;
+ for(iYear = 1900; iYear < 2050 && offset > 0; ++iYear) {
+ daysOfYear = yearDays(iYear);
+ offset -= daysOfYear;
+ monCyl += 12;
+ }
+
+ if (offset < 0) {
+ offset += daysOfYear;
+ --iYear;
+ monCyl -= 12;
+ }
+
+ this.year = iYear;
+ int yearCyl = iYear - 1864;
+ int leapMonth = leapMonth(iYear);
+ this.leap = false;
+ int daysOfMonth = 0;
+
+ int iMonth;
+ for(iMonth = 1; iMonth < 13 && offset > 0; ++iMonth) {
+ if (leapMonth > 0 && iMonth == leapMonth + 1 && !this.leap) {
+ --iMonth;
+ this.leap = true;
+ daysOfMonth = leapDays(this.year);
+ } else {
+ daysOfMonth = monthDays(this.year, iMonth);
+ }
+
+ offset -= daysOfMonth;
+ if (this.leap && iMonth == leapMonth + 1) {
+ this.leap = false;
+ }
+
+ if (!this.leap) {
+ ++monCyl;
+ }
+ }
+
+ if (offset == 0 && leapMonth > 0 && iMonth == leapMonth + 1) {
+ if (this.leap) {
+ this.leap = false;
+ } else {
+ this.leap = true;
+ --iMonth;
+ --monCyl;
+ }
+ }
+
+ if (offset < 0) {
+ offset += daysOfMonth;
+ --iMonth;
+ --monCyl;
+ }
+
+ this.month = iMonth;
+ this.day = offset + 1;
+ }
+
+ public static String getChinaDayString(int day) {
+ String[] chineseTen = new String[]{"鍒�", "鍗�", "寤�", "鍗�"};
+ int n = day % 10 == 0 ? 9 : day % 10 - 1;
+ if (day > 30) {
+ return "";
+ } else {
+ return day == 10 ? "鍒濆崄" : chineseTen[day / 10] + chineseNumber[n];
+ }
+ }
+
+ @Override
+ public String toString() {
+ String m = chineseNumber[this.month - 1];
+ if (m != null && m.trim().equals("涓�")) {
+ m = "姝�";
+ }
+
+ if (m != null && m.trim().equals("鍗佷竴")) {
+ m = "鍐�";
+ }
+
+ if (m != null && m.trim().equals("鍗佷簩")) {
+ m = "鑵�";
+ }
+
+ return this.year + this.cyclical() + this.animalsYear() + "骞�" + (this.leap ? "闂�" : "") + m + "鏈�" + getChinaDayString(this.day);
+ }
+
+ public String getDate() {
+ String m = chineseNumber[this.month - 1];
+ if (m != null && m.trim().equals("涓�")) {
+ m = "姝�";
+ }
+
+ if (m != null && m.trim().equals("鍗佷竴")) {
+ m = "鍐�";
+ }
+
+ if (m != null && m.trim().equals("鍗佷簩")) {
+ m = "鑵�";
+ }
+
+ return this.animalsYear() + "骞�" + (this.leap ? "闂�" : "") + m + "鏈�" + getChinaDayString(this.day);
+ }
+
+ public static void main(String[] args) throws ParseException {
+ Calendar today = Calendar.getInstance();
+ today.setTime(chineseDateFormat.parse("2013骞�2鏈�1鏃�"));
+ Lunar lunar = new Lunar(today);
+ System.out.println(lunar.toString());
+ System.out.println("鍖椾含鏃堕棿锛�" + chineseDateFormat.format(today.getTime()) + "銆�鍐滃巻" + lunar);
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/MessageUtils.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/MessageUtils.java
new file mode 100644
index 0000000..cbfa31b
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/MessageUtils.java
@@ -0,0 +1,37 @@
+package com.vci.ubcs.com.vci.starter.web.util;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.web.util;
+
+import org.springframework.context.MessageSource;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MessageUtils {
+ private static MessageSource messageSource;
+
+ public MessageUtils(MessageSource messageSource) {
+ MessageUtils.messageSource = messageSource;
+ }
+
+ public static String get(String msgKey) {
+ try {
+ return messageSource.getMessage(msgKey, (Object[])null, LocaleContextHolder.getLocale());
+ } catch (Throwable var2) {
+ return msgKey;
+ }
+ }
+
+ public static String get(String msgKey, Object[] objects) {
+ try {
+ return messageSource.getMessage(msgKey, objects, LocaleContextHolder.getLocale());
+ } catch (Throwable var3) {
+ return msgKey;
+ }
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/VciBaseUtil.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/VciBaseUtil.java
new file mode 100644
index 0000000..379bfc5
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/VciBaseUtil.java
@@ -0,0 +1,1098 @@
+package com.vci.ubcs.com.vci.starter.web.util;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.vci.ubcs.com.vci.starter.exception.VciBaseException;
+import com.vci.ubcs.com.vci.starter.web.pagemodel.SessionInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ResourceUtils;
+
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.io.File;
+import java.io.IOException;
+import java.lang.Character.UnicodeBlock;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+public class VciBaseUtil {
+ private static Logger log = LoggerFactory.getLogger(VciBaseUtil.class);
+ public static final String NOTIN = "not in";
+ private static String localIp = null;
+
+ public VciBaseUtil() {
+ }
+
+ public static String getPk() {
+ return UUID.randomUUID().toString();
+ }
+
+ public static int getIntForBoolean(boolean b) {
+ return b ? 1 : 0;
+ }
+
+ public static int getIntFromHibernateResult(Object obj) {
+ if (obj == null) {
+ return 0;
+ } else if (obj instanceof BigDecimal) {
+ return ((BigDecimal)obj).intValue();
+ } else if (obj instanceof BigInteger) {
+ return ((BigInteger)obj).intValue();
+ } else if (obj instanceof Double) {
+ return ((Double)obj).intValue();
+ } else if (obj instanceof Long) {
+ return ((Long)obj).intValue();
+ } else if (obj instanceof Short) {
+ return ((Short)obj).intValue();
+ } else if (obj instanceof Float) {
+ return ((Float)obj).intValue();
+ } else if (obj instanceof String) {
+ try {
+ return Integer.valueOf(obj.toString());
+ } catch (Exception var2) {
+ return 0;
+ }
+ } else {
+ return 0;
+ }
+ }
+
+ public static long getLong(String s) {
+ long l = 0L;
+ if (s == null) {
+ return 0L;
+ } else {
+ try {
+ l = Long.parseLong(s);
+ return l;
+ } catch (Exception var4) {
+ return 0L;
+ }
+ }
+ }
+
+ public static float getFloat(String s) {
+ float f = 0.0F;
+ if (s == null) {
+ return 0.0F;
+ } else {
+ try {
+ f = Float.parseFloat(s);
+ return f;
+ } catch (Exception var3) {
+ return 0.0F;
+ }
+ }
+ }
+
+ public static int getInt(String string) {
+ //int i = false;
+ if (string != null && !"".equals(string.trim())) {
+ if (string.contains(".")) {
+ string = string.substring(0, string.indexOf("."));
+ }
+
+ try {
+ int i = Integer.parseInt(string);
+ return i;
+ } catch (Exception var3) {
+ return 0;
+ }
+ } else {
+ return 0;
+ }
+ }
+
+ public static double getDouble(String s) {
+ double d = 0.0D;
+ if (isNull(s)) {
+ return 0.0D;
+ } else {
+ try {
+ d = Double.parseDouble(s);
+ return d;
+ } catch (Exception var4) {
+ return 0.0D;
+ }
+ }
+ }
+
+ public static String removeComma(String s) {
+ if (s != null && s.trim().length() != 0) {
+ if (s.startsWith(",")) {
+ s = s.substring(1, s.length());
+ }
+
+ if (s.endsWith(",")) {
+ s = s.substring(0, s.length() - 1);
+ }
+
+ return s;
+ } else {
+ return s;
+ }
+ }
+
+ public static String toInSql(String s) {
+ s = removeComma(s);
+ if (s != null && s.trim().length() != 0) {
+ String[] temp = s.split(",");
+ return toInSql(temp);
+ } else {
+ return "";
+ }
+ }
+
+ public static String toInSql(String[] s) {
+ if (s != null && s.length > 0) {
+ StringBuilder sb = new StringBuilder();
+ if (s != null && s.length > 0) {
+ for(int i = 0; i < s.length; ++i) {
+ if (s[i] != null && s[i].trim().length() > 0 && !s[i].startsWith("'")) {
+ sb.append("'").append(s[i]).append("',");
+ }
+ }
+ }
+
+ return removeComma(sb.toString());
+ } else {
+ return "";
+ }
+ }
+
+ public static String toInSql(String field, String s) {
+ return !StringUtils.isBlank(field) && !StringUtils.isBlank(s) ? toInSql(field, removeComma(s).split(","), "") : "";
+ }
+
+ public static String toInSql(String field, String[] s) {
+ return toInSql(field, s, "in");
+ }
+
+ public static String toInSql(String field, String[] s, String operation) {
+ if (!StringUtils.isBlank(field) && s != null && s.length != 0) {
+ StringBuilder sb = new StringBuilder();
+ if (s != null && s.length > 0) {
+ String andOr = "or";
+ if (operation.trim().toLowerCase().equals("not in")) {
+ andOr = "and";
+ }
+
+ for(int i = 0; i < s.length; ++i) {
+ if (s[i] != null && s[i].trim().length() > 0 && !s[i].startsWith("'")) {
+ if (i == 0) {
+ sb.append(field).append(" ").append(operation).append(" (");
+ }
+
+ if (i % 500 == 0 && i != 0) {
+ sb.append(" ").append(andOr).append(" ").append(field).append(" ").append(operation).append(" (");
+ }
+
+ sb.append("'").append(s[i]).append("'");
+ if (i % 500 != 499 && i != s.length - 1) {
+ sb.append(",");
+ }
+
+ if (i % 500 == 499 || i == s.length - 1) {
+ sb.append(") ");
+ }
+ }
+ }
+ }
+
+ return sb.toString();
+ } else {
+ return "";
+ }
+ }
+
+ /** @deprecated */
+ @Deprecated
+ public static String arrayToString(String[] array) {
+ if (array != null && array.length > 0) {
+ StringBuilder sb = new StringBuilder();
+
+ for(int i = 0; i < array.length; ++i) {
+ String record = array[i];
+ if (StringUtils.isNotBlank(record)) {
+ sb.append(record).append(",");
+ }
+ }
+
+ return removeComma(sb.toString());
+ } else {
+ return "";
+ }
+ }
+
+ public static String collectionToString(Collection collection) {
+ if (CollectionUtils.isEmpty(collection)) {
+ return "";
+ } else {
+ StringBuilder sb = new StringBuilder();
+ Iterator it = collection.iterator();
+
+ while(true) {
+ Object record;
+ do {
+ do {
+ if (!it.hasNext()) {
+ return removeComma(sb.toString());
+ }
+
+ record = it.next();
+ } while(record == null);
+ } while(record instanceof String && !StringUtils.isNotBlank((String)record));
+
+ sb.append(record.toString()).append(",");
+ }
+ }
+ }
+
+ public static String toUpForFirst(String s) {
+ if (s != null && s.trim().length() != 0) {
+ String temp = s.substring(0, 1);
+ temp = temp.toUpperCase();
+ return temp + s.substring(1, s.length());
+ } else {
+ return "";
+ }
+ }
+
+ public static String toLowForFirst(String s) {
+ if (s != null && s.trim().length() != 0) {
+ String temp = s.substring(0, 1);
+ temp = temp.toLowerCase();
+ return temp + s.substring(1, s.length());
+ } else {
+ return "";
+ }
+ }
+
+ public static int countOfString(String s, char findC) {
+ Map<String, Integer> charMap = new HashMap();
+ char[] cs = s.toCharArray();
+ char[] var4 = cs;
+ int var5 = cs.length;
+
+ for(int var6 = 0; var6 < var5; ++var6) {
+ char c = var4[var6];
+ charMap.put(String.valueOf(c), !charMap.containsKey(String.valueOf(c)) ? 1 : (Integer)charMap.get(String.valueOf(c)) + 1);
+ }
+
+ return (Integer)charMap.get(String.valueOf(findC));
+ }
+
+ public static List<String> str2List(String s) {
+ if (isNull(s)) {
+ return null;
+ } else {
+ List<String> l = new ArrayList();
+ Collections.addAll(l, removeComma(s).split(","));
+ return l;
+ }
+ }
+
+ public static String list2String(List<String> ls) {
+ return ls != null && ls.size() != 0 ? (String)ls.stream().collect(Collectors.joining(",")) : "";
+ }
+
+ public static boolean isNull(String o) {
+ return StringUtils.isEmpty(o);
+ }
+
+ public static boolean isNotNull(String o) {
+ return !isNull(o);
+ }
+
+ public static boolean isNullOrNullString(String o) {
+ return StringUtils.isBlank(o);
+ }
+
+ public static boolean inArray(String[] arr, String s) {
+ if (arr != null && s != null) {
+ String[] var2 = arr;
+ int var3 = arr.length;
+
+ for(int var4 = 0; var4 < var3; ++var4) {
+ String a = var2[var4];
+ if (s.trim().equalsIgnoreCase(a)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public static boolean inArray(Object[] arr, Object o) {
+ if (arr != null && o != null) {
+ Object[] var2 = arr;
+ int var3 = arr.length;
+
+ for(int var4 = 0; var4 < var3; ++var4) {
+ Object a = var2[var4];
+ if (a.equals(o)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public static double round(double value, int scale, int roundingMode) {
+ BigDecimal bd = new BigDecimal(value);
+ bd = bd.setScale(scale, roundingMode);
+ double d = bd.doubleValue();
+ bd = null;
+ return d;
+ }
+
+ public static double round(double value, int scale) {
+ return round(value, scale, 4);
+ }
+
+ public static boolean isEmail(String string) {
+ if (StringUtils.isBlank(string)) {
+ return false;
+ } else {
+ String regEx1 = "^([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$";
+ Pattern p = Pattern.compile(regEx1);
+ Matcher m = p.matcher(string);
+ return m.matches();
+ }
+ }
+
+ public static boolean isNumber(String s) {
+ return StringUtils.isNotBlank(s) && s.matches("\\d+\\.?\\d*");
+ }
+
+ public static Field getFieldForObject(String fieldName, List<Field> fieldsList) {
+ if (StringUtils.isBlank(fieldName)) {
+ return null;
+ } else {
+ if (fieldsList != null && fieldsList.size() > 0) {
+ Iterator var2 = fieldsList.iterator();
+
+ while(var2.hasNext()) {
+ Field field = (Field)var2.next();
+ if (field.getName().toLowerCase().equals(fieldName.toLowerCase())) {
+ return field;
+ }
+ }
+ }
+
+ return null;
+ }
+ }
+
+ public static Method getSetmethod(Class c, String fieldName) {
+ if (c != null && StringUtils.isNotBlank(fieldName)) {
+ try {
+ PropertyDescriptor pd = new PropertyDescriptor(fieldName, c);
+ return pd.getWriteMethod();
+ } catch (SecurityException var3) {
+ if (log.isErrorEnabled()) {
+ log.error("鑾峰彇getter鍑洪敊", var3);
+ }
+ } catch (IntrospectionException var4) {
+ if (log.isErrorEnabled()) {
+ log.error("鑾峰彇getter鍑洪敊", var4);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static Method getGetmethod(Class c, String fieldName) {
+ if (c != null && StringUtils.isNotBlank(fieldName)) {
+ try {
+ PropertyDescriptor pd = new PropertyDescriptor(fieldName, c);
+ return pd.getReadMethod();
+ } catch (SecurityException var3) {
+ if (log.isErrorEnabled()) {
+ log.error("鑾峰彇getter鍑洪敊", var3);
+ }
+ } catch (IntrospectionException var4) {
+ if (log.isErrorEnabled()) {
+ log.error("鑾峰彇getter鍑洪敊", var4);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static String getColumnAnnotaionNameValue(Annotation[] fieldAnnotaions) {
+ return getAnnotationValue("com.vci.starter.web.annotation.Column,javax.persistence.Column", "name", fieldAnnotaions);
+ }
+
+ public static String getAnnotationValue(String annotationName, String methodName, Annotation[] fieldAnnotaions) {
+ String[] annotaionNameArray = annotationName.split(",");
+ Annotation[] var4 = fieldAnnotaions;
+ int var5 = fieldAnnotaions.length;
+
+ for(int var6 = 0; var6 < var5; ++var6) {
+ Annotation annotation = var4[var6];
+ String anname = annotation.annotationType().getName();
+ if (inArray(annotaionNameArray, anname)) {
+ String name = null;
+
+ try {
+ name = (String)annotation.getClass().getMethod(methodName).invoke(annotation);
+ } catch (IllegalAccessException var11) {
+ var11.printStackTrace();
+ } catch (InvocationTargetException var12) {
+ var12.printStackTrace();
+ } catch (NoSuchMethodException var13) {
+ var13.printStackTrace();
+ }
+
+ return name;
+ }
+ }
+
+ return null;
+ }
+
+ public static Object getValueFromField(String fieldName, Object sourceObject) {
+ if (StringUtils.isNotBlank(fieldName)) {
+ try {
+ Method getMethod = getGetmethod(sourceObject.getClass(), fieldName);
+ if (getMethod != null) {
+ return getMethod.invoke(sourceObject);
+ }
+
+ Field field = getFieldForObject(fieldName, sourceObject);
+ if (field != null) {
+ field.setAccessible(true);
+ return field.get(sourceObject);
+ }
+ } catch (SecurityException var4) {
+ if (log.isErrorEnabled()) {
+ log.error("浠庡睘鎬т笂鑾峰彇鍊�", var4);
+ }
+ } catch (IllegalAccessException var5) {
+ if (log.isErrorEnabled()) {
+ log.error("浠庡睘鎬т笂鑾峰彇鍊�", var5);
+ }
+ } catch (IllegalArgumentException var6) {
+ if (log.isErrorEnabled()) {
+ log.error("浠庡睘鎬т笂鑾峰彇鍊�", var6);
+ }
+ } catch (InvocationTargetException var7) {
+ if (log.isErrorEnabled()) {
+ log.error("浠庡睘鎬т笂鑾峰彇鍊�", var7);
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static void setValueForMethod(Field field, Object obj, Object value) {
+ try {
+ if (field != null) {
+ field.setAccessible(true);
+ Method setMethod = getSetmethod(field.getDeclaringClass(), field.getName());
+ setMethod.invoke(obj, value);
+ }
+ } catch (Exception var4) {
+ log.error("鍙嶅皠璋冪敤鏂规硶鍑虹幇浜嗛敊璇�,", var4);
+ }
+
+ }
+
+ public static void alertNotNull(Object... s) throws VciBaseException {
+ if (s != null && s.length > 0) {
+ for(int i = 0; i < s.length; ++i) {
+ Object obj = s[i];
+ String param = "";
+
+ try {
+ ++i;
+ param = s[i].toString();
+ } catch (Exception var5) {
+ }
+
+ if (obj == null) {
+ throw new VciBaseException("鍙傛暟[{0}]涓嶈兘涓虹┖", new String[]{param});
+ }
+
+ if (obj instanceof Collection) {
+ if (CollectionUtils.isEmpty((Collection)obj)) {
+ throw new VciBaseException("鍙傛暟[{0}]涓嶈兘涓虹┖", new String[]{param});
+ }
+ } else if (StringUtils.isBlank(obj.toString())) {
+ throw new VciBaseException("鍙傛暟[{0}]涓嶈兘涓虹┖", new String[]{param});
+ }
+ }
+ }
+
+ }
+
+ /** @deprecated */
+ @Deprecated
+ public static void alertCollectionNotNull(String param, Collection collections) throws VciBaseException {
+ if (CollectionUtils.isEmpty(collections)) {
+ throw new VciBaseException("鍙傛暟{0}涓嶈兘涓虹┖", new String[]{param});
+ }
+ }
+
+ public static <T> Set<Set<T>> switchSetForOracleIn(Set<T> set) {
+ Set<Set<T>> listHasList = new HashSet();
+ if (set == null) {
+ return listHasList;
+ } else {
+ int muti = 1;
+ if (set.size() > 500) {
+ int balance = set.size() % 500;
+ muti = (set.size() - balance) / 500 + (balance == 0 ? 0 : 1);
+ }
+
+ List list = new ArrayList();
+ Iterator it = set.iterator();
+
+ while(it.hasNext()) {
+ list.add(it.next());
+ }
+
+ for(int i = 0; i < muti; ++i) {
+ int start = i * 500;
+ int end = start + 500;
+ if (i == muti - 1 || end > set.size()) {
+ end = set.size();
+ }
+
+ List subList = list.subList(start, end);
+ Set subSet = new HashSet();
+ Iterator var10 = subList.iterator();
+
+ while(var10.hasNext()) {
+ Object obj = var10.next();
+ subSet.add(obj);
+ }
+
+ listHasList.add(subSet);
+ }
+
+ return listHasList;
+ }
+ }
+
+ public static <T> Vector<Vector<T>> switchVectorForOracleIn(Vector<T> vector) {
+ Vector<Vector<T>> listHasList = new Vector();
+ if (vector == null) {
+ return listHasList;
+ } else {
+ int muti = 1;
+ if (vector.size() > 500) {
+ int balance = vector.size() % 500;
+ muti = (vector.size() - balance) / 500 + (balance == 0 ? 0 : 1);
+ }
+
+ List list = new ArrayList();
+ Iterator it = vector.iterator();
+
+ while(it.hasNext()) {
+ list.add(it.next());
+ }
+
+ for(int i = 0; i < muti; ++i) {
+ int start = i * 500;
+ int end = start + 500;
+ if (i == muti - 1 || end > vector.size()) {
+ end = vector.size();
+ }
+
+ List subList = list.subList(start, end);
+ Vector subSet = new Vector();
+ Iterator var10 = subList.iterator();
+
+ while(var10.hasNext()) {
+ Object obj = var10.next();
+ subSet.add(obj);
+ }
+
+ listHasList.add(subSet);
+ }
+
+ return listHasList;
+ }
+ }
+
+ public static <T> T jsonString2JavaBean(String jsonString, Class<T> beanClass) {
+ return JSONObject.parseObject(jsonString, beanClass);
+ }
+
+ public static void ifNullSetDefautl(String str, String defaultValue) {
+ if (isNull(str)) {
+ ;
+ }
+
+ }
+
+ public static <T> T getFristObjectFromJson(String jsonString, Class<T> beanClass) {
+ return !isNull(jsonString) ? JSONObject.parseArray(jsonString, beanClass).get(0) : null;
+ }
+
+ public static String getJSONStringWithDateFormat(Object obj) {
+ return JSONObject.toJSONStringWithDateFormat(obj, "yyyy-MM-dd HH:mm:ss.SSS", new SerializerFeature[]{SerializerFeature.WriteDateUseDateFormat});
+ }
+
+ public static Map<String, Object> objectToMap(Object o) {
+ Map<String, Object> map = new HashMap();
+ if (o != null) {
+ String jsonString = JSONObject.toJSONStringWithDateFormat(o, "yyyy-MM-dd HH:mm:ss.SSS", new SerializerFeature[]{SerializerFeature.WriteDateUseDateFormat});
+ if (StringUtils.isNotBlank(jsonString)) {
+ JSONObject jsonObject = JSONObject.parseObject(jsonString);
+ if (jsonObject != null) {
+ Iterator var4 = jsonObject.keySet().iterator();
+
+ while(var4.hasNext()) {
+ String key = (String)var4.next();
+ map.put(key, jsonObject.get(key));
+ }
+ }
+ }
+ }
+
+ return map;
+ }
+
+ public static Map<String, String> objectToMapString(Object o) {
+ Map<String, String> map = new HashMap();
+ if (o != null) {
+ String jsonString = JSONObject.toJSONStringWithDateFormat(o, "yyyy-MM-dd HH:mm:ss.SSS", new SerializerFeature[]{SerializerFeature.WriteDateUseDateFormat});
+ if (StringUtils.isNotBlank(jsonString)) {
+ JSONObject jsonObject = JSONObject.parseObject(jsonString);
+ if (jsonObject != null) {
+ Iterator var4 = jsonObject.keySet().iterator();
+
+ while(var4.hasNext()) {
+ String key = (String)var4.next();
+ map.put(key, jsonObject.getString(key));
+ }
+ }
+ }
+ }
+
+ return map;
+ }
+
+ public static boolean isNotNullForField(Object obj, Field f) {
+ return !"serialVersionUID".equalsIgnoreCase(f.getName()) && !"DEFAULT_INITIAL_CAPACITY".equalsIgnoreCase(f.getName()) && null != obj && !isNullOrNullString(obj.toString());
+ }
+
+ public static String array2String(String[] array) {
+ if (null != array && array.length != 0) {
+ String ss = "";
+ String[] var2 = array;
+ int var3 = array.length;
+
+ for(int var4 = 0; var4 < var3; ++var4) {
+ String s = var2[var4];
+ ss = ss + s + ",";
+ }
+
+ return removeComma(ss);
+ } else {
+ return "";
+ }
+ }
+
+ public static void copyValueForMap(Map source, Map target, String[] copyField) {
+ Map<String, String> copyFieldMap = new HashMap();
+ String[] var4 = copyField;
+ int var5 = copyField.length;
+
+ for(int var6 = 0; var6 < var5; ++var6) {
+ String field = var4[var6];
+ copyFieldMap.put(field, field);
+ }
+
+ copyValueForMap(source, target, (Map)copyFieldMap);
+ }
+
+ public static void copyValueForMap(Map source, Map target, Map<String, String> copyField) {
+ try {
+ Iterator it = copyField.keySet().iterator();
+
+ while(it.hasNext()) {
+ String field = (String)it.next();
+ target.put(field, source.get(copyField.get(field)));
+ }
+ } catch (Exception var5) {
+ }
+
+ }
+
+ public static Double getDoubleFromMap(String field, Map<String, Object> record) {
+ if (!isNullOrNullString(field) && record != null && record.containsKey(field)) {
+ Object v = record.get(field);
+ if (v instanceof BigDecimal) {
+ return ((BigDecimal)v).doubleValue();
+ } else {
+ return v instanceof Double ? (Double)v : getDouble((String)v);
+ }
+ } else {
+ return null;
+ }
+ }
+
+ public static String getDataByKey(String key, Map<String, Object> data) {
+ String value = "";
+ if (data.containsKey(key)) {
+ value = (String)data.get(key);
+ }
+
+ if (value == null) {
+ value = "";
+ }
+
+ return value;
+ }
+
+ public static Map getNotNullMap(Map map) {
+ if (map == null) {
+ return new HashMap();
+ } else {
+ Iterator it = map.keySet().iterator();
+ HashMap unNullMap = new HashMap();
+
+ while(true) {
+ while(true) {
+ String newKey;
+ Object value;
+ do {
+ if (!it.hasNext()) {
+ return unNullMap;
+ }
+
+ Object key = it.next();
+ newKey = key.toString().toLowerCase();
+ value = map.get(key);
+ } while(value == null);
+
+ if (value instanceof String && isNotNull(value.toString())) {
+ unNullMap.put(newKey, value);
+ } else if (!(value instanceof String)) {
+ unNullMap.put(newKey, value);
+ }
+ }
+ }
+ }
+ }
+
+ public static List<Field> getAllFieldForObj(Class c) {
+ List<Field> allField = new ArrayList();
+ Set<String> fieldNameSet = new HashSet();
+
+ for(Class classz = c; classz != Object.class; classz = classz.getSuperclass()) {
+ Field[] thisClassField = classz.getDeclaredFields();
+ Field[] var5 = thisClassField;
+ int var6 = thisClassField.length;
+
+ for(int var7 = 0; var7 < var6; ++var7) {
+ Field field = var5[var7];
+ if (!field.getName().equals("serialVersionUID")) {
+ String fieldLowerName = field.getName().toLowerCase();
+ if (!fieldNameSet.contains(fieldLowerName)) {
+ fieldNameSet.add(fieldLowerName);
+ allField.add(field);
+ }
+ }
+ }
+ }
+
+ return allField;
+ }
+
+ public static Field getTsField(Class c) {
+ List<Field> allField = getAllFieldForObj(c);
+ if (allField != null && allField.size() > 0) {
+ Iterator var2 = allField.iterator();
+
+ while(var2.hasNext()) {
+ Field field = (Field)var2.next();
+ if (field.getName().equals("ts")) {
+ return field;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static Field getFieldForObject(String fieldName, Object obj) {
+ return obj == null ? null : getFieldForObject(fieldName, obj.getClass());
+ }
+
+ public static Field getFieldForObject(String fieldName, Class c) {
+ List<Field> allField = getAllFieldForObj(c);
+ if (allField != null && allField.size() > 0) {
+ Iterator var3 = allField.iterator();
+
+ while(var3.hasNext()) {
+ Field field = (Field)var3.next();
+ if (field.getName().toLowerCase().equalsIgnoreCase(fieldName.toLowerCase())) {
+ return field;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ public static Method getSetmethod(Class c, Field field) {
+ return getSetmethod(c, field.getName());
+ }
+
+ public static Method getGetmethod(Class c, Field field) {
+ return getGetmethod(c, field.getName());
+ }
+
+ public static Method getMethodByName(Class<?> classObj, String methodName) {
+ alertNotNull(classObj, "鑾峰彇鏂规硶鐨勫璞℃墍灞炵殑绫�", methodName, "鏂规硶鐨勫悕瀛�");
+ Method[] methods = classObj.getMethods();
+ List<Method> sameMethods = (List)Arrays.stream(methods).filter((method) -> {
+ return method.getName().equalsIgnoreCase(methodName);
+ }).collect(Collectors.toList());
+ return !CollectionUtils.isEmpty(sameMethods) ? (Method)sameMethods.get(0) : null;
+ }
+
+ public static Map<String, String> whereSql2Map(String whereSql) {
+ Map<String, String> map = new HashMap();
+ if (isNotNull(whereSql)) {
+ String[] selects = whereSql.split("and");
+ if (selects != null && selects.length > 0) {
+ String[] var3 = selects;
+ int var4 = selects.length;
+
+ for(int var5 = 0; var5 < var4; ++var5) {
+ String s = var3[var5];
+ s = s.trim();
+ map.put(s.substring(0, s.indexOf(" ")).trim(), s.substring(s.indexOf(" ") + 1).trim());
+ }
+ }
+ }
+
+ return map;
+ }
+
+ public static synchronized String getRoundFilename(String prefix) {
+ if (prefix == null) {
+ prefix = "";
+ }
+
+ return prefix + System.currentTimeMillis();
+ }
+
+ public static String getLocalIp() {
+ if (localIp == null) {
+ try {
+ InetAddress inetAddress = getLocalHostLANAddress();
+ if (inetAddress == null) {
+ localIp = "127.0.0.1";
+ } else {
+ localIp = inetAddress.getHostAddress();
+ }
+ } catch (Exception var1) {
+ localIp = "127.0.0.1";
+ }
+ }
+
+ return localIp;
+ }
+
+ private static InetAddress getLocalHostLANAddress() throws Exception {
+ try {
+ InetAddress candidateAddress = null;
+ Enumeration ifaces = NetworkInterface.getNetworkInterfaces();
+
+ while(ifaces.hasMoreElements()) {
+ NetworkInterface iface = (NetworkInterface)ifaces.nextElement();
+ Enumeration inetAddrs = iface.getInetAddresses();
+
+ while(inetAddrs.hasMoreElements()) {
+ InetAddress inetAddr = (InetAddress)inetAddrs.nextElement();
+ if (!inetAddr.isLoopbackAddress()) {
+ if (inetAddr.isSiteLocalAddress()) {
+ return inetAddr;
+ }
+
+ if (candidateAddress == null) {
+ candidateAddress = inetAddr;
+ }
+ }
+ }
+ }
+
+ if (candidateAddress != null) {
+ return candidateAddress;
+ } else {
+ InetAddress jdkSuppliedAddress = InetAddress.getLocalHost();
+ return jdkSuppliedAddress;
+ }
+ } catch (Exception var5) {
+ var5.printStackTrace();
+ return null;
+ }
+ }
+
+ public static String getProjectPath() {
+ String path = "";
+
+ try {
+ String jarFilePath = ResourceUtils.getURL("classpath:").getPath();
+ if (jarFilePath.contains("!")) {
+ path = (new File(jarFilePath)).getParentFile().getParentFile().getParent();
+ } else {
+ path = (new File(jarFilePath)).getParent();
+ }
+ } catch (IOException var2) {
+ throw new VciBaseException("鑾峰彇褰撳墠鏈嶅姟鎵�鍦ㄧ殑鏂囦欢澶瑰嚭鐜颁簡閿欒");
+ }
+
+ if (path.startsWith("file:\\")) {
+ path = path.substring(6);
+ }
+
+ return path;
+ }
+
+ public static Map<String, String> getParamsByUrl(String url) {
+ if (StringUtils.isBlank(url)) {
+ return new HashMap();
+ } else {
+ String[] array = url.split("&");
+ Map<String, String> params = new HashMap();
+ String[] var3 = array;
+ int var4 = array.length;
+
+ for(int var5 = 0; var5 < var4; ++var5) {
+ String temp = var3[var5];
+ if (temp.contains("=")) {
+ String[] keyValues = temp.split("=");
+ params.put(keyValues[0], keyValues[1]);
+ } else {
+ params.put(temp, "");
+ }
+ }
+
+ return params;
+ }
+ }
+
+ public static boolean isChinese(char c) {
+ UnicodeBlock ub = UnicodeBlock.of(c);
+ return ub == UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS || ub == UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS || ub == UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A || ub == UnicodeBlock.GENERAL_PUNCTUATION || ub == UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION || ub == UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS;
+ }
+
+ public static boolean containsKeyUnCaseForMap(Map map, String key) {
+ if (!CollectionUtils.isEmpty(map)) {
+ boolean[] finded = new boolean[]{false};
+ map.forEach((k, value) -> {
+ if (k instanceof String && k.toString().toLowerCase(Locale.ROOT).equalsIgnoreCase(key)) {
+ finded[0] = true;
+ }
+ });
+ return finded[0];
+ } else {
+ return false;
+ }
+ }
+
+ public static boolean isChinese(String str) {
+ char[] ch = str.toCharArray();
+ char[] var2 = ch;
+ int var3 = ch.length;
+
+ for(int var4 = 0; var4 < var3; ++var4) {
+ char c = var2[var4];
+ if (isChinese(c)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ public static String toDBC(String input) {
+ if (StringUtils.isBlank(input)) {
+ return input;
+ } else {
+ char[] c = input.toCharArray();
+
+ for(int i = 0; i < c.length; ++i) {
+ if (c[i] == 12288) {
+ c[i] = ' ';
+ } else if (c[i] > '\uff00' && c[i] < '锝�') {
+ c[i] -= '锘�';
+ }
+ }
+
+ return new String(c);
+ }
+ }
+
+ public static String toSBC(String input) {
+ if (StringUtils.isBlank(input)) {
+ return input;
+ } else {
+ char[] c = input.toCharArray();
+
+ for(int i = 0; i < c.length; ++i) {
+ if (c[i] == 12288) {
+ c[i] = ' ';
+ } else if (c[i] > '\uff00' && c[i] < '锝�') {
+ c[i] += '锘�';
+ }
+ }
+
+ return new String(c);
+ }
+ }
+
+ public static SessionInfo getCurrentUserSessionInfoNotException() {
+ return (SessionInfo) WebThreadLocalUtil.getCurrentUserSessionInfoInThread().get();
+ }
+
+ public static String getStringValueFromObject(Object obj) {
+ if (obj == null) {
+ return "";
+ } else if (!(obj instanceof Integer) && !(obj instanceof Float) && !(obj instanceof Long) && !(obj instanceof Double)) {
+ return obj instanceof Date ? VciDateUtil.date2Str((Date)obj, "yyyy-MM-dd HH:mm:ss.SSS") : obj.toString();
+ } else {
+ if (obj instanceof Double) {
+ Double aDouble = (Double)obj;
+ if (aDouble != null && aDouble % 1.0D == 0.0D) {
+ return String.valueOf(aDouble.intValue());
+ }
+ }
+
+ return String.valueOf(obj);
+ }
+ }
+
+}
+
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/VciDateUtil.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/VciDateUtil.java
new file mode 100644
index 0000000..4f0be4c
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/VciDateUtil.java
@@ -0,0 +1,639 @@
+package com.vci.ubcs.com.vci.starter.web.util;
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.vci.ubcs.com.vci.starter.util.VciBaseUtil;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+public class VciDateUtil {
+ private static final String DEFAULT_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
+ public static final String DateTimeFormat = "yyyy-MM-dd HH:mm:ss";
+ public static final String DateTimeFormatStr = "yyyyMMddHHmmss";
+ public static final String DateTimeMillFormatStr = "yyyyMMddHHmmssSSS";
+ public static final String DateTimeMillFormat = "yyyy-MM-dd HH:mm:ss.SSS";
+ public static final String DateFormat = "yyyy-MM-dd";
+ public static final String TimeFormat = "HH:mm:ss";
+
+ private VciDateUtil() {
+ }
+
+ public static Date str2Date(String str, String format) throws Exception {
+ if (null != str && !"".equals(str) && !str.equals("null")) {
+ if (null == format || "".equals(format) || format.equals("null")) {
+ format = "yyyy-MM-dd HH:mm:ss.SSS";
+ }
+
+ SimpleDateFormat sdf = new SimpleDateFormat(format);
+ Date date = null;
+
+ try {
+ date = sdf.parse(str);
+ return date;
+ } catch (ParseException var5) {
+ throw new Exception(var5);
+ }
+ } else {
+ return null;
+ }
+ }
+
+ public static Date getCurrentMonday() {
+ return getCurrentWeekDay(2);
+ }
+
+ public static Date getCurrentWeekDay(int dayOfWeek) {
+ if (dayOfWeek > 7) {
+ dayOfWeek = 7;
+ }
+
+ if (dayOfWeek < 1) {
+ dayOfWeek = 1;
+ }
+
+ Date date = new Date();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ calendar.set(7, dayOfWeek);
+ calendar.set(11, 0);
+ calendar.set(12, 0);
+ calendar.set(13, 0);
+ calendar.set(14, 0);
+ return calendar.getTime();
+ }
+
+ public static Date getCurrentFriday() {
+ return getCurrentWeekDay(6);
+ }
+
+ public static String date2Str(Date date, String format) {
+ if (null == date) {
+ return null;
+ } else {
+ if (format == null || format.trim().length() == 0) {
+ format = "yyyy-MM-dd HH:mm:ss.SSS";
+ }
+
+ SimpleDateFormat sdf = new SimpleDateFormat(format);
+ return sdf.format(date);
+ }
+ }
+
+ public static String timestamp2Str(Timestamp time) {
+ Date date = null;
+ if (null == time) {
+ return null;
+ } else {
+ if (null != time) {
+ date = new Date(time.getTime());
+ }
+
+ return date2Str(date, "yyyy-MM-dd HH:mm:ss.SSS");
+ }
+ }
+
+ public static Timestamp str2Timestamp(String str) throws Exception {
+ if (str != null && str.trim().length() != 0) {
+ Date date = str2Date(str, "yyyy-MM-dd HH:mm:ss.SSS");
+ return new Timestamp(date.getTime());
+ } else {
+ return null;
+ }
+ }
+
+ public static String compareDate(String date, String date1) throws Exception {
+ if (date != null && date.trim().length() != 0 && date1 != null && date1.trim().length() != 0) {
+ try {
+ long time = str2Date(date, "yyyy-MM-dd").getTime();
+ long time1 = str2Date(date1, "yyyy-MM-dd").getTime();
+ if (time == time1) {
+ return "=";
+ } else if (time < time1) {
+ return "<";
+ } else {
+ return time > time1 ? ">" : "";
+ }
+ } catch (Exception var6) {
+ throw var6;
+ }
+ } else {
+ throw new Exception("浼犲叆compareDate鐨勫弬鏁颁负绌�");
+ }
+ }
+
+ public static String compareDate(Date date, Date date1) {
+ if (date != null && date1 != null) {
+ long time = date.getTime();
+ long time1 = date1.getTime();
+ if (time == time1) {
+ return "=";
+ } else if (time < time1) {
+ return "<";
+ } else {
+ return time > time1 ? ">" : "";
+ }
+ } else {
+ return "";
+ }
+ }
+
+ public static String dateTimeAddMinutes(String date, int minute) throws Exception {
+ String ret = "";
+ if (date == null || date.equals("")) {
+ date = date2Str(getNow(), "yyyy-MM-dd HH:mm:ss.SSS");
+ }
+
+ if (minute == 0) {
+ return date;
+ } else {
+ Date d = str2Date(date, "yyyy-MM-dd HH:mm:ss");
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(d);
+ cal.add(12, minute);
+ return date2Str(cal.getTime(), "yyyy-MM-dd HH:mm:ss");
+ }
+ }
+
+ public static Date getDateAddDay(String date, int dayCount) throws Exception {
+ if (date != null && !date.equals("") && !date.equals("null")) {
+ if (dayCount == 0) {
+ return str2Date(date, "yyyy-MM-dd");
+ } else {
+ Date d = str2Date(date, "yyyy-MM-dd");
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(d);
+ cal.add(5, dayCount);
+ return cal.getTime();
+ }
+ } else {
+ return getNow();
+ }
+ }
+
+ public static Date getDateAddDay(Date date, int dayCount) {
+ if (dayCount == 0) {
+ return date;
+ } else {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+ cal.add(5, dayCount);
+ return cal.getTime();
+ }
+ }
+
+ public static long getDaySub(String beginDateStr, String endDateStr) {
+ if (beginDateStr != null && !beginDateStr.trim().equals("") && endDateStr != null && !endDateStr.trim().equals("")) {
+ long day = 0L;
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
+ try {
+ Date beginDate = format.parse(beginDateStr);
+ Date endDate = format.parse(endDateStr);
+ day = (endDate.getTime() - beginDate.getTime()) / 86400000L;
+ } catch (ParseException var8) {
+ var8.printStackTrace();
+ }
+
+ return day;
+ } else {
+ return 0L;
+ }
+ }
+
+ public static long getDaySub(Date date, Date date1) {
+ return (date.getTime() - date1.getTime()) / 86400000L;
+ }
+
+ public static Date addOrSubDate(Date d, int addDayType, int addCount) {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(d);
+ cal.add(addDayType, addCount);
+ return cal.getTime();
+ }
+
+ public static Date getNow() {
+ return new Date();
+ }
+
+ public static String getNowString() {
+ return getNowString("yyyy-MM-dd HH:mm:ss.SSS");
+ }
+
+ public static String getNowString(String simpleDateFormat) {
+ Date currentTime = new Date();
+ SimpleDateFormat formatter = new SimpleDateFormat(simpleDateFormat);
+ return formatter.format(currentTime);
+ }
+
+ public static Date getNow(String simpleDateFormat) throws Exception {
+ return str2Date(getNowString(simpleDateFormat), simpleDateFormat);
+ }
+
+ public static String getCountdown(String oldtime, String newTime) {
+ if (oldtime != null && !oldtime.trim().equals("") && newTime != null && !newTime.equals("")) {
+ try {
+ Date date1 = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).parse(oldtime);
+ Date date2 = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).parse(newTime);
+ long l = date1.getTime() - date2.getTime() > 0L ? date1.getTime() - date2.getTime() : date2.getTime() - date1.getTime();
+ long d = 0L;
+ long yushu = l;
+ long h = 0L;
+ long m = 0L;
+ if (l > 86400000L) {
+ yushu = l % 86400000L;
+ d = (l - yushu) / 86400000L;
+ }
+
+ if (yushu > 3600000L) {
+ h = (yushu - yushu % 3600000L) / 3600000L;
+ yushu %= 3600000L;
+ }
+
+ if (yushu > 60000L) {
+ m = (yushu - yushu % 60000L) / 60000L;
+ }
+
+ return date1.getTime() - date2.getTime() < 0L ? "宸茬粡瓒呮湡" + d + "澶�" + h + "灏忔椂" + m + "鍒�" : "杩樺墿涓�" + d + "澶�" + h + "灏忔椂" + m + "鍒�";
+ } catch (Exception var14) {
+ return "";
+ }
+ } else {
+ return "";
+ }
+ }
+
+ public static long getDateDiffer(String oldTime, String newTime) {
+ if (oldTime != null && !oldTime.trim().equals("") && newTime != null && !newTime.equals("")) {
+ try {
+ Date date1 = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).parse(oldTime);
+ Date date2 = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).parse(newTime);
+ return date1.getTime() - date2.getTime();
+ } catch (Exception var4) {
+ return 0L;
+ }
+ } else {
+ return 0L;
+ }
+ }
+
+ public static int getWeeks(int year) {
+ if (year == 0) {
+ return year;
+ } else {
+ //int week = false;
+ int days = 365;
+ if (year % 400 == 0 || year % 4 == 0 && year % 100 != 0) {
+ days = 366;
+ }
+
+ int week = days / 7;
+ return week;
+ }
+ }
+
+ public static int getWeekOnDate(Date date) {
+ GregorianCalendar g = new GregorianCalendar();
+ g.setTime(date);
+ return isSunday(date) ? g.get(3) - 1 : g.get(3);
+ }
+
+ public static Calendar getCalendarFromWeek(String year, int week) throws Exception {
+ Date newDate = str2Date(year + "-01-01", "yyyy-MM-dd");
+ Calendar caleNew = Calendar.getInstance();
+ caleNew.setTime(newDate);
+ caleNew.add(3, week - 1);
+ return caleNew;
+ }
+
+ public static String[] getDaysInWeek(int year, int week) {
+ String[] thisWeek = new String[7];
+
+ try {
+ GregorianCalendar gc = (GregorianCalendar)getCalendarFromWeek(year + "-01-01", week);
+
+ for(int i = 0; i < 7; ++i) {
+ Calendar myCale = Calendar.getInstance();
+ myCale.setTime(gc.getTime());
+ myCale.set(5, gc.get(5) - gc.get(7) + i + 2);
+ thisWeek[i] = date2Str(myCale.getTime(), "yyyy-MM-dd");
+ }
+ } catch (Exception var6) {
+ System.out.println(var6.getMessage());
+ }
+
+ return thisWeek;
+ }
+
+ public static boolean isSunday() {
+ return isSunday(new Date());
+ }
+
+ public static boolean isSunday(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int week = calendar.get(7) - 1;
+ return week == 0;
+ }
+
+ public static boolean isWeekend(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int week = calendar.get(7) - 1;
+ return week == 0 || week == 1;
+ }
+
+ public static boolean isFriday(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int week = calendar.get(7) - 1;
+ return week == 5;
+ }
+
+ public static boolean isMouthEnd(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int dayOfMonth = calendar.get(5);
+ int endMonth = calendar.getActualMaximum(5);
+ return endMonth == dayOfMonth;
+ }
+
+ public static boolean isSeasonEnd(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int y = calendar.get(2) + 1;
+ int d = calendar.get(5);
+ if (y == 3 && d == 31) {
+ return true;
+ } else if (y == 6 && d == 30) {
+ return true;
+ } else if (y == 9 && d == 30) {
+ return true;
+ } else {
+ return y == 12 && d == 31;
+ }
+ }
+
+ public static boolean isYearEnd(Date date) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(date);
+ int y = calendar.get(2) + 1;
+ int d = calendar.get(5);
+ return y == 12 && d == 31;
+ }
+
+ public static Long getProcessedTime(Date newDate, Date startDate) {
+ try {
+ Long p = newDate.getTime() - startDate.getTime();
+ return p;
+ } catch (Exception var3) {
+ return 0L;
+ }
+ }
+
+ public static String getProcessedTime(Date startDate) {
+ return getProcessedTime(new Date(), startDate) + "ms";
+ }
+
+ public static String getCurrentYear() {
+ Calendar c = Calendar.getInstance();
+ return String.valueOf(c.get(1) + 1900);
+ }
+
+ public static String getCurrentYearStart() {
+ return getCurrentYear() + "-01-01 00:00:00";
+ }
+
+ public static String getCurrentYearEnd() {
+ return getCurrentYear() + "-12-31 23:59:59";
+ }
+
+ public static String getCurrentQuarter() {
+ String currentMouth = getCurrentMouth();
+ int currentMouthInt = getInt(currentMouth);
+ if (currentMouthInt > 0 && currentMouthInt <= 3) {
+ return "1";
+ } else if (currentMouthInt > 3 && currentMouthInt <= 6) {
+ return "2";
+ } else {
+ return currentMouthInt > 6 && currentMouthInt <= 9 ? "3" : "4";
+ }
+ }
+
+ private static int getInt(String s) {
+ try {
+ return Integer.valueOf(s);
+ } catch (Exception var2) {
+ return 0;
+ }
+ }
+
+ public static String getCurrentQuarterStart() {
+ String currentQuarter = getCurrentQuarter();
+ if ("1".equalsIgnoreCase(currentQuarter)) {
+ return getCurrentYearStart();
+ } else if ("2".equalsIgnoreCase(currentQuarter)) {
+ return getCurrentYear() + "-04-01 00:00:00";
+ } else {
+ return "3".equalsIgnoreCase(currentQuarter) ? getCurrentYear() + "-07-01 00:00:00" : getCurrentYear() + "-10-01 00:00:00";
+ }
+ }
+
+ public static String getCurrentQuarterEnd() {
+ String currentQuarter = getCurrentQuarter();
+ if ("1".equalsIgnoreCase(currentQuarter)) {
+ return getCurrentYear() + "-03-31 23:59:59";
+ } else if ("2".equalsIgnoreCase(currentQuarter)) {
+ return getCurrentYear() + "-06-30 23:59:59";
+ } else {
+ return "3".equalsIgnoreCase(currentQuarter) ? getCurrentYear() + "-09-30 23:59:59" : getCurrentYear() + "-12-31 23:59:59";
+ }
+ }
+
+ public static String getCurrentMouth() {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(getNow());
+ int m = cal.get(2);
+ return m < 10 ? "0" + String.valueOf(m) : String.valueOf(m);
+ }
+
+ public static String getCurrentMouthStart() {
+ String currentMouth = getCurrentMouth();
+ return getCurrentYear() + "-" + currentMouth + "-01 00:00:00";
+ }
+
+ public static String getCurrentMouthEnd() {
+ String currentMouth = getCurrentMouth();
+ int currentMouthInt = getInt(currentMouth);
+ if (currentMouthInt != 1 && currentMouthInt != 3 && currentMouthInt != 5 && currentMouthInt != 7 && currentMouthInt != 8 && currentMouthInt != 10 && currentMouthInt != 12) {
+ if (currentMouthInt == 2) {
+ return isLeapYear(getInt(getCurrentYear())) ? getCurrentYear() + "-" + currentMouth + "-29 23:59:59" : getCurrentYear() + "-" + currentMouth + "-28 23:59:59";
+ } else {
+ return getCurrentYear() + "-" + currentMouth + "-30 23:59:59";
+ }
+ } else {
+ return getCurrentYear() + "-" + currentMouth + "-31 23:59:59";
+ }
+ }
+
+ public static boolean isLeapYear(int year) {
+ return year % 4 == 0 && year % 100 != 0 || year % 400 == 0;
+ }
+
+ public static String getCurrentDay() {
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(getNow());
+ int day = cal.get(5);
+ return day < 10 ? "0" + String.valueOf(day) : String.valueOf(day);
+ }
+
+ public static String getCurrentDayStart() {
+ return LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MIN).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ }
+
+ public static String getCurrentDayEnd() {
+ return LocalDateTime.of(LocalDateTime.now().toLocalDate(), LocalTime.MAX).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ }
+
+ public static List<Date> getDateInRange(Date dBegin, Date dEnd) {
+ List lDate = new ArrayList();
+ lDate.add(dBegin);
+ Calendar calBegin = Calendar.getInstance();
+ calBegin.setTime(dBegin);
+ Calendar calEnd = Calendar.getInstance();
+ calEnd.setTime(dEnd);
+
+ while(dEnd.after(calBegin.getTime())) {
+ calBegin.add(5, 1);
+ lDate.add(calBegin.getTime());
+ }
+
+ return lDate;
+ }
+
+ public static Date getDateFromStringForVci(String value) {
+ Date d = null;
+ if (StringUtils.isNotBlank(value)) {
+ try {
+ if (value.indexOf("-") > -1 && value.indexOf(".") > -1 && value.indexOf(" ") > -1 && value.substring(value.lastIndexOf(".") + 1).length() >= 9) {
+ String ymd = value.substring(0, value.indexOf("."));
+ value = value.substring(value.indexOf(".") + 1);
+ if (value.indexOf(".") > -1) {
+ String hms = value.substring(0, value.lastIndexOf("."));
+ String nano = value.substring(value.lastIndexOf(".") + 1).trim();
+ if (nano.length() > 3) {
+ nano = nano.substring(0, 3);
+ }
+
+ hms = hms.replace(".", ":").replace(" ", "");
+ Date tempDate = str2Date(ymd + " " + hms, "yyyy-M-d h:m:s");
+ if (tempDate != null) {
+ d = str2Date(date2Str(tempDate, "yyyy-MM-dd HH:mm:ss") + "." + nano, "yyyy-MM-dd HH:mm:ss.SSS");
+ }
+ }
+ } else if (VciBaseUtil.isNumber(value)) {
+ d = new Date();
+
+ try {
+ d = str2Date(value, "yyyyMMddHHmmssSSS");
+ } catch (Exception var8) {
+ if (value.length() != 14) {
+ d.setTime(VciBaseUtil.getLong(value));
+ } else {
+ try {
+ d = str2Date(value, "yyyyMMddHHmmss");
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(d);
+ if (cal.get(1) < 1900) {
+ d.setTime(VciBaseUtil.getLong(value));
+ }
+ } catch (Exception var7) {
+ d.setTime(VciBaseUtil.getLong(value));
+ }
+ }
+ }
+ } else {
+ d = str2Date(value, "yyyy-MM-dd HH:mm:ss.SSS");
+ }
+ } catch (Exception var9) {
+ try {
+ d = str2Date(value, "yyyy-MM-dd HH:mm:ss.SSS");
+ } catch (Exception var6) {
+ }
+ }
+ }
+
+ return d;
+ }
+
+ public static Date readText2Date(String text) {
+ if (VciBaseUtil.isNullOrNullString(text)) {
+ return null;
+ } else {
+ SimpleDateFormat dateFormat = null;
+ int exactDateLength = 0;
+ if (text.trim().indexOf("/") > -1 && text.trim().length() == 19) {
+ exactDateLength = 19;
+ dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+ } else if (text.trim().indexOf("/") > -1 && text.trim().length() == 17) {
+ exactDateLength = 17;
+ dateFormat = new SimpleDateFormat("yy/MM/dd HH:mm:ss");
+ } else if (text.trim().indexOf("/") > -1 && text.trim().length() == 8) {
+ exactDateLength = 8;
+ dateFormat = new SimpleDateFormat("yy/MM/dd");
+ } else if (text.trim().indexOf("-") > -1 && text.trim().length() >= 19) {
+ if (text.trim().length() == 19) {
+ exactDateLength = 19;
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ } else if (text.trim().length() == 23) {
+ exactDateLength = 23;
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+ }
+ } else if (text.trim().indexOf("-") > -1 && text.trim().length() == 17) {
+ exactDateLength = 17;
+ dateFormat = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
+ } else if (text.trim().indexOf("-") > -1 && text.trim().length() == 8) {
+ exactDateLength = 8;
+ dateFormat = new SimpleDateFormat("yy-MM-dd");
+ } else {
+ exactDateLength = 19;
+ dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ }
+
+ if (text != null && exactDateLength >= 0 && text.length() != exactDateLength) {
+ throw new IllegalArgumentException("涓嶈兘鍒濆鍖栨椂闂达紝鍥犱负鍐呭涓嶅埌" + exactDateLength + "闀垮害");
+ } else {
+ try {
+ return str2Date(date2Str(dateFormat.parse(text), "yyyy-MM-dd HH:mm:ss"), "yyyy-MM-dd HH:mm:ss.SSS");
+ } catch (ParseException var4) {
+ throw new IllegalArgumentException("涓嶈兘鏍煎紡鍖栨棩鏈�: " + var4.getMessage(), var4);
+ } catch (Exception var5) {
+ throw new IllegalArgumentException("涓嶈兘鏍煎紡鍖栨棩鏈�: " + var5.getMessage(), var5);
+ }
+ }
+ }
+ }
+
+ public static String getChinaDate(String d) throws Exception {
+ Date s = str2Date(d, "yyyy-MM-dd");
+ SimpleDateFormat chineseDateFormat = new SimpleDateFormat("yyyy骞碝M鏈坉d鏃�");
+ Calendar today = Calendar.getInstance();
+
+ try {
+ today.setTime(chineseDateFormat.parse(date2Str(s, "yyyy骞碝M鏈坉d鏃�")));
+ } catch (ParseException var5) {
+ throw new Exception(var5);
+ }
+
+ Lunar lunar = new Lunar(today);
+ return lunar.getDate();
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/WebThreadLocalUtil.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/WebThreadLocalUtil.java
new file mode 100644
index 0000000..c9a342a
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/com/vci/starter/web/util/WebThreadLocalUtil.java
@@ -0,0 +1,35 @@
+package com.vci.ubcs.com.vci.starter.web.util;
+
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+
+//package com.vci.starter.web.util;
+
+
+import com.vci.ubcs.com.vci.starter.web.pagemodel.SessionInfo;
+
+public class WebThreadLocalUtil {
+ private static ThreadLocal<SessionInfo> currentUserSessionInfoInThread = new ThreadLocal();
+ private static ThreadLocal<String> needQueryTotalInThread = new ThreadLocal();
+
+ public WebThreadLocalUtil() {
+ }
+
+ public static ThreadLocal<SessionInfo> getCurrentUserSessionInfoInThread() {
+ return currentUserSessionInfoInThread;
+ }
+
+ public static void setCurrentUserSessionInfoInThread(ThreadLocal<SessionInfo> currentUserSessionInfoInThread) {
+ WebThreadLocalUtil.currentUserSessionInfoInThread = currentUserSessionInfoInThread;
+ }
+
+ public static ThreadLocal<String> getNeedQueryTotalInThread() {
+ return needQueryTotalInThread;
+ }
+
+ public static void setNeedQueryTotalInThread(ThreadLocal<String> needQueryTotalInThread) {
+ WebThreadLocalUtil.needQueryTotalInThread = needQueryTotalInThread;
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 1994c08..e5e0fd4 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -24,84 +24,6 @@
<dependencies>
<dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-platform-web</artifactId>
- <version>2022.1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-openfeign</artifactId>
- </exclusion>
-<!-- <exclusion>-->
-<!-- <groupId>com.vci</groupId>-->
-<!-- <artifactId>vci-starter-corba</artifactId>-->
-<!-- </exclusion>-->
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-platform-webservice</artifactId>
- <version>2022.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>com.vci.mdm</groupId>
- <artifactId>vci-mdm-wrj-webducking</artifactId>
- <version>2022.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>de.odysseus.staxon</groupId>
- <artifactId>staxon</artifactId>
- <version>1.3</version>
- </dependency>
-
- <!--axis2 begin -->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-adb</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-kernel</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-http</artifactId>
- <version>${axis2.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax-servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-transport-local</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- <version>${axis2.version}</version>
- </dependency>
- <!--axis2 end -->
-
- <!--webservice鐨勫唴瀹�-->
- <dependency>
- <groupId>com.vci</groupId>
- <artifactId>vci-platform-webservice</artifactId>
- <version>2022.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-code-api</artifactId>
<version>3.0.1.RELEASE</version>
@@ -117,8 +39,13 @@
<artifactId>blade-core-boot</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-starter-swagger</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cn.easyproject</groupId>
+ <artifactId>orai18n</artifactId>
+ <version>${orai18n.version}</version>
</dependency>
</dependencies>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/CodeApplication.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/CodeApplication.java
index 3eb114f..904cf38 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/CodeApplication.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/CodeApplication.java
@@ -16,13 +16,9 @@
*/
package com.vci.ubcs.code;
+import org.springblade.core.cloud.client.UbcsCloudApplication;
import org.springblade.core.launch.UbcsApplication;
import org.springblade.core.launch.constant.AppConstant;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableScheduling;
/**
* Code鍚姩鍣�
@@ -30,11 +26,7 @@
* @author
* ludc
*/
-@SpringBootApplication
-@EnableFeignClients(basePackages = {"com.vci.*"})
-@ComponentScan({"com.vci.*"})
-@EnableScheduling
-@EnableCaching
+@UbcsCloudApplication
public class CodeApplication {
public static void main(String[] args) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingClassSyncScheduling.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingClassSyncScheduling.java
deleted file mode 100644
index 6fc7456..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingClassSyncScheduling.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.vci.ubcs.code.Scheduling;
-
-
-import com.vci.ubcs.code.service.CodeDuckingSyncServiceI;
-import com.vci.starter.web.enumpck.BooleanEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 闆嗘垚浠诲姟瀹氭椂鍣�
- * 鎻掑叆dockingtask涓�
- * 浠巇ockingtask涓彇鍑烘潵鏁版嵁锛屾帹閫佸嚭鍘荤殑鎿嶄綔
- */
-@Component
-public class DockingClassSyncScheduling {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private CodeDuckingSyncServiceI codeDuckingSyncServiceI;
-
- @Value("${clsfSyncPush.isStart:false}")
- public boolean CLSF_SYNC_PUSH_ISSTARE;
-
- /**
- * 鏄惁鍒濆鍖栧畬鎴愪簡
- */
- public static volatile String FINISH_INIT = "false";
-
- /**
- * 鍦ㄥ垵濮嬪寲瀹屾垚鍚庢墽琛�
- */
- @PostConstruct()
- public void onInit(){
- FINISH_INIT = "true";
- }
-
- //榛樿姣忓垎閽熸墽琛屾柟娉�
- @Scheduled(cron = "${clsfSyncPush.cronTime:0 0/10 * * * ?}")
- public void scheduled() {
- if(CLSF_SYNC_PUSH_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
- codeDuckingSyncServiceI.DockingClassSyncScheduing();
- SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
- String time = formatter.format(new Date());
- String outinfo = "============鍦� "+time+" 鎵ц浜嗗垎绫婚泦鎴愭帹閫�";
- logger.info(outinfo);
- }
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java
deleted file mode 100644
index 699196e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingDataSyncScheduling.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.vci.ubcs.code.Scheduling;
-
-import com.vci.ubcs.code.service.CodeDuckingSyncServiceI;
-import com.vci.starter.web.enumpck.BooleanEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 闆嗘垚浠诲姟瀹氭椂鍣�
- * 鎻掑叆dockingtask涓�
- * 浠巇ockingtask涓彇鍑烘潵鏁版嵁锛屾帹閫佸嚭鍘荤殑鎿嶄綔
- */
-@Component
-public class DockingDataSyncScheduling {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private CodeDuckingSyncServiceI codeDuckingSyncServiceI;
-
- @Value("${dataSyncPush.isStart:false}")
- public boolean DATA_SYNC_PUSH_ISSTARE;
-
- /**
- * 鏄惁鍒濆鍖栧畬鎴愪簡
- */
- public static volatile String FINISH_INIT = "false";
-
- /**
- * 鍦ㄥ垵濮嬪寲瀹屾垚鍚庢墽琛�
- */
- @PostConstruct()
- public void onInit(){
- FINISH_INIT = "true";
- }
-
- //榛樿姣忓垎閽熸墽琛屾柟娉�
- @Scheduled(cron = "${dataSyncPush.cronTime:0 0/10 * * * ?}")
- public void scheduled() {
- if(DATA_SYNC_PUSH_ISSTARE && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
- codeDuckingSyncServiceI.DockingDataSyncScheduing();
- SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
- String time = formatter.format(new Date());
- String outinfo = "============鍦� "+time+" 鎵ц浜嗕富鏁版嵁闆嗘垚鏁版嵁鎺ㄩ��";
- logger.info(outinfo);
- }
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingScheduling.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingScheduling.java
deleted file mode 100644
index 430cebf..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/Scheduling/DockingScheduling.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.vci.ubcs.code.Scheduling;
-
-
-import com.vci.ubcs.code.service.CodeDuckingServiceI;
-import com.vci.starter.web.enumpck.BooleanEnum;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * 闆嗘垚浠诲姟瀹氭椂鍣�
- * 鎻掑叆dockingtask涓�
- * 浠巇ockingtask涓彇鍑烘潵鏁版嵁锛屾帹閫佸嚭鍘荤殑鎿嶄綔
- */
-@Component
-public class DockingScheduling {
-
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Resource
- private CodeDuckingServiceI codeDuckingServiceI;
-
- @Value("${docking.insertCache2:false}")
- public boolean INSERT_CACHE2;
-
- /**
- * 鏄惁鍒濆鍖栧畬鎴愪簡
- */
- public static volatile String FINISH_INIT = "false";
-
- /**
- * 鍦ㄥ垵濮嬪寲瀹屾垚鍚庢墽琛�
- */
- @PostConstruct()
- public void onInit(){
- FINISH_INIT = "true";
- }
-
- //榛樿姣忓垎閽熸墽琛屾柟娉�
- @Scheduled(cron = "${docking.cron:0 0/10 * * * ?}")
- public void scheduled() {
- if(INSERT_CACHE2 && BooleanEnum.TRUE.getValue().equalsIgnoreCase(FINISH_INIT)) {
- codeDuckingServiceI.DockingScheduing();
- SimpleDateFormat formatter= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.");
- String time = formatter.format(new Date());
- String outinfo = "============鍦� "+time+" 鎵ц浜嗕富鏁版嵁闆嗘垚鏁版嵁鎺ㄩ��";
- logger.info(outinfo);
- }
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomSerialAlgorithmExample.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomSerialAlgorithmExample.java
deleted file mode 100644
index b553c41..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/algorithm/CustomSerialAlgorithmExample.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.vci.ubcs.code.algorithm;
-
-import com.vci.ubcs.code.annotation.MdmSerialAlgorithm;
-import com.vci.ubcs.code.annotation.MdmSerialAlgorithmMethod;
-
-/**
- * 娴佹按绠楁硶鐨勭ず渚�
- */
-@MdmSerialAlgorithm(text = "娴佹按绠楁硶鐨勭ず渚�",description = "璇蜂笉瑕佷娇鐢ㄨ繖涓被锛岃繖涓被鍙槸绀轰緥锛岀敤浜庢煡鐪嬪浣曠紪鍐欐祦姘寸畻娉�")
-public class CustomSerialAlgorithmExample {
-
- /**
- * 鐢熸垚娴佹按鍙风殑鏂规硶
- * @return 娴佹按鍙风殑淇℃伅
- */
- @MdmSerialAlgorithmMethod
- public String serialGenerate(){
- return "";
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/BaseEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/BaseEnum.java
new file mode 100644
index 0000000..8e839e9
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/BaseEnum.java
@@ -0,0 +1,7 @@
+package com.vci.ubcs.code.annotation;
+
+public interface BaseEnum {
+ String getValue();
+
+ String getText();
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmIntegrationMap.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmIntegrationMap.java
deleted file mode 100644
index 8b443ed..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmIntegrationMap.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.vci.ubcs.code.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 闆嗘垚鏃惰嚜瀹氫箟鐨勮浆鎹㈢被
- * @author weidy
- * @date 2022-1-18
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MdmIntegrationMap {
-
- /**
- * 鍊硷紝瀹為檯灏辨槸杩欎釜娉ㄨВ鎵�鍦ㄧ殑绫荤殑鍏ㄨ矾寰�
- * @return 鍊�
- */
- String value() default "";
-
- /**
- * 浜嬩欢鐨勫悕绉�
- * @return 浜嬩欢鍚嶇О
- */
- String text();
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmIntegrationMapMethod.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmIntegrationMapMethod.java
deleted file mode 100644
index b462cf9..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmIntegrationMapMethod.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.vci.ubcs.code.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 闆嗘垚鏃惰嚜瀹氫箟鐨勮浆鎹㈡柟娉�
- * @author weidy
- * @date 2022-1-18
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MdmIntegrationMapMethod {
-
- /**
- * 鍊硷紝
- * @return 鍊�
- */
- String value() default "";
-
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmSerialAlgorithm.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmSerialAlgorithm.java
deleted file mode 100644
index 7e7fe98..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmSerialAlgorithm.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.vci.ubcs.code.annotation;
-
-import org.springframework.stereotype.Component;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 鑷畾涔夋祦姘寸畻娉曠殑娉ㄨВ
- * @author weidy
- * @date 2022-1-18
- */
-@Target({ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Component
-public @interface MdmSerialAlgorithm {
-
- /**
- * 鍊硷紝瀹為檯灏辨槸杩欎釜娉ㄨВ鎵�鍦ㄧ殑绫荤殑鍏ㄨ矾寰�
- * @return 鍊�
- */
- String value() default "";
-
- /**
- * 浜嬩欢鐨勫悕绉�
- * @return 浜嬩欢鍚嶇О
- */
- String text();
-
- /**
- * 鎻忚堪
- * @return 鎻忚堪
- */
- String description() default "";
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmSerialAlgorithmMethod.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmSerialAlgorithmMethod.java
deleted file mode 100644
index 752206b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/annotation/MdmSerialAlgorithmMethod.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.vci.ubcs.code.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 鑷畾涔夋祦姘寸畻娉曞鐞嗘柟娉曠殑娉ㄨВ
- * @author weidy
- * @date 2022-1-18
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface MdmSerialAlgorithmMethod {
-
- /**
- * 鍊�
- * @return 鍊�
- */
- String value() default "";
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/FrameWorkDefaultValueConstant.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/FrameWorkDefaultValueConstant.java
new file mode 100644
index 0000000..f1dd8d4
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/FrameWorkDefaultValueConstant.java
@@ -0,0 +1,169 @@
+package com.vci.ubcs.code.constant;
+
+/**
+ * 骞冲彴妗嗘灦鐨勪竴浜涢粯璁ゅ�硷紝鍦ㄤ竴浜涘鎴蜂笉闇�瑕佺鐞嗘煇浜涙。妗堟椂锛岄粯璁や竴涓��
+ * @author weidy
+ * @date 2019/12/30
+ */
+public class FrameWorkDefaultValueConstant {
+
+ /**
+ * 榛樿鐨勭粍缁囦富閿�
+ */
+ public static final String DEFAULT_ORGANIZATION_OID = "defaultOrg";
+
+ /**
+ * 榛樿鐨勭粍缁囧悕绉�
+ */
+ public static final String DEFAULT_ORGANIZATION_NAME = "榛樿缁勭粐";
+
+ /**
+ * 榛樿鐨勫簱鎴夸富閿�
+ */
+ public static final String DEFAULT_WAREHOUSE_OID = "defaultWarehouse";
+
+ /**
+ * 榛樿鐨勫簱鎴垮悕绉�
+ */
+ public static final String DEFAULT_WAREHOUSE_NAME ="榛樿搴撴埧";
+
+ /**
+ * 榛樿鐨勮揣浣嶄富閿�
+ */
+ public static final String DEFAULT_GOODS_LOCATION_OID = "defaultGoodsLocation";
+
+ /**
+ * 榛樿鐨勮揣浣嶅悕绉�
+ */
+ public static final String DEFAULT_GOODS_LOCATION_NAME = "榛樿璐т綅";
+
+ /**
+ * 榛樿鐨勫簱鎴跨鐞嗗憳
+ */
+ public static final String DEFAULT_WAREHOUSE_ADMIN_OID = "defaultWarehouseAdmin";
+
+ /**
+ * 榛樿鐨勫簱鎴跨鐞嗗憳鍚嶇О
+ */
+ public static final String DEFAULT_WAREHOUSE_ADMIN_NAME = "榛樿搴撴埧绠＄悊鍛�";
+
+ /**
+ * 榛樿鐢ㄦ埛
+ */
+ public static final String DEFAULT_USER_OID = "defaultUser";
+
+ /**
+ * 榛樿鐢ㄦ埛鍚嶇О
+ */
+ public static final String DEFAULT_USER_NAME = "榛樿鐢ㄦ埛";
+
+ /**
+ * 榛樿閮ㄩ棬
+ */
+ public static final String DEFAULT_DEPARTMENT_OID = "defaultDepartment";
+
+ /**
+ * 榛樿閮ㄩ棬鍚嶇О
+ */
+ public static final String DEFAULT_DEPARTMENT_NAME = "榛樿閮ㄩ棬";
+
+ /**
+ * 榛樿token
+ */
+ public static final String DEFAULT_TOKEN = "51b3df0f-e769-40a5-bf3a-a8143ef0262f";
+
+ /**
+ * 鍚敤鐨勬暟鎹�
+ */
+ public static final String FRAMEWORK_DATA_ENABLED = "Enabled";
+
+ /**
+ * 鍋滅敤鐨勬暟鎹�
+ */
+ public static final String FRAMEWORK_DATA_DISABLED = "Disabled";
+
+ /**
+ * 缂栬緫鐨勬暟鎹�
+ */
+ public static final String FRAMEWORK_RELEASE_EDITING = "Editing";
+
+ /**
+ * 瀹℃牳涓殑鏁版嵁
+ */
+ public static final String FRAMEWORK_RELEASE_AUDITING = "Auditing";
+
+ /**
+ * 宸叉彁浜�
+ */
+ public static final String FRAMEWORK_RELEASE_SUBMIT = "Submit";
+
+ /**
+ * 鍙戝竷鐨勬暟鎹�
+ */
+ public static final String FRAMEWORK_RELEASE_RELEASED = "Released";
+
+ /**
+ * 鍦ㄦ爲涓婃樉绀衡�滄墍鏈塜XX鈥濊繖涓妭鐐圭殑涓婚敭
+ */
+ public static final String ALL_DATA_TREE_NODE_OID = "${all}";
+
+ /**
+ * 鏌ヨ鎵�鏈夌殑鐗堟湰
+ */
+ public static final String QUERY_ALL_REVISION = "${queryAllRevision}";
+
+ /**
+ * 鍙傜収鐨勬椂鍊欙紝鏄剧ず宸插仠鐢ㄧ殑鏁版嵁鐨勬煡璇㈠弬鏁�
+ */
+ public static final String REFER_SHOW_DISABLED_QUERY_KEY ="referAllLcStatus";
+
+ /**
+ * 瀹屾垚
+ */
+ public static final String FRAMEWORK_RELEASE_FINISH = "Finish";
+
+ /**
+ * 宸叉寕璧�
+ */
+ public static final String FRAMEWORK_RELEASE_SUSPENDED = "Suspended";
+
+ /**
+ * 宸蹭綔搴�
+ */
+ public static final String FRAMEWORK_RELEASE_OBSOLETED = "Obsoleted";
+
+ /**
+ * 鎵ц涓�
+ */
+ public static final String FRAMEWORK_RELEASE_EXECUTING = "Executing";
+
+ /**
+ * 宸查��鍥�
+ */
+ public static final String FRAMEWORK_RELEASE_SENDBACK = "SendBack";
+
+ /**
+ * 宸叉敹鍥�
+ */
+ public static final String FRAMEWORK_RELEASE_TAKEBACK = "TakeBack";
+
+ /**
+ * 榛樿鐨勫瘑鐮佺瓥鐣ヤ富閿�
+ */
+ public static final String DEFAULT_PASSWORD_STRATEGY = "defaultPasswordStrategy";
+
+ /**
+ * 鐘舵�佸瓧娈�
+ */
+ public static final String LC_STATUS = "lcStatus";
+
+ /**
+ * 瀛楁瘝鍗囩増鐨勭増鏈鍒�
+ */
+ public static final String CHAR_REVISION = "characterversionrule";
+
+ /**
+ * 鏁板瓧鍗囩増鐨勭増鏈鍒�
+ */
+ public static final String NUMBER_REVISION = "numberversionrule";
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/FrameWorkLangCodeConstant.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/FrameWorkLangCodeConstant.java
new file mode 100644
index 0000000..0686993
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/FrameWorkLangCodeConstant.java
@@ -0,0 +1,321 @@
+package com.vci.ubcs.code.constant;
+
+//package com.vci.frameworkcore.constant;
+
+/**
+ * 鍩虹妗嗘灦鐨勯�氱敤鐨勫璇█缂栫爜
+ * @author weidy
+ * @date 2020/4/25
+ */
+public class FrameWorkLangCodeConstant {
+
+ /**
+ * 娣诲姞鎴愬姛
+ */
+ public static final String ADD_SUCCESS ="addSuccess";
+
+ /**
+ * 娣诲姞澶辫触
+ */
+ public static final String ADD_FAIL = "addFailInDB";
+
+ /**
+ * 淇敼鎴愬姛
+ */
+ public static final String EDIT_SUCCESS = "editSuccess";
+
+ /**
+ * 淇敼澶辫触
+ */
+ public static final String EDIT_FAIL = "editFail";
+
+ /**
+ * 鍒犻櫎鎴愬姛
+ */
+ public static final String DELETE_SUCCESS = "deleteSuccess";
+
+ /**
+ * 绾ц仈鍒犻櫎鎴愬姛
+ */
+ public static final String DELETE_SUCCESS_CASCADE = "deleteSuccessCascade";
+
+ /**
+ * 鍒犻櫎澶辫触
+ */
+ public static final String DELETE_FAIL = "deleteFail";
+
+ /**
+ * 鍚敤鎴愬姛
+ */
+ public static final String ENABLE_SUCCESS ="enableSuccess";
+
+ /**
+ * 閿佸畾鎴愬姛
+ */
+ public static final String LOCK_SUCCESS = "lockSuccess";
+
+ /**
+ * 閿佸畾澶辫触
+ */
+ public static final String LOCK_FAIL = "lockFail";
+
+ /**
+ * 瑙ｉ攣鎴愬姛
+ */
+ public static final String UNLOCK_SUCCESS = "unlockSuccess";
+
+ /**
+ * 瑙ｉ攣澶辫触
+ */
+ public static final String UNLOCK_FAIL = "unlockFail";
+
+ /**
+ * 绾ц仈鍚敤鎴愬姛
+ */
+ public static final String ENABLE_SUCCESS_CASCADE = "enableSuccessCascade";
+
+ /**
+ * 鍚敤澶辫触
+ */
+ public static final String ENABLE_FAIL = "enableFail";
+
+ /**
+ * 鍋滅敤鎴愬姛
+ */
+ public static final String DISABLE_SUCCESS = "disableSuccess";
+
+ /**
+ * 绾ц仈鍋滅敤鎴愬姛
+ */
+ public static final String DISABLE_SUCCESS_CASCADE = "disableSuccessCascade";
+
+ /**
+ * 鍋滅敤澶辫触
+ */
+ public static final String DISABLE_FAIL = "disableFail";
+
+ /**
+ * 鍗囩増鏈彿鎴愬姛
+ */
+ public static final String UP_REVISION_SUCCESS = "dataUpRevisionSuccess";
+
+ /**
+ * 鍗囩増鏈彿澶辫触
+ */
+ public static final String UP_REVISION_FAIL = "dataUpRevisionFail";
+
+ /**
+ * 鍗囩増娆℃垚鍔�
+ */
+ public static final String UP_VERSION_SUCCESS = "dataUpVersionSuccess";
+
+ /**
+ * 鍗囩増娆″け璐�
+ */
+ public static final String UP_VERSION_FAIL = "dataUpVersionFail";
+
+ /**
+ * 鎻愪氦鎴愬姛
+ */
+ public static final String SUBMIT_SUCCESS= "submitSuccess";
+
+ /**
+ * 鎻愪氦澶辫触
+ */
+ public static final String SUBMIR_FAIL = "submitFail";
+
+ /**
+ * 鍙戝竷鎴愬姛
+ */
+ public static final String RELEASE_SUCCESS = "releaseSuccess";
+
+ /**
+ * 鍙戝竷澶辫触
+ */
+ public static final String RELEASE_FAIL = "releaseFail";
+
+ /**
+ * 鐗堟湰鍙烽噸澶�
+ */
+ public static final String REVISION_REPEAT = "revisionRepeat";
+
+ /**
+ * 鐗堟鍙烽噸澶�
+ */
+ public static final String VERSION_REPEAT= "versionRepeat";
+
+ /**
+ * 鏍规嵁涓婚敭鏌ヨ鏁版嵁涓嶅瓨鍦�
+ */
+ public static final String DATA_OID_NOT_EXIST = "dataOidNotExist";
+
+ /**
+ * 鏍规嵁涓婚敭鏌ヨ鐨勬暟鎹笉瀛樺湪
+ */
+ public static final String DATA_ID_NOT_EXIST = "dataIdNotExist";
+
+ /**
+ * 鏍规嵁鍚嶇О鏌ヨ鐨勬暟鎹笉瀛樺湪
+ */
+ public static final String DATA_NAME_NOT_EXIST = "dataNameNotExist";
+
+ /**
+ * 灞炴�у�奸噸澶�
+ */
+ public static final String DATA_ATTR_REPEAT = "dataRepeat";
+
+ /**
+ * 鑰佺増鏈殑鏁版嵁涓嶅瓨鍦�
+ */
+ public static final String OLD_REVISION_DATA_NOT_EXIST = "oldRevsionDataNotExist";
+
+ /**
+ * 涓婄骇涓婚敭瀹為檯鏄綋鍓嶈妭鐐圭殑涓嬬骇鑺傜偣锛屼細寮曡捣姝诲惊鐜�
+ */
+ public static final String PARENT_OID_IS_CHILD ="parentIsChild";
+
+ /**
+ * 鏁版嵁琚紩鐢紝涓嶅厑璁稿垹闄�
+ */
+ public static final String DATA_LINKED_NOT_DELETE = "dataLinkedNotDelete";
+
+ /**
+ * 鏁版嵁鐨勫瓙鑺傜偣涔熻寮曠敤锛屼笉鍏佽鍒犻櫎
+ */
+ public static final String DATA_CASCADE_LINKED_NOT_DELETE = "dataCascadeLinkedNotDelete";
+
+ /**
+ * 鏁版嵁琚紩鐢紝涓嶅厑璁镐慨鏀�
+ */
+ public static final String DATA_LINKED_NOT_EDIT ="dataLinkedNotEdit";
+
+ /**
+ * 鏁版嵁涓嶅紩鐢紝涓嶅厑璁镐慨鏀规煇涓睘鎬�
+ */
+ public static final String DATA_LINKED_NOT_EDIT_ATTR="dataLinkedNotEditAttr";
+
+ /**
+ * 涓婄骇妗ｆ涓嶅瓨鍦�
+ */
+ public static final String DATA_PARENT_NOT_EXIST = "parentNotExist";
+
+ /**
+ * 鍒嗙被鏁版嵁涓嶅瓨鍦�
+ */
+ public static final String DATA_CLASSIFY_NOT_EXIST = "classifyNotExist";
+
+ /**
+ * 褰撳墠鐘舵�佷笅涓嶅厑璁镐慨鏀规暟鎹�
+ */
+ public static final String LCSTATUS_CAN_NOT_EDIT = "lcStatusCannotEditData";
+
+ /**
+ * 褰撳墠鐘舵�佷笅涓嶅厑璁稿垹闄ゆ暟鎹�
+ */
+ public static final String LCSTATUS_CAN_NOT_DELETE = "lcStatusCannotDeleteData";
+
+ /**
+ * 瀵煎叆鎴愬姛
+ */
+ public static final String IMPORT_SUCCESS = "importSuccess";
+
+ /**
+ * 瀵煎叆澶辫触
+ */
+ public static final String IMPORT_FAIL = "importFail";
+
+ /**
+ * 瀵煎叆鐨勬ā鏉挎枃浠朵笉瀛樺湪
+ */
+ public static final String IMPORT_TEMPLATE_FILE_NOT_FOUND = "importTemplateFileNotFound";
+
+ /**
+ * 瀵煎嚭鎴愬姛
+ */
+ public static final String EXPORT_SUCCESS = "exportSuccess";
+
+ /**
+ * 瀵煎嚭澶辫触
+ */
+ public static final String EXPORT_FAIL = "exportFail";
+
+ /**
+ * 涓婁紶鎴愬姛
+ */
+ public static final String UPLOAD_SUCCESS = "uploadSuccess";
+
+ /**
+ * 涓婁紶澶辫触
+ */
+ public static final String UPLOAD_FAIL = "uploadFail";
+
+ /**
+ * 涓嬭浇鎴愬姛
+ */
+ public static final String DOWNLOAD_SUCCESS = "downloadSuccess";
+
+ /**
+ * 涓嬭浇澶辫触
+ */
+ public static final String DOWNLOAD_FAIL = "downloadFail";
+
+ /**
+ * 鏂囦欢涓嶅瓨鍦�
+ */
+ public static final String FILE_NOT_EXIST = "fileNotExist";
+
+ /**
+ * 瀹℃壒鎴愬姛
+ */
+ public static final String AUDIT_SUCCESS = "auditSuccess";
+
+ /**
+ * 瀹℃壒澶辫触
+ */
+ public static final String AUDIT_FAIL = "auditFail";
+
+ /**
+ * 涓嬪彂鎴愬姛
+ */
+ public static final String ISSUED_SUCCESS = "issuedSuccess";
+
+ /**
+ * 涓嬪彂澶辫触
+ */
+ public static final String ISSUED_FAIL = "issuedFail";
+
+ /**
+ * 鎺ユ敹鎴愬姛
+ */
+ public static final String RECEIVE_SUCCESS = "receiveSuccess";
+
+ /**
+ * 鎺ユ敹澶辫触
+ */
+ public static final String RECEIVE_FAIL = "receiveFail";
+
+ /**
+ * 璁″垝鐨勫埗閫犱緷鎹笉瀛樺湪
+ */
+ public static final String PLAN_SOURCE_NOT_EXIST = "planSourceNotExist";
+
+ /**
+ * 璁″垝鐨勫埗閫犵洰鏍囦笉瀛樺湪
+ */
+ public static final String PLAN_TARGET_NOT_EXIST = "planTargetNotExist";
+
+ /**
+ * 娲惧彂鎴愬姛
+ */
+ public static final String DISPATCH_SUCCESS = "dispatchSuccess";
+
+ /**
+ * 娲惧彂澶辫触
+ */
+ public static final String DISPATCH_FAIL = "dispatchFail";
+
+ /**
+ * 璇ヨ鍒掍笅涓嶅瓨鍦ㄦ淳鍙戣繃鐨勪换鍔�
+ */
+ public static final String DISPATCH_TASK_NOT_EXIST_BY_PLAN = "dispatchTaskNotExistByPlan";
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java
new file mode 100644
index 0000000..81c307d
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeAllcodeController.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.code.entity.CodeAllcode;
+import com.vci.ubcs.code.service.ICodeAllcodeService;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+import com.vci.ubcs.code.wrapper.CodeAllcodeWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * 鍏ㄩ儴鐮佸�� 鎺у埗鍣�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("blade-code/CodeAllcode")
+@Api(value = "鍏ㄩ儴鐮佸��", tags = "鍏ㄩ儴鐮佸�兼帴鍙�")
+public class CodeAllcodeController extends BladeController {
+
+ private final ICodeAllcodeService CodeAllcodeService;
+
+ /**
+ * 鍏ㄩ儴鐮佸�� 璇︽儏
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "璇︽儏", notes = "浼犲叆CodeAllcode")
+ public R<CodeAllcodeVO> detail(CodeAllcode CodeAllcode) {
+ CodeAllcode detail = CodeAllcodeService.getOne(Condition.getQueryWrapper(CodeAllcode));
+ return R.data(CodeAllcodeWrapper.build().entityVO(detail));
+ }
+ /**
+ * 鍏ㄩ儴鐮佸�� 鍒嗛〉
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeAllcode")
+ public R<IPage<CodeAllcodeVO>> list(CodeAllcode CodeAllcode, Query query) {
+ IPage<CodeAllcode> pages = CodeAllcodeService.page(Condition.getPage(query), Condition.getQueryWrapper(CodeAllcode));
+ return R.data(CodeAllcodeWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 鍏ㄩ儴鐮佸�� 鑷畾涔夊垎椤�
+ */
+ @GetMapping("/page")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeAllcode")
+ public R<IPage<CodeAllcodeVO>> page(CodeAllcodeVO CodeAllcode, Query query) {
+ IPage<CodeAllcodeVO> pages = CodeAllcodeService.selectCodeAllcodePage(Condition.getPage(query), CodeAllcode);
+ return R.data(pages);
+ }
+
+ /**
+ * 鍏ㄩ儴鐮佸�� 鏂板
+ */
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "鏂板", notes = "浼犲叆CodeAllcode")
+ public R save(@Valid @RequestBody CodeAllcode codeAllcode) {
+ return R.status(CodeAllcodeService.save(codeAllcode));
+ }
+
+ /**
+ * 鍏ㄩ儴鐮佸�� 淇敼
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "淇敼", notes = "浼犲叆CodeAllcode")
+ public R update(@Valid @RequestBody CodeAllcode codeAllcode) {
+ return R.status(CodeAllcodeService.updateById(codeAllcode));
+ }
+
+ /**
+ * 鍏ㄩ儴鐮佸�� 鏂板鎴栦慨鏀�
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆CodeAllcode")
+ public R submit(@Valid @RequestBody CodeAllcode codeAllcode) {
+ return R.status(CodeAllcodeService.saveOrUpdate(codeAllcode));
+ }
+
+ /**
+ * 鍏ㄩ儴鐮佸�� 鍒犻櫎
+ */
+ @PostMapping("/remove")
+ @ApiOperationSupport(order = 7)
+ @ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆ids")
+ public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) {
+ return R.status(CodeAllcodeService.removeBatchByIds(Func.toLongList(ids)));
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySyncController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySyncController.java
deleted file mode 100644
index 754d0fa..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySyncController.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.dto.datapush.result.ResultJsonDTO;
-import com.vci.ubcs.code.dto.datapush.result.ResultNodeDataDTO;
-import com.vci.ubcs.code.dto.datapush.result.ResultNodeObjectDTO;
-import com.vci.ubcs.code.service.UniversalInterfaceI;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.vci.starter.web.annotation.controller.VciUnCheckRight;
-import com.vci.starter.web.annotation.controller.VciUnUseResponseAdvice;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Arrays;
-
-/**
- * 涓婚搴撳垎绫绘帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-20
- */
-@RestController
-@VciUnCheckRight
-@RequestMapping("/codeSyncUniversalControoler")
-public class CodeApplySyncController {
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
- /**
- * 鎺ュ彛闆嗘垚鏈嶅姟
- */
- @Autowired
- private UniversalInterfaceI universalInterface;
- /****
- * 鐢宠鎺ュ彛
- * @param dataString 灞炴�т俊鎭�
- * @param dataType 鏁版嵁鏍煎紡绫诲瀷
- * @return
- * @throws Throwable
- */
- @VciUnCheckRight
- @VciUnUseResponseAdvice
- @PostMapping("/applyCode")
- public String applyCode(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) {
- String result="";
- try {
- result = universalInterface.applyCode(dataString, dataType);
- }catch (Throwable e){
- e.printStackTrace();
- logger.error("applyCode->"+e.getMessage());
- }
- return result;
- }
-
- /****
- * 鏇存柊/鍒犻櫎/鐘舵�佹帴鍙�
- * @param dataString 灞炴�т俊鎭�
- * @param dataType 鏁版嵁鏍煎紡绫诲瀷
- * @return
- * @throws Throwable
- */
- @VciUnCheckRight
- @VciUnUseResponseAdvice
- @PostMapping("/syncData")
- public String syncData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) {
- String result="";
- try {
- result= universalInterface.syncEditData(dataString,dataType);
- }catch (Throwable e){
- e.printStackTrace();;
- logger.error("syncData->"+e.getMessage());
- }
- return result;
- }
-
-
- /****
- * 鏌ヨ鍒嗙被鍙�
- * @param dataString 灞炴�т俊鎭�
- * @param dataType 鏁版嵁鏍煎紡绫诲瀷
- * @return
- * @throws Throwable
- */
- @VciUnCheckRight
- @VciUnUseResponseAdvice
- @PostMapping("/queryClassify")
- public String queryClassify(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
- String result="";
- try {
- result = universalInterface.queryClassify(dataString, dataType);
- }catch (Throwable e){
- e.printStackTrace();
- logger.error("queryClassify->"+e.getMessage());
- }
- return result;
- }
-
- /****
- * 鏌ヨ鍒嗙被鍙�
- * @param dataString 灞炴�т俊鎭�
- * @param dataType 鏁版嵁鏍煎紡绫诲瀷
- * @return
- * @throws Throwable
- */
- @VciUnCheckRight
- @VciUnUseResponseAdvice
- @PostMapping("/queryData")
- public String queryData(@RequestParam("dataString")String dataString,@RequestParam("dataType")String dataType) throws Throwable {
- String result="";
- try {
- result= universalInterface.queryData(dataString,dataType);
- }catch (Throwable e){
- e.printStackTrace();
- logger.error("queryData->"+e.getMessage());
- }
- return result;
- }
-
- /****
- * 鏌ヨ鍒嗙被鍙�
- * @param dataString 灞炴�т俊鎭�
- * @param dataType 鏁版嵁鏍煎紡绫诲瀷
- * @return
- * @throws Throwable
- */
- @VciUnCheckRight
- @VciUnUseResponseAdvice
- @PostMapping("/testPushData")
- public String testPushData(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType) throws Throwable {
- String result="";
- ResultJsonDTO resultJsonDTO=new ResultJsonDTO();
- ResultNodeDataDTO resultNodeDataDTO =new ResultNodeDataDTO();
- ResultNodeObjectDTO resultNodeObjectDTO=new ResultNodeObjectDTO();
- resultNodeObjectDTO.setCode("01001");
- resultNodeObjectDTO.setOid("0001");
- resultNodeObjectDTO.setMsg("娴嬭瘯鎴愬姛");
- resultNodeObjectDTO.setErroid("0");
- resultNodeDataDTO.setObject(Arrays.asList(resultNodeObjectDTO));
- if(dataType.equalsIgnoreCase("json")){
- resultJsonDTO.setData(resultNodeDataDTO);
- Object object = JSONObject.toJSON(resultJsonDTO);
- result = object.toString();
- }else{
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(ResultNodeDataDTO.class);
- xStream.autodetectAnnotations(true);
- String results=xStream.toXML(resultNodeDataDTO);
- result ="<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + results;
-
- }
- //result="\"<?xml version=\\\"1.0\\\" encoding=\\\"UTF-8\\\" ?><data>\\n <object code=\\\"01001\\\" oid=\\\"0001\\\" erroid=\\\"0\\\" msg=\\\"娴嬭瘯鎴愬姛\\\"/>\\n</data>\"";
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- /* XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(ResultNodeDataDTO.class);
- xStream.autodetectAnnotations(true);
- ResultNodeDataDTO resultNodeDataDTOs = (ResultNodeDataDTO) xStream.fromXML(result);
- resultJsonDTO.setData(resultNodeDataDTO);*/
- return result;
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
deleted file mode 100644
index 17b1034..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeBasicSecController.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-import com.vci.ubcs.code.service.CodeBasicSecServiceI;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.Tree;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeBasicSecDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-import java.util.List;
-
-
-/**
- * 鐮佹鍩虹淇℃伅鎺у埗鍣�
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeBasicSecController")
-public class CodeBasicSecController {
- /**
- * 鐮佹鍩虹淇℃伅 鏈嶅姟
- */
- @Autowired
- private CodeBasicSecServiceI codeBasicSecService;
-
- /**
- * 鐮佹鍩虹淇℃伅鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
- */
- @GetMapping("/gridCodeBasicSec")
- public DataGrid<CodeBasicSecVO> gridCodeBasicSec(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeBasicSecService.gridCodeBasicSec(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 鐮佹鍩虹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeBasicSecVO> addSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO){
- CodeBasicSecVO codeBasicSecVO = null;
- try {
- codeBasicSecVO = codeBasicSecService.addSave(codeBasicSecDTO);
- } catch (VciBaseException e) {
- return BaseResult.fail(e.getCode());
- }
- return BaseResult.success(codeBasicSecVO);
- }
-
- /**
- * 淇敼 鐮佹鍩虹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeBasicSecVO> editSave(@RequestBody CodeBasicSecDTO codeBasicSecDTO){
- CodeBasicSecVO codeBasicSecVO = null;
- try {
- codeBasicSecVO = codeBasicSecService.editSave(codeBasicSecDTO);
- } catch (VciBaseException e) {
- return BaseResult.fail(e.getCode());
- }
- return BaseResult.success(codeBasicSecVO);
- }
-
-
- /**
- * 鍒犻櫎鐮佹鍩虹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeBasicSec(CodeBasicSecDTO codeBasicSecDTO) {
- return codeBasicSecService.deleteCodeBasicSec(codeBasicSecDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鐮佹鍩虹淇℃伅
- * @param oid 涓婚敭
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeBasicSecVO> getObjectByOid(String oid){
- CodeBasicSecVO codeBasicSecVO = codeBasicSecService.getObjectByOid(oid);
- return BaseResult.success(codeBasicSecVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鐮佹鍩虹淇℃伅
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeBasicSecVO> listCodeBasicSecByOids(String oids){
- Collection<CodeBasicSecVO> voCollection = codeBasicSecService.listCodeBasicSecByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeBasicSecVO> refDataGridCodeBasicSec(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeBasicSecService.refDataGridCodeBasicSec(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鍙傛暟鍒嗙被鐮佹鍩虹淇℃伅鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑锛屽繀椤昏鏈夌紪鐮佽鍒欑殑涓婚敭 pkCodeRule
- * @return 鐮佹鐨勪俊鎭�
- */
- @GetMapping("/refDataGridClassifySec")
- public DataGrid<CodeBasicSecVO> refDataGridClassifySec(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeBasicSecService.refDataGridClassifySec(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鍏嬮殕鐮佹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱idArr锛氶�夋嫨婧愮爜娈典富閿殑闆嗗悎锛宲kCodeRule锛氱洰鏍囩紪鐮佽鍒欑殑涓婚敭
- * @return 鍏嬮殕缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @PostMapping("/clone")
- public BaseResult cloneCodeBasicSec(@RequestBody CodeBasicSecDTO codeBasicSecDTO){
- VciBaseUtil.alertNotNull(codeBasicSecDTO.getOidArr(),"閫夋嫨鐮佹涓婚敭");
- List<String> oidArr = VciBaseUtil.str2List(codeBasicSecDTO.getOidArr());
- if (CollectionUtils.isEmpty(oidArr)){
- return BaseResult.fail("閫夋嫨鐮佹涓婚敭涓嶈兘涓虹┖");
- }
- return codeBasicSecService.cloneCodeBasicSec(oidArr,codeBasicSecDTO.getPkCodeRule());
- }
-
- /**
- * 鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋�
- * @param oid 鐩爣鍒嗙被鐮佹涓婚敭
- * @return 鍒嗙被鐮佹鏍戠粨鏋�
- */
- @GetMapping("/treeCodeClassifySec")
- public List<Tree> gridCodeClassifySecTree (String oid){
- VciBaseUtil.alertNotNull(oid,"鍒嗙被鐮佹涓婚敭");
- return codeBasicSecService.gridCodeClassifySecTree(oid);
- }
-
- /**
- * 涓婄Щ
- * @param oid 涓婚敭
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/upOrderNum")
- public BaseResult upOrderNum(String oid){
- codeBasicSecService.upOrderNum(oid);
- return BaseResult.success();
- }
-
- /**
- * 涓嬬Щ
- * @param oid 涓婚敭
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/downOrderNum")
- public BaseResult downOrderNum(String oid){
- codeBasicSecService.downOrderNum(oid);
- return BaseResult.success();
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeButtonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeButtonController.java
deleted file mode 100644
index ef2c081..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeButtonController.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-import com.vci.ubcs.code.service.CodeButtonServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeButtonDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeButtonVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
-/**
- * 涓绘暟鎹腑鐨勬寜閽墿灞曟帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeButtonController")
-public class CodeButtonController {
- /**
- * 涓绘暟鎹腑鐨勬寜閽墿灞� 鏈嶅姟
- */
- @Autowired
- private CodeButtonServiceI codeButtonService;
-
- /**
- * 涓绘暟鎹腑鐨勬寜閽墿灞曞垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeButton")
- public DataGrid<CodeButtonVO> gridCodeButton(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
-
- return codeButtonService.gridCodeButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param codeButtonDTO 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeButtonVO> addSave(@RequestBody CodeButtonDTO codeButtonDTO){
- CodeButtonVO codeButtonVO = codeButtonService.addSave(codeButtonDTO);
- return BaseResult.success(codeButtonVO);
- }
-
- /**
- * 淇敼 涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param codeButtonDTO 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeButtonVO> editSave(@RequestBody CodeButtonDTO codeButtonDTO){
- CodeButtonVO codeButtonVO = codeButtonService.editSave(codeButtonDTO);
- return BaseResult.success(codeButtonVO);
- }
-
-
- /**
- * 鍒犻櫎涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param codeButtonDTO 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeButton( CodeButtonDTO codeButtonDTO) {
- return codeButtonService.deleteCodeButton(codeButtonDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param oid 涓婚敭
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeButtonVO> getObjectByOid(String oid){
- CodeButtonVO codeButtonVO = codeButtonService.getObjectByOid(oid);
- return BaseResult.success(codeButtonVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeButtonVO> listCodeButtonByOids(String oids){
- Collection<CodeButtonVO> voCollection = codeButtonService.listCodeButtonByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
- /**
- * 鍚敤
- * @param buttonDTO 鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍚敤缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @PostMapping("/enableData")
- public BaseResult enableOrgDuty(CodeButtonDTO buttonDTO) {
- return codeButtonService.enableCodeButton(buttonDTO);
- }
-
- /**
- * 鍋滅敤
- * @param buttonDTO 鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍋滅敤缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @PostMapping("/disableData")
- public BaseResult disableOrgDuty(CodeButtonDTO buttonDTO) {
- return codeButtonService.disableCodeButton(buttonDTO);
- }
-
-
-
-
- /**
- * 鍙傜収涓绘暟鎹腑鐨勬寜閽墿灞曞垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeButtonVO> refDataGridCodeButton(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeButtonService.refDataGridCodeButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java
deleted file mode 100644
index 8b517df..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodeClassifyServiceI;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.util.ControllerUtil;
-import com.vci.starter.web.util.LangBaseUtil;
-import com.vci.starter.web.util.LocalFileUtil;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.OsAttributeVO;
-import org.apache.commons.lang.StringUtils;
-import com.vci.ubcs.code.dto.CodeClassifyDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.List;
-
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED;
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED;
-
-/**
- * 涓婚搴撳垎绫绘帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-20
- */
-@RestController
-@RequestMapping("/codeClassifyController")
-public class CodeClassifyController {
- /**
- * 涓婚搴撳垎绫� 鏈嶅姟
- */
- @Autowired
- private CodeClassifyServiceI codeClassifyService;
-
- /**
- * 涓婚搴撳垎绫绘爲
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 涓婚搴撳垎绫绘樉绀烘爲
- */
- @GetMapping("/treeCodeClassify")
- public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) {
- return codeClassifyService.treeCodeClassify(treeQueryObject);
- }
-
- /**
- * 涓婚搴撶殑鏍�
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 涓婚搴撴樉绀烘爲
- */
- @GetMapping("/treeTopCodeClassify")
- public List<Tree> treeTopCodeClassify(TreeQueryObject treeQueryObject){
- return codeClassifyService.treeTopCodeClassify(treeQueryObject);
- }
-
- /**
- * 澧炲姞 涓婚搴撳垎绫�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeClassifyVO> addSave(@RequestBody CodeClassifyDTO codeClassifyDTO){
- if(codeClassifyDTO.getOrdernum()==null){
- codeClassifyDTO.setOrdernum(0);
- }
- CodeClassifyVO codeClassifyVO = codeClassifyService.addSave(codeClassifyDTO);
- return BaseResult.success(codeClassifyVO);
- }
-
- /**
- * 淇敼 涓婚搴撳垎绫�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeClassifyVO> editSave(@RequestBody CodeClassifyDTO codeClassifyDTO){
- return codeClassifyService.editSave(codeClassifyDTO);
- }
-
- /**
- * 妫�鏌� 涓婚搴撳垎绫绘槸鍚﹀垹闄�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴��
- * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- @PostMapping( "/checkIsCanDelete")
- public BaseResult checkIsCanDelete(CodeClassifyDTO codeClassifyDTO) {
- return codeClassifyService.checkIsCanDelete(codeClassifyDTO);
- }
-
- /**
- * 鍒犻櫎涓婚搴撳垎绫�
- * @param codeClassifyDTO锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeClassify(CodeClassifyDTO codeClassifyDTO) {
- return codeClassifyService.deleteCodeClassify(codeClassifyDTO);
- }
-
- /**
- * 鍚敤
- * @param codeClassifyDTO
- * @return
- */
- @PostMapping( "/enableData")
- public BaseResult enable(CodeClassifyDTO codeClassifyDTO) {
- return codeClassifyService.updateLcStatus(codeClassifyDTO.getOid(),FRAMEWORK_DATA_ENABLED);
- }
-
- /**
- * 鍋滅敤
- * @param codeClassifyDTO
- * @return
- */
- @PostMapping( "/disableData")
- public BaseResult disable(CodeClassifyDTO codeClassifyDTO) {
- return codeClassifyService.updateLcStatus(codeClassifyDTO.getOid(),FRAMEWORK_DATA_DISABLED);
- }
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撳垎绫�
- * @param oid 涓婚敭
- * @return 涓婚搴撳垎绫绘樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyVO> getObjectByOid(String oid){
- CodeClassifyVO codeClassifyVO = codeClassifyService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撳垎绫�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撳垎绫绘樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyVO> listCodeClassifyByOids(String oids){
- Collection<CodeClassifyVO> voCollection = codeClassifyService.listCodeClassifyByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
- /**
- * 鍙傜収鏍� 涓婚搴撳垎绫�
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 涓婚搴撳垎绫绘樉绀烘爲
- */
- @GetMapping("/referTree")
- public List<Tree> referTree(TreeQueryObject treeQueryObject) {
- return codeClassifyService.referTree(treeQueryObject);
- }
-
- /**
- * 瀵煎嚭鍒嗙被
- * @param oid 鍒嗙被涓婚敭
- */
- @GetMapping("/exportClassify")
- public void exportClassify(String oid, HttpServletResponse response) throws IOException {
- String excelName = codeClassifyService.exportClassify(oid);
- try {
- ControllerUtil.writeFileToResponse(response,excelName);
- } catch (Throwable e) {
- //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
- String msg = LangBaseUtil.getErrorMsg(e);
- String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒.txt";
- LocalFileUtil.writeContentToFile(msg,errorFile);
- ControllerUtil.writeFileToResponse(response,errorFile);
- }
- }
-
- /**
- * 涓嬭浇瀵煎叆鐨勬ā鏉�
- * @param response 鍝嶅簲瀵硅薄
- * @throws IOException 鎶涘嚭寮傚父
- */
- @GetMapping("/downloadImportExcel")
- public void downloadImportExcel(HttpServletResponse response) throws IOException {
- String excelName = codeClassifyService.createImportExcel();
- try {
- ControllerUtil.writeFileToResponse(response,excelName);
- } catch (Throwable e) {
- //濡傛灉鍑洪敊,鎶婇敊璇俊鎭啓鍒皌ext
- String msg = LangBaseUtil.getErrorMsg(e);
- if(StringUtils.isBlank(msg)){
- msg = "鏈煡閿欒";
- }
- ControllerUtil.writeDataToResponse(response,msg.getBytes(StandardCharsets.UTF_8),null);
- }
- }
-
- /**
- * 瀵煎叆鍒嗙被
- * @param file excel鐨勫唴瀹�
- * @return 鎵ц缁撴灉锛宱bj鏈夊�艰〃绀烘湁閿欒淇℃伅锛岄渶瑕佽闂甦ownloadErrorFile鏉ヤ笅杞�
- */
- @PostMapping("/importClassify")
- public BaseResult importClassify(MultipartFile file) {
- String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
- File file1 = new File(excelFileName);
- try {
- file.transferTo(new File(excelFileName));
- codeClassifyService.importClassify(file1);
- return BaseResult.success();
- }catch (Throwable e) {
- String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒淇℃伅.txt";
- LocalFileUtil.writeContentToFile(LangBaseUtil.getErrorMsg(e),errorFile);
- //鏀惧埌map閲�
- BaseResult result = BaseResult.fail("瀵煎叆澶辫触");
- result.setObj(ControllerUtil.putErrorFile(errorFile));
- return result;
- }finally {
- file1.delete();
- }
- }
-
- /**
- * 涓嬭浇閿欒鐨勬枃浠朵俊鎭�
- * @param uuid 鍞竴鏍囪瘑
- * @param response 鍝嶅簲瀵硅薄
- * @throws IOException 鎶涘嚭寮傚父
- */
- @GetMapping("/downloadErrorFile")
- public void downloadErrorFile(String uuid, HttpServletResponse response) throws IOException {
- ControllerUtil.downloadErrorFile(response,uuid);
- }
-
- /**
- * 鑾峰彇鍒嗙被鍏宠仈鐨勫睘鎬�
- * @param baseQueryObject 鏌ヨ瀵硅薄锛屽繀椤绘湁codeClassifyOid锛屾敮鎸乮d鍜宯ame涓ょ鏌ヨ鏉′欢(涓嶆敮鎸佸垎椤�)
- * @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴��
- */
- @GetMapping("/listClassifyLinkAttr")
- public DataGrid<OsAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject){
- return codeClassifyService.listClassifyLinkAttr(baseQueryObject);
- }
-
- /**
- * 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
- * @param idPath 缂栧彿鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- @GetMapping("/getObjectByIdPath")
- public CodeClassifyVO getObjectByIdPath(String idPath){
- return codeClassifyService.getObjectByIdPath(idPath);
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java
deleted file mode 100644
index 98cf7d8..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyProcessTempController.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-import com.vci.ubcs.code.service.CodeClassifyProcessTempServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeClsProcessTempController")
-public class CodeClassifyProcessTempController {
- /**
- * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉� 鏈嶅姟
- */
- @Autowired
- private CodeClassifyProcessTempServiceI codeClassifyProcessTempService;
-
- /**
- * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉垮垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeClassifyProcessTemp")
- public DataGrid<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyProcessTempService.gridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeClassifyProcessTempVO> addSave(@RequestBody CodeClassifyProcessTempDTO codeClassifyProcessTempDTO){
- CodeClassifyProcessTempVO codeClassifyProcessTempVO = codeClassifyProcessTempService.addSave(codeClassifyProcessTempDTO);
- return BaseResult.success(codeClassifyProcessTempVO);
- }
-
- /**
- * 淇敼 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeClassifyProcessTempVO> editSave(@RequestBody CodeClassifyProcessTempDTO codeClassifyProcessTempDTO){
- CodeClassifyProcessTempVO codeClassifyProcessTempVO = codeClassifyProcessTempService.editSave(codeClassifyProcessTempDTO);
- return BaseResult.success(codeClassifyProcessTempVO);
- }
-
-
- /**
- * 鍒犻櫎鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeClassifyProcessTemp( CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) {
- return codeClassifyProcessTempService.deleteCodeClassifyProcessTemp(codeClassifyProcessTempDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param oid 涓婚敭
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyProcessTempVO> getObjectByOid(String oid){
- CodeClassifyProcessTempVO codeClassifyProcessTempVO = codeClassifyProcessTempService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyProcessTempVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyProcessTempVO> listCodeClassifyProcessTempByOids(String oids){
- Collection<CodeClassifyProcessTempVO> voCollection = codeClassifyProcessTempService.listCodeClassifyProcessTempByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉垮垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyProcessTempService.refDataGridCodeClassifyProcessTemp(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 浣跨敤妯℃澘鑾峰彇浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeTemplateOid 妯℃澘鐨勪富閿�
- * @param processUse 娴佺▼鐨勭敤閫�
- * @return 娴佺▼妯℃澘鐨勪俊鎭�
- */
- @GetMapping("/listProcessTemplate")
- public BaseResult<CodeClassifyProcessTempVO> listProcessTemplate(String codeTemplateOid,String processUse){
- List<CodeClassifyProcessTempVO> processTempVOList = codeClassifyProcessTempService.listProcessTemplate(codeTemplateOid,processUse);
- BaseResult result = BaseResult.success();
- result.setData(processTempVOList);
- return result;
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTempMapItemController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTempMapItemController.java
deleted file mode 100644
index 1d52df8..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTempMapItemController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodeClassifyTempMapItemServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeClassifyTempMapItemDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTempMapItemVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
-
-/**
- * 鏄犲皠瑙勫垯鐨勬槑缁嗘帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-03-10
- */
-@RestController
-@RequestMapping("/codeClsTempMapItemController")
-public class CodeClassifyTempMapItemController {
- /**
- * 鏄犲皠瑙勫垯鐨勬槑缁� 鏈嶅姟
- */
- @Autowired
- private CodeClassifyTempMapItemServiceI codeClassifyTempMapItemService;
-
- /**
- * 鏄犲皠瑙勫垯鐨勬槑缁嗗垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeClassifyTempMapItem")
- public DataGrid<CodeClassifyTempMapItemVO> gridCodeClassifyTempMapItem(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyTempMapItemService.gridCodeClassifyTempMapItem(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 鏄犲皠瑙勫垯鐨勬槑缁�
- * @param codeClassifyTempMapItemDTO 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeClassifyTempMapItemVO> addSave(@RequestBody CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO){
- CodeClassifyTempMapItemVO codeClassifyTempMapItemVO = codeClassifyTempMapItemService.addSave(codeClassifyTempMapItemDTO);
- return BaseResult.success(codeClassifyTempMapItemVO);
- }
-
- /**
- * 淇敼 鏄犲皠瑙勫垯鐨勬槑缁�
- * @param codeClassifyTempMapItemDTO 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeClassifyTempMapItemVO> editSave(@RequestBody CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO){
- CodeClassifyTempMapItemVO codeClassifyTempMapItemVO = codeClassifyTempMapItemService.editSave(codeClassifyTempMapItemDTO);
- return BaseResult.success(codeClassifyTempMapItemVO);
- }
-
-
- /**
- * 鍒犻櫎鏄犲皠瑙勫垯鐨勬槑缁�
- * @param codeClassifyTempMapItemDTO 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeClassifyTempMapItem( CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO) {
- return codeClassifyTempMapItemService.deleteCodeClassifyTempMapItem(codeClassifyTempMapItemDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鏄犲皠瑙勫垯鐨勬槑缁�
- * @param oid 涓婚敭
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyTempMapItemVO> getObjectByOid(String oid){
- CodeClassifyTempMapItemVO codeClassifyTempMapItemVO = codeClassifyTempMapItemService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyTempMapItemVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鏄犲皠瑙勫垯鐨勬槑缁�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyTempMapItemVO> listCodeClassifyTempMapItemByOids(String oids){
- Collection<CodeClassifyTempMapItemVO> voCollection = codeClassifyTempMapItemService.listCodeClassifyTempMapItemByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収鏄犲皠瑙勫垯鐨勬槑缁嗗垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeClassifyTempMapItemVO> refDataGridCodeClassifyTempMapItem(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyTempMapItemService.refDataGridCodeClassifyTempMapItem(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java
deleted file mode 100644
index a7e1e1e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodeClassifyTemplateAttrServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.OsBtmTypeAttributeVO;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateAttrDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeClassifyTempAttrController")
-public class CodeClassifyTemplateAttrController {
- /**
- * 涓婚搴撳垎绫荤殑妯℃澘灞炴�� 鏈嶅姟
- */
- @Autowired
- private CodeClassifyTemplateAttrServiceI codeClassifyTemplateAttrService;
-
-
- /**
- * 涓婚搴撳垎绫荤殑妯℃澘灞炴�у垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeClassifyTemplateAttr")
- public DataGrid<CodeClassifyTemplateAttrVO> gridCodeClassifyTemplateAttr(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyTemplateAttrService.gridCodeClassifyTemplateAttr(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeClassifyTemplateAttrVO> addSave(@RequestBody CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO){
- CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO = codeClassifyTemplateAttrService.addSave(codeClassifyTemplateAttrDTO);
- return BaseResult.success(codeClassifyTemplateAttrVO);
- }
-
- /**
- * 鎵归噺淇濆瓨鍒楄〃鏁版嵁
- * @param list
- * @return
- */
- @PostMapping( "/batchAddSave")
- public BaseResult<List<CodeClassifyTemplateAttrVO>> batchAddSaves(@RequestBody List<CodeClassifyTemplateAttrDTO> list){
- if(CollectionUtils.isEmpty(list)){
- return BaseResult.fail("鍒楄〃涓嶈兘涓虹┖!");
- }
- List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOs = codeClassifyTemplateAttrService.batchAddSave(list);
- return BaseResult.success(codeClassifyTemplateAttrVOs);
- }
-
-
- /**
- * 淇敼 涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeClassifyTemplateAttrVO> editSave(@RequestBody CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO){
- return codeClassifyTemplateAttrService.editSave(codeClassifyTemplateAttrDTO);
- }
-
-
- /**
- * 鍒犻櫎涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeClassifyTemplateAttr(@RequestBody CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO) {
- return codeClassifyTemplateAttrService.deleteCodeClassifyTemplateAttr(codeClassifyTemplateAttrDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param oid 涓婚敭
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyTemplateAttrVO> getObjectByOid(String oid){
- CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO = codeClassifyTemplateAttrService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyTemplateAttrVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyTemplateAttrVO> listCodeClassifyTemplateAttrByOids(String oids){
- Collection<CodeClassifyTemplateAttrVO> voCollection = codeClassifyTemplateAttrService.listCodeClassifyTemplateAttrByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収涓婚搴撳垎绫荤殑妯℃澘灞炴�у垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeClassifyTemplateAttrVO> refDataGridCodeClassifyTemplateAttr(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyTemplateAttrService.refDataGridCodeClassifyTemplateAttr(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鏌ヨ杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�,鎺掗櫎鎺夎繖涓ā鏉垮凡缁忓瓨鍦ㄧ殑灞炴��
- * @param baseQueryObject
- * @return
- */
- @GetMapping("/codeClassifyTemplateAttrByBtm")
- public DataGrid<OsBtmTypeAttributeVO> codeClassifyTemplateAttrByBtm(BaseQueryObject baseQueryObject){
- return codeClassifyTemplateAttrService.codeClassifyTemplateAttrByBtm(baseQueryObject);
- }
-
- /**
- * 鏌ヨ杩欎釜涓氬姟绫诲瀷涓嬨�佽繖涓ā鏉垮凡缁忓瓨鍦ㄧ殑灞炴��
- * @param baseQueryObject
- * @return
- */
- @GetMapping("/codeClassifyTemplateAttrByBtmHave")
- public DataGrid<OsBtmTypeAttributeVO> codeClassifyTemplateAttrByBtmHave(BaseQueryObject baseQueryObject){
- return codeClassifyTemplateAttrService.codeClassifyTemplateAttrByBtmHave(baseQueryObject);
- }
-
- /**
- * 鍚屾鍒板叾浠栨ā鏉�
- * @param codeClassifyAttrDTO id 鑻辨枃鍚嶇О
- * @return 鎵ц缁撴灉
- */
- @PostMapping( "/copyto")
- public BaseResult copyto(@RequestBody CodeClassifyTemplateAttrDTO codeClassifyAttrDTO) {
- return codeClassifyTemplateAttrService.copyto(codeClassifyAttrDTO);
- }
-
-
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java
deleted file mode 100644
index dc761b5..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateButtonController.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-import com.vci.ubcs.code.service.CodeClassifyTemplateButtonServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateButtonDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateButtonVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
-/**
- * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeClsTempButtonController")
-public class CodeClassifyTemplateButtonController {
- /**
- * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽� 鏈嶅姟
- */
- @Autowired
- private CodeClassifyTemplateButtonServiceI codeClassifyTemplateButtonService;
-
- /**
- * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeClassifyTemplateButton")
- public DataGrid<CodeClassifyTemplateButtonVO> gridCodeClassifyTemplateButton(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyTemplateButtonService.gridCodeClassifyTemplateButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeClassifyTemplateButtonVO> addSave(@RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
- CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = codeClassifyTemplateButtonService.addSave(codeClassifyTemplateButtonDTO);
- return BaseResult.success(codeClassifyTemplateButtonVO);
- }
-
- /**
- * 淇敼 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeClassifyTemplateButtonVO> editSave(@RequestBody CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO){
- CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = codeClassifyTemplateButtonService.editSave(codeClassifyTemplateButtonDTO);
- return BaseResult.success(codeClassifyTemplateButtonVO);
- }
-
-
- /**
- * 鍒犻櫎涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeClassifyTemplateButton( CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) {
- return codeClassifyTemplateButtonService.deleteCodeClassifyTemplateButton(codeClassifyTemplateButtonDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param oid 涓婚敭
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyTemplateButtonVO> getObjectByOid(String oid){
- CodeClassifyTemplateButtonVO codeClassifyTemplateButtonVO = codeClassifyTemplateButtonService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyTemplateButtonVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyTemplateButtonVO> listCodeClassifyTemplateButtonByOids(String oids){
- Collection<CodeClassifyTemplateButtonVO> voCollection = codeClassifyTemplateButtonService.listCodeClassifyTemplateButtonByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeClassifyTemplateButtonVO> refDataGridCodeClassifyTemplateButton(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyTemplateButtonService.refDataGridCodeClassifyTemplateButton(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
deleted file mode 100644
index 8db523a..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateController.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-import com.vci.ubcs.code.lifecycle.CodeClassifyTemplateLC;
-import com.vci.ubcs.code.service.CodeClassifyTemplateServiceI;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 鍒嗙被妯℃澘瀵硅薄鎺у埗鍣�
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeClassifyTemplateController")
-public class CodeClassifyTemplateController {
- /**
- * 鍒嗙被妯℃澘瀵硅薄 鏈嶅姟
- */
- @Autowired
- private CodeClassifyTemplateServiceI codeClassifyTemplateService;
-
- /**
- * 鍒嗙被妯℃澘瀵硅薄鏍�
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず鏍�
- */
- @GetMapping("/treeCodeClassifyTemplate")
- public List<Tree> treeCodeClassifyTemplate(TreeQueryObject treeQueryObject) {
- return codeClassifyTemplateService.treeCodeClassifyTemplate(treeQueryObject);
- }
-
- /**
- * 鍒嗙被妯℃澘鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄
- * @return 鏄剧ず瀵硅薄
- */
- @GetMapping("/gridCodeClassifyTemplate")
- public DataGrid<CodeClassifyTemplateVO> gridCodeClassifyTemplate(BaseQueryObject baseQueryObject){
- return codeClassifyTemplateService.gridCodeClassifyTemplate(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 澧炲姞 鍒嗙被妯℃澘瀵硅薄
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeClassifyTemplateVO> addSave(@RequestBody CodeClassifyTemplateDTO codeClassifyTemplateDTO){
- return codeClassifyTemplateService.addSave(codeClassifyTemplateDTO);
- }
-
- /**
- * 淇敼 鍒嗙被妯℃澘瀵硅薄
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeClassifyTemplateVO> editSave(@RequestBody CodeClassifyTemplateDTO codeClassifyTemplateDTO){
- return codeClassifyTemplateService.editSave(codeClassifyTemplateDTO);
- }
-
- /**
- * 妫�鏌� 鍒嗙被妯℃澘瀵硅薄鏄惁鍒犻櫎
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄锛屽繀椤昏鏈塷id鍜宼s灞炴��
- * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- @PostMapping( "/checkIsCanDelete")
- public BaseResult checkIsCanDelete(@RequestBody CodeClassifyTemplateDTO codeClassifyTemplateDTO) {
- return codeClassifyTemplateService.checkIsCanDelete(codeClassifyTemplateDTO);
- }
-
- /**
- * 鍒犻櫎鍒嗙被妯℃澘瀵硅薄
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeClassifyTemplate( CodeClassifyTemplateDTO codeClassifyTemplateDTO) {
- return codeClassifyTemplateService.deleteCodeClassifyTemplate(codeClassifyTemplateDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被妯℃澘瀵硅薄
- * @param oid 涓婚敭
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyTemplateVO> getObjectByOid(String oid){
- CodeClassifyTemplateVO codeClassifyTemplateVO = codeClassifyTemplateService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyTemplateVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍒嗙被妯℃澘瀵硅薄
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyTemplateVO> listCodeClassifyTemplateByOids(String oids){
- Collection<CodeClassifyTemplateVO> voCollection = codeClassifyTemplateService.listCodeClassifyTemplateByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収鏍� 鍒嗙被妯℃澘瀵硅薄
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず鏍�
- */
- @GetMapping("/referTree")
- public List<Tree> referTree(TreeQueryObject treeQueryObject) {
- return codeClassifyTemplateService.referTree(treeQueryObject);
- }
-
- /**
- * 鍚敤
- * @param codeClassifyDTO oid
- * @return
- */
- @PostMapping( "/enableData")
- public BaseResult enable( CodeClassifyTemplateDTO codeClassifyDTO) {
- return codeClassifyTemplateService.updateLcStatus(codeClassifyDTO.getOid(), CodeClassifyTemplateLC.RELEASED.getValue());
- }
-
- /**
- * 鍋滅敤
- * @param codeClassifyDTO oid
- * @return
- */
- @PostMapping( "/disableData")
- public BaseResult disableData( CodeClassifyTemplateDTO codeClassifyDTO) {
- return codeClassifyTemplateService.updateLcStatus(codeClassifyDTO.getOid(),CodeClassifyTemplateLC.DISABLED.getValue());
- }
-
- /**
- * 鍐嶇紪杈�
- * @param codeClassifyDTO oid
- * @return
- */
- @PostMapping( "/editDate")
- public BaseResult editDate( CodeClassifyTemplateDTO codeClassifyDTO) {
- return codeClassifyTemplateService.updateLcStatus(codeClassifyDTO.getOid(),CodeClassifyTemplateLC.EDITING.getValue());
- }
-
- /**
- * 鍗囩増
- * @param codeClassifyDTO
- * @return oid妯℃澘oid
- */
- @PostMapping( "/upgrade")
- public BaseResult Upgrade(@RequestBody CodeClassifyTemplateDTO codeClassifyDTO) {
-
- return codeClassifyTemplateService.Upgrade(codeClassifyDTO);
- }
-
- @GetMapping( "/upgrade1")
- public BaseResult upgrade1( CodeClassifyTemplateDTO codeClassifyDTO) {
-
- return Upgrade(codeClassifyDTO);
- }
-
- /**
- * 鍏嬮殕
- * @param codeClassifyDTO
- * @return oid妯℃澘oid
- */
- @PostMapping( "/copy")
- public BaseResult copyTemplate(@RequestBody CodeClassifyTemplateDTO codeClassifyDTO) {
-
- return codeClassifyTemplateService.copyTemplate(codeClassifyDTO);
- }
-
- @GetMapping( "/copyTemplate1")
- public BaseResult copyTemplate1( CodeClassifyTemplateDTO codeClassifyDTO) {
-
- return copyTemplate(codeClassifyDTO);
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateMapController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateMapController.java
deleted file mode 100644
index 4a9131d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateMapController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodeClassifyTemplateMapServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateMapDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateMapVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
-
-/**
- * 涓婚搴撴ā鏉挎槧灏勮鍒欐帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeClassifyTempMapController")
-public class CodeClassifyTemplateMapController {
- /**
- * 涓婚搴撴ā鏉挎槧灏勮鍒� 鏈嶅姟
- */
- @Autowired
- private CodeClassifyTemplateMapServiceI codeClassifyTemplateMapService;
-
- /**
- * 涓婚搴撴ā鏉挎槧灏勮鍒欏垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeClassifyTemplateMap")
- public DataGrid<CodeClassifyTemplateMapVO> gridCodeClassifyTemplateMap(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyTemplateMapService.gridCodeClassifyTemplateMap(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param codeClassifyTemplateMapDTO 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeClassifyTemplateMapVO> addSave(@RequestBody CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO){
- CodeClassifyTemplateMapVO codeClassifyTemplateMapVO = codeClassifyTemplateMapService.addSave(codeClassifyTemplateMapDTO);
- return BaseResult.success(codeClassifyTemplateMapVO);
- }
-
- /**
- * 淇敼 涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param codeClassifyTemplateMapDTO 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeClassifyTemplateMapVO> editSave(@RequestBody CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO){
- CodeClassifyTemplateMapVO codeClassifyTemplateMapVO = codeClassifyTemplateMapService.editSave(codeClassifyTemplateMapDTO);
- return BaseResult.success(codeClassifyTemplateMapVO);
- }
-
-
- /**
- * 鍒犻櫎涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param codeClassifyTemplateMapDTO 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeClassifyTemplateMap( CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO) {
- return codeClassifyTemplateMapService.deleteCodeClassifyTemplateMap(codeClassifyTemplateMapDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param oid 涓婚敭
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyTemplateMapVO> getObjectByOid(String oid){
- CodeClassifyTemplateMapVO codeClassifyTemplateMapVO = codeClassifyTemplateMapService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyTemplateMapVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyTemplateMapVO> listCodeClassifyTemplateMapByOids(String oids){
- Collection<CodeClassifyTemplateMapVO> voCollection = codeClassifyTemplateMapService.listCodeClassifyTemplateMapByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収涓婚搴撴ā鏉挎槧灏勮鍒欏垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeClassifyTemplateMapVO> refDataGridCodeClassifyTemplateMap(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeClassifyTemplateMapService.refDataGridCodeClassifyTemplateMap(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java
deleted file mode 100644
index adaafe4..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyValueController.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.service.CodeClassifyValueServiceI;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.Tree;
-import com.vci.starter.web.pagemodel.TreeQueryObject;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeClassifyValueDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍒嗙被鐮佹鐨勭爜鍊兼帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeClassifyValueController")
-public class CodeClassifyValueController {
- /**
- * 鍒嗙被鐮佹鐨勭爜鍊� 鏈嶅姟
- */
- @Autowired
- private CodeClassifyValueServiceI codeClassifyValueService;
-
- /**
- * 鍒嗙被鐮佹鐨勭爜鍊兼爲
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀烘爲
- */
- @GetMapping("/treeCodeClassifyValue")
- public List<Tree> treeCodeClassifyValue(TreeQueryObject treeQueryObject) {
- return codeClassifyValueService.treeCodeClassifyValue(treeQueryObject);
- }
-
- /**
- * 澧炲姞 鍒嗙被鐮佹鐨勭爜鍊�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeClassifyValueVO> addSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
- CodeClassifyValueVO codeClassifyValueVO = codeClassifyValueService.addSave(codeClassifyValueDTO);
- return BaseResult.success(codeClassifyValueVO);
- }
-
- /**
- * 淇敼 鍒嗙被鐮佹鐨勭爜鍊�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeClassifyValueVO> editSave(@RequestBody CodeClassifyValueDTO codeClassifyValueDTO){
- CodeClassifyValueVO codeClassifyValueVO = codeClassifyValueService.editSave(codeClassifyValueDTO);
- return BaseResult.success(codeClassifyValueVO);
- }
-
- /**
- * 妫�鏌� 鍒嗙被鐮佹鐨勭爜鍊兼槸鍚﹀垹闄�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴��
- * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- @PostMapping( "/checkIsCanDelete")
- public BaseResult checkIsCanDelete( CodeClassifyValueDTO codeClassifyValueDTO) {
- return codeClassifyValueService.checkIsCanDelete(codeClassifyValueDTO);
- }
-
- /**
- * 鍒犻櫎鍒嗙被鐮佹鐨勭爜鍊�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeClassifyValue( CodeClassifyValueDTO codeClassifyValueDTO) {
- return codeClassifyValueService.deleteCodeClassifyValue(codeClassifyValueDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被鐮佹鐨勭爜鍊�
- * @param oid 涓婚敭
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeClassifyValueVO> getObjectByOid(String oid){
- CodeClassifyValueVO codeClassifyValueVO = codeClassifyValueService.getObjectByOid(oid);
- return BaseResult.success(codeClassifyValueVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍒嗙被鐮佹鐨勭爜鍊�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeClassifyValueVO> listCodeClassifyValueByOids(String oids){
- Collection<CodeClassifyValueVO> voCollection = codeClassifyValueService.listCodeClassifyValueByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収鏍� 鍒嗙被鐮佹鐨勭爜鍊�
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀烘爲
- */
- @GetMapping("/referTree")
- public List<Tree> referTree(TreeQueryObject treeQueryObject) {
- return codeClassifyValueService.referTree(treeQueryObject);
- }
-
- /**
- * 淇濆瓨椤甸潰涓婄殑鍒嗙被鐮佹鐮佸�硷紝涓昏鏄繚瀛樺簭鍙风敤浜庢帓搴忋�傚鏋滄暟鎹簱涓瓨鍦ㄩ〉闈紶杈撳璞￠泦鍚堜腑涓嶅瓨鍦ㄧ殑鍊硷紝鍒欏垹闄ゃ��
- * @param param 鍙傛暟锛屽寘鎷琩toList 椤甸潰浼犺緭瀵硅薄闆嗗悎 鍜宑odeclassifysecoid 鍒嗙被鐮佹涓婚敭
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/saveOrder")
- public BaseResult saveOrder(@RequestBody Map<String,Object> param){
- JSONArray json = JSONArray.parseArray(String.valueOf(param.get("dtoList")));
- List<CodeClassifyValueDTO> dtoList = new ArrayList<>();
- for (int i = 0; i < json.size(); i++) {
- CodeClassifyValueDTO codeFixedValueDTO = JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(json.get(i))), CodeClassifyValueDTO.class);
- dtoList.add(codeFixedValueDTO);
- }
- String codeclassifysecoid = (String) param.get("codeclassifysecoid");
- VciBaseUtil.alertNotNull(dtoList,"鐮佸�奸泦鍚�");
- if (CollectionUtils.isEmpty(dtoList)){
- return BaseResult.success();
- }
- return codeClassifyValueService.batchSave4Order(dtoList,codeclassifysecoid);
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeDuckingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeDuckingController.java
deleted file mode 100644
index 4304603..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeDuckingController.java
+++ /dev/null
@@ -1,293 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.constant.MdmDuckingConstant;
-import com.vci.ubcs.code.entity.DockingDataDO;
-import com.vci.ubcs.code.entity.DockingLogeDO;
-import com.vci.ubcs.code.entity.DockingTaskDO;
-import com.vci.ubcs.code.entity.SysIntHeaderDO;
-import com.vci.ubcs.code.service.CodeDuckingServiceI;
-import com.vci.ubcs.code.service.CodeDuckingSyncServiceI;
-import com.vci.ubcs.code.service.DockingPreApplyDataServiceI;
-import com.vci.ubcs.code.service.DockingPreAttrMappingSeviceI;
-import com.vci.starter.web.annotation.controller.VciUnCheckRight;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.ControllerUtil;
-import com.vci.ubcs.code.dto.CodeOrderDTO;
-import com.vci.ubcs.code.dto.DockingPreApplyDataDTO;
-import com.vci.ubcs.code.dto.DockingPreAttrMappingDTO;
-import com.vci.ubcs.code.dto.PreApplyCodeOrderDTO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyDataVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓绘暟鎹紪鐮侀�氱敤闆嗘垚鎺у埗鍣�
- *
- * @author wangyi
- * @date 2022-03-20
- */
-@RestController
-@RequestMapping("/ducking")
-class CodeDuckingController {
-
- /**
- * 闆嗘垚鏈嶅姟
- */
- @Autowired
- private CodeDuckingServiceI codeDuckingServiceI;
-
- /**
- * 闆嗘垚鏈嶅姟
- */
- @Autowired
- private CodeDuckingSyncServiceI codeDuckingSyncServiceI;
- /***
- * 闆嗘垚灞炴�ф搷浣滃眰
- */
- @Autowired
- private DockingPreAttrMappingSeviceI dockingPreAttrMappingSeviceI;
-
- /**
- * 棰勭敵璇锋帴鏀堕泦鎴愭暟鎹�
- */
- @Autowired
- private DockingPreApplyDataServiceI dockingPreApplyDataServiceI;
-
- public CodeDuckingController() {
- }
-
-
-
-
- /**
- * 淇敼 涓婚搴撳垎绫�
- * @param dockingPreApplyDataDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/setDataClassId")
- public BaseResult<List<DockingPreApplyDataVO>> batchSetDataClassId(@RequestBody DockingPreApplyDataDTO dockingPreApplyDataDTO){
- List<DockingPreApplyDataVO> dataDTOList= dockingPreApplyDataServiceI.batchSetDataClassId(dockingPreApplyDataDTO);
- return BaseResult.success(dataDTOList);
- }
-
- /***
- * 鏍规嵁閫夋嫨棰濋鐢宠鐨勬暟鎹嬀閫夋暟鎹�
- * @param codeClassifyOid
- * @param templateOid
- * @param btmType
- * @param dataOids
- * @return
- */
- @GetMapping("/gridApplyData")
- public DataGrid<Map<String,String>> gridApplyData(String codeClassifyOid, String templateOid, String btmType, String dataOids){
- return dockingPreApplyDataServiceI.gridApplyData(codeClassifyOid,templateOid,btmType,dataOids);
- }
-
-
- /***
- * 鏍规嵁閫夋嫨棰濋鐢宠鐨勬暟鎹嬀閫夋暟鎹�
- *
- * @return
- */
- @PutMapping("/batchApplyDatas")
- public BaseResult batchApplyDatas(@RequestBody List<CodeOrderDTO> orderDTOs){
- return dockingPreApplyDataServiceI.batchApplyDatas(orderDTOs);
- }
-
- /**
- * 闆嗘垚棰勭敵璇峰垪琛�-宸插弽鐮�
- * @param baseQueryObject
- * ducking/gridPreDataFinish
- * @return
- */
- @GetMapping("/gridPreDataFinishNum")
- public DataGrid<DockingPreApplyDataVO> gridDockingPreApplyDataFinishNum(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- baseQueryObject.addCondition("num", QueryOptionConstant.ISNOTNULL);
- DataGrid<DockingPreApplyDataVO> dockingPreApplyDataVODataGrid = dockingPreApplyDataServiceI.gridDockingPreApplyData(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- return dockingPreApplyDataVODataGrid;
- }
-
- /**
- * 闆嗘垚棰勭敵璇峰垪琛�-宸插鐞�
- * @param baseQueryObject
- * ducking/gridPreDataFinish
- * @return
- */
- @GetMapping("/gridPreDataFinish")
- public DataGrid<DockingPreApplyDataVO> gridDockingPreApplyDataFinish(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- baseQueryObject.addCondition("classifyoid", QueryOptionConstant.ISNOTNULL);
- DataGrid<DockingPreApplyDataVO> dockingPreApplyDataVODataGrid = dockingPreApplyDataServiceI.gridDockingPreApplyData(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- return dockingPreApplyDataVODataGrid;
- }
-
- /**
- * 闆嗘垚棰勭敵璇峰垪琛�-鏈畬鎴�
- * @param baseQueryObject
- * ducking/gridPreDataUnFinish
- * @return
- */
- @GetMapping("/gridPreDataUnFinish")
- public DataGrid<DockingPreApplyDataVO> gridPreDataUnFinish(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- baseQueryObject.addCondition("num", "null");
- return dockingPreApplyDataServiceI.gridDockingPreApplyData(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鎵归噺澶勭悊棰勭敵璇风紪鐮�
- * 蹇呴』瑕佹湁鍒嗙被oid鍜宒ataoid
- * @return
- */
- @PostMapping("/applyData")
- public BaseResult applyData(@RequestBody List<PreApplyCodeOrderDTO> preApplyCodeOrderDTOList){
- return dockingPreApplyDataServiceI.applyData(preApplyCodeOrderDTOList);
- }
-
- /**
- * 闆嗘垚棰勭敵璇峰垪琛�-鏌ヨ鏁版嵁璇︾粏淇℃伅
- * @param dockingPreApplyDataDTO
- * @return
- */
- @GetMapping("/datainfo")
- @VciUnCheckRight
- public BaseResult datainfo(DockingPreApplyDataDTO dockingPreApplyDataDTO){
- return dockingPreApplyDataServiceI.getDataInfoMap(dockingPreApplyDataDTO);
- }
-
- /**
- * data鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
- */
- @GetMapping("/gridData")
- public DataGrid<DockingDataDO> gridData(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeDuckingServiceI.gridData(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * data鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
- */
- @GetMapping("/gridTask")
- public DataGrid<DockingTaskDO> gridTask(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeDuckingServiceI.gridTask(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
- */
- @GetMapping("/gridLoge")
- public DataGrid<DockingLogeDO> gridLoge(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- Map<String, String> queryMap = baseQueryObject.getConditionMap();
- queryMap.put("type", MdmDuckingConstant.DATA_LOGE_OUT);
- }
- return codeDuckingServiceI.gridLoge(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鎺ュ彛param鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
- */
- @GetMapping("/gridHeader")
- public DataGrid<SysIntHeaderDO> gridParam(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- Map<String, String> queryMap = baseQueryObject.getConditionMap();
- queryMap.put("type", MdmDuckingConstant.DATA_LOGE_OUT);
- }
- return codeDuckingServiceI.gridHeader(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- *鎵归噺澶勭悊
- * 蹇呴』瑕佹湁鍒嗙被oid鍜宒ataoid
- * @return
- */
- @PostMapping("/sendData")
- public BaseResult sendData(String oid){
-
- return codeDuckingSyncServiceI.sendData(oid);
- }
-
- /***
- * 鍒濆鍖栧睘鎬ч厤缃粍浠�
- * @param sourceClsfId 鍒嗙被oid
- * @param type //1锛氭棤浜烘満;2锛�420
- * @param templateOid 妯℃澘oid锛屽涓互,鍒嗗紑鐨�
- * @param baseQueryObject //鏌ヨ瀵硅薄
- * @return
- */
- @GetMapping("/gridAttrMapping")
- public DataGrid<DockingPreAttrMappingVO> gridAttrMappings(String sourceClsfId, String templateOid, int type, BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return dockingPreAttrMappingSeviceI.gridAttrMappings(sourceClsfId,type,baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /***
- * 灞炴�у彇鍊艰寖鍥磋幏鍙�
- * @param attrOid 灞炴�id
- * @param type //1锛氭棤浜烘満;2锛�420
- * @param baseQueryObject /鏌ヨ瀵硅薄
- * @return
- */
- @GetMapping("/gridAttrRanges")
- public DataGrid<DockingPreAttrRangeVO> gridAttrRanges(String attrOid, int type, BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return dockingPreAttrMappingSeviceI.gridAttrRanges(attrOid,type,baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 淇濆瓨灞炴�ф槧灏勯厤缃粍浠�
- * @param dockingPreAttrMappingDTOS 灞炴�ф槧灏勯厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/batchAddSave")
- public BaseResult<List<DockingPreAttrMappingVO>> batchSave(@RequestBody List<DockingPreAttrMappingDTO> dockingPreAttrMappingDTOS){
- List<DockingPreAttrMappingVO> dockingPreAttrRangeVOS= dockingPreAttrMappingSeviceI.batchAddSave(dockingPreAttrMappingDTOS);
- return BaseResult.success(dockingPreAttrRangeVOS);
- }
-
- /**
- * 涓嬭浇閿欒鐨勬枃浠朵俊鎭�
- * @param uuid 鍞竴鏍囪瘑
- * @param response 鍝嶅簲瀵硅薄
- * @throws IOException 鎶涘嚭寮傚父
- */
- @GetMapping("/downloadErrorFile")
- public void downloadErrorFile(String uuid, HttpServletResponse response) throws IOException {
- ControllerUtil.downloadErrorFile(response,uuid);
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
deleted file mode 100644
index afe623b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeFixedValueController.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.service.CodeFixedValueServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeFixedValueDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍥哄畾鐮佹鐨勭爜鍊兼帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeFixedValueController")
-public class CodeFixedValueController {
- /**
- * 鍥哄畾鐮佹鐨勭爜鍊� 鏈嶅姟
- */
- @Autowired
- private CodeFixedValueServiceI codeFixedValueService;
-
- /**
- * 鍥哄畾鐮佹鐨勭爜鍊煎垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeFixedValue")
- public DataGrid<CodeFixedValueVO> gridCodeFixedValue(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeFixedValueService.gridCodeFixedValue(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 鍥哄畾鐮佹鐨勭爜鍊�
- * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeFixedValueVO> addSave(@RequestBody CodeFixedValueDTO codeFixedValueDTO){
- CodeFixedValueVO codeFixedValueVO = codeFixedValueService.addSave(codeFixedValueDTO);
- return BaseResult.success(codeFixedValueVO);
- }
-
- /**
- * 淇敼 鍥哄畾鐮佹鐨勭爜鍊�
- * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeFixedValueVO> editSave(@RequestBody CodeFixedValueDTO codeFixedValueDTO){
- CodeFixedValueVO codeFixedValueVO = codeFixedValueService.editSave(codeFixedValueDTO);
- return BaseResult.success(codeFixedValueVO);
- }
-
-
- /**
- * 鍒犻櫎鍥哄畾鐮佹鐨勭爜鍊�
- * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeFixedValue( CodeFixedValueDTO codeFixedValueDTO) {
- return codeFixedValueService.deleteCodeFixedValue(codeFixedValueDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鍥哄畾鐮佹鐨勭爜鍊�
- * @param oid 涓婚敭
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeFixedValueVO> getObjectByOid(String oid){
- CodeFixedValueVO codeFixedValueVO = codeFixedValueService.getObjectByOid(oid);
- return BaseResult.success(codeFixedValueVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍥哄畾鐮佹鐨勭爜鍊�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeFixedValueVO> listCodeFixedValueByOids(String oids){
- Collection<CodeFixedValueVO> voCollection = codeFixedValueService.listCodeFixedValueByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収鍥哄畾鐮佹鐨勭爜鍊煎垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeFixedValueVO> refDataGridCodeFixedValue(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeFixedValueService.refDataGridCodeFixedValue(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鎵归噺娣诲姞鍥哄畾鐮佹鐨勭爜鍊硷紝濡傛灉淇濆瓨鐨勯泦鍚堜腑涓嶅瓨鍦ㄥ凡鍦ㄦ暟鎹簱涓殑鐮佸�煎垯鍒犻櫎銆備富瑕佹槸淇濆瓨鐮佸�肩殑搴忓彿
- * @param param 鍙傛暟锛屽寘鎷琩toList 椤甸潰浼犺緭瀵硅薄闆嗗悎 codefixedsecoid 鍥哄畾鐮佹涓婚敭
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/saveOrder")
- public BaseResult<CodeFixedValueVO> batchSave4Order(@RequestBody Map<String,Object> param){
- JSONArray json = JSONArray.parseArray(String.valueOf(param.get("dtoList")));
- List<CodeFixedValueDTO> dtoList = new ArrayList<>();
- for (int i = 0; i < json.size(); i++) {
- CodeFixedValueDTO codeFixedValueDTO = JSONObject.toJavaObject(JSONObject.parseObject(JSONObject.toJSONString(json.get(i))), CodeFixedValueDTO.class);
- dtoList.add(codeFixedValueDTO);
- }
- String codefixedsecoid = (String) param.get("codefixedsecoid");
- VciBaseUtil.alertNotNull(dtoList,"鐮佸�煎璞￠泦鍚�",codefixedsecoid,"鍥哄畾鐮佹鐨勪富閿�");
- if (CollectionUtils.isEmpty(dtoList)){
- return codeFixedValueService.batchDeleteBySecOid(codefixedsecoid);
- }
- return codeFixedValueService.batchSave4Order(dtoList,codefixedsecoid);
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatRuleController.java
deleted file mode 100644
index 8f03f37..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeKeyAttrRepeatRuleController.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodeKeyAttrRepeatRuleServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeKeyAttrRepeatRuleDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
-/**
- * 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鎺у埗鍣�
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeKeyAttrRepeatController")
-public class CodeKeyAttrRepeatRuleController {
- /**
- * 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯 鏈嶅姟
- */
- @Autowired
- private CodeKeyAttrRepeatRuleServiceI codeKeyAttrRepeatRuleService;
-
- /**
- * 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄鍒楄〃
- */
- @GetMapping("/gridCodeKeyAttrRepeatRule")
- public DataGrid<CodeKeyAttrRepeatRuleVO> gridCodeKeyAttrRepeatRule(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeKeyAttrRepeatRuleService.gridCodeKeyAttrRepeatRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param codeKeyAttrRepeatRuleDTO 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeKeyAttrRepeatRuleVO> addSave(@RequestBody CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO){
- CodeKeyAttrRepeatRuleVO codeKeyAttrRepeatRuleVO = codeKeyAttrRepeatRuleService.addSave(codeKeyAttrRepeatRuleDTO);
- return BaseResult.success(codeKeyAttrRepeatRuleVO);
- }
-
- /**
- * 淇敼 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param codeKeyAttrRepeatRuleDTO 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeKeyAttrRepeatRuleVO> editSave(@RequestBody CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO){
- CodeKeyAttrRepeatRuleVO codeKeyAttrRepeatRuleVO = codeKeyAttrRepeatRuleService.editSave(codeKeyAttrRepeatRuleDTO);
- return BaseResult.success(codeKeyAttrRepeatRuleVO);
- }
-
-
- /**
- * 鍒犻櫎鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param codeKeyAttrRepeatRuleDTO 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeKeyAttrRepeatRule( CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO) {
- return codeKeyAttrRepeatRuleService.deleteCodeKeyAttrRepeatRule(codeKeyAttrRepeatRuleDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param oid 涓婚敭
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeKeyAttrRepeatRuleVO> getObjectByOid(String oid){
- CodeKeyAttrRepeatRuleVO codeKeyAttrRepeatRuleVO = codeKeyAttrRepeatRuleService.getObjectByOid(oid);
- return BaseResult.success(codeKeyAttrRepeatRuleVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeKeyAttrRepeatRuleVO> listCodeKeyAttrRepeatRuleByOids(String oids){
- Collection<CodeKeyAttrRepeatRuleVO> voCollection = codeKeyAttrRepeatRuleService.listCodeKeyAttrRepeatRuleByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeKeyAttrRepeatRuleVO> refDataGridCodeKeyAttrRepeatRule(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeKeyAttrRepeatRuleService.refDataGridCodeKeyAttrRepeatRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseAttrController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseAttrController.java
deleted file mode 100644
index 2aaebcd..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodePhaseAttrController.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodePhaseAttrServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodePhaseAttrDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodePhaseAttrVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
-/**
- * 闃舵鐨勫睘鎬ф帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codePhaseAttrController")
-public class CodePhaseAttrController {
- /**
- * 闃舵鐨勫睘鎬� 鏈嶅姟
- */
- @Autowired
- private CodePhaseAttrServiceI codePhaseAttrService;
-
- /**
- * 闃舵鐨勫睘鎬у垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodePhaseAttr")
- public DataGrid<CodePhaseAttrVO> gridCodePhaseAttr(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codePhaseAttrService.gridCodePhaseAttr(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 闃舵鐨勫睘鎬�
- * @param codePhaseAttrDTO 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodePhaseAttrVO> addSave(@RequestBody CodePhaseAttrDTO codePhaseAttrDTO){
- CodePhaseAttrVO codePhaseAttrVO = codePhaseAttrService.addSave(codePhaseAttrDTO);
- return BaseResult.success(codePhaseAttrVO);
- }
-
- /**
- * 淇敼 闃舵鐨勫睘鎬�
- * @param codePhaseAttrDTO 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodePhaseAttrVO> editSave(@RequestBody CodePhaseAttrDTO codePhaseAttrDTO){
- CodePhaseAttrVO codePhaseAttrVO = codePhaseAttrService.editSave(codePhaseAttrDTO);
- return BaseResult.success(codePhaseAttrVO);
- }
-
-
- /**
- * 鍒犻櫎闃舵鐨勫睘鎬�
- * @param codePhaseAttrDTO 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodePhaseAttr( CodePhaseAttrDTO codePhaseAttrDTO) {
- return codePhaseAttrService.deleteCodePhaseAttr(codePhaseAttrDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇闃舵鐨勫睘鎬�
- * @param oid 涓婚敭
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodePhaseAttrVO> getObjectByOid(String oid){
- CodePhaseAttrVO codePhaseAttrVO = codePhaseAttrService.getObjectByOid(oid);
- return BaseResult.success(codePhaseAttrVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇闃舵鐨勫睘鎬�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodePhaseAttrVO> listCodePhaseAttrByOids(String oids){
- Collection<CodePhaseAttrVO> voCollection = codePhaseAttrService.listCodePhaseAttrByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収闃舵鐨勫睘鎬у垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodePhaseAttrVO> refDataGridCodePhaseAttr(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codePhaseAttrService.refDataGridCodePhaseAttr(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeResembleRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeResembleRuleController.java
deleted file mode 100644
index fb40034..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeResembleRuleController.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodeResembleRuleServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeResembleRuleDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeResembleRuleVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
-/**
- * 鐩镐技鏌ヨ瑙勫垯鎺у埗鍣�
- *
- * @author weidy
- * @date 2022-04-10
- */
-@RestController
-@RequestMapping("/resembleRuleController")
-public class CodeResembleRuleController {
- /**
- * 鐩镐技鏌ヨ瑙勫垯 鏈嶅姟
- */
- @Autowired
- private CodeResembleRuleServiceI codeResembleRuleService;
-
- /**
- * 鐩镐技鏌ヨ瑙勫垯鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄鍒楄〃
- */
- @GetMapping("/gridCodeResembleRule")
- public DataGrid<CodeResembleRuleVO> gridCodeResembleRule(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeResembleRuleService.gridCodeResembleRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeResembleRuleVO> addSave(@RequestBody CodeResembleRuleDTO codeResembleRuleDTO){
- CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.addSave(codeResembleRuleDTO);
- return BaseResult.success(codeResembleRuleVO);
- }
-
- /**
- * 淇敼 鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeResembleRuleVO> editSave(@RequestBody CodeResembleRuleDTO codeResembleRuleDTO){
- CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.editSave(codeResembleRuleDTO);
- return BaseResult.success(codeResembleRuleVO);
- }
-
-
- /**
- * 鍒犻櫎鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeResembleRule( CodeResembleRuleDTO codeResembleRuleDTO) {
- return codeResembleRuleService.deleteCodeResembleRule(codeResembleRuleDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鐩镐技鏌ヨ瑙勫垯
- * @param oid 涓婚敭
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeResembleRuleVO> getObjectByOid(String oid){
- CodeResembleRuleVO codeResembleRuleVO = codeResembleRuleService.getObjectByOid(oid);
- return BaseResult.success(codeResembleRuleVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鐩镐技鏌ヨ瑙勫垯
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeResembleRuleVO> listCodeResembleRuleByOids(String oids){
- Collection<CodeResembleRuleVO> voCollection = codeResembleRuleService.listCodeResembleRuleByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収鐩镐技鏌ヨ瑙勫垯鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeResembleRuleVO> refDataGridCodeResembleRule(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeResembleRuleService.refDataGridCodeResembleRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
index 22f7d61..ed02431 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
@@ -1,167 +1,127 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
package com.vci.ubcs.code.controller;
-
-import com.vci.ubcs.code.service.CodeRuleServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.CodeRuleDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
+import com.vci.ubcs.code.entity.CodeRule;
+import com.vci.ubcs.code.service.ICodeRuleService;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
+import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
-import java.util.Collection;
-import java.util.Map;
-
+import javax.validation.Valid;
/**
- * 涓绘暟鎹紪鐮佽鍒欐帶鍒跺櫒
+ * 缂栫爜瑙勫垯 鎺у埗鍣�
*
- * @author weidy
- * @date 2022-01-24
+ * @author ludc
+ * @since 2023-04-03
*/
@RestController
-@RequestMapping("/mdmRuleController")
-public class CodeRuleController {
- /**
- * 涓绘暟鎹紪鐮佽鍒� 鏈嶅姟
- */
- @Autowired
- private CodeRuleServiceI codeRuleService;
+@AllArgsConstructor
+@RequestMapping("/mdmRule")
+@Api(value = "缂栫爜瑙勫垯", tags = "缂栫爜瑙勫垯鎺ュ彛")
+public class CodeRuleController extends BladeController {
- /**
- * 涓绘暟鎹紪鐮佽鍒欏垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeRule")
- public DataGrid<CodeRuleVO> gridCodeRule(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- DataGrid<CodeRuleVO> result = codeRuleService.gridCodeRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- return result;
- }
- /**
- * 澧炲姞 涓绘暟鎹紪鐮佽鍒�
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeRuleVO> addSave(@RequestBody CodeRuleDTO codeRuleDTO){
- CodeRuleVO codeRuleVO = codeRuleService.addSave(codeRuleDTO);
- return BaseResult.success(codeRuleVO);
- }
+ private final ICodeRuleService codeRuleService;
- /**
- * 淇敼 涓绘暟鎹紪鐮佽鍒�
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeRuleVO> editSave(@RequestBody CodeRuleDTO codeRuleDTO){
- CodeRuleVO codeRuleVO = codeRuleService.editSave(codeRuleDTO);
- return BaseResult.success(codeRuleVO);
- }
+ /**
+ * 缂栫爜瑙勫垯 璇︽儏
+ */
+ @GetMapping("/detail")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "璇︽儏", notes = "浼犲叆codeRule")
+ public R<CodeRuleVO> detail(CodeRule codeRule) {
+ CodeRule detail = codeRuleService.getOne(Condition.getQueryWrapper(codeRule));
+ return R.data(CodeRuleWrapper.build().entityVO(detail));
+ }
+ /**
+ * 缂栫爜瑙勫垯 鍒嗛〉
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeRuleVO")
+ public R<IPage<CodeRuleVO>> list(CodeRule codeRule, Query query) {
+ IPage<CodeRule> pages = codeRuleService.page(Condition.getPage(query), Condition.getQueryWrapper(codeRule));
+ return R.data(CodeRuleWrapper.build().pageVO(pages));
+ }
+ /**
+ * 缂栫爜瑙勫垯 鑷畾涔夊垎椤�
+ */
+ @GetMapping("/gridCodeRule")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeRule")
+ public R<IPage<CodeRuleVO>> page(CodeRuleVO CodeRule, Query query) {
+ IPage<CodeRuleVO> pages = codeRuleService.selectPlCodeRulePage(Condition.getPage(query.setDescs("CREATETIME")), CodeRule);
+ return R.data(pages);
+ }
- /**
- * 鍒犻櫎涓绘暟鎹紪鐮佽鍒�
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeRule( CodeRuleDTO codeRuleDTO) {
- return codeRuleService.deleteCodeRule(codeRuleDTO);
- }
+ /**
+ * 澧炲姞 涓绘暟鎹紪鐮佽鍒�
+ * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PostMapping("/addCode")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "鏂板", notes = "浼犲叆CodeRule")
+ public R save(@Valid @RequestBody CodeRuleDTO codeRuleDTO) {
+ return R.status(codeRuleService.addSave(codeRuleDTO));
+ }
- /**
- * 涓婚敭鑾峰彇涓绘暟鎹紪鐮佽鍒�
- * @param oid 涓婚敭
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeRuleVO> getObjectByOid(String oid){
- CodeRuleVO codeRuleVO = codeRuleService.getObjectByOid(oid);
- return BaseResult.success(codeRuleVO);
- }
+ /**
+ * 淇敼 涓绘暟鎹紪鐮佽鍒�
+ * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
+ */
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "淇敼", notes = "浼犲叆CodeRule")
+ public R update(@Valid @RequestBody CodeRuleDTO codeRuleDTO) {
+ return R.status(codeRuleService.editSave(codeRuleDTO));
+ }
- /**
- * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹紪鐮佽鍒�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeRuleVO> listCodeRuleByOids(String oids){
- Collection<CodeRuleVO> voCollection = codeRuleService.listCodeRuleByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
+ /**
+ * 缂栫爜瑙勫垯 鏂板鎴栦慨鏀�
+ */
+ @PostMapping("/submit")
+ @ApiOperationSupport(order = 6)
+ @ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆CodeRule")
+ public R submit(@Valid @RequestBody CodeRule codeRule) {
+ return R.status(codeRuleService.saveOrUpdate(codeRule));
+ }
+ /**
+ * 鍒犻櫎涓绘暟鎹紪鐮佽鍒�
+ * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
+ * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+ */
+ @DeleteMapping( "/deleteData")
+ public R delCodeRule(@Valid @RequestBody CodeRuleDTO codeRuleDTO) {
+ return codeRuleService.deleteCodeRule(codeRuleDTO);
+ }
-
- /**
- * 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeRuleVO> refDataGridCodeRule(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeRuleService.refDataGridCodeRule(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鏌ョ湅涓绘暟鎹紪鐮佽鍒欑殑浣跨敤鑼冨洿
- * @param oid 涓婚敭
- * @return 浣跨敤鑼冨洿
- */
- @GetMapping("/listUseRange")
- public BaseResult<CodeClassifyVO> listUseRange(String oid){
- Collection<CodeClassifyVO> voList = codeRuleService.listUseRangeInCodeClassify(oid);
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voList);
- return baseResult;
- }
-
- /**
- * 鍋滅敤涓庡惎鐢ㄧ紪鐮佽鍒�
- * @param map 灏佽鍙傛暟锛屽寘鎷琽id 缂栫爜瑙勫垯涓婚敭 update 鏇存柊鐘舵�佺殑鎿嶄綔
- * @return 鎵ц缁撴灉
- */
- @PostMapping ("/updateStatus")
- public BaseResult updateStatus(@RequestBody Map<String,String> map){
- if (CollectionUtils.isEmpty(map)){
- return BaseResult.fail("鍙傛暟閿欒");
- }
- String oid = map.get("oid");
- String update = map.get("update");
- return codeRuleService.updateStatus(oid,update);
- }
-
- /**
- * 鍏嬮殕缂栫爜瑙勫垯
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- */
- @PostMapping("/clone")
- public BaseResult cloneCodeRule(@RequestBody CodeRuleDTO codeRuleDTO){
- return codeRuleService.cloneCodeRule(codeRuleDTO);
- }
-
- /**
- * 缂栫爜瑙勫垯娓呯┖鎵�鏈夊凡鐢熸垚鐨勭紪鐮�
- * @param oid 缂栫爜瑙勫垯涓婚敭
- * @return 鎵ц缁撴灉
- */
- @DeleteMapping("/clearAllCode")
- public BaseResult clearAllCode(String oid){
- return codeRuleService.clearAllCode(oid);
- }
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSerialAlgorithmController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSerialAlgorithmController.java
deleted file mode 100644
index 17166e6..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSerialAlgorithmController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodeSerialAlgorithmServiceI;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.code.vo.pagemodel.CodeSerialAlgorithmVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 娴佹按绠楁硶鎺у埗鍣�
- * @author weidy
- * @date 2022-2-17
- */
-@RestController
-@RequestMapping("/codeSerialAlgorithmController")
-public class CodeSerialAlgorithmController {
-
- /**
- * 绠楁硶鏈嶅姟
- */
- @Autowired
- private CodeSerialAlgorithmServiceI algorithmService;
-
- /**
- * 绠楁硶鐨勫垪琛�
- * @return 绠楁硶鐨勪俊鎭�
- */
- @GetMapping("/gridCodeSerialAlgorithm")
- public DataGrid<CodeSerialAlgorithmVO> gridCodeSerialAlgorithm(){
- return algorithmService.gridSerialAlgorithm();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java
deleted file mode 100644
index bd6e209..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSynonymController.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodeSynonymServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeSynonymDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeSynonymVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
-
-/**
- * 鍚屼箟璇嶉厤缃帶鍒跺櫒
- *
- * @author weidy
- * @date 2022-02-17
- */
-@RestController
-@RequestMapping("/codeSynonymController")
-public class CodeSynonymController {
- /**
- * 鍚屼箟璇嶉厤缃� 鏈嶅姟
- */
- @Autowired
- private CodeSynonymServiceI codeSynonymService;
-
- /**
- * 鍚屼箟璇嶉厤缃垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞″垪琛�
- */
- @GetMapping("/gridCodeSynonym")
- public DataGrid<CodeSynonymVO> gridCodeSynonym(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeSynonymService.gridCodeSynonym(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeSynonymVO> addSave(@RequestBody CodeSynonymDTO codeSynonymDTO){
- CodeSynonymVO codeSynonymVO = codeSynonymService.addSave(codeSynonymDTO);
- return BaseResult.success(codeSynonymVO);
- }
-
- /**
- * 淇敼 鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeSynonymVO> editSave(@RequestBody CodeSynonymDTO codeSynonymDTO){
- CodeSynonymVO codeSynonymVO = codeSynonymService.editSave(codeSynonymDTO);
- return BaseResult.success(codeSynonymVO);
- }
-
-
- /**
- * 鍒犻櫎鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeSynonym( CodeSynonymDTO codeSynonymDTO) {
- return codeSynonymService.deleteCodeSynonym(codeSynonymDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇鍚屼箟璇嶉厤缃�
- * @param oid 涓婚敭
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞�
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeSynonymVO> getObjectByOid(String oid){
- CodeSynonymVO codeSynonymVO = codeSynonymService.getObjectByOid(oid);
- return BaseResult.success(codeSynonymVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍚屼箟璇嶉厤缃�
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞�
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeSynonymVO> listCodeSynonymByOids(String oids){
- Collection<CodeSynonymVO> voCollection = codeSynonymService.listCodeSynonymByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収鍚屼箟璇嶉厤缃垪琛�
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeSynonymVO> refDataGridCodeSynonym(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeSynonymService.refDataGridCodeSynonym(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java
deleted file mode 100644
index c1225f7..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeTemplatePhaseController.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.vci.ubcs.code.controller;
-
-
-import com.vci.ubcs.code.service.CodeTemplatePhaseServiceI;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Collection;
-
-
-/**
- * 妯℃澘闃舵鎺у埗鍣�
- *
- * @author weidy
- * @date 2022-01-24
- */
-@RestController
-@RequestMapping("/codeTempPhaseController")
-public class CodeTemplatePhaseController {
- /**
- * 妯℃澘闃舵 鏈嶅姟
- */
- @Autowired
- private CodeTemplatePhaseServiceI codeTemplatePhaseService;
-
- /**
- * 妯℃澘闃舵鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃
- */
- @GetMapping("/gridCodeTemplatePhase")
- public DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeTemplatePhaseService.gridCodeTemplatePhase(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
- /**
- * 澧炲姞 妯℃澘闃舵
- * @param codeTemplatePhaseDTO 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PostMapping( "/addSave")
- public BaseResult<CodeTemplatePhaseVO> addSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
- CodeTemplatePhaseVO codeTemplatePhaseVO = codeTemplatePhaseService.addSave(codeTemplatePhaseDTO);
- return BaseResult.success(codeTemplatePhaseVO);
- }
-
- /**
- * 淇敼 妯℃澘闃舵
- * @param codeTemplatePhaseDTO 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- @PutMapping("/editSave")
- public BaseResult<CodeTemplatePhaseVO> editSave(@RequestBody CodeTemplatePhaseDTO codeTemplatePhaseDTO){
- CodeTemplatePhaseVO codeTemplatePhaseVO = codeTemplatePhaseService.editSave(codeTemplatePhaseDTO);
- return BaseResult.success(codeTemplatePhaseVO);
- }
-
-
- /**
- * 鍒犻櫎妯℃澘闃舵
- * @param codeTemplatePhaseDTO 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @DeleteMapping( "/deleteData")
- public BaseResult delCodeTemplatePhase( CodeTemplatePhaseDTO codeTemplatePhaseDTO) {
- return codeTemplatePhaseService.deleteCodeTemplatePhase(codeTemplatePhaseDTO);
- }
-
- /**
- * 涓婚敭鑾峰彇妯℃澘闃舵
- * @param oid 涓婚敭
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄
- */
- @GetMapping("/getObjectByOid")
- public BaseResult<CodeTemplatePhaseVO> getObjectByOid(String oid){
- CodeTemplatePhaseVO codeTemplatePhaseVO = codeTemplatePhaseService.getObjectByOid(oid);
- return BaseResult.success(codeTemplatePhaseVO);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇妯℃澘闃舵
- * @param oids 涓婚敭锛屽涓互閫楀彿鍒嗛殧锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄
- */
- @GetMapping("/listDataByOids")
- public BaseResult<CodeTemplatePhaseVO> listCodeTemplatePhaseByOids(String oids){
- Collection<CodeTemplatePhaseVO> voCollection = codeTemplatePhaseService.listCodeTemplatePhaseByOids(VciBaseUtil.str2List(oids));
- BaseResult baseResult = BaseResult.success();
- baseResult.setData(voCollection);
- return baseResult;
- }
-
-
-
- /**
- * 鍙傜収妯℃澘闃舵鍒楄〃
- * @param baseQueryObject 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- */
- @GetMapping("/refDataGrid")
- public DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(BaseQueryObject baseQueryObject){
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- return codeTemplatePhaseService.refDataGridCodeTemplatePhase(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鑾峰彇闃舵涓病鏈変娇鐢ㄧ殑妯℃澘灞炴��
- * @param baseQueryObject 鏌ヨ瀵硅薄锛屽繀椤昏鏈夋ā鏉跨殑涓婚敭锛坈lassifyTemplateOid锛夛紝鍚﹀垯涓嶈兘纭畾灞炴��
- * @return 灞炴�х殑淇℃伅
- */
- @GetMapping("/gridUnUsedAttribute")
- public DataGrid<CodeClassifyTemplateAttrVO> gridUnUsedAttribute(BaseQueryObject baseQueryObject){
- return codeTemplatePhaseService.gridUnUsedAttribute(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
- /**
- * 鑾峰彇闃舵涓娇鐢ㄧ殑妯℃澘灞炴��
- * @param baseQueryObject 鏌ヨ瀵硅薄锛屽繀椤昏闃舵鐨勪富閿�(codePhaseOid)
- * @return 灞炴�х殑淇℃伅
- */
- @GetMapping("/gridUsedAttribute")
- public DataGrid<CodeClassifyTemplateAttrVO> gridUsedAttribute(BaseQueryObject baseQueryObject){
- return codeTemplatePhaseService.gridUsedAttribute(baseQueryObject.getConditionMap(),baseQueryObject.getPageHelper());
- }
-
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java
new file mode 100644
index 0000000..766625a
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeCodeAllcodeDTO.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.dto;
+
+import com.vci.ubcs.code.entity.CodeAllcode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 鍏ㄩ儴鐮佸�� 鏁版嵁浼犺緭瀵硅薄瀹炰綋绫�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CodeCodeAllcodeDTO extends CodeAllcode {
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeRuleDTO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeRuleDTO.java
new file mode 100644
index 0000000..d03e57f
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/dto/CodeRuleDTO.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.dto;
+
+import com.vci.ubcs.code.entity.CodeRule;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 缂栫爜瑙勫垯 鏁版嵁浼犺緭瀵硅薄瀹炰綋绫�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CodeRuleDTO extends CodeRule {
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 4615707117067738769L;
+
+ /**
+ * 鐮佹闆嗗悎
+ */
+ private List<CodeBasicSecDTO> elements;
+
+ public List<CodeBasicSecDTO> getElements() {
+ return elements;
+ }
+
+ public void setElements(List<CodeBasicSecDTO> elements) {
+ this.elements = elements;
+ }
+
+ @Override
+ public String toString() {
+ return "CodeRuleDTO{" +
+ "elements=" + elements +
+ '}'+ super.toString();
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeAllCodeDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeAllCodeDO.java
deleted file mode 100644
index 6219024..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeAllCodeDO.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Transient;
-import com.vci.starter.web.model.BaseModel;
-
-/**
- * 鍏ㄩ儴鐨勭爜鍊�
- * @author weidy
- * @date 2022-3-1
- */
-//@VciBtmType(name = MdmBtmTypeConstant.CODE_ALL_CODE,text = "鎵�鏈夌殑鐮佸��",lifeCycle = MdmLifeCycleConstant.CODE_ALL_CODE_LC,
-// startStatus = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED)
-@TableName("PL_CODE_CODEALLCODE")
-public class CodeAllCodeDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 5020487634341415429L;
- /**
- * 鍒嗙被鐨勪富閿�
- */
- private String codeClassifyOid;
-
- /**
- * 瑙勫垯鐨勪富閿�
- */
- //@VciUseRefer(MdmBtmTypeConstant.CODE_RULE)
- private String codeRuleOid;
-
- /**
- * 瑙勫垯鐨勫悕绉�
- */
- @Transient
- private String codeRuleOidName;
-
- /**
- * 瀛樺偍鏁版嵁鐨勬ā鏉�
- */
- private String codeClassifyTemplateOid;
-
- /**
- * 鐮佸�肩殑鍊�
- */
- private String id;
-
- /**
- * 鍒涘缓缂栫爜鐨勪笟鍔＄被鍨�
- */
- private String createCodeBtm;
-
- /**
- * 鍒涘缓缂栫爜鐨勪笟鍔℃暟鎹富閿�
- */
- private String createCodeOid;
-
- /***
- * 娴佹按渚濊禆
- */
- private String serialUnit;
-
- /**
- * 娌℃湁濉厖鍓嶇殑娴佹按鍙�
- */
- private String unFillSerial;
-
- public String getSerialUnit() {
- return serialUnit;
- }
-
- public void setSerialUnit(String serialUnit) {
- this.serialUnit = serialUnit;
- }
-
- public String getUnFillSerial() {
- return unFillSerial;
- }
-
- public void setUnFillSerial(String unFillSerial) {
- this.unFillSerial = unFillSerial;
- }
-
- public String getCodeClassifyOid() {
- return codeClassifyOid;
- }
-
- public void setCodeClassifyOid(String codeClassifyOid) {
- this.codeClassifyOid = codeClassifyOid;
- }
-
- public String getCodeRuleOid() {
- return codeRuleOid;
- }
-
- public void setCodeRuleOid(String codeRuleOid) {
- this.codeRuleOid = codeRuleOid;
- }
-
- public String getCodeClassifyTemplateOid() {
- return codeClassifyTemplateOid;
- }
-
- public void setCodeClassifyTemplateOid(String codeClassifyTemplateOid) {
- this.codeClassifyTemplateOid = codeClassifyTemplateOid;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCreateCodeBtm() {
- return createCodeBtm;
- }
-
- public void setCreateCodeBtm(String createCodeBtm) {
- this.createCodeBtm = createCodeBtm;
- }
-
- public String getCreateCodeOid() {
- return createCodeOid;
- }
-
- public void setCreateCodeOid(String createCodeOid) {
- this.createCodeOid = createCodeOid;
- }
-
- public String getCodeRuleOidName() {
- return codeRuleOidName;
- }
-
- public void setCodeRuleOidName(String codeRuleOidName) {
- this.codeRuleOidName = codeRuleOidName;
- }
-
- @Override
- public String toString() {
- return "CodeAllCodeDO{" +
- "codeClassifyOid='" + codeClassifyOid + '\'' +
- ", codeRuleOid='" + codeRuleOid + '\'' +
- ", codeRuleOidName='" + codeRuleOidName + '\'' +
- ", codeClassifyTemplateOid='" + codeClassifyTemplateOid + '\'' +
- ", id='" + id + '\'' +
- ", createCodeBtm='" + createCodeBtm + '\'' +
- ", createCodeOid='" + createCodeOid + '\'' +
- ", serialUnit='" + serialUnit + '\'' +
- ", unFillSerial='" + unFillSerial + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeBasicSecDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeBasicSecDO.java
deleted file mode 100644
index 8b7a686..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeBasicSecDO.java
+++ /dev/null
@@ -1,730 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.*;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.enumpck.VciFieldTypeEnum;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.web.constant.EnumIdConstant;
-
-/**
- * 鍩虹鐮佹鐨勪俊鎭�
- * 鏂逛究鍦ㄥ悓涓�涓〉闈㈤噷鏄剧ず鎵�鏈夌殑鐮佹
- * @author weidy
- * @date 2022-1-18
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_BASIC_SEC,text = "鐮佹鍩虹淇℃伅",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_CODEBASICSEC")
-public class CodeBasicSecDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 1803476098497357359L;
- /**
- * 鐮佹淇℃伅
- */
- @Column(columnDefinition = "鐮佹淇℃伅",nullable = false)
- private String id;
-
- /**
- * 鐮佹鍚嶇О
- */
- @Column(columnDefinition = "鐮佹鍚嶇О",nullable = false)
- private String name;
-
- /**
- * 鐮佹绫诲瀷
- */
- @Column(columnDefinition = "鐮佹绫诲瀷",nullable = false)
- @VciUseEnum(value = MdmEnumIdConstant.CODE_SEC_TYPE,showTextField = "secTypeText")
- private String secType;
-
- /**
- * 鐮佹闀垮害绫诲瀷鏄剧ず鏂囨湰
- */
- @Transient()
- private String secTypeText;
-
- /**
- * 鎵�灞炵紪鐮佽鍒�
- */
- @Column(columnDefinition = "鎵�灞炵紪鐮佽鍒�",nullable = false)
- private String pkCodeRule;
-
- /**
- * 鐮佹鎺掑簭鍙�
- */
- @Column(columnDefinition = "orderNum",nullable = false)
- private Integer orderNum;
-
- /**
- * 寮曠敤鐨勫睘鎬х殑鏂囨湰
- */
- @Column(columnDefinition = "寮曠敤鐨勫睘鎬у悕绉�")
- private String referAttributeName;
-
- /**
- * 寮曠敤鐨勫睘鎬ц嫳鏂囧悕绉�
- */
- @Column(columnDefinition = "寮曠敤鐨勫睘鎬ц嫳鏂�")
- private String referAttributeId;
-
- /**
- * 鍙栧�艰鍒�
- */
- @Column(columnDefinition = "鍙栧�艰鍒�",length = 4000)
- private String getValueClass ;
-
- //鍓嶇杈撳叆鍚庤嚜鍔ㄥ姞鍏ュ埌鏋氫妇涓�
- /**
- * 鏃ユ湡鏍煎紡
- */
- @Column(columnDefinition = "鏃ユ湡鏍煎紡")
- private String codeDateFormatStr;
-
- /**
- * 鐮佹闀垮害绫诲瀷
- */
- @Column(columnDefinition = "鐮佹闀垮害绫诲瀷")
- @VciUseEnum(value = MdmEnumIdConstant.CODE_SEC_LENGTH,showTextField = "secLengthTypeText")
- private String codeSecLengthType;
-
- /**
- * 鐮佹闀垮害绫诲瀷鏄剧ず鏂囨湰
- */
- @Transient(referColumn = MdmEnumIdConstant.CODE_SEC_LENGTH + "_secLengthType")
- private String codeSecLengthTypeText;
-
- /**
- * 鐮佹鐨勯暱搴�
- */
- @Column(columnDefinition = "鐮佹鐨勯暱搴�")
- private String codeSecLength;
-
- /**
- * 灞傜骇绫诲瀷
- */
- @Column(columnDefinition = "灞傜骇绫诲瀷")
- @VciUseEnum(value = MdmEnumIdConstant.CODE_LEVEL_TYPE,showTextField = "codeLevelTypeText")
- private String codeLevelType;
-
- /**
- * 灞傜骇绫诲瀷鏄剧ず鏂囨湰
- */
- @Transient(referColumn = MdmEnumIdConstant.CODE_LEVEL_TYPE + "_codeLevelType")
- private String codeLevelTypeText;
-
- /**
- * 灞傜骇鐨勫��
- */
- @Column(columnDefinition = "灞傜骇鐨勫��")
- private Integer codeLevelValue;
-
- /**
- * 鍊兼埅鍙栭暱搴�
- */
- @Column(columnDefinition = "鍊兼埅鍙栭暱搴�")
- private Integer valueCutLength;
-
- /**
- * 瀛楃鎴彇绫诲瀷
- */
- @Column(columnDefinition = "瀛楃鎴彇绫诲瀷")
- @VciUseEnum(value = MdmEnumIdConstant.CODE_CUT_TYPE,showTextField = "valueCutTypeText")
- private String valueCutType;
-
- /**
- * 瀛楃涓叉埅鍙栫被鍨嬫樉绀烘枃鏈�
- */
- @Transient
- private String valueCutTypeText;
-
- /**
- * 鍙栧�肩被鍨�
- */
- @Column(columnDefinition = "鍙栧�肩被鍨�")
- @VciUseEnum(value = MdmEnumIdConstant.CODE_GET_VALUE_TYPE,showTextField = "codeGetValueTypeText")
- private String codeGetValueType;
-
- /**
- * 鍙栧�肩被鍨嬫樉绀烘枃鏈�
- */
- @Transient
- private String codeGetValueTypeText;
-
- /**
- * 寮曠敤鐨勫睘鎬ф墍灞炵殑搴撳垎绫�
- */
- @Column(columnDefinition = "寮曠敤灞炴�ф墍灞炵殑搴撳垎绫�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY)
- private String referCodeClassifyOid;
-
- /**
- * 寮曠敤鐨勫睘鎬ф墍灞炲簱鍒嗙被鐨勫悕绉�
- */
- @Transient(referColumn = "referCodeClassifyOid.name")
- private String referCodeClassifyOidName;
-
- /**
- * 寮曠敤鐨勪笟鍔＄被鍨�
- */
- @Column(columnDefinition = "寮曠敤鐨勪笟鍔＄被鍨�")
- private String referBtmId;
-
- /**
- * 寮曠敤鐨勪笟鍔＄被鍨嬪悕绉�
- */
- @Column(columnDefinition = "寮曠敤鐨勪笟鍔＄被鍨嬪悕绉�")
- private String referBtmName;
-
- /**
- * 鍙傜収鐨勭獥鍙ｉ厤缃�
- */
- @Column(columnDefinition = "鍙傜収绐楀彛閰嶇疆",length = 4000)
- private String referConfig;
-
- /**
- * 鏄剧ず淇℃伅
- */
- @Column(columnDefinition = "鏄剧ず淇℃伅",length = 4000)
- private String referValueInfo;
-
- /**
- * 杩囨护鐨剆ql鍐呭
- */
- @Column(columnDefinition = "杩囨护鐨剆ql鍐呭",length = 4000)
- private String filterSql ;
-
-
- /**
- * 娴佹按鍙疯捣濮嬪��
- */
- @Column(columnDefinition = "娴佹按鍙疯捣濮嬪��")
- private String serialStart;
-
- /**
- * 娴佹按鐨勬闀�
- */
- @Column(columnDefinition = "娴佹按鐨勬闀�")
- private Integer serialStep;
-
-
- /**
- * 缂栫爜琛ヤ綅鏂瑰紡
- */
- @VciUseEnum(value = EnumIdConstant.CODE_FILL_TYPE,showTextField = "codeFillTypeText")
- @Column(columnDefinition = "缂栫爜琛ヤ綅鏂瑰紡")
- private String codeFillType;
-
- /**
- * 缂栫爜琛ヤ綅鏂瑰紡鏄剧ず鏂囨湰
- */
- @Column(columnDefinition = "缂栫爜琛ヤ綅鏂瑰紡鏄剧ず鏂囨湰")
- private String codeFillTypeText;
-
- /**
- * 琛ヤ綅鏃剁殑瀛楃
- */
- @Column(columnDefinition = "琛ヤ綅鏃剁殑瀛楃",defaultValue = "0")
- private String codeFillSeparator;
-
- /**
- * 濉厖闀垮害
- */
- @Column(columnDefinition = "濉厖闀垮害")
- private String codeFillLength;
-
- /**
- * 涓婇檺
- */
- @Column(columnDefinition = "娴佹按涓婇檺")
- private Integer codeFillLimit;
-
- /**
- * 娴佹按鏄惁琛ョ爜
- */
- @Column(columnDefinition = "娴佹按鏄惁琛ョ爜",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String codeFillFlag;
-
- /**
- * 鑷畾涔夌殑娴佹按绠楁硶绫�
- */
- @Column(columnDefinition = "鑷畾涔夌殑娴佹按绠楁硶")
- private String customCodeSerialClass;
-
- /**
- * 鏄惁鑷姩鍖归厤鍒嗙被鍊�
- */
- @Column(columnDefinition = "鏄惁鑷姩鍖归厤鍒嗙被鍊�",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String matchClassifyValueFlag;
-
- /**
- * 鐖跺垎绫荤爜娈典富閿�
- */
- @Column(columnDefinition = "鐖跺垎绫荤爜娈典富閿�")
- @VciUseRefer(value = MdmBtmTypeConstant.CODE_BASIC_SEC,showTextField = "parentClassifySecText")
- private String parentClassifySecOid;
-
- /**
- * 鐖跺垎绫荤爜娈靛悕绉�
- */
- @Transient(referColumn = "parentClassifySecOid.name")
- private String parentClassifySecText;
-
-
- /**
- * 鏄惁鍙互涓虹┖
- */
- @Column(columnDefinition = "鏄惁鍙互涓虹┖",defaultValue = "true")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String nullableFlag;
-
- /**
- * 鏄惁鍙備笌缂栫爜
- */
- @Column(columnDefinition = "鏄惁鍙備笌缂栫爜",defaultValue = "true")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String componentCodeFlag;
-
- /**
- * 鏄惁娴佹按渚濊禆
- */
- @Column(columnDefinition = "鏄惁娴佹按渚濊禆",defaultValue = "true")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String serialDependFlag;
-
- /**
- * 鏄惁鏄剧ず
- */
- @Column(columnDefinition = "鏄惁鏄剧ず",defaultValue = "true")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String displayFlag;
-
- /**
- * 娴佹按渚濊禆椤哄簭
- */
- @Column(columnDefinition = "娴佹按渚濊禆椤哄簭")
- private Integer serialDependOrder;
-
- public String getReferCodeClassifyOidName() {
- return referCodeClassifyOidName;
- }
-
- public void setReferCodeClassifyOidName(String referCodeClassifyOidName) {
- this.referCodeClassifyOidName = referCodeClassifyOidName;
- }
-
- public String getReferBtmId() {
- return referBtmId;
- }
-
- public void setReferBtmId(String referBtmId) {
- this.referBtmId = referBtmId;
- }
-
- public String getReferBtmName() {
- return referBtmName;
- }
-
- public void setReferBtmName(String referBtmName) {
- this.referBtmName = referBtmName;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getSecType() {
- return secType;
- }
-
- public void setSecType(String secType) {
- this.secType = secType;
- }
-
- public String getSecTypeText() {
- return secTypeText;
- }
-
- public void setSecTypeText(String secTypeText) {
- this.secTypeText = secTypeText;
- }
-
- public String getPkCodeRule() {
- return pkCodeRule;
- }
-
- public void setPkCodeRule(String pkCodeRule) {
- this.pkCodeRule = pkCodeRule;
- }
-
- public String getGetValueClass() {
- return getValueClass;
- }
-
- public void setGetValueClass(String getValueClass) {
- this.getValueClass = getValueClass;
- }
-
- public String getCodeDateFormatStr() {
- return codeDateFormatStr;
- }
-
- public void setCodeDateFormatStr(String codeDateFormatStr) {
- this.codeDateFormatStr = codeDateFormatStr;
- }
-
-
- public String getCodeSecLength() {
- return codeSecLength;
- }
-
- public void setCodeSecLength(String codeSecLength) {
- this.codeSecLength = codeSecLength;
- }
-
- public String getCodeLevelType() {
- return codeLevelType;
- }
-
- public void setCodeLevelType(String codeLevelType) {
- this.codeLevelType = codeLevelType;
- }
-
- public String getCodeLevelTypeText() {
- return codeLevelTypeText;
- }
-
- public void setCodeLevelTypeText(String codeLevelTypeText) {
- this.codeLevelTypeText = codeLevelTypeText;
- }
-
- public Integer getCodeLevelValue() {
- return codeLevelValue;
- }
-
- public void setCodeLevelValue(Integer codeLevelValue) {
- this.codeLevelValue = codeLevelValue;
- }
-
- public Integer getValueCutLength() {
- return valueCutLength;
- }
-
- public void setValueCutLength(Integer valueCutLength) {
- this.valueCutLength = valueCutLength;
- }
-
- public String getValueCutType() {
- return valueCutType;
- }
-
- public void setValueCutType(String valueCutType) {
- this.valueCutType = valueCutType;
- }
-
- public String getValueCutTypeText() {
- return valueCutTypeText;
- }
-
- public void setValueCutTypeText(String valueCutTypeText) {
- this.valueCutTypeText = valueCutTypeText;
- }
-
- public String getCodeGetValueType() {
- return codeGetValueType;
- }
-
- public void setCodeGetValueType(String codeGetValueType) {
- this.codeGetValueType = codeGetValueType;
- }
-
- public String getCodeGetValueTypeText() {
- return codeGetValueTypeText;
- }
-
- public void setCodeGetValueTypeText(String codeGetValueTypeText) {
- this.codeGetValueTypeText = codeGetValueTypeText;
- }
-
- public String getReferCodeClassifyOid() {
- return referCodeClassifyOid;
- }
-
- public void setReferCodeClassifyOid(String referCodeClassifyOid) {
- this.referCodeClassifyOid = referCodeClassifyOid;
- }
-
- public String getReferConfig() {
- return referConfig;
- }
-
- public void setReferConfig(String referConfig) {
- this.referConfig = referConfig;
- }
-
- public String getReferValueInfo() {
- return referValueInfo;
- }
-
- public void setReferValueInfo(String referValueInfo) {
- this.referValueInfo = referValueInfo;
- }
-
- public String getFilterSql() {
- return filterSql;
- }
-
- public void setFilterSql(String filterSql) {
- this.filterSql = filterSql;
- }
-
- public String getSerialStart() {
- return serialStart;
- }
-
- public void setSerialStart(String serialStart) {
- this.serialStart = serialStart;
- }
-
- public Integer getSerialStep() {
- return serialStep;
- }
-
- public void setSerialStep(Integer serialStep) {
- this.serialStep = serialStep;
- }
-
- public String getCodeFillType() {
- return codeFillType;
- }
-
- public void setCodeFillType(String codeFillType) {
- this.codeFillType = codeFillType;
- }
-
- public String getCodeFillTypeText() {
- return codeFillTypeText;
- }
-
- public void setCodeFillTypeText(String codeFillTypeText) {
- this.codeFillTypeText = codeFillTypeText;
- }
-
- public String getCodeFillSeparator() {
- return codeFillSeparator;
- }
-
- public void setCodeFillSeparator(String codeFillSeparator) {
- this.codeFillSeparator = codeFillSeparator;
- }
-
- public String getCodeFillLength() {
- return codeFillLength;
- }
-
- public void setCodeFillLength(String codeFillLength) {
- this.codeFillLength = codeFillLength;
- }
-
- public Integer getCodeFillLimit() {
- return codeFillLimit;
- }
-
- public void setCodeFillLimit(Integer codeFillLimit) {
- this.codeFillLimit = codeFillLimit;
- }
-
- public String getCodeFillFlag() {
- return codeFillFlag;
- }
-
- public void setCodeFillFlag(String codeFillFlag) {
- this.codeFillFlag = codeFillFlag;
- }
-
- public String getCustomCodeSerialClass() {
- return customCodeSerialClass;
- }
-
- public void setCustomCodeSerialClass(String customCodeSerialClass) {
- this.customCodeSerialClass = customCodeSerialClass;
- }
-
- public String getMatchClassifyValueFlag() {
- return matchClassifyValueFlag;
- }
-
- public void setMatchClassifyValueFlag(String matchClassifyValueFlag) {
- this.matchClassifyValueFlag = matchClassifyValueFlag;
- }
-
- public String getParentClassifySecOid() {
- return parentClassifySecOid;
- }
-
- public void setParentClassifySecOid(String parentClassifySecOid) {
- this.parentClassifySecOid = parentClassifySecOid;
- }
-
- public String getParentClassifySecText() {
- return parentClassifySecText;
- }
-
- public void setParentClassifySecText(String parentClassifySecText) {
- this.parentClassifySecText = parentClassifySecText;
- }
-
-
- public String getCodeSecLengthType() {
- return codeSecLengthType;
- }
-
- public void setCodeSecLengthType(String codeSecLengthType) {
- this.codeSecLengthType = codeSecLengthType;
- }
-
- public String getCodeSecLengthTypeText() {
- return codeSecLengthTypeText;
- }
-
- public void setCodeSecLengthTypeText(String codeSecLengthTypeText) {
- this.codeSecLengthTypeText = codeSecLengthTypeText;
- }
-
- public String getNullableFlag() {
- return nullableFlag;
- }
-
- public void setNullableFlag(String nullableFlag) {
- this.nullableFlag = nullableFlag;
- }
-
- public String getComponentCodeFlag() {
- return componentCodeFlag;
- }
-
- public void setComponentCodeFlag(String componentCodeFlag) {
- this.componentCodeFlag = componentCodeFlag;
- }
-
- public String getSerialDependFlag() {
- return serialDependFlag;
- }
-
- public void setSerialDependFlag(String serialDependFlag) {
- this.serialDependFlag = serialDependFlag;
- }
-
- public String getDisplayFlag() {
- return displayFlag;
- }
-
- public void setDisplayFlag(String displayFlag) {
- this.displayFlag = displayFlag;
- }
-
- public Integer getSerialDependOrder() {
- return serialDependOrder;
- }
-
- public void setSerialDependOrder(Integer serialDependOrder) {
- this.serialDependOrder = serialDependOrder;
- }
-
- public String getReferAttributeId() {
- return referAttributeId;
- }
-
- public void setReferAttributeId(String referAttributeId) {
- this.referAttributeId = referAttributeId;
- }
-
- public String getReferAttributeName() {
- return referAttributeName;
- }
-
- public void setReferAttributeName(String referAttributeName) {
- this.referAttributeName = referAttributeName;
- }
-
- @Override
- public String toString() {
- return "CodeBasicSecDO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", secType='" + secType + '\'' +
- ", secTypeText='" + secTypeText + '\'' +
- ", pkCodeRule='" + pkCodeRule + '\'' +
- ", orderNum=" + orderNum +
- ", referAttributeName='" + referAttributeName + '\'' +
- ", referAttributeId='" + referAttributeId + '\'' +
- ", getValueClass='" + getValueClass + '\'' +
- ", codeDateFormatStr='" + codeDateFormatStr + '\'' +
- ", codeSecLengthType='" + codeSecLengthType + '\'' +
- ", codeSecLengthTypeText='" + codeSecLengthTypeText + '\'' +
- ", codeSecLength='" + codeSecLength + '\'' +
- ", codeLevelType='" + codeLevelType + '\'' +
- ", codeLevelTypeText='" + codeLevelTypeText + '\'' +
- ", codeLevelValue=" + codeLevelValue +
- ", valueCutLength=" + valueCutLength +
- ", valueCutType='" + valueCutType + '\'' +
- ", valueCutTypeText='" + valueCutTypeText + '\'' +
- ", codeGetValueType='" + codeGetValueType + '\'' +
- ", codeGetValueTypeText='" + codeGetValueTypeText + '\'' +
- ", referCodeClassifyOid='" + referCodeClassifyOid + '\'' +
- ", referCodeClassifyOidName='" + referCodeClassifyOidName + '\'' +
- ", referBtmId='" + referBtmId + '\'' +
- ", referBtmName='" + referBtmName + '\'' +
- ", referConfig='" + referConfig + '\'' +
- ", referValueInfo='" + referValueInfo + '\'' +
- ", filterSql='" + filterSql + '\'' +
- ", serialStart='" + serialStart + '\'' +
- ", serialStep=" + serialStep +
- ", codeFillType='" + codeFillType + '\'' +
- ", codeFillTypeText='" + codeFillTypeText + '\'' +
- ", codeFillSeparator='" + codeFillSeparator + '\'' +
- ", codeFillLength='" + codeFillLength + '\'' +
- ", codeFillLimit=" + codeFillLimit +
- ", codeFillFlag='" + codeFillFlag + '\'' +
- ", customCodeSerialClass='" + customCodeSerialClass + '\'' +
- ", matchClassifyValueFlag='" + matchClassifyValueFlag + '\'' +
- ", parentClassifySecOid='" + parentClassifySecOid + '\'' +
- ", parentClassifySecText='" + parentClassifySecText + '\'' +
- ", nullableFlag='" + nullableFlag + '\'' +
- ", componentCodeFlag='" + componentCodeFlag + '\'' +
- ", serialDependFlag='" + serialDependFlag + '\'' +
- ", displayFlag='" + displayFlag + '\'' +
- ", serialDependOrder=" + serialDependOrder +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeButtonDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeButtonDO.java
deleted file mode 100644
index 9a67ba9..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeButtonDO.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.Transient;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseEnum;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-
-/**
- * 缂栫爜閲岀殑鎸夐挳鎵╁睍
- * @author weidy
- * @date 2022-1-17
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_BUTTON,text = "涓绘暟鎹腑鐨勬寜閽墿灞�",lifeCycle = FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME)
-@TableName("PL_CODE_CODEBUTTON")
-public class CodeButtonDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = -2281543776769670606L;
-
- /**
- * 鎸夐挳鐨勮嫳鏂囩紪鍙�
- */
- @Column(nullable = false,columnDefinition = "鎸夐挳鐨勮嫳鏂囩紪鍙�")
- private String id;
-
- /**
- * 鎸夐挳鐨勪腑鏂囧悕绉�
- */
- @Column(nullable = false,columnDefinition = "鎸夐挳鐨勪腑鏂囧悕绉�")
- private String name;
-
- /**
- * 鎸夐挳鐨勫浘鏍囨牱寮�
- */
- @Column(columnDefinition = "鎸夐挳鐨勫浘鏍囨牱寮�")
- private String iconCls;
-
- /**
- * 鎵ц鐨刯s鍐呭
- */
- @Column(columnDefinition = "鎵ц鐨刯s鍐呭")
- private String executeJs;
-
- /**
- * 浣跨敤鎸夐挳鐨勪綅缃�
- */
- @Column(columnDefinition = "鎸夐挳鐨勪綅缃�")
- @VciUseEnum(value = MdmEnumIdConstant.CODE_BUTTON_POSITION,showTextField = "usedPositionTypeText")
- private String usedPositionType;
-
- /**
- * 浣跨敤鎸夐挳鐨勪綅缃殑鏄剧ず鏂囨湰
- */
- @Transient(referColumn = MdmEnumIdConstant.CODE_BUTTON_POSITION +"_usedPositionType")
- private String usedPositionTypeText;
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getIconCls() {
- return iconCls;
- }
-
- public void setIconCls(String iconCls) {
- this.iconCls = iconCls;
- }
-
- public String getExecuteJs() {
- return executeJs;
- }
-
- public void setExecuteJs(String executeJs) {
- this.executeJs = executeJs;
- }
-
- public String getUsedPositionType() {
- return usedPositionType;
- }
-
- public void setUsedPositionType(String usedPositionType) {
- this.usedPositionType = usedPositionType;
- }
-
- public String getUsedPositionTypeText() {
- return usedPositionTypeText;
- }
-
- public void setUsedPositionTypeText(String usedPositionTypeText) {
- this.usedPositionTypeText = usedPositionTypeText;
- }
-
- @Override
- public String toString() {
- return "CodeButtonDO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", iconCls='" + iconCls + '\'' +
- ", executeJs='" + executeJs + '\'' +
- ", usedPositionType='" + usedPositionType + '\'' +
- ", usedPositionTypeText='" + usedPositionTypeText + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyDO.java
deleted file mode 100644
index c0f1f67..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyDO.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.Transient;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 涓婚搴撶殑鍒嗙被
- * @author weidy
- * @date 2022-1-14
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY,text = "涓婚搴撳垎绫�",lifeCycle = FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME)
-@TableName("PL_CODE_CLASSIFY")
-public class CodeClassifyDO extends BaseModel {
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 2217599544701726951L;
-
- /**
- * 鍒嗙被鐨勭紪鍙�
- */
- @Column(nullable = false,columnDefinition = "鍒嗙被鐨勭紪鍙�")
- private String id;
-
- /**
- * 鍒嗙被鐨勫悕绉�
- */
- @Column(nullable = false,columnDefinition = "鍒嗙被鐨勫悕绉�")
- private String name;
-
- /**
- * 涓婄骇鐨勪富閿�
- */
- @Column(columnDefinition = "涓婄骇鏁版嵁鐨勪富閿�")
- private String parentCodeClassifyOid;
-
- /**
- * 鎺掑簭鍙�
- */
- @Column(columnDefinition = "鎺掑簭鍙�",nullable = false)
- private Integer orderNum;
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨�
- */
- @Column(columnDefinition = "涓氬姟绫诲瀷鐨勭紪鍙�")
- private String btmTypeId;
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨嬬殑涓枃鍚嶇О
- */
- @Column(columnDefinition = "涓氬姟绫诲瀷鐨勫悕绉�")
- private String btmTypeName;
-
- /**
- * 缂栫爜瑙勫垯鐨勪富閿�
- */
- @Column(columnDefinition = "缂栫爜瑙勫垯鐨勪富閿�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_RULE)
- private String codeRuleOid;
-
- /**
- * 缂栫爜瑙勫垯鐨勫悕绉�
- */
- @Transient(referColumn = "codeRuleOid.name")
- private String codeRuleOidName;
-
- /**
- * 鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯
- */
- @Column(columnDefinition = "鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯")
- @VciUseRefer(MdmBtmTypeConstant.CODE_KEY_ATTR_REPEAT_RULE)
- private String codeKeyAttrRepeatOid;
-
- /**
- * 鍏抽敭灞炴�ф煡璇㈢殑瑙勫垯鍚嶇О
- */
- @Transient(referColumn = "codeKeyAttrRepeatOid.name")
- private String codeKeyAttrRepeatOidName;
-
- /**
- * 鐩镐技椤规煡璇㈢殑瑙勫垯涓婚敭
- */
- @Column(columnDefinition = "鐩镐技椤规煡璇㈢殑瑙勫垯")
- @VciUseRefer(MdmBtmTypeConstant.CODE_RESEMBLE_RULE)
- private String codeResembleRuleOid;
-
- /**
- * 鐩镐技椤规煡璇㈣鍒欏悕绉�
- */
- @Transient(referColumn = "codeResembleRuleOid.name")
- private String codeResembleRuleOidName;
-
- /**
- * 鏁版嵁鎵�鍦ㄧ殑灞傜骇
- */
- @Transient
- private Integer dataLevel;
-
- /**
- * 璺緞
- */
- @Transient
- private String path;
- /***
- * 鍚嶇О璺緞
- */
- @Transient
- private String namePath;
- /***
- * 浠ｇ爜璺緞
- */
- @Transient
- private String idPath;
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getParentCodeClassifyOid() {
- return parentCodeClassifyOid;
- }
-
- public void setParentCodeClassifyOid(String parentCodeClassifyOid) {
- this.parentCodeClassifyOid = parentCodeClassifyOid;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public String getBtmTypeId() {
- return btmTypeId;
- }
-
- public void setBtmTypeId(String btmTypeId) {
- this.btmTypeId = btmTypeId;
- }
-
- public String getBtmTypeName() {
- return btmTypeName;
- }
-
- public void setBtmTypeName(String btmTypeName) {
- this.btmTypeName = btmTypeName;
- }
-
- public String getCodeRuleOid() {
- return codeRuleOid;
- }
-
- public void setCodeRuleOid(String codeRuleOid) {
- this.codeRuleOid = codeRuleOid;
- }
-
-
- public String getCodeKeyAttrRepeatOid() {
- return codeKeyAttrRepeatOid;
- }
-
- public void setCodeKeyAttrRepeatOid(String codeKeyAttrRepeatOid) {
- this.codeKeyAttrRepeatOid = codeKeyAttrRepeatOid;
- }
-
- public String getCodeRuleOidName() {
- return codeRuleOidName;
- }
-
- public void setCodeRuleOidName(String codeRuleOidName) {
- this.codeRuleOidName = codeRuleOidName;
- }
-
- public String getCodeKeyAttrRepeatOidName() {
- return codeKeyAttrRepeatOidName;
- }
-
- public void setCodeKeyAttrRepeatOidName(String codeKeyAttrRepeatOidName) {
- this.codeKeyAttrRepeatOidName = codeKeyAttrRepeatOidName;
- }
-
- public Integer getDataLevel() {
- return dataLevel;
- }
-
- public void setDataLevel(Integer dataLevel) {
- this.dataLevel = dataLevel;
- }
-
- public String getCodeResembleRuleOid() {
- return codeResembleRuleOid;
- }
-
- public void setCodeResembleRuleOid(String codeResembleRuleOid) {
- this.codeResembleRuleOid = codeResembleRuleOid;
- }
-
- public String getCodeResembleRuleOidName() {
- return codeResembleRuleOidName;
- }
-
- public void setCodeResembleRuleOidName(String codeResembleRuleOidName) {
- this.codeResembleRuleOidName = codeResembleRuleOidName;
- }
-
- public String getNamePath() {
- return namePath;
- }
-
- public void setNamePath(String namePath) {
- this.namePath = namePath;
- }
-
- public String getIdPath() {
- return idPath;
- }
-
- public void setIdPath(String idPath) {
- this.idPath = idPath;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyDO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", parentCodeClassifyOid='" + parentCodeClassifyOid + '\'' +
- ", orderNum=" + orderNum +
- ", btmTypeId='" + btmTypeId + '\'' +
- ", btmTypeName='" + btmTypeName + '\'' +
- ", codeRuleOid='" + codeRuleOid + '\'' +
- ", codeRuleOidName='" + codeRuleOidName + '\'' +
- ", codeKeyAttrRepeatOid='" + codeKeyAttrRepeatOid + '\'' +
- ", codeKeyAttrRepeatOidName='" + codeKeyAttrRepeatOidName + '\'' +
- ", codeResembleRuleOid='" + codeResembleRuleOid + '\'' +
- ", codeResembleRuleOidName='" + codeResembleRuleOidName + '\'' +
- ", dataLevel=" + dataLevel +
- ", path='" + path + '\'' +
- ", namePath='" + namePath + '\'' +
- ", idPath='" + idPath + '\'' +
- '}';
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessPhaseDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessPhaseDO.java
deleted file mode 100644
index 8734a64..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessPhaseDO.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 娴佺▼妯℃澘鍜岄樁娈电殑鍐呭
- * @author weidy
- * @date 2022-1-14
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_PHASE,text = "娴佺▼妯℃澘鍜岄樁娈电殑鍐呭",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_CLASSIFYPROCESSPHASE")
-public class CodeClassifyProcessPhaseDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 3814649551140170874L;
- /**
- * 涓婚搴撳垎绫讳富閿�
- */
- @Column(nullable = false,columnDefinition = "涓婚搴撳垎绫讳富閿�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY)
- private String codeClassifyOid;
-
- /**
- * 鎵�灞炴ā鏉�
- */
- @Column(nullable = false,columnDefinition = "鎵�灞炴ā鏉�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE)
- private String classifyTemplateOid;
-
- /**
- * 鎵�灞為樁娈电殑淇℃伅
- */
- @Column(nullable = false,columnDefinition = "鎵�灞炴ā鏉块樁娈�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_TEMPLATE_PHASE)
- private String codePhaseOid;
-
- /**
- * 娴佺▼妯℃澘缂栧彿
- */
- @Column(columnDefinition = "娴佺▼妯℃澘缂栧彿")
- private String id;
-
- /**
- * 娴佺▼妯℃澘鐨勫悕绉�
- */
- @Column(columnDefinition = "娴佺▼妯℃澘鍚嶇О",nullable = false)
- private String name;
-
- /**
- * 娴佺▼涓殑浠诲姟鑺傜偣鐨勫悕绉�
- */
- @Column(columnDefinition = "娴佺▼涓殑浠诲姟鑺傜偣鍚嶇О",nullable = false)
- private String processNodeName;
-
-
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCodeClassifyOid() {
- return codeClassifyOid;
- }
-
- public void setCodeClassifyOid(String codeClassifyOid) {
- this.codeClassifyOid = codeClassifyOid;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getClassifyTemplateOid() {
- return classifyTemplateOid;
- }
-
- public void setClassifyTemplateOid(String classifyTemplateOid) {
- this.classifyTemplateOid = classifyTemplateOid;
- }
-
- public String getCodePhaseOid() {
- return codePhaseOid;
- }
-
- public void setCodePhaseOid(String codePhaseOid) {
- this.codePhaseOid = codePhaseOid;
- }
-
- public String getProcessNodeName() {
- return processNodeName;
- }
-
- public void setProcessNodeName(String processNodeName) {
- this.processNodeName = processNodeName;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyProcessPhaseDO{" +
- "codeClassifyOid='" + codeClassifyOid + '\'' +
- ", classifyTemplateOid='" + classifyTemplateOid + '\'' +
- ", codePhaseOid='" + codePhaseOid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", processNodeName='" + processNodeName + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessTempDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessTempDO.java
deleted file mode 100644
index 0e2a182..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyProcessTempDO.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.*;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-
-/**
- * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @author weidy
- * @date 2022-1-14
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE,text = "鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_CLASSIFYPROCESSTEMP")
-public class CodeClassifyProcessTempDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 6606901931032525995L;
- /**
- * 涓婚搴撳垎绫讳富閿�
- */
- @Column(nullable = false,columnDefinition = "涓婚搴撳垎绫讳富閿�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY)
- private String codeClassifyOid;
-
- /**
- * 鎵�灞炴ā鏉�
- */
- @Column(nullable = false,columnDefinition = "鎵�灞炴ā鏉�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE)
- private String classifyTemplateOid;
-
- /**
- * 娴佺▼妯℃澘缂栧彿
- */
- @Column(columnDefinition = "娴佺▼妯℃澘缂栧彿")
- private String id;
-
- /**
- * 娴佺▼妯℃澘鐨勫悕绉�
- */
- @Column(columnDefinition = "娴佺▼妯℃澘鍚嶇О",nullable = false)
- private String name;
-
- /**
- * 娴佺▼妯℃澘鐢ㄩ��
- */
- @Column(columnDefinition = "娴佺▼妯℃澘鐢ㄩ��",nullable = false)
- @VciUseEnum(value = MdmEnumIdConstant.CODE_CLASSIFY_PROCESS_USE,showTextField = "codeProcessUseText")
- private String codeProcessUse;
-
- /**
- * 娴佺▼妯℃澘鐢ㄩ�旀樉绀哄悕绉�
- */
- @Transient
- private String codeProcessUseText;
-
- /**
- * 娴佺▼妯℃澘鐨勭増鏈�
- */
- @Column(nullable = false)
- private String processVersion;
-
- /**
- * 瀛樺偍鍏宠仈鐨勬ā鏉垮睘鎬х紪鍙�
- */
- @Column(columnDefinition = "鏄剧ず鍦ㄦ祦绋嬩腑鐨勫睘鎬�")
- private String codeTempAttrOidArr;
-
- /**
- * 瀛樺偍鍏宠仈鐨勬ā鏉垮睘鎬у悕绉�
- */
- @Column(columnDefinition = "鏄剧ず鍦ㄦ祦绋嬩腑鐨勫睘鎬у悕绉�")
- private String codeTempAttrOidArrName;
-
- public String getProcessVersion() {
- return processVersion;
- }
-
- public void setProcessVersion(String processVersion) {
- this.processVersion = processVersion;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCodeClassifyOid() {
- return codeClassifyOid;
- }
-
- public void setCodeClassifyOid(String codeClassifyOid) {
- this.codeClassifyOid = codeClassifyOid;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCodeProcessUse() {
- return codeProcessUse;
- }
-
- public void setCodeProcessUse(String codeProcessUse) {
- this.codeProcessUse = codeProcessUse;
- }
-
- public String getCodeProcessUseText() {
- return codeProcessUseText;
- }
-
- public void setCodeProcessUseText(String codeProcessUseText) {
- this.codeProcessUseText = codeProcessUseText;
- }
-
- public String getClassifyTemplateOid() {
- return classifyTemplateOid;
- }
-
- public void setClassifyTemplateOid(String classifyTemplateOid) {
- this.classifyTemplateOid = classifyTemplateOid;
- }
-
- public String getCodeTempAttrOidArr() {
- return codeTempAttrOidArr;
- }
-
- public void setCodeTempAttrOidArr(String codeTempAttrOidArr) {
- this.codeTempAttrOidArr = codeTempAttrOidArr;
- }
-
- public String getCodeTempAttrOidArrName() {
- return codeTempAttrOidArrName;
- }
-
- public void setCodeTempAttrOidArrName(String codeTempAttrOidArrName) {
- this.codeTempAttrOidArrName = codeTempAttrOidArrName;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyProcessTempDO{" +
- "codeClassifyOid='" + codeClassifyOid + '\'' +
- ", classifyTemplateOid='" + classifyTemplateOid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", codeProcessUse='" + codeProcessUse + '\'' +
- ", codeProcessUseText='" + codeProcessUseText + '\'' +
- ", processVersion='" + processVersion + '\'' +
- ", codeTempAttrOidArr='" + codeTempAttrOidArr + '\'' +
- ", codeTempAttrOidArrName='" + codeTempAttrOidArrName + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTempMapItemDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTempMapItemDO.java
deleted file mode 100644
index ccf60a0..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTempMapItemDO.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.Transient;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 鏄犲皠瑙勫垯鐨勬槑缁�
- * @author weidy
- * @date 2022-1-17
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_TEMPLATE_MAP_ITEM,text = "鏄犲皠瑙勫垯鐨勬槑缁�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_CLASSIFYTEMPMAPITEM")
-public class CodeClassifyTempMapItemDO extends BaseModel {
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = -415692697543751712L;
-
- /**
- * 鏄犲皠瑙勫垯涓婚敭
- */
- @Column(nullable = false,columnDefinition = "鏄犲皠瑙勫垯涓婚敭")
- @VciUseRefer(MdmBtmTypeConstant.CODE_TEMPLATE_MAP)
- private String classifyTemplateMapOid;
-
- /**
- * 鏄犲皠鍚嶇О
- */
- @Column(columnDefinition = "鏄犲皠鍚嶇О")
- private String name;
-
- /**
- * 闆嗗洟鐮佸睘鎬ey
- */
- @Column(columnDefinition = "闆嗗洟鐮佸睘鎬ey")
- private String groupCodeAttrId;
-
- /**
- * 闆嗗洟鐮佸睘鎬у悕绉�
- */
- @Column(columnDefinition = "闆嗗洟鐮佸睘鎬у悕绉�")
- private String groupCodeAttrName;
-
- /**
- * 鍒嗙被妯℃澘灞炴�т富閿�
- */
- @Column(columnDefinition = "鍒嗙被妯℃澘灞炴�т富閿�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR)
- private String classifyTemplateAttrOid;
- /**
- * 妯℃澘灞炴�ey
- */
- @Transient(referColumn = "classifyTemplateAttrOid.id")
- private String classifyAttrId;
-
- /**
- * 妯℃澘灞炴�у悕绉�
- */
- @Transient(referColumn = "classifyTemplateAttrOid.name")
- private String classifyAttrName;
-
- /**
- * 鐩爣绔殑鏃堕棿鏍煎紡
- */
- @Column(columnDefinition = "鐩爣绔殑鏃堕棿鏍煎紡")
- private String targetDateFormat;
-
- /**
- * 杞崲鍏紡
- */
- @Column(columnDefinition = "杞崲鍏紡",length = 4000)
- private String switchEval;
-
- /**
- * 杞崲鐨勮嚜瀹氫箟绫�
- */
- @Column(columnDefinition = "杞崲鐨勮嚜瀹氫箟绫�",length = 200)
- private String switchClassName;
-
- public String getClassifyTemplateMapOid() {
- return classifyTemplateMapOid;
- }
-
- public void setClassifyTemplateMapOid(String classifyTemplateMapOid) {
- this.classifyTemplateMapOid = classifyTemplateMapOid;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getGroupCodeAttrId() {
- return groupCodeAttrId;
- }
-
- public void setGroupCodeAttrId(String groupCodeAttrId) {
- this.groupCodeAttrId = groupCodeAttrId;
- }
-
- public String getGroupCodeAttrName() {
- return groupCodeAttrName;
- }
-
- public void setGroupCodeAttrName(String groupCodeAttrName) {
- this.groupCodeAttrName = groupCodeAttrName;
- }
-
- public String getClassifyTemplateAttrOid() {
- return classifyTemplateAttrOid;
- }
-
- public void setClassifyTemplateAttrOid(String classifyTemplateAttrOid) {
- this.classifyTemplateAttrOid = classifyTemplateAttrOid;
- }
-
- public String getClassifyAttrId() {
- return classifyAttrId;
- }
-
- public void setClassifyAttrId(String classifyAttrId) {
- this.classifyAttrId = classifyAttrId;
- }
-
- public String getClassifyAttrName() {
- return classifyAttrName;
- }
-
- public void setClassifyAttrName(String classifyAttrName) {
- this.classifyAttrName = classifyAttrName;
- }
-
- public String getTargetDateFormat() {
- return targetDateFormat;
- }
-
- public void setTargetDateFormat(String targetDateFormat) {
- this.targetDateFormat = targetDateFormat;
- }
-
- public String getSwitchEval() {
- return switchEval;
- }
-
- public void setSwitchEval(String switchEval) {
- this.switchEval = switchEval;
- }
-
- public String getSwitchClassName() {
- return switchClassName;
- }
-
- public void setSwitchClassName(String switchClassName) {
- this.switchClassName = switchClassName;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyTempMapItemDO{" +
- "classifyTemplateMapOid='" + classifyTemplateMapOid + '\'' +
- ", name='" + name + '\'' +
- ", groupCodeAttrId='" + groupCodeAttrId + '\'' +
- ", groupCodeAttrName='" + groupCodeAttrName + '\'' +
- ", classifyTemplateAttrOid='" + classifyTemplateAttrOid + '\'' +
- ", classifyAttrId='" + classifyAttrId + '\'' +
- ", classifyAttrName='" + classifyAttrName + '\'' +
- ", targetDateFormat='" + targetDateFormat + '\'' +
- ", switchEval='" + switchEval + '\'' +
- ", switchClassName='" + switchClassName + '\'' +
- '}' + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttrDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttrDO.java
deleted file mode 100644
index d2bf132..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateAttrDO.java
+++ /dev/null
@@ -1,860 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.*;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.enumpck.VciFieldTypeEnum;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @author weidy
- * @date 2022-1-17
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,text = "涓婚搴撳垎绫荤殑妯℃澘灞炴��",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_CLASSIFYTEMPLATEATTR")
-public class CodeClassifyTemplateAttrDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = -8685210169495428202L;
-
- /**
- * 鎵�灞炴ā鏉�
- */
- @Column(nullable = false,columnDefinition = "鎵�灞炴ā鏉�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE)
- private String classifyTemplateOid;
-
- /**
- * 鎵�灞炴ā鏉垮悕绉�
- */
- @Transient(referColumn = "classifyTemplateOid.name")
- private String classifyTemplateOidName;
-
- /**
- * 灞炴�ц嫳鏂囧悕绉�
- */
- @Column(nullable = false,columnDefinition = "灞炴�ц嫳鏂囧悕绉�")
- private String id;
-
- /**
- * 灞炴�т腑鏂囧悕绉�
- */
- @Column(nullable = false,columnDefinition = "灞炴�т腑鏂囧悕绉�")
- private String name;
-
- /**
- * 灞炴�х殑绫诲瀷
- */
- @Column(columnDefinition = "灞炴�х殑绫诲瀷",nullable = false)
- private String attributeDataType;
-
- /**
- * 鏄惁鍏抽敭灞炴��
- */
- @Column(columnDefinition = "鏄惁鍏抽敭灞炴��",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String keyAttrFlag;
-
- /**
- * 鏄惁蹇�熸煡璇㈠睘鎬�
- */
- @Column(columnDefinition = "鏄惁蹇�熸煡璇㈠睘鎬�",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String queryAttrFlag;
-
- /**
- * 鏄惁楂樼骇鏌ヨ灞炴��
- */
- @Column(columnDefinition = "鏄惁楂樼骇鏌ヨ灞炴��",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String seniorQueryAttrFlag;
-
- /**
- * 鐩镐技鏌ラ噸灞炴��
- */
- @Column(columnDefinition = "鐩镐技鏌ラ噸灞炴��",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String sameRepeatAttrFlag;
-
- /**
- * 鏄惁鎺掑簭
- */
- @Column(columnDefinition = "鏄惁鎺掑簭",defaultValue = "true")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String sortAttrFlag;
-
- /**
- * 鏄惁鐢熸垚浜岀淮鐮�
- */
- @Column(columnDefinition = "鏄惁鐢熸垚浜岀淮鐮�",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String qrcodeFlag;
-
- /**
- * 鏄惁鐢熸垚鏉″舰鐮�
- */
- @Column(columnDefinition = "鏄惁鐢熸垚涓�缁寸爜",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String barcodeFlag;
-
-
- /**
- * 缁勫悎瑙勫垯
- */
- @Column(columnDefinition = "缁勫悎瑙勫垯",length = 4000)
- private String componentRule;
-
- /**
- * 楠岃瘉瑙勫垯
- */
- @Column(columnDefinition = "楠岃瘉瑙勫垯",length = 4000)
- private String verifyRule;
-
- /**
- * 鍒嗙被娉ㄥ叆灞傜骇
- */
- @Column(columnDefinition = "鍒嗙被娉ㄥ叆灞傜骇",defaultValue = "none")
- private String classifyInvokeLevel;
-
- /**
- * 鍒嗙被娉ㄥ叆鐨勫睘鎬�
- */
- @Column(columnDefinition = "鍒嗙被娉ㄥ叆鐨勫睘鎬ц嫳鏂囧悕绉�",length = 32)
- private String classifyInvokeAttr;
-
- /**
- * 鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�
- */
- @Column(columnDefinition = "鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�",length = 200)
- private String classifyInvokeAttrName;
-
- /**
- * 鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫
- */
- @Column(columnDefinition = "鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String classifyInvokeEditFlag;
-
- /**
- * 灞炴�ф帓搴忓彿
- */
- @Column(columnDefinition = "灞炴�ф帓搴忓彿")
- private Integer orderNum;
-
- /**
- * 琛ㄥ崟閲屾槸鍚︽樉绀�
- */
- @Column(columnDefinition = "琛ㄥ崟閲屾槸鍚︽樉绀�",defaultValue = "true")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String formDisplayFlag;
-
- /**
- * 鍒楄〃閲屾槸鍚︽樉绀�
- */
- @Column(columnDefinition = "鍒楄〃閲屾槸鍚︽樉绀�",defaultValue = "true")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String tableDisplayFlag;
-
- /**
- * 鎵�灞炲睘鎬у垎缁�
- */
- @Column(columnDefinition = "鎵�灞炲睘鎬у垎缁�")
- private String attributeGroup;
-
- /**
- * 浣跨敤鏋氫妇鑻辨枃缂栧彿
- */
- @Column(columnDefinition = "浣跨敤鏋氫妇鑻辨枃缂栧彿")
- private String enumId;
-
- /**
- * 浣跨敤鏋氫妇涓枃鍚嶇О
- */
- @Column(columnDefinition = "浣跨敤鏋氫妇涓枃鍚嶇О")
- private String enumName;
-
- /**
- * 鏋氫妇鏄惁鍙互缂栬緫
- */
- @Column(columnDefinition = "鏋氫妇鏄惁鍙互缂栬緫")
- private String enumEditFlag;
-
- /**
- * 鍙傜収涓氬姟绫诲瀷
- */
- @Column(columnDefinition = "鍙傜収鐨勪笟鍔＄被鍨嬭嫳鏂囧悕绉�")
- private String referBtmId;
-
- /**
- * 鍙傜収鐨勪笟鍔＄被鍨嬩腑鏂囧悕绉�
- */
- @Column(columnDefinition = "鍙傜収鐨勪笟鍔＄被鍨嬩腑鏂囧悕绉�")
- private String referBtmName;
-
- /**
- * 鍙傜収鐨勭獥鍙ｉ厤缃�
- */
- @Column(columnDefinition = "鍙傜収绐楀彛閰嶇疆",length = 4000)
- private String referConfig;
-
- /**
- * 鏄惁蹇呰緭
- */
- @Column(columnDefinition = "鏄惁蹇呰緭",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String requireFlag;
-
- /**
- * 鏄惁鍙
- */
- @Column(columnDefinition = "鏄惁鍙",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String readOnlyFlag;
-
- /**
- * 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
- */
- @Column(columnDefinition = "灞炴�ф帶鍒惰緭鍏ョ殑闀垮害",defaultValue = "254")
- private Integer controlLength = 254;
-
- /**
- * 琛ㄥ崟涓婃樉绀虹殑鏍峰紡
- */
- @Column(length = 1000,columnDefinition = "琛ㄥ崟閲屾樉绀虹殑鏍峰紡")
- private String formDisplayStyle;
-
- /**
- * 琛ㄦ牸閲屾樉绀虹殑鏍峰紡
- */
- @Column(length = 1000,columnDefinition = "琛ㄦ牸閲屾樉绀虹殑鏍峰紡")
- private String tableDisplayStyle;
-
- /**
- * 琛ㄥ崟涓秴閾炬帴
- */
- @Column(columnDefinition = "琛ㄥ崟涓秴閾炬帴鍐呭",length = 1000)
- private String formHref;
-
- /**
- * 琛ㄦ牸涓秴閾炬帴
- */
- @Column(columnDefinition = "琛ㄦ牸涓秴閾炬帴鍐呭",length = 1000)
- private String tableHref;
-
- /**
- * 灏忔暟绮惧害
- */
- @Column(columnDefinition = "灏忔暟绮惧害")
- private Integer precisionLength;
-
- /**
- * 灏忔暟鍒诲害
- */
- @Column(columnDefinition = "灏忔暟鍒诲害")
- private Integer scaleLength;
-
- /**
- * 鍙栧�艰寖鍥�
- */
- @Column(columnDefinition = "鍙栧�艰寖鍥�",length = 1000)
- private String valueArea;
-
- /**
- * 鏃堕棿鏍煎紡
- */
- @Column(columnDefinition = "鏃堕棿鏍煎紡")
- private String codeDateFormat;
-
- /**
- * 琛ㄦ牸涓樉绀虹殑js
- */
- @Column(columnDefinition = "琛ㄦ牸閲屾樉绀鸿皟鐢ㄧ殑js",length = 254)
- private String tableDisplayJs;
-
- /**
- * 鏄惁鏄剧ず澶氳鏂囨湰
- */
- @Column(columnDefinition = "鏄惁鏄剧ず澶氳鏂囨湰",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String textAreaFlag;
-
- /**
- * 鏄惁涓哄浘鐗囩瓑鍏冪礌
- */
- @Column(columnDefinition = "棰勮鍥�",defaultValue = "false")
- @VciFieldType(VciFieldTypeEnum.VTBoolean)
- private String imageFlag;
-
- /**
- * 榛樿鍊�
- */
- @Column(columnDefinition = "榛樿鍊�")
- private String defaultValue;
-
- /**
- * 鍓嶇紑
- */
- @Column(columnDefinition = "鍓嶇紑")
- private String prefixValue;
-
- /**
- * 鍚庣紑
- */
- @Column(columnDefinition = "鍚庣紑")
- private String suffixValue;
-
- /**
- * 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��
- */
- @Column(columnDefinition = "閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��")
- private String filterSourceAttr;
-
- /**
- * 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�
- */
- @Column(columnDefinition = "閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�")
- private String filterSourceAttrName;
-
- /**
- * 浣跨敤鏋氫妇娉ㄥ叆鐨勫瓧绗︿覆鏍煎紡
- */
- @Column(length = 4000,columnDefinition = "鏋氫妇娉ㄥ叆鐨勫唴瀹�")
- private String enumString;
-
- /**
- * 灞炴�х殑瀹藉害
- */
- @Column(columnDefinition = "灞炴�у垪琛ㄤ腑瀹藉害")
- private Integer attrTableWidth;
- /**
- * 璇存槑
- */
- @Column(columnDefinition = "璇存槑")
- private String explain;
-
- /**
- * 閫夋嫨搴撴爣璇�
- */
- @Column(columnDefinition = "閫夋嫨搴撴爣璇�")
- private String libraryIdentification;
-
- /**
- * 绾ц仈灞炴�х紪鍙�
- */
- @Column(columnDefinition = "绾ц仈灞炴�х紪鍙�")
- private String parentCode;
-
- /**
- * 绾ц仈灞炴�у悕绉�
- */
- @Column(columnDefinition = "绾ц仈灞炴�у悕绉�")
- private String parentName;
-
- /**
- * 绾ц仈鏌ヨ灞炴��
- */
- @Column(columnDefinition = "绾ц仈鏌ヨ灞炴��")
- private String parentQueryAttr;
-
-
-
- public String getClassifyTemplateOid() {
- return classifyTemplateOid;
- }
-
- public void setClassifyTemplateOid(String classifyTemplateOid) {
- this.classifyTemplateOid = classifyTemplateOid;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getAttributeDataType() {
- return attributeDataType;
- }
-
- public void setAttributeDataType(String attributeDataType) {
- this.attributeDataType = attributeDataType;
- }
-
- public String getKeyAttrFlag() {
- return keyAttrFlag;
- }
-
- public void setKeyAttrFlag(String keyAttrFlag) {
- this.keyAttrFlag = keyAttrFlag;
- }
-
- public String getQueryAttrFlag() {
- return queryAttrFlag;
- }
-
- public void setQueryAttrFlag(String queryAttrFlag) {
- this.queryAttrFlag = queryAttrFlag;
- }
-
- public String getSeniorQueryAttrFlag() {
- return seniorQueryAttrFlag;
- }
-
- public void setSeniorQueryAttrFlag(String seniorQueryAttrFlag) {
- this.seniorQueryAttrFlag = seniorQueryAttrFlag;
- }
-
- public String getSameRepeatAttrFlag() {
- return sameRepeatAttrFlag;
- }
-
- public void setSameRepeatAttrFlag(String sameRepeatAttrFlag) {
- this.sameRepeatAttrFlag = sameRepeatAttrFlag;
- }
-
- public String getSortAttrFlag() {
- return sortAttrFlag;
- }
-
- public void setSortAttrFlag(String sortAttrFlag) {
- this.sortAttrFlag = sortAttrFlag;
- }
-
- public String getQrcodeFlag() {
- return qrcodeFlag;
- }
-
- public void setQrcodeFlag(String qrcodeFlag) {
- this.qrcodeFlag = qrcodeFlag;
- }
-
- public String getBarcodeFlag() {
- return barcodeFlag;
- }
-
- public void setBarcodeFlag(String barcodeFlag) {
- this.barcodeFlag = barcodeFlag;
- }
-
- public String getComponentRule() {
- return componentRule;
- }
-
- public void setComponentRule(String componentRule) {
- this.componentRule = componentRule;
- }
-
- public String getVerifyRule() {
- return verifyRule;
- }
-
- public void setVerifyRule(String verifyRule) {
- this.verifyRule = verifyRule;
- }
-
- public String getClassifyInvokeLevel() {
- return classifyInvokeLevel;
- }
-
- public void setClassifyInvokeLevel(String classifyInvokeLevel) {
- this.classifyInvokeLevel = classifyInvokeLevel;
- }
-
- public String getClassifyInvokeAttr() {
- return classifyInvokeAttr;
- }
-
- public void setClassifyInvokeAttr(String classifyInvokeAttr) {
- this.classifyInvokeAttr = classifyInvokeAttr;
- }
-
- public String getClassifyInvokeAttrName() {
- return classifyInvokeAttrName;
- }
-
- public void setClassifyInvokeAttrName(String classifyInvokeAttrName) {
- this.classifyInvokeAttrName = classifyInvokeAttrName;
- }
-
- public String getClassifyInvokeEditFlag() {
- return classifyInvokeEditFlag;
- }
-
- public void setClassifyInvokeEditFlag(String classifyInvokeEditFlag) {
- this.classifyInvokeEditFlag = classifyInvokeEditFlag;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public String getFormDisplayFlag() {
- return formDisplayFlag;
- }
-
- public void setFormDisplayFlag(String formDisplayFlag) {
- this.formDisplayFlag = formDisplayFlag;
- }
-
- public String getTableDisplayFlag() {
- return tableDisplayFlag;
- }
-
- public void setTableDisplayFlag(String tableDisplayFlag) {
- this.tableDisplayFlag = tableDisplayFlag;
- }
-
- public String getAttributeGroup() {
- return attributeGroup;
- }
-
- public void setAttributeGroup(String attributeGroup) {
- this.attributeGroup = attributeGroup;
- }
-
- public String getEnumId() {
- return enumId;
- }
-
- public void setEnumId(String enumId) {
- this.enumId = enumId;
- }
-
- public String getEnumName() {
- return enumName;
- }
-
- public void setEnumName(String enumName) {
- this.enumName = enumName;
- }
-
- public String getEnumEditFlag() {
- return enumEditFlag;
- }
-
- public void setEnumEditFlag(String enumEditFlag) {
- this.enumEditFlag = enumEditFlag;
- }
-
- public String getReferBtmId() {
- return referBtmId;
- }
-
- public void setReferBtmId(String referBtmId) {
- this.referBtmId = referBtmId;
- }
-
- public String getReferBtmName() {
- return referBtmName;
- }
-
- public void setReferBtmName(String referBtmName) {
- this.referBtmName = referBtmName;
- }
-
- public String getReferConfig() {
- return referConfig;
- }
-
- public void setReferConfig(String referConfig) {
- this.referConfig = referConfig;
- }
-
- public String getRequireFlag() {
- return requireFlag;
- }
-
- public void setRequireFlag(String requireFlag) {
- this.requireFlag = requireFlag;
- }
-
- public String getReadOnlyFlag() {
- return readOnlyFlag;
- }
-
- public void setReadOnlyFlag(String readOnlyFlag) {
- this.readOnlyFlag = readOnlyFlag;
- }
-
- public Integer getControlLength() {
- return controlLength;
- }
-
- public void setControlLength(Integer controlLength) {
- this.controlLength = controlLength;
- }
-
- public String getFormDisplayStyle() {
- return formDisplayStyle;
- }
-
- public void setFormDisplayStyle(String formDisplayStyle) {
- this.formDisplayStyle = formDisplayStyle;
- }
-
- public String getTableDisplayStyle() {
- return tableDisplayStyle;
- }
-
- public void setTableDisplayStyle(String tableDisplayStyle) {
- this.tableDisplayStyle = tableDisplayStyle;
- }
-
- public String getFormHref() {
- return formHref;
- }
-
- public void setFormHref(String formHref) {
- this.formHref = formHref;
- }
-
- public String getTableHref() {
- return tableHref;
- }
-
- public void setTableHref(String tableHref) {
- this.tableHref = tableHref;
- }
-
- public Integer getPrecisionLength() {
- return precisionLength;
- }
-
- public void setPrecisionLength(Integer precisionLength) {
- this.precisionLength = precisionLength;
- }
-
- public Integer getScaleLength() {
- return scaleLength;
- }
-
- public void setScaleLength(Integer scaleLength) {
- this.scaleLength = scaleLength;
- }
-
- public String getValueArea() {
- return valueArea;
- }
-
- public void setValueArea(String valueArea) {
- this.valueArea = valueArea;
- }
-
- public String getCodeDateFormat() {
- return codeDateFormat;
- }
-
- public void setCodeDateFormat(String codeDateFormat) {
- this.codeDateFormat = codeDateFormat;
- }
-
- public String getTableDisplayJs() {
- return tableDisplayJs;
- }
-
- public void setTableDisplayJs(String tableDisplayJs) {
- this.tableDisplayJs = tableDisplayJs;
- }
-
- public String getTextAreaFlag() {
- return textAreaFlag;
- }
-
- public void setTextAreaFlag(String textAreaFlag) {
- this.textAreaFlag = textAreaFlag;
- }
-
- public String getImageFlag() {
- return imageFlag;
- }
-
- public void setImageFlag(String imageFlag) {
- this.imageFlag = imageFlag;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public String getPrefixValue() {
- return prefixValue;
- }
-
- public void setPrefixValue(String prefixValue) {
- this.prefixValue = prefixValue;
- }
-
- public String getSuffixValue() {
- return suffixValue;
- }
-
- public void setSuffixValue(String suffixValue) {
- this.suffixValue = suffixValue;
- }
-
- public String getFilterSourceAttr() {
- return filterSourceAttr;
- }
-
- public void setFilterSourceAttr(String filterSourceAttr) {
- this.filterSourceAttr = filterSourceAttr;
- }
-
- public String getFilterSourceAttrName() {
- return filterSourceAttrName;
- }
-
- public void setFilterSourceAttrName(String filterSourceAttrName) {
- this.filterSourceAttrName = filterSourceAttrName;
- }
-
- public String getEnumString() {
- return enumString;
- }
-
- public void setEnumString(String enumString) {
- this.enumString = enumString;
- }
-
- public Integer getAttrTableWidth() {
- return attrTableWidth;
- }
-
- public void setAttrTableWidth(Integer attrTableWidth) {
- this.attrTableWidth = attrTableWidth;
- }
-
- public String getExplain() {
- return explain;
- }
-
- public void setExplain(String explain) {
- this.explain = explain;
- }
-
- public String getLibraryIdentification() {
- return libraryIdentification;
- }
-
- public void setLibraryIdentification(String libraryIdentification) {
- this.libraryIdentification = libraryIdentification;
- }
-
- public String getParentCode() {
- return parentCode;
- }
-
- public void setParentCode(String parentCode) {
- this.parentCode = parentCode;
- }
-
- public String getParentName() {
- return parentName;
- }
-
- public void setParentName(String parentName) {
- this.parentName = parentName;
- }
-
- public String getParentQueryAttr() {
- return parentQueryAttr;
- }
-
- public void setParentQueryAttr(String parentQueryAttr) {
- this.parentQueryAttr = parentQueryAttr;
- }
-
- public String getClassifyTemplateOidName() {
- return classifyTemplateOidName;
- }
-
- public void setClassifyTemplateOidName(String classifyTemplateOidName) {
- this.classifyTemplateOidName = classifyTemplateOidName;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyTemplateAttrDO{" +
- "classifyTemplateOid='" + classifyTemplateOid + '\'' +
- ", classifyTemplateOidName='" + classifyTemplateOidName + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", attributeDataType='" + attributeDataType + '\'' +
- ", keyAttrFlag='" + keyAttrFlag + '\'' +
- ", queryAttrFlag='" + queryAttrFlag + '\'' +
- ", seniorQueryAttrFlag='" + seniorQueryAttrFlag + '\'' +
- ", sameRepeatAttrFlag='" + sameRepeatAttrFlag + '\'' +
- ", sortAttrFlag='" + sortAttrFlag + '\'' +
- ", qrcodeFlag='" + qrcodeFlag + '\'' +
- ", barcodeFlag='" + barcodeFlag + '\'' +
- ", componentRule='" + componentRule + '\'' +
- ", verifyRule='" + verifyRule + '\'' +
- ", classifyInvokeLevel='" + classifyInvokeLevel + '\'' +
- ", classifyInvokeAttr='" + classifyInvokeAttr + '\'' +
- ", classifyInvokeAttrName='" + classifyInvokeAttrName + '\'' +
- ", classifyInvokeEditFlag='" + classifyInvokeEditFlag + '\'' +
- ", orderNum=" + orderNum +
- ", formDisplayFlag='" + formDisplayFlag + '\'' +
- ", tableDisplayFlag='" + tableDisplayFlag + '\'' +
- ", attributeGroup='" + attributeGroup + '\'' +
- ", enumId='" + enumId + '\'' +
- ", enumName='" + enumName + '\'' +
- ", enumEditFlag='" + enumEditFlag + '\'' +
- ", referBtmId='" + referBtmId + '\'' +
- ", referBtmName='" + referBtmName + '\'' +
- ", referConfig='" + referConfig + '\'' +
- ", requireFlag='" + requireFlag + '\'' +
- ", readOnlyFlag='" + readOnlyFlag + '\'' +
- ", controlLength=" + controlLength +
- ", formDisplayStyle='" + formDisplayStyle + '\'' +
- ", tableDisplayStyle='" + tableDisplayStyle + '\'' +
- ", formHref='" + formHref + '\'' +
- ", tableHref='" + tableHref + '\'' +
- ", precisionLength=" + precisionLength +
- ", scaleLength=" + scaleLength +
- ", valueArea='" + valueArea + '\'' +
- ", codeDateFormat='" + codeDateFormat + '\'' +
- ", tableDisplayJs='" + tableDisplayJs + '\'' +
- ", textAreaFlag='" + textAreaFlag + '\'' +
- ", imageFlag='" + imageFlag + '\'' +
- ", defaultValue='" + defaultValue + '\'' +
- ", prefixValue='" + prefixValue + '\'' +
- ", suffixValue='" + suffixValue + '\'' +
- ", filterSourceAttr='" + filterSourceAttr + '\'' +
- ", filterSourceAttrName='" + filterSourceAttrName + '\'' +
- ", enumString='" + enumString + '\'' +
- ", attrTableWidth=" + attrTableWidth +
- ", explain='" + explain + '\'' +
- ", libraryIdentification='" + libraryIdentification + '\'' +
- ", parentCode='" + parentCode + '\'' +
- ", parentName='" + parentName + '\'' +
- ", parentQueryAttr='" + parentQueryAttr + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButtonDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButtonDO.java
deleted file mode 100644
index d525482..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateButtonDO.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.*;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-
-/**
- * 妯℃澘灞炴�т笅鐨勬寜閽�
- * @author weidy
- * @date 2022-1-17
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_TEMPLATE_BUTTON,text = "涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_CLASSIFYTEMPLATEBUTTON")
-public class CodeClassifyTemplateButtonDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = -5004852745300082871L;
- /**
- * 鎵�灞炴ā鏉�
- */
- @Column(nullable = false,columnDefinition = "鎵�灞炴ā鏉�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE)
- private String classifyTemplateOid;
-
- /**
- * 鎸夐挳鐨勪富閿�
- */
- @Column(nullable = false,columnDefinition = "鎸夐挳鐨勪富閿�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_BUTTON)
- private String classifyButtonOid;
-
- /**
- * 鎸夐挳鐨勫悕绉�
- */
- @Transient(referColumn = "classifyButtonOid.name")
- private String classifyButtonOidName;
-
- /**
- * 鎸夐挳鐢ㄩ��
- */
- @Column(columnDefinition = "鎸夐挳鐢ㄩ��")
- @VciUseEnum(value = MdmEnumIdConstant.CODE_TEMPLATE_BUTTON_USE,showTextField = "buttonUseText")
- private String buttonUse;
-
- /**
- * 鎸夐挳鐢ㄩ�旀樉绀哄璞�
- */
- @Transient()
- private String buttonUseText;
-
- /**
- * 鎸夐挳鏍囪瘑
- */
- @Transient(referColumn = "classifyButtonOid.id")
- private String id;
-
- /**
- * 鎺掑簭鍙�
- */
- @Column(columnDefinition = "鎺掑簭鍙�")
- private Integer orderNum;
-
- public String getClassifyTemplateOid() {
- return classifyTemplateOid;
- }
-
- public void setClassifyTemplateOid(String classifyTemplateOid) {
- this.classifyTemplateOid = classifyTemplateOid;
- }
-
- public String getClassifyButtonOid() {
- return classifyButtonOid;
- }
-
- public void setClassifyButtonOid(String classifyButtonOid) {
- this.classifyButtonOid = classifyButtonOid;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- public String getButtonUse() {
- return buttonUse;
- }
-
- public void setButtonUse(String buttonUse) {
- this.buttonUse = buttonUse;
- }
-
- public String getButtonUseText() {
- return buttonUseText;
- }
-
- public void setButtonUseText(String buttonUseText) {
- this.buttonUseText = buttonUseText;
- }
-
- public String getClassifyButtonOidName() {
- return classifyButtonOidName;
- }
-
- public void setClassifyButtonOidName(String classifyButtonOidName) {
- this.classifyButtonOidName = classifyButtonOidName;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyTemplateButtonDO{" +
- "classifyTemplateOid='" + classifyTemplateOid + '\'' +
- ", classifyButtonOid='" + classifyButtonOid + '\'' +
- ", classifyButtonOidName='" + classifyButtonOidName + '\'' +
- ", buttonUse='" + buttonUse + '\'' +
- ", buttonUseText='" + buttonUseText + '\'' +
- ", orderNum=" + orderNum +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateDO.java
deleted file mode 100644
index 3caf9d5..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateDO.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.Transient;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmLifeCycleConstant;
-
-/**
- * 鍒嗙被妯℃澘瀵硅薄鏁版嵁瀵硅薄
- *
- * @author weidy
- * @date 2022-01-24
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE,text = "鍒嗙被妯℃澘瀵硅薄",lifeCycle = MdmLifeCycleConstant.CODE_CLASSIFY_TEMPLATE_LC,
- revisionRule = FrameWorkDefaultValueConstant.NUMBER_REVISION,startStatus = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING)
-@TableName("PL_CODE_CLASSIFYTEMPLATE")
-public class CodeClassifyTemplateDO extends BaseModel {
-
- /**
- * 绂佹淇敼杩欎釜鍊�
- */
- private static final long serialVersionUID = 4615707117801077811L;
-
- /**
- * 涓婚搴撳垎绫讳富閿�
- */
- @Column(columnDefinition = "涓婚搴撳垎绫讳富閿�" ,showTextField = "codeClassifyOidName" )
- @VciUseRefer(value = MdmBtmTypeConstant.CODE_CLASSIFY,showTextField = "codeClassifyOidName" )
- private String codeClassifyOid;
-
- /**
- * 涓婚搴撳垎绫讳富閿樉绀烘枃鏈�
- */
- @Transient(referColumn = "codeClassifyOid.name")
- private String codeClassifyOidName;
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨�
- */
- @Column(columnDefinition = "涓氬姟绫诲瀷鐨勭紪鍙�")
- private String btmTypeId;
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨嬬殑涓枃鍚嶇О
- */
- @Column(columnDefinition = "涓氬姟绫诲瀷鐨勫悕绉�")
- private String btmTypeName;
-
- public String getCodeClassifyOid() {
- return codeClassifyOid;
- }
-
- public void setCodeClassifyOid(String codeClassifyOid) {
- this.codeClassifyOid = codeClassifyOid;
- }
-
- public String getCodeClassifyOidName() {
- return codeClassifyOidName;
- }
-
- public void setCodeClassifyOidName(String codeClassifyOidName) {
- this.codeClassifyOidName = codeClassifyOidName;
- }
-
- public String getBtmTypeId() {
- return btmTypeId;
- }
-
- public void setBtmTypeId(String btmTypeId) {
- this.btmTypeId = btmTypeId;
- }
-
- public String getBtmTypeName() {
- return btmTypeName;
- }
-
- public void setBtmTypeName(String btmTypeName) {
- this.btmTypeName = btmTypeName;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyTemplateDO{" +
- "codeClassifyOid='" + codeClassifyOid + '\'' +
- ", codeClassifyOidName='" + codeClassifyOidName + '\'' +
- ", btmTypeId='" + btmTypeId + '\'' +
- ", btmTypeName='" + btmTypeName + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateMapDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateMapDO.java
deleted file mode 100644
index 9a161c4..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyTemplateMapDO.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.*;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-
-/**
- * 妯℃澘鏄犲皠瑙勫垯
- * 闆嗗洟鐮佸鍏ュ拰瀵煎嚭
- * @author weidy
- * @date 2022-1-17
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_TEMPLATE_MAP,text = "涓婚搴撴ā鏉挎槧灏勮鍒�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_CLASSIFYTEMPLATEMAP")
-public class CodeClassifyTemplateMapDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = -7507653171857583003L;
- /**
- * 鎵�灞炴ā鏉�
- */
- @Column(nullable = false,columnDefinition = "鎵�灞炴ā鏉�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE)
- private String classifyTemplateOid;
-
- /**
- * 鎵�灞炴ā鏉垮悕绉�
- */
- @Transient(referColumn = "classifyTemplateOid.name")
- private String classifyTemplateName;
-
- /**
- * 鏄犲皠瑙勫垯缂栧彿
- */
- @Column(columnDefinition = "鏄犲皠瑙勫垯缂栧彿")
- private String id;
-
- /**
- * 鏄犲皠瑙勫垯鍚嶇О
- */
- @Column(columnDefinition = "鏄犲皠瑙勫垯鍚嶇О",nullable = false)
- private String name;
-
- /**
- * 鏄犲皠瑙勫垯绫诲瀷
- */
- @Column(columnDefinition = "鏄犲皠瑙勫垯绫诲瀷",nullable = false)
- @VciUseEnum(value = MdmEnumIdConstant.CODE_MAP_RULE_TYPE,showTextField = "codeMapRuleTypeText")
- private String codeMapRuleType;
-
- /**
- * 鏄犲皠瑙勫垯绫诲瀷鐨勫悕绉�
- */
- @Transient
- private String codeMapRuleTypeText;
-
- public String getClassifyTemplateOid() {
- return classifyTemplateOid;
- }
-
- public void setClassifyTemplateOid(String classifyTemplateOid) {
- this.classifyTemplateOid = classifyTemplateOid;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCodeMapRuleType() {
- return codeMapRuleType;
- }
-
- public void setCodeMapRuleType(String codeMapRuleType) {
- this.codeMapRuleType = codeMapRuleType;
- }
-
- public String getCodeMapRuleTypeText() {
- return codeMapRuleTypeText;
- }
-
- public void setCodeMapRuleTypeText(String codeMapRuleTypeText) {
- this.codeMapRuleTypeText = codeMapRuleTypeText;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyTemplateMapDO{" +
- "classifyTemplateOid='" + classifyTemplateOid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", codeMapRuleType='" + codeMapRuleType + '\'' +
- ", codeMapRuleTypeText='" + codeMapRuleTypeText + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValueDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValueDO.java
deleted file mode 100644
index 05a1660..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeClassifyValueDO.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 鍒嗙被鐮佹鐨勭爜鍊�
- * 鐩稿綋浜庣骇鑱旂殑涓嬫媺妗�
- * @author weidy
- * @date 2022-1-18
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_CLASSIFY_VALUE,text = "鍒嗙被鐮佹鐨勭爜鍊�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_CLASSIFYVALUE")
-public class CodeClassifyValueDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 5238387322464830032L;
- /**
- * 鍒嗙被鐮佹涓婚敭
- */
- @Column(columnDefinition = "鍒嗙被鐮佹涓婚敭")
- @VciUseRefer(MdmBtmTypeConstant.CODE_BASIC_SEC)
- private String codeClassifySecOid;
-
- /**
- * 鍒嗙被鐮佸��
- */
- @Column(columnDefinition = "鍒嗙被鐮佸��")
- private String id;
-
- /**
- * 鍒嗙被鍚嶇О
- */
- @Column(columnDefinition = "鍒嗙被鍚嶇О")
- private String name;
-
- /**
- * 鐮佸�煎簭鍙�
- */
- @Column(columnDefinition = "鐮佸�煎簭鍙�")
- private Integer orderNum;
-
- /**
- * 涓婄骇鍒嗙被鐮佸�间富閿�
- */
- @Column(columnDefinition = "涓婄骇鍒嗙被鐮佸�间富閿�")
- private String parentClassifyValueOid;
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCodeClassifySecOid() {
- return codeClassifySecOid;
- }
-
- public void setCodeClassifySecOid(String codeClassifySecOid) {
- this.codeClassifySecOid = codeClassifySecOid;
- }
-
- public String getParentClassifyValueOid() {
- return parentClassifyValueOid;
- }
-
- public void setParentClassifyValueOid(String parentClassifyValueOid) {
- this.parentClassifyValueOid = parentClassifyValueOid;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- @Override
- public String toString() {
- return "CodeClassifyValueDO{" +
- "codeClassifySecOid='" + codeClassifySecOid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", orderNum=" + orderNum +
- ", parentClassifyValueOid='" + parentClassifyValueOid + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeFixedValueDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeFixedValueDO.java
deleted file mode 100644
index d211f41..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeFixedValueDO.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-
-/**
- * 鍥哄畾鐮佹鐨勭爜鍊�
- * 鐩稿綋浜庡湪鏋氫妇鐨勪綔鐢紝浼氭湁澶氫釜
- * @author weidy
- * @date 2022-1-18
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_FIXED_VALUE,text = "鍥哄畾鐮佹鐨勭爜鍊�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_FIXEDVALUE")
-public class CodeFixedValueDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 3392365440606832597L;
- /**
- * 鍥哄畾鐮佹涓婚敭
- */
- @Column(columnDefinition = "鍥哄畾鐮佹涓婚敭")
- @VciUseRefer(MdmBtmTypeConstant.CODE_BASIC_SEC)
- private String codeFixedSecOid;
-
- /**
- * 鍥哄畾鐮佹鐨勭爜鍊�
- */
- @Column(columnDefinition = "鍥哄畾鐮佹鐨勭爜鍊�")
- private String id;
-
- /**
- * 鍥哄畾鐮佹鐮佸�肩殑鎻忚堪
- */
- @Column(columnDefinition = "鍥哄畾鐮佹鐮佸�肩殑鎻忚堪")
- private String name;
-
- /**
- * 灞炴�ф帓搴忓彿
- */
- @Column(columnDefinition = "灞炴�ф帓搴忓彿")
- private Integer orderNum;
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCodeFixedSecOid() {
- return codeFixedSecOid;
- }
-
- public void setCodeFixedSecOid(String codeFixedSecOid) {
- this.codeFixedSecOid = codeFixedSecOid;
- }
-
- public Integer getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(Integer orderNum) {
- this.orderNum = orderNum;
- }
-
- @Override
- public String toString() {
- return "CodeFixedValueDO{" +
- "codeFixedSecOid='" + codeFixedSecOid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", orderNum=" + orderNum +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeatRuleDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeatRuleDO.java
deleted file mode 100644
index 096e954..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeatRuleDO.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-
-/**
- * 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @author weidy
- * @date 2022-1-17
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_KEY_ATTR_REPEAT_RULE,text = "鍏抽敭鏁版嵁鏌ラ噸瑙勫垯",lifeCycle = FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME)
-@TableName("PL_CODE_KEYATTRREPEATRULE")
-public class CodeKeyAttrRepeatRuleDO extends BaseModel {
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 6696611801656232742L;
-
- /**
- * 鏌ラ噸瑙勫垯鑻辨枃缂栧彿
- */
- @Column(columnDefinition = "鏌ラ噸瑙勫垯鑻辨枃缂栧彿")
- private String id;
-
- /**
- * 鏌ラ噸瑙勫垯涓枃鍚嶇О
- */
- @Column(nullable = false,columnDefinition = "鏌ラ噸瑙勫垯涓枃鍚嶇О")
- private String name;
-
- /**
- * 鏄惁蹇界暐澶у皬鍐�
- */
- @Column(columnDefinition = "鏄惁蹇界暐澶у皬鍐�")
- private String ignoreCaseFlag;
-
- /**
- * 鏄惁蹇界暐绌烘牸
- */
- @Column(columnDefinition = "鏄惁蹇界暐绌烘牸")
- private String ignoreSpaceFlag;
-
- /**
- * 鏄惁蹇界暐鍏ㄩ儴绌烘牸
- */
- @Column(columnDefinition = "鏄惁蹇界暐鍏ㄩ儴绌烘牸")
- private String ignoreAllSpaceFlag;
-
- /**
- * 鏄惁蹇界暐鍏ㄥ崐瑙�
- */
- @Column(columnDefinition = "鏄惁蹇界暐鍏ㄥ崐瑙�")
- private String ignoreWidthFlag;
-
- public String getIgnoreWidthFlag() {
- return ignoreWidthFlag;
- }
-
- public void setIgnoreWidthFlag(String ignoreWidthFlag) {
- this.ignoreWidthFlag = ignoreWidthFlag;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getIgnoreCaseFlag() {
- return ignoreCaseFlag;
- }
-
- public void setIgnoreCaseFlag(String ignoreCaseFlag) {
- this.ignoreCaseFlag = ignoreCaseFlag;
- }
-
- public String getIgnoreSpaceFlag() {
- return ignoreSpaceFlag;
- }
-
- public void setIgnoreSpaceFlag(String ignoreSpaceFlag) {
- this.ignoreSpaceFlag = ignoreSpaceFlag;
- }
-
- public String getIgnoreAllSpaceFlag() {
- return ignoreAllSpaceFlag;
- }
-
- public void setIgnoreAllSpaceFlag(String ignoreAllSpaceFlag) {
- this.ignoreAllSpaceFlag = ignoreAllSpaceFlag;
- }
-
- @Override
- public String toString() {
- return "CodeKeyAttrRepeatRuleDO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", ignoreCaseFlag='" + ignoreCaseFlag + '\'' +
- ", ignoreSpaceFlag='" + ignoreSpaceFlag + '\'' +
- ", ignoreAllSpaceFlag='" + ignoreAllSpaceFlag + '\'' +
- ", ignoreWidthFlag='" + ignoreWidthFlag + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttrDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttrDO.java
deleted file mode 100644
index 49a6d38..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodePhaseAttrDO.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-
-/**
- * 闃舵鐨勫睘鎬�
- * @author weidy
- * @date 2022-1-14
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_PHASE_ATTR,text = "闃舵鐨勫睘鎬�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_PHASEATTR")
-public class CodePhaseAttrDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 1316335276045033657L;
- /**
- * 鎵�灞為樁娈电殑淇℃伅
- */
- @Column(nullable = false,columnDefinition = "鎵�灞炴ā鏉块樁娈�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_TEMPLATE_PHASE)
- private String codePhaseOid;
-
- /**
- * 灞炴�х紪鍙�
- */
- @Column(columnDefinition = "灞炴�х紪鍙�",nullable = false)
- private String id;
-
- /**
- * 灞炴�у悕绉�
- */
- @Column(columnDefinition = "灞炴�у悕绉�")
- private String name;
-
- /**
- * 鎵�灞炲睘鎬у垎缁�
- */
- @Column(columnDefinition = "鎵�灞炲睘鎬у垎缁�")
- private String attributeGroup;
-
- public String getAttributeGroup() {
- return attributeGroup;
- }
-
- public void setAttributeGroup(String attributeGroup) {
- this.attributeGroup = attributeGroup;
- }
-
- public String getCodePhaseOid() {
- return codePhaseOid;
- }
-
- public void setCodePhaseOid(String codePhaseOid) {
- this.codePhaseOid = codePhaseOid;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String toString() {
- return "CodePhaseAttrDO{" +
- "codePhaseOid='" + codePhaseOid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", attributeGroup='" + attributeGroup + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeResembleRuleDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeResembleRuleDO.java
deleted file mode 100644
index 895e589..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeResembleRuleDO.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-
-/**
- * 鐩镐技鏌ヨ瑙勫垯
- * @author weidy
- * @date 2022-4-10
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_RESEMBLE_RULE,text = "鐩镐技鏌ヨ瑙勫垯",lifeCycle = FrameWorkLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME)
-@TableName("PL_CODE_RESEMBLERULE")
-public class CodeResembleRuleDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 7375719926432663351L;
-
- /**
- * 鐩镐技鏌ヨ瑙勫垯缂栧彿
- */
- @Column(columnDefinition = "鐩镐技鏌ヨ瑙勫垯缂栧彿")
- private String id;
-
- /**
- * 鐩镐技鏌ヨ瑙勫垯缂栧彿
- */
- @Column(nullable = false,columnDefinition = "鐩镐技鏌ヨ瑙勫垯缂栧彿")
- private String name;
-
- /**
- * 鏄惁蹇界暐澶у皬鍐�
- */
- @Column(columnDefinition = "鏄惁蹇界暐澶у皬鍐�")
- private String ignoreCaseFlag;
-
- /**
- * 鏄惁蹇界暐绌烘牸
- */
- @Column(columnDefinition = "鏄惁蹇界暐绌烘牸")
- private String ignoreSpaceFlag;
-
- /**
- * 鏄惁蹇界暐鍏ㄩ儴绌烘牸
- */
- @Column(columnDefinition = "鏄惁蹇界暐鍏ㄩ儴绌烘牸")
- private String ignoreAllSpaceFlag;
-
- /**
- * 鏄惁蹇界暐鍏ㄥ崐瑙�
- */
- @Column(columnDefinition = "鏄惁蹇界暐鍏ㄥ崐瑙�")
- private String ignoreWidthFlag;
-
- /**
- * 杩炴帴绗�
- */
- @Column(columnDefinition = "杩炴帴绗�",length = 200)
- private String linkCharacter;
-
- public String getIgnoreWidthFlag() {
- return ignoreWidthFlag;
- }
-
- public void setIgnoreWidthFlag(String ignoreWidthFlag) {
- this.ignoreWidthFlag = ignoreWidthFlag;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getIgnoreCaseFlag() {
- return ignoreCaseFlag;
- }
-
- public void setIgnoreCaseFlag(String ignoreCaseFlag) {
- this.ignoreCaseFlag = ignoreCaseFlag;
- }
-
- public String getIgnoreSpaceFlag() {
- return ignoreSpaceFlag;
- }
-
- public void setIgnoreSpaceFlag(String ignoreSpaceFlag) {
- this.ignoreSpaceFlag = ignoreSpaceFlag;
- }
-
- public String getIgnoreAllSpaceFlag() {
- return ignoreAllSpaceFlag;
- }
-
- public void setIgnoreAllSpaceFlag(String ignoreAllSpaceFlag) {
- this.ignoreAllSpaceFlag = ignoreAllSpaceFlag;
- }
-
-
- public String getLinkCharacter() {
- return linkCharacter;
- }
-
- public void setLinkCharacter(String linkCharacter) {
- this.linkCharacter = linkCharacter;
- }
-
- @Override
- public String toString() {
- return "CodeResembleRuleDO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", ignoreCaseFlag='" + ignoreCaseFlag + '\'' +
- ", ignoreSpaceFlag='" + ignoreSpaceFlag + '\'' +
- ", ignoreAllSpaceFlag='" + ignoreAllSpaceFlag + '\'' +
- ", ignoreWidthFlag='" + ignoreWidthFlag + '\'' +
- ", linkCharacter='" + linkCharacter + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeRuleDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeRuleDO.java
deleted file mode 100644
index 144b81b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeRuleDO.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmLifeCycleConstant;
-
-/**
- * 缂栫爜瑙勫垯
- * @author weidy
- * @date 2022-1-18
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_RULE,text = "涓绘暟鎹紪鐮佽鍒�",lifeCycle = MdmLifeCycleConstant.CODE_RULE_LC,startStatus = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING)
-@TableName("PL_CODE_RULE")
-public class CodeRuleDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = -7142347409110551299L;
- /**
- * 瑙勫垯缂栧彿
- */
- @Column(columnDefinition = "瑙勫垯缂栧彿")
- private String id;
-
- /**
- * 瑙勫垯鐨勫悕绉�
- */
- @Column(columnDefinition = "瑙勫垯鍚嶇О")
- private String name;
-
- /**
- * 瑙勫垯鐨勬弿杩�
- */
- @Column(columnDefinition = "瑙勫垯鐨勬弿杩�")
- private String description;
-
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public void setDescription(String description) {
- this.description = description;
- }
-
- @Override
- public String toString() {
- return "CodeRuleDO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", description='" + description + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeSerialValueDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeSerialValueDO.java
deleted file mode 100644
index 5f1ae43..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeSerialValueDO.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-
-/**
- * 缂栫爜瑙勫垯鐨勬祦姘村��
- * @author weidy
- * @date 2022-3-1
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_SERIAL_VALUE,text = "娴佹按鐨勫��",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_SERIALVALUE")
-public class CodeSerialValueDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 4585738864706015777L;
- /**
- * 缂栫爜瑙勫垯鐨勪富閿�
- */
- @Column(nullable = false,columnDefinition = "缂栫爜瑙勫垯涓婚敭")
- @VciUseRefer(MdmBtmTypeConstant.CODE_RULE)
- private String codeRuleOid;
-
- /***
- * 娴佹按渚濊禆
- */
- @Column(length = 4000,columnDefinition = "娴佹按渚濊禆")
- private String serialUnit;
-
- /**
- * 鐮佹鐨勪富閿�
- */
- @Column(columnDefinition = "鐮佹鐨勪富閿�")
- private String codeSecOid;
-
- /**
- * 鏈�澶ф祦姘村彿
- */
- @Column(columnDefinition = "鏈�澶ф祦姘村彿")
- private String maxSerial;
-
- public String getCodeRuleOid() {
- return codeRuleOid;
- }
-
- public void setCodeRuleOid(String codeRuleOid) {
- this.codeRuleOid = codeRuleOid;
- }
-
- public String getSerialUnit() {
- return serialUnit;
- }
-
- public void setSerialUnit(String serialUnit) {
- this.serialUnit = serialUnit;
- }
-
- public String getCodeSecOid() {
- return codeSecOid;
- }
-
- public void setCodeSecOid(String codeSecOid) {
- this.codeSecOid = codeSecOid;
- }
-
- public String getMaxSerial() {
- return maxSerial;
- }
-
- public void setMaxSerial(String maxSerial) {
- this.maxSerial = maxSerial;
- }
-
- @Override
- public String toString() {
- return "CodeSerialValueDO{" +
- "codeRuleOid='" + codeRuleOid + '\'' +
- ", serialUnit='" + serialUnit + '\'' +
- ", codeSecOid='" + codeSecOid + '\'' +
- ", maxSerial='" + maxSerial + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeSynonymDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeSynonymDO.java
deleted file mode 100644
index ed2f42a..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeSynonymDO.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.Transient;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 鍚屼箟璇�
- * @author weidy
- * @date 2022-2-17
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_SYNONYM,text = "鍚屼箟璇嶉厤缃�",description = "鍚屼箟璇嶉厤缃�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_SYNONYM")
-public class CodeSynonymDO extends BaseModel {
-
- /**
- * 妯℃澘涓婚敭
- */
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE)
- @Column(nullable = false,columnDefinition = "妯℃澘涓婚敭")
- private String codeClassifyTemplateOid;
-
- /**
- * 妯℃澘鐨勫悕绉�
- */
- @Transient(referColumn = "codeClassifyTemplateOid.name")
- private String codeClassifyTemplateOidName;
-
-
- /**
- * 灞炴�х殑鑻辨枃鍚嶇О
- */
- @Column(nullable = false,columnDefinition = "灞炴�ц嫳鏂囧悕绉�")
- private String id;
-
- /**
- * 灞炴�х殑涓枃鍚嶇О
- */
- @Column(nullable = false,columnDefinition = "灞炴�т腑鏂囧悕绉�")
- private String name;
-
- /**
- * 婧愬��
- */
- @Column(nullable = false,length = 200,columnDefinition = "婧愬��")
- private String sourceValue;
-
- /**
- * 鍚屼箟璇�
- */
- @Column(nullable = false,length = 200,columnDefinition = "鍚屼箟璇�")
- private String synonymValue;
-
- public String getCodeClassifyTemplateOid() {
- return codeClassifyTemplateOid;
- }
-
- public void setCodeClassifyTemplateOid(String codeClassifyTemplateOid) {
- this.codeClassifyTemplateOid = codeClassifyTemplateOid;
- }
-
- public String getCodeClassifyTemplateOidName() {
- return codeClassifyTemplateOidName;
- }
-
- public void setCodeClassifyTemplateOidName(String codeClassifyTemplateOidName) {
- this.codeClassifyTemplateOidName = codeClassifyTemplateOidName;
- }
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getSourceValue() {
- return sourceValue;
- }
-
- public void setSourceValue(String sourceValue) {
- this.sourceValue = sourceValue;
- }
-
- public String getSynonymValue() {
- return synonymValue;
- }
-
- public void setSynonymValue(String synonymValue) {
- this.synonymValue = synonymValue;
- }
-
-
- @Override
- public String toString() {
- return "CodeSynonymDO{" +
- "codeClassifyTemplateOid='" + codeClassifyTemplateOid + '\'' +
- ", codeClassifyTemplateOidName='" + codeClassifyTemplateOidName + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", sourceValue='" + sourceValue + '\'' +
- ", synonymValue='" + synonymValue + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhaseDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhaseDO.java
deleted file mode 100644
index 76c9cc5..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/CodeTemplatePhaseDO.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseRefer;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-
-/**
- * 妯℃澘闃舵
- * @author weidy
- * @date 2022-1-14
- */
-@VciBtmType(name = MdmBtmTypeConstant.CODE_TEMPLATE_PHASE,text = "妯℃澘闃舵",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_TEMPLATEPHASE")
-public class CodeTemplatePhaseDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 3526024656097456437L;
- /**
- * 鎵�灞炵紪鐮佹ā鏉�
- */
- @Column(nullable = false,columnDefinition = "鎵�灞炵紪鐮佹ā鏉�")
- @VciUseRefer(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE)
- private String codeClassifyTemplateOid;
-
- /**
- * 闃舵缂栧彿
- */
- @Column(columnDefinition = "闃舵缂栧彿")
- private String id;
-
- /**
- * 闃舵鍚嶇О
- */
- @Column(nullable = false,columnDefinition = "闃舵鍚嶇О")
- private String name;
-
-
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCodeClassifyTemplateOid() {
- return codeClassifyTemplateOid;
- }
-
- public void setCodeClassifyTemplateOid(String codeClassifyTemplateOid) {
- this.codeClassifyTemplateOid = codeClassifyTemplateOid;
- }
-
-
- @Override
- public String toString() {
- return "CodeTemplatePhaseDO{" +
- "codeClassifyTemplateOid='" + codeClassifyTemplateOid + '\'' +
- ", id='" + id + '\'' +
- ", name='" + name + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingDataDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingDataDO.java
deleted file mode 100644
index a7b9aa5..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingDataDO.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 瑕佹帹閫佸緱鏁版嵁
- * @author wangyi
- * @date 2022-10-7
- */
-@VciBtmType(name = MdmBtmTypeConstant.DOCKING_DATA,text = "璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_DOCKINGDATA")
-public class DockingDataDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 5020487634341415429L;
-
- /**
- * uniquecode
- */
- @Column(columnDefinition = "uniquecode")
- private String uniquecode;
-
- /**
- * 绯荤粺鎺ュ彛oid
- */
- @Column(columnDefinition = "鍒嗙被oid")
- private String classifyoid;
-
- /**
- * 绯荤粺id
- */
- @Column(columnDefinition = "涓氬姟绫诲瀷oid")
- private String btmoid;
-
- /**
- * 绯荤粺id
- */
- @Column(columnDefinition = "涓氬姟绫诲瀷id")
- private String btmid;
-
- /**
- * 绯荤粺id
- */
- @Column(columnDefinition = "鎺ㄩ�佺被鍨�")
- private String sendtype;
-
- /**
- * 绯荤粺id
- */
- @Column(columnDefinition = "鏄惁鍒嗚В浠诲姟")
- private String sendflag;
-
- /**
- * 绯荤粺id
- */
- @Column(columnDefinition = "鍒嗙被id")
- private String classifyid;
-
- /**
- * 绯荤粺id
- */
- @Column(columnDefinition = "鍒嗙被鍚嶇О")
- private String classifyname;
-
- public String getUniquecode() {
- return uniquecode;
- }
-
- public void setUniquecode(String uniquecode) {
- this.uniquecode = uniquecode;
- }
-
- public String getClassifyoid() {
- return classifyoid;
- }
-
- public void setClassifyoid(String classifyoid) {
- this.classifyoid = classifyoid;
- }
-
- public String getBtmoid() {
- return btmoid;
- }
-
- public void setBtmoid(String btmoid) {
- this.btmoid = btmoid;
- }
-
- public String getBtmid() {
- return btmid;
- }
-
- public void setBtmid(String btmid) {
- this.btmid = btmid;
- }
-
- public String getSendtype() {
- return sendtype;
- }
-
- public void setSendtype(String sendtype) {
- this.sendtype = sendtype;
- }
-
- public String getSendflag() {
- return sendflag;
- }
-
- public void setSendflag(String sendflag) {
- this.sendflag = sendflag;
- }
-
- public String getClassifyid() {
- return classifyid;
- }
-
- public void setClassifyid(String classifyid) {
- this.classifyid = classifyid;
- }
-
- public String getClassifyname() {
- return classifyname;
- }
-
- public void setClassifyname(String classifyname) {
- this.classifyname = classifyname;
- }
-
- @Override
- public String toString() {
- return "DockingDataDO{" +
- "classifyoid='" + classifyoid + '\'' +
- ", uniquecode='" + uniquecode + '\'' +
- ", btmoid='" + btmoid + '\'' +
- ", btmid='" + btmid + '\'' +
- ", sendtype='" + sendtype + '\'' +
- ", sendflag='" + sendflag + '\'' +
- ", classifyid='" + classifyid + '\'' +
- ", classifyname='" + classifyname + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingLogeDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingLogeDO.java
deleted file mode 100644
index 7b113f5..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingLogeDO.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciFieldType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-import static com.vci.starter.web.enumpck.VciFieldTypeEnum.VTClob;
-
-/**
- * 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇�
- * @author wangyi
- * @date 2022-3-7
- */
-@VciBtmType(name = MdmBtmTypeConstant.DOCKING_LOGE,text = "璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_DOCKINGLOGE")
-public class DockingLogeDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 5020487634341415429L;
- /**
- * 绯荤粺id
- */
- @Column(nullable = false,columnDefinition = "绯荤粺id")
- private String systemoid;
-
- /**
- * 绯荤粺缂栧彿
- */
- @Column(nullable = false,columnDefinition = "绯荤粺缂栧彿")
- private String systemcode;
-
- /**
- * 绯荤粺鍚嶇О
- */
- @Column(nullable = false,columnDefinition = "绯荤粺鍚嶇О")
- private String systemname;
-
- /**
- * 鍒嗙被oid
- */
- @Column(nullable = false,columnDefinition = "鍒嗙被oid")
- private String classifyoid;
-
- /**
- * 鍒嗙被id
- */
- @Column(nullable = false,columnDefinition = "鍒嗙被id")
- private String classifyid;
-
- /**
- * 鍒嗙被name
- */
- @Column(nullable = false,columnDefinition = "鍒嗙被name")
- private String classifyname;
-
- /**
- * 鍞竴鏍囪瘑
- */
- @Column(columnDefinition = "鍞竴鏍囪瘑")
- private String uniquecode;
-
- /**
- * 鎺ュ彛绫诲瀷锛氭帹閫佹帴鍙�/鏌ヨ鎺ュ彛,鏆傛椂涓嶇敤
- */
- @Column(columnDefinition = "鎺ュ彛绫诲瀷")
- private String type;
-
- /**
- * 杩旇繕鎻愮ず
- */
- @Column(columnDefinition = "杩旇繕鎻愮ず")
- private String msg;
-
- /**
- * 鍙傛暟锛氶�氱煡鎺ュ彛鏄垜浠紶鍑虹殑鍙傛暟/鏌ヨ鎺ュ彛鏄埆浜轰紶鍏ョ殑鍙傛暟
- */
- @VciFieldType(VTClob)
- @Column(columnDefinition = "鍙傛暟")
- private String paramstring;
-
- /**
- * 浼犻�抶ml
- */
- @Column(columnDefinition = "浼犻�抶ml",length = 4000)
- private String sendXml;
-
- /**
- * 杩斿洖锛氶�氱煡鎺ュ彛鏄垜浠敹鍒扮殑鍙嶉锛屾煡璇㈡帴鍙ｆ槸鍒汉鏀跺埌鐨勫弽棣�
- */
- @VciFieldType(VTClob)
- @Column(columnDefinition = "杩斿洖")
- private String returnstring;
-
- /**
- * 鎺ュ彛鐘舵�侊細鎴愬姛/澶辫触
- */
- @Column(nullable = false,columnDefinition = "鎺ュ彛鐘舵��")
- private String interfacestatus;
- private Object MdmBtmTypeConstant;
-
- public String getUniquecode() {
- return uniquecode;
- }
-
- public void setUniquecode(String uniquecode) {
- this.uniquecode = uniquecode;
- }
-
- public String getSendXml() {
- return sendXml;
- }
-
- public void setSendXml(String sendXml) {
- this.sendXml = sendXml;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public String getSystemoid() {
- return systemoid;
- }
-
- public void setSystemoid(String systemoid) {
- this.systemoid = systemoid;
- }
-
- public String getSystemcode() {
- return systemcode;
- }
-
- public void setSystemcode(String systemcode) {
- this.systemcode = systemcode;
- }
-
- public String getSystemname() {
- return systemname;
- }
-
- public void setSystemname(String systemname) {
- this.systemname = systemname;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getParamstring() {
- return paramstring;
- }
-
- public void setParamstring(String paramstring) {
- this.paramstring = paramstring;
- }
-
- public String getReturnstring() {
- return returnstring;
- }
-
- public void setReturnstring(String returnstring) {
- this.returnstring = returnstring;
- }
-
- public String getInterfacestatus() {
- return interfacestatus;
- }
-
- public void setInterfacestatus(String interfacestatus) {
- this.interfacestatus = interfacestatus;
- }
-
- public String getClassifyoid() {
- return classifyoid;
- }
-
- public void setClassifyoid(String classifyoid) {
- this.classifyoid = classifyoid;
- }
-
- public String getClassifyid() {
- return classifyid;
- }
-
- public void setClassifyid(String classifyid) {
- this.classifyid = classifyid;
- }
-
- public String getClassifyname() {
- return classifyname;
- }
-
- public void setClassifyname(String classifyname) {
- this.classifyname = classifyname;
- }
-
- @Override
- public String toString() {
- return "DockingLogeDO{" +
- "systemoid='" + systemoid + '\'' +
- ", uniquecode='" + uniquecode + '\'' +
- ", systemcode='" + systemcode + '\'' +
- ", systemname='" + systemname + '\'' +
- ", classifyoid='" + classifyoid + '\'' +
- ", classifyid='" + classifyid + '\'' +
- ", classifyname='" + classifyname + '\'' +
- ", type='" + type + '\'' +
- ", msg='" + msg + '\'' +
- ", paramstring='" + paramstring + '\'' +
- ", sendXml='" + sendXml + '\'' +
- ", returnstring='" + returnstring + '\'' +
- ", interfacestatus='" + interfacestatus + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyDataDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyDataDO.java
deleted file mode 100644
index 8e6c440..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyDataDO.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅锛屽拰DockingPSMDataInfoDO涓�瀵瑰鐨勫叧绯�
- * @author wangyi
- * @date 2022-3-7
- */
-@VciBtmType(name = MdmBtmTypeConstant.DOCKING_PRE_APPLY_DATA,text = "璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_DOCKINGPREAPPLYDATA")
-public class DockingPreApplyDataDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 5020487634341415429L;
-
- /**
- * 鐢宠oid
- */
- @Column(nullable = false,columnDefinition = "鐢宠oid")
- private String preapplyoid;
-
- /**
- * 鍞竴鏍囪瘑锛屽伐鑹洪噷杈圭殑鍥惧彿
- */
- @Column(nullable = false,columnDefinition = "鍞竴鏍囪瘑")
- private String uniquecode;
-
- /**
- * 涓婚搴撶紪鍙�
- */
- @Column(nullable = false,columnDefinition = "涓婚搴撶紪鍙�")
- private String type;
-
- /**
- * 绯荤粺缂栧彿
- */
- @Column(nullable = false,columnDefinition = "绯荤粺缂栧彿")
- private String systemid;
-
- /**
- * 姝ｅ湪浣跨敤鏍囧織
- */
- @Column(nullable = true,columnDefinition = "姝ｅ湪浣跨敤鏍囧織")
- private String useddflag;
-
- /**
- * 鍏宠仈鍒嗙被鎿嶄綔杩囧悗锛岃褰曠殑鍏宠仈鍒嗙被oid
- */
- @Column(columnDefinition = "鍏宠仈鍒嗙被oid")
- private String classifyoid;
-
- /**
- * 鍏宠仈鍒嗙被鎿嶄綔杩囧悗锛岃褰曠殑鍏宠仈鍒嗙被鍚嶇О
- */
- @Column(columnDefinition = "鍏宠仈鍒嗙被鍚嶇О")
- private String classifyname;
-
- /**
- * 鐢宠鎴愬姛鍚庣殑缂栫爜,鎴栬�呭凡缁忓瓨鍦ㄧ殑缂栫爜
- */
- @Column(columnDefinition = "鏄惁瀹屾垚鐢宠缂栫爜")
- private String num;
- /**
- * 瑙勬牸鍨嬪彿
- */
- @Column(columnDefinition = "瑙勬牸鍨嬪彿")
- private String model;
- /**
- * 闆朵欢绫诲瀷
- */
- @Column(columnDefinition = "闆朵欢绫诲瀷")
- private String parttype;
- /**
- * 璁￠噺鍗曚綅
- */
- @Column(columnDefinition = "璁￠噺鍗曚綅")
- private String unit;
-
- /**
- * 鍗曢噸
- */
- @Column(columnDefinition = "鍗曢噸")
- private String weight;
-
- /**
- * 鏄惁閲嶈浠�
- */
- @Column(columnDefinition = "鏄惁閲嶈浠�")
- private String importantPart;
-
- /**
- * 鏄惁鍏抽敭浠�
- */
- @Column(columnDefinition = "鏄惁鍏抽敭浠�")
- private String keyPart;
- /**
- * 鏁版嵁澶勭悊杩斿洖鐘舵�佺爜
- */
- @Column(columnDefinition = "鏁版嵁澶勭悊杩斿洖鐘舵�佺爜")
- private String datacode;
-
- /**
- * 鏁版嵁澶勭悊杩斿洖淇℃伅
- */
- @Column(columnDefinition = "鏁版嵁澶勭悊杩斿洖淇℃伅")
- private String datamsg;
- private Object MdmBtmTypeConstant;
-
- public String getUniquecode() {
- return uniquecode;
- }
-
- public void setUniquecode(String unique) {
- this.uniquecode = unique;
- }
-
- public String getClassifyoid() {
- return classifyoid;
- }
-
- public void setClassifyoid(String classifyoid) {
- this.classifyoid = classifyoid;
- }
-
- public String getUseddflag() {
- return useddflag;
- }
-
- public void setUseddflag(String useddflag) {
- this.useddflag = useddflag;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSystemid() {
- return systemid;
- }
-
- public void setSystemid(String systemid) {
- this.systemid = systemid;
- }
-
- public String getClassifyname() {
- return classifyname;
- }
-
- public void setClassifyname(String classifyname) {
- this.classifyname = classifyname;
- }
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getDatacode() {
- return datacode;
- }
-
- public void setDatacode(String datacode) {
- this.datacode = datacode;
- }
-
- public String getDatamsg() {
- return datamsg;
- }
-
- public void setDatamsg(String datamsg) {
- this.datamsg = datamsg;
- }
-
- public String getPreapplyoid() {
- return preapplyoid;
- }
-
- public void setPreapplyoid(String preapplyoid) {
- this.preapplyoid = preapplyoid;
- }
-
- public String getModel() {
- return model;
- }
-
- public void setModel(String model) {
- this.model = model;
- }
-
- public String getParttype() {
- return parttype;
- }
-
- public void setParttype(String parttype) {
- this.parttype = parttype;
- }
-
- public String getUnit() {
- return unit;
- }
-
- public void setUnit(String unit) {
- this.unit = unit;
- }
-
- public String getWeight() {
- return weight;
- }
-
- public void setWeight(String weight) {
- this.weight = weight;
- }
-
- public String getImportantPart() {
- return importantPart;
- }
-
- public void setImportantPart(String importantPart) {
- this.importantPart = importantPart;
- }
-
- public String getKeyPart() {
- return keyPart;
- }
-
- public void setKeyPart(String keyPart) {
- this.keyPart = keyPart;
- }
-
-
- @Override
- public String toString() {
- return "DockingPreApplyDataDO{" +
- "preapplyoid='" + preapplyoid + '\'' +
- ", uniquecode='" + uniquecode + '\'' +
- ", type='" + type + '\'' +
- ", systemid='" + systemid + '\'' +
- ", useddflag='" + useddflag + '\'' +
- ", classifyoid='" + classifyoid + '\'' +
- ", classifyname='" + classifyname + '\'' +
- ", num='" + num + '\'' +
- ", model='" + model + '\'' +
- ", parttype='" + parttype + '\'' +
- ", unit='" + unit + '\'' +
- ", weight='" + weight + '\'' +
- ", importantPart='" + importantPart + '\'' +
- ", keyPart='" + keyPart + '\'' +
- ", datacode='" + datacode + '\'' +
- ", datamsg='" + datamsg + '\'' +
- "} " + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyDataInfoDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyDataInfoDO.java
deleted file mode 100644
index a04cfa4..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyDataInfoDO.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @author wangyi
- * @date 2022-3-7
- */
-@VciBtmType(name = MdmBtmTypeConstant.DOCKING_PRE_APPLY_DATA_INFO,text = "璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_DOCKINGPREAPPLYDATAINFO")
-public class DockingPreApplyDataInfoDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 5020487634341415429L;
-
- /**
- * data鐨刼id
- */
- @Column(nullable = false,columnDefinition = "data鐨刼id")
- private String dataoid;
-
- /**
- * 鍞竴鏍囪瘑锛屽伐鑹洪噷杈圭殑鍥惧彿
- */
- @Column(nullable = false,columnDefinition = "鍞竴鏍囪瘑")
- private String uniquecode;
-
- /**
- * 灞炴�ey
- */
- @Column(nullable = true,columnDefinition = "灞炴�ey")
- private String key;
-
- /**
- * 灞炴�ey鍚箟
- */
- @Column(nullable = true,columnDefinition = "灞炴�ey鍚箟")
- private String mean;
-
- /**
- * 灞炴�alue
- */
- @Column(nullable = true,columnDefinition = "灞炴�alue",length = 4000)
- private String value;
-
- public String getDataoid() {
- return dataoid;
- }
-
- public void setDataoid(String dataoid) {
- this.dataoid = dataoid;
- }
-
- public String getUniquecode() {
- return uniquecode;
- }
-
- public void setUniquecode(String uniquecode) {
- this.uniquecode = uniquecode;
- }
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public String getMean() {
- return mean;
- }
-
- public void setMean(String mean) {
- this.mean = mean;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "DockingPSMDataInfoDO{" +
- "dataoid='" + dataoid + '\'' +
- ", uniquecode='" + uniquecode + '\'' +
- ", key='" + key + '\'' +
- ", mean='" + mean + '\'' +
- ", value='" + value + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrMappingDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrMappingDO.java
deleted file mode 100644
index 06ef4b4..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrMappingDO.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 璁板綍闆嗘垚灞炴�т笌涓绘暟鎹睘鎬ф槧灏勫叧绯诲璞�
- * @author xiejun
- * @date 2023-01-06
- */
-@VciBtmType(name = MdmBtmTypeConstant.DOCKING_PRE_JINTEGMAPCONFIG,text = "闆嗘垚灞炴�ф槧灏勫叧绯诲璞�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_DOCKINGPREATTRMAPPING")
-public class DockingPreAttrMappingDO extends BaseModel {
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 6020487634341415429L;
-
- /***
- * 榛樿鍊�
- */
- @Column(nullable = true,columnDefinition = "榛樿鍊�")
- private String jdefaultValue;
-
- /***
- * 榛樿鍊�
- */
- /**
- * 姝ｅ湪浣跨敤鏍囧織
- */
- @Column(nullable = true,columnDefinition = "婧愮郴缁熺殑灞炴�id")
- private String jmetaListId;
- /**
- * 婧愬垎绫籭d
- */
- @Column(nullable = false,columnDefinition = "婧愮郴缁熺殑鍒嗙被oid")
- private String jsourceClsfId;
- /**
- * 婧愬垎绫诲悕绉�
- */
- @Column(nullable = true,columnDefinition = "婧愮郴缁熺殑鍒嗙被鍚嶇О")
- private String jsourceClsfName;
- /**
- * 婧愬睘鎬id
- */
- @Column(nullable = true,columnDefinition = "鐩爣绯荤粺灞炴�х郴id")
- private String jtargetAttrId;
-
- /**
- * 鐩爣灞炴�id
- */
- @Column(nullable = true,columnDefinition = "鐩爣绯荤粺鍒嗙被oid")
- private String jtargetClsfId;
-
- /***
- * 妯℃澘Id
- */
- @Column(nullable = true,columnDefinition = "妯℃澘瑙嗗浘鐨刼id")
- private String jviewModeId;
- /***
- * 妯℃澘鍚嶇О
- */
- @Column(nullable = true,columnDefinition = "妯℃澘鍚嶇О")
- private String jviewModeName;
-
- /***
- * 鐩爣灞炴�у唴閮ㄥ悕绉�
- */
- @Column(nullable = true,columnDefinition = "鐩爣绯荤粺灞炴�у唴閮ㄥ��")
- private String jtargetAttrKey;
-
- /***
- * 鐩爣灞炴�у悕绉�
- */
- @Column(nullable = true,columnDefinition = "鐩爣绯荤粺灞炴�у悕绉�")
- private String jtargetAttrName;
-
- /***
- * 鐩爣灞炴�у唴閮ㄥ悕绉�
- */
- @Column(nullable = false,columnDefinition = "婧愮郴缁熷睘鎬у唴閮ㄥ悕绉�")
- private String jsourceAttrKey;
-
- /***
- * 鐩爣灞炴�у悕绉�
- */
- @Column(nullable = false,columnDefinition = "婧愮郴缁熷睘鎬у悕绉�")
- private String jsourceAttrName;
-
-
- public String getJdefaultValue() {
- return jdefaultValue;
- }
-
- public void setJdefaultValue(String jdefaultValue) {
- this.jdefaultValue = jdefaultValue;
- }
-
- public String getJmetaListId() {
- return jmetaListId;
- }
-
- public void setJmetaListId(String jmetaListId) {
- this.jmetaListId = jmetaListId;
- }
-
- public String getJsourceClsfId() {
- return jsourceClsfId;
- }
-
- public void setJsourceClsfId(String jsourceClsfId) {
- this.jsourceClsfId = jsourceClsfId;
- }
-
- public String getJsourceClsfName() {
- return jsourceClsfName;
- }
-
- public void setJsourceClsfName(String jsourceClsfName) {
- this.jsourceClsfName = jsourceClsfName;
- }
-
- public String getJtargetAttrId() {
- return jtargetAttrId;
- }
-
- public void setJtargetAttrId(String jtargetAttrId) {
- this.jtargetAttrId = jtargetAttrId;
- }
-
- public String getJtargetClsfId() {
- return jtargetClsfId;
- }
-
- public void setJtargetClsfId(String jtargetClsfId) {
- this.jtargetClsfId = jtargetClsfId;
- }
-
- public String getJviewModeId() {
- return jviewModeId;
- }
-
- public void setJviewModeId(String jviewModeId) {
- this.jviewModeId = jviewModeId;
- }
-
- public String getJviewModeName() {
- return jviewModeName;
- }
-
- public void setJviewModeName(String jviewModeName) {
- this.jviewModeName = jviewModeName;
- }
-
- public String getJtargetAttrKey() {
- return jtargetAttrKey;
- }
-
- public void setJtargetAttrKey(String jtargetAttrKey) {
- this.jtargetAttrKey = jtargetAttrKey;
- }
-
- public String getJtargetAttrName() {
- return jtargetAttrName;
- }
-
- public void setJtargetAttrName(String jtargetAttrName) {
- this.jtargetAttrName = jtargetAttrName;
- }
-
- public String getJsourceAttrKey() {
- return jsourceAttrKey;
- }
-
- public void setJsourceAttrKey(String jsourceAttrKey) {
- this.jsourceAttrKey = jsourceAttrKey;
- }
-
- public String getJsourceAttrName() {
- return jsourceAttrName;
- }
-
- public void setJsourceAttrName(String jsourceAttrName) {
- this.jsourceAttrName = jsourceAttrName;
- }
-
- @Override
- public String toString() {
- return "DockingPreAttrMappingDO{" +
- "jdefaultValue='" + jdefaultValue + '\'' +
- ", jmetaListId='" + jmetaListId + '\'' +
- ", jsourceClsfId='" + jsourceClsfId + '\'' +
- ", jsourceClsfName='" + jsourceClsfName + '\'' +
- ", jtargetAttrId='" + jtargetAttrId + '\'' +
- ", jtargetClsfId='" + jtargetClsfId + '\'' +
- ", jviewModeId='" + jviewModeId + '\'' +
- ", jviewModeName='" + jviewModeName + '\'' +
- ", jtargetAttrKey='" + jtargetAttrKey + '\'' +
- ", jtargetAttrName='" + jtargetAttrName + '\'' +
- ", jsourceAttrKey='" + jsourceAttrKey + '\'' +
- ", jsourceAttrName='" + jsourceAttrName + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrRangeDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrRangeDO.java
deleted file mode 100644
index 2a2a2d0..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrRangeDO.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-
-@VciBtmType(name = MdmBtmTypeConstant.DOCKING_PRE_JRANGE,text = "闆嗘垚灞炴�у彇鍊艰寖鍥村璞�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_DOCKINGPREATTRRANGE")
-public class DockingPreAttrRangeDO extends BaseModel {
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 6020487634341415410L;
- /***
- *灞炴�d
- */
- @Column(nullable = false,columnDefinition = "灞炴�id")
- private String jmetaListId;
-
- /**
- * 灞炴�ф灇涓炬樉绀哄悕绉�
- */
- @Column(nullable = false,columnDefinition = "婧愬睘鎬ф灇涓炬樉绀哄悕绉�")
- private String jnumText;
- /**
- * 灞炴�ф灇涓惧唴閮ㄥ悕绉�
- */
- @Column(nullable = false,columnDefinition = "婧愬睘鎬ф灇涓惧唴閮ㄥ悕绉�")
- private String jnumTextValue;
-
- /**
- * 婧愬睘鎬ф灇涓炬樉绀哄悕绉�
- */
- @Column(nullable = true,columnDefinition = "灞炴�ф灇涓炬樉绀哄悕绉�")
- private String jtargeNumText;
- /**
- * 婧愬睘鎬ф灇涓惧唴閮ㄥ悕绉�
- */
- @Column(nullable = false,columnDefinition = "灞炴�ф灇涓惧唴閮ㄥ悕绉�")
- private String jtargeNumTextValue;
-
- public String getJmetaListId() {
- return jmetaListId;
- }
-
- public void setJmetaListId(String jmetaListId) {
- this.jmetaListId = jmetaListId;
- }
-
- public String getJnumText() {
- return jnumText;
- }
-
- public void setJnumText(String jnumText) {
- this.jnumText = jnumText;
- }
-
- public String getJnumTextValue() {
- return jnumTextValue;
- }
-
- public void setJnumTextValue(String jnumTextValue) {
- this.jnumTextValue = jnumTextValue;
- }
-
- public String getJtargeNumText() {
- return jtargeNumText;
- }
-
- public void setJtargeNumText(String jtargeNumText) {
- this.jtargeNumText = jtargeNumText;
- }
-
- public String getJtargeNumTextValue() {
- return jtargeNumTextValue;
- }
-
- public void setJtargeNumTextValue(String jtargeNumTextValue) {
- this.jtargeNumTextValue = jtargeNumTextValue;
- }
-
- @Override
- public String toString() {
- return "DockingPreAttrRangeDO{" +
- "jmetaListId='" + jmetaListId + '\'' +
- ", jnumText='" + jnumText + '\'' +
- ", jnumTextValue='" + jnumTextValue + '\'' +
- ", jtargeNumText='" + jtargeNumText + '\'' +
- ", jtargeNumTextValue='" + jtargeNumTextValue + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingTaskDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingTaskDO.java
deleted file mode 100644
index 07504cd..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/DockingTaskDO.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * 鏁版嵁鍙戝竷銆佷慨鏀瑰悗锛岃褰曚笅闇�瑕侀�氱煡鐨勭郴缁�
- * 姣斿锛歄A绯荤粺鐢宠浜嗕汉鍛樿繖涓垎绫荤殑鏁版嵁锛屼汉鍛樿繖涓垎绫讳笅鍙戝竷浜嗕竴鏉℃柊鏁版嵁锛岄渶瑕佹妸鏉℃暟鎹帹閫佺粰OA绯荤粺锛屼細鍦ㄨ繖涓笟鍔＄被鍨嬩笅浜х敓涓�鏉℃暟鎹�傜劧鍚庡畾鏃跺櫒鎸夋椂鍙戦�佷换鍔°��
- * 濡傛灉鏈変袱涓郴缁熺敵璇蜂簡浜哄憳鏁版嵁锛屽氨浼氫骇鐢熶袱鏉℃暟鎹�
- * @author wangyi
- * @date 2022-3-7
- */
-@VciBtmType(name = MdmBtmTypeConstant.DOCKING_TASK,text = "璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_DOCKINGTASK")
-public class DockingTaskDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 5020487634341415429L;
-
- /**
- * 绯荤粺鎺ュ彛oid
- */
- @Column(nullable = false,columnDefinition = "绯荤粺鎺ュ彛oid")
- private String sysinfooid;
-
- /**
- * 绯荤粺id
- */
- @Column(nullable = false,columnDefinition = "绯荤粺oid")
- private String systemoid;
-
- /**
- * 绯荤粺缂栧彿
- */
- @Column(nullable = false,columnDefinition = "绯荤粺缂栧彿")
- private String systemcode;
-
- /**
- * 绯荤粺鍚嶇О
- */
- @Column(nullable = false,columnDefinition = "绯荤粺鍚嶇О")
- private String systemname;
-
- /**
- * 鍒嗙被oid
- */
- @Column(nullable = false,columnDefinition = "鍒嗙被oid")
- private String classifyoid;
-
- /**
- * 鍒嗙被id
- */
- @Column(nullable = false,columnDefinition = "鍒嗙被id")
- private String classifyid;
-
- /**
- * 鍒嗙被鍚嶇О
- */
- @Column(nullable = false,columnDefinition = "鍒嗙被鍚嶇О")
- private String classifyname;
-
- /**
- * 涓氬姟绫诲瀷鏁版嵁oid
- */
- @Column(nullable = false,columnDefinition = "涓氬姟绫诲瀷鏁版嵁oid")
- private String btmoid;
-
- /**
- * 涓氬姟绫诲瀷鏁版嵁id
- */
- @Column(nullable = false,columnDefinition = "涓氬姟绫诲瀷鏁版嵁id")
- private String btmid;
-
- /**
- * 鍞竴鏍囪瘑
- */
- @Column(columnDefinition = "鍞竴鏍囪瘑")
- private String uniquecode;
-
- /**
- * 鍙戦�佺被鍨�
- */
- @Column(nullable = false,columnDefinition = "鍙戦�佺被鍨�")
- private String sendtype;
-
- /**
- * 鏄惁鍙戦�佹垚鍔�
- */
- @Column(nullable = false,columnDefinition = "鏄惁鍙戦�佹垚鍔�")
- private String sendflag;
-
- /**
- * dockingdata鐨刼id
- */
- @Column(nullable = false,columnDefinition = "dockingdata鐨刼id")
- private String dataoid;
-
- public String getSendtype() {
- return sendtype;
- }
-
- public void setSendtype(String sendtype) {
- this.sendtype = sendtype;
- }
-
- public String getSystemoid() {
- return systemoid;
- }
-
- public void setSystemoid(String systemoid) {
- this.systemoid = systemoid;
- }
-
- public String getSystemcode() {
- return systemcode;
- }
-
- public void setSystemcode(String systemcode) {
- this.systemcode = systemcode;
- }
-
- public String getSystemname() {
- return systemname;
- }
-
- public void setSystemname(String systemname) {
- this.systemname = systemname;
- }
-
- public String getClassifyoid() {
- return classifyoid;
- }
-
- public void setClassifyoid(String classifyoid) {
- this.classifyoid = classifyoid;
- }
- public String getClassifyid() {
- return classifyid;
- }
-
- public void setClassifyid(String classifyid) {
- this.classifyid = classifyid;
- }
-
- public String getClassifyname() {
- return classifyname;
- }
-
- public void setClassifyname(String classifyname) {
- this.classifyname = classifyname;
- }
-
- public String getBtmoid() {
- return btmoid;
- }
-
- public void setBtmoid(String btmoid) {
- this.btmoid = btmoid;
- }
-
- public String getBtmid() {
- return btmid;
- }
-
- public void setBtmid(String btmid) {
- this.btmid = btmid;
- }
-
- public String getSendflag() {
- return sendflag;
- }
-
- public void setSendflag(String sendflag) {
- this.sendflag = sendflag;
- }
-
- public String getSysinfooid() {
- return sysinfooid;
- }
-
- public void setSysinfooid(String sysinfooid) {
- this.sysinfooid = sysinfooid;
- }
-
- public String getUniquecode() {
- return uniquecode;
- }
-
- public void setUniquecode(String uniquecode) {
- this.uniquecode = uniquecode;
- }
- public String getDataoid() {
- return dataoid;
- }
-
- public void setDataoid(String dataoid) {
- this.dataoid = dataoid;
- }
-
-
- @Override
- public String toString() {
- return "DockingTaskDO{" +
- "sysinfooid='" + sysinfooid + '\'' +
- ", systemoid='" + systemoid + '\'' +
- ", systemcode='" + systemcode + '\'' +
- ", systemname='" + systemname + '\'' +
- ", classifyoid='" + classifyoid + '\'' +
- ", classifyid='" + classifyid + '\'' +
- ", classifyname='" + classifyname + '\'' +
- ", btmoid='" + btmoid + '\'' +
- ", btmid='" + btmid + '\'' +
- ", sendflag='" + sendflag + '\'' +
- ", uniquecode='" + uniquecode + '\'' +
- ", sendtype='" + sendtype + '\'' +
- ", dataoid='" + dataoid + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntAuthorityDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntAuthorityDO.java
deleted file mode 100644
index 24838d8..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntAuthorityDO.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.Transient;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.annotation.VciUseEnum;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-
-/**
- * Description: 绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- *
- * @author: LiHang
- * @date: Created on 2022/3/7
- */
-@VciBtmType(name = MdmBtmTypeConstant.SYS_INT_AUTHORITY,text = "绯荤粺闆嗘垚鎺ュ彛鐨勮璇�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE,startStatus = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_SYSINTAUTHORITY")
-public class SysIntAuthorityDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 1144067849291882385L;
-
- /**
- * 璁よ瘉缂栧彿
- */
- @Column(columnDefinition = "璁よ瘉缂栧彿")
- private String id;
-
- /**
- * 璁よ瘉鍚嶇О
- */
- @Column(columnDefinition = "璁よ瘉鍚嶇О")
- private String name;
-
- /**
- * 绯荤粺鎻忚堪
- */
- @Column(columnDefinition = "璁よ瘉鎻忚堪")
- private String description;
-
- /**
- * 璁よ瘉鏂瑰紡
- */
- @Column(columnDefinition = "璁よ瘉鏂瑰紡",nullable = false)
- @VciUseEnum(value = MdmEnumIdConstant.SYS_INTEGRATION_AUTHORITY_TYPE,showTextField = "typeText")
- private String type;
-
- /**
- * 璁よ瘉鏂瑰紡鏄剧ず鏂囨湰
- */
- @Transient()
- private String typeText;
-
- /**
- * 楠岃瘉鐢ㄦ埛
- */
- @Column(columnDefinition = "楠岃瘉鐢ㄦ埛")
- private String userAccount;
-
- /**
- * 楠岃瘉瀵嗙爜
- */
- @Column(columnDefinition = "楠岃瘉瀵嗙爜")
- private String userCode;
-
- /**
- * 楠岃瘉浠ょ墝
- */
- @Column(columnDefinition = "楠岃瘉浠ょ墝")
- private String token;
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTypeText() {
- return typeText;
- }
-
- public void setTypeText(String typeText) {
- this.typeText = typeText;
- }
-
- public String getUserAccount() {
- return userAccount;
- }
-
- public void setUserAccount(String userAccount) {
- this.userAccount = userAccount;
- }
-
- public String getUserCode() {
- return userCode;
- }
-
- public void setUserCode(String userCode) {
- this.userCode = userCode;
- }
-
- public String getToken() {
- return token;
- }
-
- public void setToken(String token) {
- this.token = token;
- }
-
- @Override
- public String toString() {
- return "SysIntegrationAuthorityDO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", description='" + description + '\'' +
- ", type='" + type + '\'' +
- ", typeText='" + typeText + '\'' +
- ", userAccount='" + userAccount + '\'' +
- ", userCode='" + userCode + '\'' +
- ", token='" + token + '\'' +
- '}' + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntBaseDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntBaseDO.java
deleted file mode 100644
index 3e39bf0..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntBaseDO.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * Description:绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- *
- * @author: LiHang
- * @date: Created on 2022/3/7
- */
-@VciBtmType(name = MdmBtmTypeConstant.SYS_INT_BASE,text = "绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE,startStatus = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_SYSINTBASE")
-public class SysIntBaseDO extends BaseModel {
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = -5910713918419137900L;
- /**
- * 绯荤粺缂栧彿
- */
- @Column(columnDefinition = "绯荤粺缂栧彿",nullable = false)
- private String id;
-
- /**
- * 绯荤粺鍚嶇О
- */
- @Column(columnDefinition = "绯荤粺鍚嶇О",nullable = false)
- private String name;
-
- /**
- * 绯荤粺鎻忚堪
- */
- @Column(columnDefinition = "绯荤粺鎻忚堪")
- private String description;
-
- @Override
- public String getId() {
- return id;
- }
-
- @Override
- public void setId(String id) {
- this.id = id;
- }
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public void setDescription(String description) {
- this.description = description;
- }
-
- @Override
- public String toString() {
- return "SysIntegrationBaseDO{" +
- "id='" + id + '\'' +
- ", name='" + name + '\'' +
- ", description='" + description + '\'' +
- '}' + super.toString();
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntHeaderDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntHeaderDO.java
deleted file mode 100644
index a94763e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntHeaderDO.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * Description: 绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- *
- * @author: wangyi
- * @date: Created on 2022/3/7
- */
-@VciBtmType(name = MdmBtmTypeConstant.SYS_INT_HEADER,text = "绯荤粺闆嗘垚鎺ュ彛鐨勮璇�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE,startStatus = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_SYSINTHEADER")
-public class SysIntHeaderDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 1144067849291882385L;
-
- /**
- * SysIntInfoDO 鐨刼id
- */
- @Column(columnDefinition = "鎺ュ彛oid")
- private String infoOid;
-
- /**
- * 鍙傛暟key
- */
- @Column(columnDefinition = "鍙傛暟key")
- private String headerkey;
-
- /**
- * 鍙傛暟value
- */
- @Column(columnDefinition = "鍙傛暟value")
- private String headeralue;
-
- /**
- * 鏄惁浣跨敤
- */
- @Column(columnDefinition = "鏄惁浣跨敤")
- private String usedflag;
-
-
- public String getInfoOid() {
- return infoOid;
- }
-
- public void setInfoOid(String infoOid) {
- this.infoOid = infoOid;
- }
-
- public String getHeaderkey() {
- return headerkey;
- }
-
- public void setHeaderkey(String headerkey) {
- this.headerkey = headerkey;
- }
-
- public String getHeaderalue() {
- return headeralue;
- }
-
- public void setHeaderalue(String headeralue) {
- this.headeralue = headeralue;
- }
-
- public String getUsedflag() {
- return usedflag;
- }
-
- public void setUsedflag(String usedflag) {
- this.usedflag = usedflag;
- }
-
- @Override
- public String toString() {
- return "SysIntHeaderDO{" +
- "infoOid='" + infoOid + '\'' +
- ", headerkey='" + headerkey + '\'' +
- ", headeralue='" + headeralue + '\'' +
- ", usedflag='" + usedflag + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntInfoDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntInfoDO.java
deleted file mode 100644
index b0c980e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntInfoDO.java
+++ /dev/null
@@ -1,658 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.*;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-
-/**requesturl
- * Description: 绯荤粺闆嗘垚鎺ュ彛鍩虹淇℃伅
- *
- * @author LiHang
- * @date Created on 2022/3/7
- */
-@VciBtmType(name = MdmBtmTypeConstant.SYS_INT_INFO,text = "绯荤粺闆嗘垚鍩虹淇℃伅",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE,startStatus = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_SYSINTINFO")
-public class SysIntInfoDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = -6867365039736279037L;
-
- /**
- * 鍚敤銆佸仠鐢╰rue/false锛屼笉鐢ㄥ钩鍙扮殑鏋氫妇锛屽噺灏戝骞冲彴鐨勮�﹀悎
- */
- @Column(columnDefinition = "鍚敤鍋滅敤")
- private String usedflag;
-
- /**
- * 鍒嗙被oid
- */
- @Column(columnDefinition = "鍒嗙被oid")
- private String classifyoid;
-
- /**
- * 鍒嗙被id
- */
- @Column(columnDefinition = "鍒嗙被id")
- private String classifyid;
-
- /**
- * 鍒嗙被鍚嶇О
- */
- @Column(columnDefinition = "鍒嗙被鍚嶇О")
- private String classifyname;
-
- /**
- * 鎺ㄩ�佺郴缁無id
- */
- @Column(columnDefinition = "鎺ㄩ�佺郴缁無id")
- private String sysbaseoid;
-
- /**
- * 鎺ㄩ�佺郴缁熺紪鍙�
- */
- @Column(columnDefinition = "鎺ㄩ�佺郴缁熺紪鍙�")
- private String sysbaseid;
-
- /**
- * 鎺ㄩ�佺郴缁熷悕绉�
- */
- @Column(columnDefinition = "鎺ㄩ�佺郴缁熷悕绉�")
- private String sysbasename;
-
- /**
- * 鎺ュ彛鍑芥暟
- */
- @Column(columnDefinition = "鎺ュ彛鍑芥暟")
- private String interfaceFunction;
-
- /**
- * 鍛藉悕绌洪棿
- */
- @Column(columnDefinition = "鍛藉悕绌洪棿")
- private String namespace;
-
- /**
- * soapAction
- */
- @Column(columnDefinition = "soapAction")
- private String soapaction;
-
- /**
- * 鍙傛暟鍚嶇О
- */
- @Column(columnDefinition = "鍙傛暟鍚嶇О")
- private String targName;
-
- /**
- * cxfaxis
- */
- @Column(columnDefinition = "cxfaxis")
- private String cxfaxis;
-
- /**
- * 璇锋眰鍦板潃
- */
- @Column(columnDefinition = "璇锋眰鍦板潃")
- private String requestUrl;
-
- /**
- * 鎺ュ彛绫诲瀷
- */
- @Column(columnDefinition = "鎺ュ彛绫诲瀷")
- @VciUseEnum(value = MdmEnumIdConstant.SYS_INTEGRATION_REQUEST_TYPE,showTextField = "interfaceTypeText")
- private String interfaceType;
-
- /**
- * 鎺ュ彛绫诲瀷鏄剧ず鏂囨湰
- */
- @Transient()
- private String interfaceTypeText;
-
- /**
- * 鍙傛暟绫诲瀷
- */
- @Column(columnDefinition = "鍙傛暟绫诲瀷")
- @VciUseEnum(value = MdmEnumIdConstant.SYS_INTEGRATION_PARAM_AND_RETURN_TYPE,showTextField = "paramTypeText")
- private String paramType;
-
- /**
- * 鍙傛暟绫诲瀷鏄剧ず鏂囨湰
- */
- @Transient()
- private String paramTypeText;
-
- /**
- * 杩斿洖鍊肩被鍨�
- */
- @Column(columnDefinition = "杩斿洖鍊肩被鍨�")
- @VciUseEnum(value = MdmEnumIdConstant.SYS_INTEGRATION_PARAM_AND_RETURN_TYPE,showTextField = "returnTypeText")
- private String returnType;
-
- /**
- * 杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
- */
- @Transient()
- private String returnTypeText;
-
- //===================================浠ヤ笅鏆傛椂涓嶇敤
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨�
- */
- @Column(columnDefinition = "涓氬姟绫诲瀷鐨勭紪鍙�")
- private String btmTypeId;
-
- /**
- * 瀛樺偍鐨勪笟鍔＄被鍨嬬殑涓枃鍚嶇О
- */
- @Column(columnDefinition = "涓氬姟绫诲瀷鐨勫悕绉�")
- private String btmTypeName;
-
- /**
- * 鏉ユ簮绯荤粺涓婚敭
- */
- @Column(columnDefinition = "鏉ユ簮绯荤粺涓婚敭")
- @VciUseRefer(MdmBtmTypeConstant.SYS_INT_BASE)
- private String sourceSystemOid;
-
- /**
- * 婧愮郴缁熷悕绉�
- */
- //@Transient(referColumn = "sourceSystemOid.name")
- private String sourceSysName;
-
- /**
- * 婧愮郴缁熸爣璇�
- */
- //@Transient(referColumn = "sourceSystemOid.id")
- private String sourceSysId;
-
- /**
- * 鐩爣绯荤粺涓婚敭
- */
- @Column(columnDefinition = "鐩爣绯荤粺涓婚敭")
- @VciUseRefer(MdmBtmTypeConstant.SYS_INT_BASE)
- private String targetSystemOid;
-
- /**
- * 鐩爣绯荤粺鍚嶇О
- */
- //@Transient(referColumn = "targetSystemOid.name")
- private String targetSysName;
-
- /**
- * 鐩爣绯荤粺鏍囪瘑
- */
- //@Transient(referColumn = "targetSystemOid.id")
- private String targetSysId;
-
- /**
- * 璇锋眰鏂瑰紡
- */
- @Column(columnDefinition = "璇锋眰鏂瑰紡")
- @VciUseEnum(value = MdmEnumIdConstant.SYS_INTEGRATION_REQUEST_METHOD_TYPE,showTextField = "requestMethodText")
- private String requestMethod;
-
- /**
- * 璇锋眰鏂瑰紡鏄剧ず鏂囨湰
- */
- @Transient()
- private String requestMethodText;
-
- /**
- * 璁よ瘉鏂瑰紡涓婚敭
- */
- @Column(columnDefinition = "璁よ瘉鏂瑰紡涓婚敭")
- @VciUseRefer(MdmBtmTypeConstant.SYS_INT_AUTHORITY)
- private String authorityOid;
-
- /**
- * 璁よ瘉鏂瑰紡
- */
- @Transient(referColumn = "authorityOid.type")
- @VciUseEnum(value = MdmEnumIdConstant.SYS_INTEGRATION_AUTHORITY_TYPE,showTextField = "authorityTypeText")
- private String authorityType;
-
- /**
- * 璁よ瘉鏂瑰紡鏄剧ず鏂囨湰
- */
- @Transient()
- private String authorityTypeText;
-
- /**
- * 楠岃瘉鐢ㄦ埛
- */
- @Transient(referColumn = "authorityOid.userAccount")
- private String userAccount;
-
- /**
- * 楠岃瘉瀵嗙爜
- */
- @Transient(referColumn = "authorityOid.userCode")
- private String userCode;
-
- /**
- * 楠岃瘉浠ょ墝
- */
- @Transient(referColumn = "authorityOid.token")
- private String token;
-
- /**
- * 鎺ュ彛鎻忚堪
- */
- @Column(columnDefinition = "鎺ュ彛鎻忚堪")
- private String description;
-
- /**
- * 绫昏矾寰�
- */
- @Column(columnDefinition = "绫昏矾寰�")
- private String classPath;
-
- /**
- * 鏁版嵁娴佸悜鏂瑰紡
- */
- @Column(columnDefinition = "鏁版嵁娴佸悜鏂瑰紡")
- @VciUseEnum(value = MdmEnumIdConstant.SYS_INTEGRATION_DATA_FLOW_TYPE,showTextField = "dataFlowTypeText")
- private String dataFlowType;
-
- /**
- * 鏁版嵁娴佸悜鏂瑰紡鐨勬樉绀哄瓧娈�
- */
- @Transient()
- private String dataFlowTypeText;
-
- /***
- * 鎺ㄩ�佺被鍨� 1:鏁版嵁鎺ㄩ��/2鍒嗙被鎺ㄩ�侊紝榛樿鏁版嵁鎺ㄩ��
- */
- @Column(columnDefinition = "鎺ㄩ�佺被鍨�")
- @VciUseEnum(value = MdmEnumIdConstant.SYS_INTEGRATION_PUSH_TYPE,showTextField = "pushTypeText")
- private String pushType;
- /***
- * 鎺ㄩ�佺被鍨嬫樉绀哄��
- */
- @Transient()
- private String pushTypeText;
-
- public String getClassifyid() {
- return classifyid;
- }
-
- public void setClassifyid(String classifyid) {
- this.classifyid = classifyid;
- }
-
- public String getClassifyname() {
- return classifyname;
- }
-
- public void setClassifyname(String classifyname) {
- this.classifyname = classifyname;
- }
-
- public String getTargName() {
- return targName;
- }
-
- public void setTargName(String targName) {
- this.targName = targName;
- }
-
- public String getSoapaction() {
- return soapaction;
- }
-
- public void setSoapaction(String soapaction) {
- this.soapaction = soapaction;
- }
-
- public String getCxfaxis() {
- return cxfaxis;
- }
-
- public void setCxfaxis(String cxfaxis) {
- this.cxfaxis = cxfaxis;
- }
-
- public String getNamespace() {
- return namespace;
- }
-
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- public String getBtmTypeId() {
- return btmTypeId;
- }
-
- public void setBtmTypeId(String btmTypeId) {
- this.btmTypeId = btmTypeId;
- }
-
- public String getBtmTypeName() {
- return btmTypeName;
- }
-
- public void setBtmTypeName(String btmTypeName) {
- this.btmTypeName = btmTypeName;
- }
-
- public String getClassPath() {
- return classPath;
- }
-
- public void setClassPath(String classPath) {
- this.classPath = classPath;
- }
-
- @Override
- public String getDescription() {
- return description;
- }
-
- @Override
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getSourceSystemOid() {
- return sourceSystemOid;
- }
-
- public void setSourceSystemOid(String sourceSystemOid) {
- this.sourceSystemOid = sourceSystemOid;
- }
-
- public String getSourceSysName() {
- return sourceSysName;
- }
-
- public void setSourceSysName(String sourceSysName) {
- this.sourceSysName = sourceSysName;
- }
-
- public String getSourceSysId() {
- return sourceSysId;
- }
-
- public void setSourceSysId(String sourceSysId) {
- this.sourceSysId = sourceSysId;
- }
-
- public String getTargetSystemOid() {
- return targetSystemOid;
- }
-
- public void setTargetSystemOid(String targetSystemOid) {
- this.targetSystemOid = targetSystemOid;
- }
-
- public String getTargetSysName() {
- return targetSysName;
- }
-
- public void setTargetSysName(String targetSysName) {
- this.targetSysName = targetSysName;
- }
-
- public String getTargetSysId() {
- return targetSysId;
- }
-
- public void setTargetSysId(String targetSysId) {
- this.targetSysId = targetSysId;
- }
-
- public String getInterfaceType() {
- return interfaceType;
- }
-
- public void setInterfaceType(String interfaceType) {
- this.interfaceType = interfaceType;
- }
-
- public String getInterfaceTypeText() {
- return interfaceTypeText;
- }
-
- public void setInterfaceTypeText(String interfaceTypeText) {
- this.interfaceTypeText = interfaceTypeText;
- }
-
- public String getRequestUrl() {
- return requestUrl;
- }
-
- public void setRequestUrl(String requestUrl) {
- this.requestUrl = requestUrl;
- }
-
- public String getRequestMethod() {
- return requestMethod;
- }
-
- public void setRequestMethod(String requestMethod) {
- this.requestMethod = requestMethod;
- }
-
- public String getRequestMethodText() {
- return requestMethodText;
- }
-
- public void setRequestMethodText(String requestMethodText) {
- this.requestMethodText = requestMethodText;
- }
-
- public String getParamType() {
- return paramType;
- }
-
- public void setParamType(String paramType) {
- this.paramType = paramType;
- }
-
- public String getParamTypeText() {
- return paramTypeText;
- }
-
- public void setParamTypeText(String paramTypeText) {
- this.paramTypeText = paramTypeText;
- }
-
- public String getReturnType() {
- return returnType;
- }
-
- public void setReturnType(String returnType) {
- this.returnType = returnType;
- }
-
- public String getReturnTypeText() {
- return returnTypeText;
- }
-
- public void setReturnTypeText(String returnTypeText) {
- this.returnTypeText = returnTypeText;
- }
-
- public String getAuthorityOid() {
- return authorityOid;
- }
-
- public void setAuthorityOid(String authorityOid) {
- this.authorityOid = authorityOid;
- }
-
- public String getUserAccount() {
- return userAccount;
- }
-
- public void setUserAccount(String userAccount) {
- this.userAccount = userAccount;
- }
-
- public String getUserCode() {
- return userCode;
- }
-
- public void setUserCode(String userCode) {
- this.userCode = userCode;
- }
-
- public String getToken() {
- return token;
- }
-
- public void setToken(String token) {
- this.token = token;
- }
-
- public String getInterfaceFunction() {
- return interfaceFunction;
- }
-
- public void setInterfaceFunction(String interfaceFunction) {
- this.interfaceFunction = interfaceFunction;
- }
-
- public String getAuthorityType() {
- return authorityType;
- }
-
- public void setAuthorityType(String authorityType) {
- this.authorityType = authorityType;
- }
-
- public String getAuthorityTypeText() {
- return authorityTypeText;
- }
-
- public void setAuthorityTypeText(String authorityTypeText) {
- this.authorityTypeText = authorityTypeText;
- }
-
- public String getDataFlowType() {
- return dataFlowType;
- }
-
- public void setDataFlowType(String dataFlowType) {
- this.dataFlowType = dataFlowType;
- }
-
- public String getDataFlowTypeText() {
- return dataFlowTypeText;
- }
-
- public void setDataFlowTypeText(String dataFlowTypeText) {
- this.dataFlowTypeText = dataFlowTypeText;
- }
-
- public String getClassifyoid() {
- return classifyoid;
- }
-
- public void setClassifyoid(String classifyoid) {
- this.classifyoid = classifyoid;
- }
-
- public String getUsedflag() {
- return usedflag;
- }
-
- public void setUsedflag(String usedflag) {
- this.usedflag = usedflag;
- }
-
- public String getSysbaseoid() {
- return sysbaseoid;
- }
-
- public void setSysbaseoid(String sysbaseoid) {
- this.sysbaseoid = sysbaseoid;
- }
-
- public String getSysbasename() {
- return sysbasename;
- }
-
- public void setSysbasename(String sysbasename) {
- this.sysbasename = sysbasename;
- }
-
- public String getSysbaseid() {
- return sysbaseid;
- }
-
- public void setSysbaseid(String sysbaseid) {
- this.sysbaseid = sysbaseid;
- }
-
- public String getPushType() {
- return pushType;
- }
-
- public void setPushType(String pushType) {
- this.pushType = pushType;
- }
-
- public String getPushTypeText() {
- return pushTypeText;
- }
-
- public void setPushTypeText(String pushTypeText) {
- this.pushTypeText = pushTypeText;
- }
-
- @Override
- public String toString() {
- return "SysIntInfoDO{" +
- "usedflag='" + usedflag + '\'' +
- ", classifyoid='" + classifyoid + '\'' +
- ", classifyid='" + classifyid + '\'' +
- ", classifyname='" + classifyname + '\'' +
- ", sysbaseoid='" + sysbaseoid + '\'' +
- ", sysbaseid='" + sysbaseid + '\'' +
- ", sysbasename='" + sysbasename + '\'' +
- ", interfaceFunction='" + interfaceFunction + '\'' +
- ", namespace='" + namespace + '\'' +
- ", soapaction='" + soapaction + '\'' +
- ", targName='" + targName + '\'' +
- ", cxfaxis='" + cxfaxis + '\'' +
- ", requestUrl='" + requestUrl + '\'' +
- ", interfaceType='" + interfaceType + '\'' +
- ", interfaceTypeText='" + interfaceTypeText + '\'' +
- ", paramType='" + paramType + '\'' +
- ", paramTypeText='" + paramTypeText + '\'' +
- ", returnType='" + returnType + '\'' +
- ", returnTypeText='" + returnTypeText + '\'' +
- ", btmTypeId='" + btmTypeId + '\'' +
- ", btmTypeName='" + btmTypeName + '\'' +
- ", sourceSystemOid='" + sourceSystemOid + '\'' +
- ", sourceSysName='" + sourceSysName + '\'' +
- ", sourceSysId='" + sourceSysId + '\'' +
- ", targetSystemOid='" + targetSystemOid + '\'' +
- ", targetSysName='" + targetSysName + '\'' +
- ", targetSysId='" + targetSysId + '\'' +
- ", requestMethod='" + requestMethod + '\'' +
- ", requestMethodText='" + requestMethodText + '\'' +
- ", authorityOid='" + authorityOid + '\'' +
- ", authorityType='" + authorityType + '\'' +
- ", authorityTypeText='" + authorityTypeText + '\'' +
- ", userAccount='" + userAccount + '\'' +
- ", userCode='" + userCode + '\'' +
- ", token='" + token + '\'' +
- ", description='" + description + '\'' +
- ", classPath='" + classPath + '\'' +
- ", dataFlowType='" + dataFlowType + '\'' +
- ", dataFlowTypeText='" + dataFlowTypeText + '\'' +
- ", pushType='" + pushType + '\'' +
- ", pushTypeText='" + pushTypeText + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntParamDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntParamDO.java
deleted file mode 100644
index eee1aa2..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/SysIntParamDO.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.starter.web.annotation.Column;
-import com.vci.starter.web.annotation.VciBtmType;
-import com.vci.starter.web.constant.FrameWorkLcStatusConstant;
-import com.vci.starter.web.model.BaseModel;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-
-/**
- * Description: 绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- *
- * @author: wangyi
- * @date: Created on 2022/3/7
- */
-@VciBtmType(name = MdmBtmTypeConstant.SYS_INT_PARAMTERY,text = "绯荤粺闆嗘垚鎺ュ彛鐨勮璇�",lifeCycle = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE,startStatus = FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE)
-@TableName("PL_CODE_SYSINTPARAM")
-public class SysIntParamDO extends BaseModel {
-
- /**
- * 搴忓垪鍖�
- */
- private static final long serialVersionUID = 1144067849291882385L;
-
- /**
- * SysIntInfoDO 鐨刼id
- */
- @Column(columnDefinition = "鎺ュ彛oid")
- private String infoOid;
-
- /**
- * 鍙傛暟key
- */
- @Column(columnDefinition = "鍙傛暟key")
- private String paramkey;
-
- /**
- * 鍙傛暟value
- */
- @Column(columnDefinition = "鍙傛暟value")
- private String paramvalue;
-
- /**
- * 鏄惁浣跨敤
- */
- @Column(columnDefinition = "鏄惁浣跨敤")
- private String usedflag;
-
- public String getInfoOid() {
- return infoOid;
- }
-
- public void setInfoOid(String infoOid) {
- this.infoOid = infoOid;
- }
-
- public String getParamkey() {
- return paramkey;
- }
-
- public void setParamkey(String paramkey) {
- this.paramkey = paramkey;
- }
-
- public String getParamvalue() {
- return paramvalue;
- }
-
- public void setParamvalue(String paramvalue) {
- this.paramvalue = paramvalue;
- }
-
- public String getUsedflag() {
- return usedflag;
- }
-
- public void setUsedflag(String usedflag) {
- this.usedflag = usedflag;
- }
-
- @Override
- public String toString() {
- return "SysIntParamDO{" +
- "infoOid='" + infoOid + '\'' +
- ", paramkey='" + paramkey + '\'' +
- ", paramvalue='" + paramvalue + '\'' +
- ", usedflag='" + usedflag + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/TaskDuckingDO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/TaskDuckingDO.java
deleted file mode 100644
index 4bf00c0..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/entity/TaskDuckingDO.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package com.vci.ubcs.code.entity;
-
-/**
- * V5鍙戦�佹秷鎭璞�
- * @author wangyi
- * @date 2022-03-14
- */
-public class TaskDuckingDO {
-
- /**
- * 娉ㄥ唽绯荤粺缂栫爜
- */
- public String registerCode;
-
- /**
- * 绗笁鏂圭郴缁熷緟鍔炰富閿�
- */
- public String taskId;
-
- /**
- * 寰呭姙鏍囬
- */
- public String title;
-
- /**
- * 寰呭姙鍙戣捣浜哄鍚�
- */
- public String senderName;
-
- /**
- * 绫诲埆
- */
- public String classify;
-
- /**
- * 鍐呭绫诲瀷
- */
- public String contentType;
-
- /**
- * 鐘舵��0寰呭姙锛�1宸插姙
- */
- public String state;
-
- /**
- * H5绌块�忓湴鍧�
- */
- public String h5url;
- /**
- * PC绌块�忓湴鍧�
- */
- public String url;
- /**
- * 鐧诲綍鍚嶇О/浜哄憳缂栫爜/鎵嬫満鍙�/鐢靛瓙閭欢
- */
- public String noneBindingSender;
- /**
- * 鐧诲綍鍚嶇О/浜哄憳缂栫爜/鎵嬫満鍙�/鐢靛瓙閭欢
- */
- public String noneBindingReceiver;
-
- /**
- * 绗笁鏂圭郴缁熷彂閫佽�呬富閿�
- */
- public String thirdSenderId;
-
- /**
- * 绗笁鏂圭郴缁熸帴鏀朵汉涓婚敭
- */
- public String thirdReceiverId;
-
- /**
- * 寰呭姙鍙戣捣鏃ユ湡锛屾牸寮弝yyy-MM-dd HH:mm
- */
- public String creationDate;
-
- /**
- * 鍘熺敓app鐨勪笅杞藉湴鍧�
- */
- public String content;
-
- /**
- * 澶勭悊鍚庣姸鎬侊細0/1/2/3鍚屾剰宸插姙/涓嶅悓鎰忓凡鍔�/鍙栨秷/椹冲洖
- */
- public String subState;
-
- public String getRegisterCode() {
- return registerCode;
- }
-
- public void setRegisterCode(String registerCode) {
- this.registerCode = registerCode;
- }
-
- public String getTaskId() {
- return taskId;
- }
-
- public void setTaskId(String taskId) {
- this.taskId = taskId;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getSenderName() {
- return senderName;
- }
-
- public void setSenderName(String senderName) {
- this.senderName = senderName;
- }
-
- public String getClassify() {
- return classify;
- }
-
- public void setClassify(String classify) {
- this.classify = classify;
- }
-
- public String getContentType() {
- return contentType;
- }
-
- public void setContentType(String contentType) {
- this.contentType = contentType;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getH5url() {
- return h5url;
- }
-
- public void setH5url(String h5url) {
- this.h5url = h5url;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getNoneBindingSender() {
- return noneBindingSender;
- }
-
- public void setNoneBindingSender(String noneBindingSender) {
- this.noneBindingSender = noneBindingSender;
- }
-
- public String getNoneBindingReceiver() {
- return noneBindingReceiver;
- }
-
- public void setNoneBindingReceiver(String noneBindingReceiver) {
- this.noneBindingReceiver = noneBindingReceiver;
- }
-
- public String getThirdSenderId() {
- return thirdSenderId;
- }
-
- public void setThirdSenderId(String thirdSenderId) {
- this.thirdSenderId = thirdSenderId;
- }
-
- public String getThirdReceiverId() {
- return thirdReceiverId;
- }
-
- public void setThirdReceiverId(String thirdReceiverId) {
- this.thirdReceiverId = thirdReceiverId;
- }
-
- public String getCreationDate() {
- return creationDate;
- }
-
- public void setCreationDate(String creationDate) {
- this.creationDate = creationDate;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public String getSubState() {
- return subState;
- }
-
- public void setSubState(String subState) {
- this.subState = subState;
- }
-
- @Override
- public String toString() {
- return "{" +
- "registerCode='" + registerCode + '\'' +
- ", taskId='" + taskId + '\'' +
- ", title='" + title + '\'' +
- ", senderName='" + senderName + '\'' +
- ", classify='" + classify + '\'' +
- ", contentType='" + contentType + '\'' +
- ", state='" + state + '\'' +
- ", h5url='" + h5url + '\'' +
- ", url='" + url + '\'' +
- ", noneBindingSender='" + noneBindingSender + '\'' +
- ", noneBindingReceiver='" + noneBindingReceiver + '\'' +
- ", thirdSenderId='" + thirdSenderId + '\'' +
- ", thirdReceiverId='" + thirdReceiverId + '\'' +
- ", creationDate='" + creationDate + '\'' +
- ", content='" + content + '\'' +
- ", subState='" + subState + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeButtonUseEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeButtonUseEnum.java
deleted file mode 100644
index f357f42..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeButtonUseEnum.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 妯℃澘鐨勬寜閽敤閫�
- * @author weidy
- * @date 2022-1-17
- */
-@VciEnum(name = MdmEnumIdConstant.CODE_TEMPLATE_BUTTON_USE,text = "妯℃澘鐨勬寜閽敤閫�",description = "")
-public enum CodeButtonUseEnum implements BaseEnum {
-
- /**
- * 缂栫爜鐢宠
- */
- ORDER("code_temp_button_use_order","缂栫爜鐢宠"),
-
- /**
- * 缂栫爜淇敼
- */
- MODIFY("code_temp_button_use_modify","缂栫爜淇敼"),
-
- /**
- * 缂栫爜鍥炴敹
- */
- DELETE("code_temp_button_use_delete","缂栫爜鍥炴敹"),
-
- /**
- * 鏌ヨ
- */
- QUERY("code_temp_button_use_query","鏌ヨ");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeButtonUseEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeButtonUseEnum wenum : CodeButtonUseEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeButtonUseEnum wenum : CodeButtonUseEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeButtonUseEnum forValue(String value) {
- for (CodeButtonUseEnum wenum : CodeButtonUseEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeClassifyProcessUseEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeClassifyProcessUseEnum.java
deleted file mode 100644
index bb42e1e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeClassifyProcessUseEnum.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 鍒嗙被鐨勬祦绋嬬殑鐢ㄩ��
- * @author weidy
- * @date 2022-1-17
- */
-@VciEnum(name = MdmEnumIdConstant.CODE_CLASSIFY_PROCESS_USE,text = "鍒嗙被涓殑娴佺▼妯℃澘鐢ㄩ��",description = "")
-public enum CodeClassifyProcessUseEnum implements BaseEnum {
-
- /**
- * 鐢宠
- */
- ORDER("code_cls_flow_use_order","鐢宠"),
-
- /**
- * 淇敼
- */
- MODIFY("code_cls_flow_use_modify","淇敼"),
-
- /**
- * 鍥炴敹
- */
- DELETE("code_cls_flow_use_delete","鍥炴敹"),
-
- /**
- * 鍐荤粨
- */
- FREEZE("code_cls_flow_use_freeze","鍐荤粨"),
-
- /**
- * 瑙ｅ喕
- */
- UNFREEZE("code_cls_flow_use_unfreeze","瑙ｅ喕");
-
-// /**
-// * 鍏朵粬
-// */
-// OTHER("code_cls_flow_use_other","鍏朵粬");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeClassifyProcessUseEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeClassifyProcessUseEnum wenum : CodeClassifyProcessUseEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeClassifyProcessUseEnum wenum : CodeClassifyProcessUseEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeClassifyProcessUseEnum forValue(String value) {
- for (CodeClassifyProcessUseEnum wenum : CodeClassifyProcessUseEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeCutTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeCutTypeEnum.java
deleted file mode 100644
index 0fb8b5b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeCutTypeEnum.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 鎴彇绫诲瀷
- * @author weidy
- * @date 2022-1-17
- */
-@VciEnum(name = MdmEnumIdConstant.CODE_CUT_TYPE,text = "鍊兼埅鍙栫被鍨�",description = "")
-public enum CodeCutTypeEnum implements BaseEnum {
-
- /**
- * 涓嶆埅鍙�
- */
- NONE("code_cut_none","涓嶆埅鍙�"),
-
- /**
- * 宸︽埅鍙�
- */
- LEFT("code_cut_left","宸︽埅鍙�"),
-
- /**
- * 鍙虫埅鍙�
- */
- RIGHT("code_level_right","鍙虫埅鍙�");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeCutTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeCutTypeEnum wenum : CodeCutTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeCutTypeEnum wenum : CodeCutTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeCutTypeEnum forValue(String value) {
- for (CodeCutTypeEnum wenum : CodeCutTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeGetValueTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeGetValueTypeEnum.java
deleted file mode 100644
index 62689ff..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeGetValueTypeEnum.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 鍙栧�肩被鍨�
- * @author weidy
- * @date 2022-1-17
- */
-@VciEnum(name = MdmEnumIdConstant.CODE_GET_VALUE_TYPE,text = "涓绘暟鎹腑鍙栧�肩被鍨�",description = "")
-public enum CodeGetValueTypeEnum implements BaseEnum {
-
- /**
- * 褰撳墠鍒嗙被浠ｅ彿鍊�
- */
- CURRENT("code_get_value_current","褰撳墠鍒嗙被浠ｅ彿鍊�"),
-
- /**
- * 鍚戜笂閬嶅巻鍏ㄩ儴鐖朵唬鍙风殑鍚堝苟鍊�
- */
- TOP("code_get_value_all_up","鍚戜笂閬嶅巻鍏ㄩ儴鐖朵唬鍙风殑鍚堝苟鍊�");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeGetValueTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeGetValueTypeEnum wenum : CodeGetValueTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeGetValueTypeEnum wenum : CodeGetValueTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeGetValueTypeEnum forValue(String value) {
- for (CodeGetValueTypeEnum wenum : CodeGetValueTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeLevelTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeLevelTypeEnum.java
deleted file mode 100644
index 17ad387..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeLevelTypeEnum.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 灞傜骇鐮佹鐨勫眰绾х被鍨�
- * @author weidy
- * @date 2022-1-17
- */
-@VciEnum(name = MdmEnumIdConstant.CODE_LEVEL_TYPE,text = "灞傜骇鐮佹鐨勫眰绾х被鍨�",description = "")
-public enum CodeLevelTypeEnum implements BaseEnum {
-
- /**
- * 鎸囧畾灞傜骇
- */
- SPECIAL("code_level_special","鎸囧畾灞傜骇"),
-
-// /**
-// * 浠绘剰灞傜骇
-// */
-// ANY("code_level_any","浠绘剰灞傜骇"),
-
- /**
- * 鏈�灏忓眰绾�
- */
- MIN("code_level_min","鏈�灏忓眰绾�");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeLevelTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeLevelTypeEnum wenum : CodeLevelTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeLevelTypeEnum wenum : CodeLevelTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeLevelTypeEnum forValue(String value) {
- for (CodeLevelTypeEnum wenum : CodeLevelTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeMapRuleTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeMapRuleTypeEnum.java
deleted file mode 100644
index f1b3399..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeMapRuleTypeEnum.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 鏄犲皠瑙勫垯绫诲瀷
- * @author weidy
- * @date 2022-1-17
- */
-@VciEnum(name = MdmEnumIdConstant.CODE_MAP_RULE_TYPE,text = "鏄犲皠瑙勫垯绫诲瀷",description = "")
-public enum CodeMapRuleTypeEnum implements BaseEnum {
-
- /**
- * 闆嗗洟鐮佸鍑�
- */
- GROUP_EXPORT("code_map_group_export","闆嗗洟鐮佸鍑�"),
-
- /**
- * 闆嗗洟鐮佸鍏�
- */
- GROUP_IMPORT("code_map_group_import","闆嗗洟鐮佸鍏�"),
-
- /**
- * 鎵归噺鐢宠
- */
- BATCH_ORDER("code_map_batch_order","鎵归噺鐢宠"),
-
- /**
- * 鍏朵粬
- */
- OTHER("code_map_other","鍏朵粬"),
-
- /**
- * 鍘嗗彶鏁版嵁瀵煎叆
- */
- HISTORY_DATA_IMPORT("code_map_history_import","鍘嗗彶鏁版嵁瀵煎叆");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeMapRuleTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeMapRuleTypeEnum wenum : CodeMapRuleTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeMapRuleTypeEnum wenum : CodeMapRuleTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeMapRuleTypeEnum forValue(String value) {
- for (CodeMapRuleTypeEnum wenum : CodeMapRuleTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecLengthTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecLengthTypeEnum.java
deleted file mode 100644
index 8678584..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecLengthTypeEnum.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 鐮佹闀垮害鎺у埗绫诲瀷
- * @author weidy
- * @date 2022-1-17
- */
-@VciEnum(name = MdmEnumIdConstant.CODE_SEC_LENGTH,text = "鐮佹闀垮害绫诲瀷",description = "")
-public enum CodeSecLengthTypeEnum implements BaseEnum {
-
- /**
- * 鍥哄畾闀垮害
- */
- STATIC("code_sec_length_static","鍥哄畾闀垮害"),
-
- /**
- * 鍙彉闀垮害
- */
- TOOLBAR("code_sec_length_variable","鍙彉闀垮害");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeSecLengthTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeSecLengthTypeEnum wenum : CodeSecLengthTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeSecLengthTypeEnum wenum : CodeSecLengthTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeSecLengthTypeEnum forValue(String value) {
- for (CodeSecLengthTypeEnum wenum : CodeSecLengthTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java
index e202eac..42ff3a3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeSecTypeEnum.java
@@ -1,9 +1,8 @@
package com.vci.ubcs.code.enumpack;
-
+import com.vci.ubcs.code.annotation.BaseEnum;
import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
+import com.vci.ubcs.com.vci.starter.annotation.VciEnum;
/**
* 鐮佹鐨勭被鍨�
@@ -13,145 +12,146 @@
@VciEnum(name = MdmEnumIdConstant.CODE_SEC_TYPE,text = "鐮佹鐨勭被鍨�",description = "")
public enum CodeSecTypeEnum implements BaseEnum {
- /**
- * 鍥哄畾鐮佹
- */
- CODE_FIXED_SEC("codefixedsec","鍥哄畾鐮佹"),
+ /**
+ * 鍥哄畾鐮佹
+ */
+ CODE_FIXED_SEC("codefixedsec","鍥哄畾鐮佹"),
- /**
- * 鍙彉鐮佹
- */
- CODE_VARIABLE_SEC("codevariablesec","鍙彉鐮佹"),
- /**
- * 鏃ユ湡鐮佹
- */
- CODE_DATE_SEC("codedatasec","鏃ユ湡鐮佹"),
- /**
- * 鍒嗙被鐮佹
- */
- CODE_CLASSIFY_SEC("codeclassifysec","鍒嗙被鐮佹"),
- /**
- * 灞炴�х爜娈�
- */
- CODE_ATTR_SEC("codeattrsec","灞炴�х爜娈�"),
- /**
- * 娴佹按鐮佹
- */
- CODE_SERIAL_SEC("codeserialsec","娴佹按鐮佹"),
+ /**
+ * 鍙彉鐮佹
+ */
+ CODE_VARIABLE_SEC("codevariablesec","鍙彉鐮佹"),
+ /**
+ * 鏃ユ湡鐮佹
+ */
+ CODE_DATE_SEC("codedatasec","鏃ユ湡鐮佹"),
+ /**
+ * 鍒嗙被鐮佹
+ */
+ CODE_CLASSIFY_SEC("codeclassifysec","鍒嗙被鐮佹"),
+ /**
+ * 灞炴�х爜娈�
+ */
+ CODE_ATTR_SEC("codeattrsec","灞炴�х爜娈�"),
+ /**
+ * 娴佹按鐮佹
+ */
+ CODE_SERIAL_SEC("codeserialsec","娴佹按鐮佹"),
- /**
- * 灞傜骇鐮佹
- */
- CODE_LEVEL_SEC("codelevelsec","灞傜骇鐮佹"),
+ /**
+ * 灞傜骇鐮佹
+ */
+ CODE_LEVEL_SEC("codelevelsec","灞傜骇鐮佹"),
- /**
- * 寮曠敤鐮佹
- */
- CODE_REFER_SEC("coderefersec","寮曠敤鐮佹")
- ;
+ /**
+ * 寮曠敤鐮佹
+ */
+ CODE_REFER_SEC("coderefersec","寮曠敤鐮佹")
+ ;
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
+ /**
+ * 鏋氫妇鐨勫��
+ */
+ private String value;
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
+ /**
+ * 鏋氫妇鏄剧ず鏂囨湰
+ */
+ private String text;
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
+ /**
+ * 鑾峰彇鏋氫妇鍊�
+ *
+ * @return 鏋氫妇鍊�
+ */
+ @Override
+ public String getValue() {
+ return value;
+ }
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
+ /**
+ * 璁剧疆鏋氫妇鍊�
+ *
+ * @param value 鏋氫妇鍊�
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
+ /**
+ * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
+ *
+ * @return 鏄剧ず鏂囨湰
+ */
+ @Override
+ public String getText() {
+ return text;
+ }
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
+ /**
+ * 璁剧疆鏄剧ず鏂囨湰
+ *
+ * @param text 鏄剧ず鏂囨湰
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeSecTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
+ /**
+ * 鏋勯�犲嚱鏁�
+ *
+ * @param value 鍊�
+ * @param text 鏄剧ず鏂囨湰
+ */
+ private CodeSecTypeEnum(String value, String text) {
+ this.value = value;
+ this.text = text;
+ }
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeSecTypeEnum wenum : CodeSecTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
+ /**
+ * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
+ *
+ * @param text 鍚嶇О
+ * @return 鏋氫妇鍊�
+ */
+ public static String getValueByText(String text) {
+ for (CodeSecTypeEnum wenum : CodeSecTypeEnum.values()) {
+ if (wenum.getText().equalsIgnoreCase(text)) {
+ return wenum.getValue();
+ }
+ }
+ return "";
+ }
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeSecTypeEnum wenum : CodeSecTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鍚嶇О
+ */
+ public static String getTextByValue(String value) {
+ for (CodeSecTypeEnum wenum : CodeSecTypeEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum.getText();
+ }
+ }
+ return "";
+ }
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeSecTypeEnum forValue(String value) {
- for (CodeSecTypeEnum wenum : CodeSecTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
+ */
+ public static CodeSecTypeEnum forValue(String value) {
+ for (CodeSecTypeEnum wenum : CodeSecTypeEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum;
+ }
+ }
+ return null;
+ }
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeUseButtonPositionTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeUseButtonPositionTypeEnum.java
deleted file mode 100644
index 27a026b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/CodeUseButtonPositionTypeEnum.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 鎸夐挳浣跨敤浣嶇疆
- * @author weidy
- * @date 2022-1-17
- */
-@VciEnum(name = MdmEnumIdConstant.CODE_BUTTON_POSITION,text = "鎸夐挳鐨勪娇鐢ㄤ綅缃�",description = "")
-public enum CodeUseButtonPositionTypeEnum implements BaseEnum {
-
- /**
- * 鍦ㄨ〃鏍间腑浣跨敤
- */
- TABLE("code_button_table","鍦ㄨ〃鏍间腑浣跨敤"),
-
- /**
- * 宸ュ叿鏍�
- */
- TOOLBAR("code_button_toolbar","宸ュ叿鏍�");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeUseButtonPositionTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeUseButtonPositionTypeEnum wenum : CodeUseButtonPositionTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeUseButtonPositionTypeEnum wenum : CodeUseButtonPositionTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeUseButtonPositionTypeEnum forValue(String value) {
- for (CodeUseButtonPositionTypeEnum wenum : CodeUseButtonPositionTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationAuthorityTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationAuthorityTypeEnum.java
deleted file mode 100644
index 5e4309c..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationAuthorityTypeEnum.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * Description: 绯荤粺闆嗘垚楠岃瘉鏂瑰紡
- *
- * @author: LiHang
- * @date: Created on 2022/3/7
- */
-@VciEnum(name = MdmEnumIdConstant.SYS_INTEGRATION_AUTHORITY_TYPE,text = "绯荤粺闆嗘垚楠岃瘉鏂瑰紡",description = "")
-public enum SysIntegrationAuthorityTypeEnum implements BaseEnum {
- /**
- * 鐢ㄦ埛鏂瑰紡
- */
- LOGIN("login","鐢ㄦ埛鐧诲綍"),
- /**
- * 浠ょ墝鏂瑰紡
- */
- TOKEN("token","浠ょ墝");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private SysIntegrationAuthorityTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (SysIntegrationAuthorityTypeEnum wenum : SysIntegrationAuthorityTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (SysIntegrationAuthorityTypeEnum wenum : SysIntegrationAuthorityTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static SysIntegrationAuthorityTypeEnum forValue(String value) {
- for (SysIntegrationAuthorityTypeEnum wenum : SysIntegrationAuthorityTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationDataFlowTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationDataFlowTypeEnum.java
deleted file mode 100644
index 54abf18..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationDataFlowTypeEnum.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * Description:鏁版嵁娴佸悜鏂瑰紡
- *
- * @author LiHang
- * @date Created on 2022/3/14
- */
-public enum SysIntegrationDataFlowTypeEnum implements BaseEnum {
- /**
- * 鎺ㄩ��
- */
- PUSH("push","鎺ㄩ��"),
- /**
- * 閫氱煡鍜屾煡璇�
- */
- NOTICE_AND_QUERY("noticeAndQuery","閫氱煡鍜屾煡璇�");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private SysIntegrationDataFlowTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (SysIntegrationDataFlowTypeEnum wenum : SysIntegrationDataFlowTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (SysIntegrationDataFlowTypeEnum wenum : SysIntegrationDataFlowTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static SysIntegrationDataFlowTypeEnum forValue(String value) {
- for (SysIntegrationDataFlowTypeEnum wenum : SysIntegrationDataFlowTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationParamAndReturnTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationParamAndReturnTypeEnum.java
deleted file mode 100644
index 6aede7d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationParamAndReturnTypeEnum.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * Description: 绯荤粺闆嗘垚鎺ュ彛鍙傛暟涓庤繑鍥炲�肩被鍨�
- *
- * @author: LiHang
- * @date: Created on 2022/3/7
- */
-@VciEnum(name = MdmEnumIdConstant.SYS_INTEGRATION_PARAM_AND_RETURN_TYPE,text = "绯荤粺闆嗘垚鎺ュ彛鍙傛暟涓庤繑鍥炲�肩被鍨�",description = "")
-public enum SysIntegrationParamAndReturnTypeEnum implements BaseEnum {
- /**
- * Json鏍煎紡
- */
- JSON("json","Json"),
- /**
- * Xml鏍煎紡
- */
- XML("xml","xml");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private SysIntegrationParamAndReturnTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (SysIntegrationParamAndReturnTypeEnum wenum : SysIntegrationParamAndReturnTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (SysIntegrationParamAndReturnTypeEnum wenum : SysIntegrationParamAndReturnTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static SysIntegrationParamAndReturnTypeEnum forValue(String value) {
- for (SysIntegrationParamAndReturnTypeEnum wenum : SysIntegrationParamAndReturnTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationRequestMethodEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationRequestMethodEnum.java
deleted file mode 100644
index 7a5623e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationRequestMethodEnum.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * Description:绯荤粺闆嗘垚鎺ュ彛璇锋眰鏂瑰紡绫诲瀷
- *
- * @author: LiHang
- * @date: Created on 2022/3/7
- */
-@VciEnum(name = MdmEnumIdConstant.SYS_INTEGRATION_REQUEST_METHOD_TYPE,text = "绯荤粺闆嗘垚鎺ュ彛璇锋眰鏂瑰紡绫诲瀷",description = "")
-public enum SysIntegrationRequestMethodEnum implements BaseEnum {
- /**
- * post璇锋眰
- */
- POST("post","post"),
- /**
- * get璇锋眰
- */
- GET("get","get"),
- /**
- * put璇锋眰
- */
- PUT("put","put"),
- /**
- * delete璇锋眰
- */
- DELETE("delete","delete");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private SysIntegrationRequestMethodEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (SysIntegrationRequestMethodEnum wenum : SysIntegrationRequestMethodEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (SysIntegrationRequestMethodEnum wenum : SysIntegrationRequestMethodEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static SysIntegrationRequestMethodEnum forValue(String value) {
- for (SysIntegrationRequestMethodEnum wenum : SysIntegrationRequestMethodEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationRequestTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationRequestTypeEnum.java
deleted file mode 100644
index eb7bb78..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationRequestTypeEnum.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * Description:绯荤粺闆嗘垚鎺ュ彛鐨勭被鍨�
- *
- * @author: LiHang
- * @date: Created on 2022/3/7
- */
-@VciEnum(name = MdmEnumIdConstant.SYS_INTEGRATION_REQUEST_TYPE,text = "绯荤粺闆嗘垚鎺ュ彛鐨勭被鍨�",description = "")
-public enum SysIntegrationRequestTypeEnum implements BaseEnum {
- /**
- * HTTP鏂瑰紡
- */
- HTTP("http","Http"),
- /**
- * WebService鏂瑰紡
- */
- WEB_SERVICE("webService","webService"),
- WEB_SERVICE_ERP("webService","webService"),
- WEB_SERVICE_CXF("webService","webService"),
- WEB_SERVICE_AXIS("webService","webService"),
- /**
- * 绫昏矾寰�
- */
- CLASSPATH("classPath","绫昏矾寰�");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private SysIntegrationRequestTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (SysIntegrationRequestTypeEnum wenum : SysIntegrationRequestTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (SysIntegrationRequestTypeEnum wenum : SysIntegrationRequestTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static SysIntegrationRequestTypeEnum forValue(String value) {
- for (SysIntegrationRequestTypeEnum wenum : SysIntegrationRequestTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/sysIntegrationPushTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/sysIntegrationPushTypeEnum.java
deleted file mode 100644
index 6aaa998..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/sysIntegrationPushTypeEnum.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.vci.ubcs.code.enumpack;
-
-
-import com.vci.ubcs.code.constant.MdmEnumIdConstant;
-import com.vci.starter.web.annotation.VciEnum;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-@VciEnum(name = MdmEnumIdConstant.SYS_INTEGRATION_PUSH_TYPE,text = "绯荤粺鎺ュ彛鎺ㄩ�佹柟寮�",description = "")
-public enum sysIntegrationPushTypeEnum implements BaseEnum {
- /**
- * 鍒嗙被鎺ㄩ�佹柟寮�
- */
- JSON("1","鏁版嵁鎺ㄩ��"),
- /**
- * Xml鏍煎紡
- */
- XML("2","鍒嗙被鎺ㄩ��");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private sysIntegrationPushTypeEnum(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (sysIntegrationPushTypeEnum wenum : sysIntegrationPushTypeEnum.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (sysIntegrationPushTypeEnum wenum : sysIntegrationPushTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static sysIntegrationPushTypeEnum forValue(String value) {
- for (sysIntegrationPushTypeEnum wenum : sysIntegrationPushTypeEnum.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeAllCodeLC.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeAllCodeLC.java
deleted file mode 100644
index bcb1756..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeAllCodeLC.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.vci.ubcs.code.lifecycle;
-
-
-import com.vci.ubcs.code.constant.MdmLifeCycleConstant;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
-import com.vci.starter.web.annotation.VciLifeCycle;
-import com.vci.starter.web.annotation.VciLifeCycleTrans;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 鍏ㄩ儴鐨勭爜鍊肩殑鐢熷懡鍛ㄦ湡
- * @author weidy
- * @date 2022-3-1
- */
-@VciLifeCycle(name = MdmLifeCycleConstant.CODE_ALL_CODE_LC,text = "鍏ㄩ儴鐨勭爜鍊肩殑鐢熷懡鍛ㄦ湡",description = "",startStatus = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,
- translations={
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "鍙戝竷"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_OBSOLETED,name = "鐮佸�煎洖鏀跺垹闄ゆ暟鎹�"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_AUDITING,name = "鎻愪氦瀹℃壒"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_AUDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,name = "瀹℃壒涓嶉�氳繃鎴栬�呯粓姝�"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_AUDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "瀹℃壒閫氳繃"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK,name = "鍥炴敹"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK,name = "鏈彂甯冪洿鎺ュ仠鐢�"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,target = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,name = "鎵ц鍋滅敤"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "鍋滅敤鍚庡啀娆＄敓鏁�"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK,name = "鍋滅敤鍚庡洖鏀�")
- }
-)
-public enum CodeAllCodeLC implements BaseEnum {
-
- /**
- * 缂栬緫涓�
- */
- EDITING(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,"缂栬緫涓�"),
-
- /**
- * 瀹℃壒涓�
- */
- AUDITING(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_AUDITING,"瀹℃壒涓�"),
-
- /**
- * 宸插彂甯�
- */
- RELEASED(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,"宸插彂甯�"),
-
- /**
- * 鐮佸�煎洖鏀�
- */
- TASK_BACK(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK,"鐮佸�煎洖鏀�"),
-
- /**
- * 鐮佸�兼暟鎹攢姣�
- */
- OBSOLETED(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_OBSOLETED,"鐮佸�兼暟鎹攢姣�"),
-
- /**
- * 鍋滅敤
- */
- DISABLE(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,"鍋滅敤");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeAllCodeLC(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeAllCodeLC wenum : CodeAllCodeLC.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeAllCodeLC wenum : CodeAllCodeLC.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeAllCodeLC forValue(String value) {
- for (CodeAllCodeLC wenum : CodeAllCodeLC.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeClassifyTemplateLC.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeClassifyTemplateLC.java
deleted file mode 100644
index eb3f7a9..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeClassifyTemplateLC.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.vci.ubcs.code.lifecycle;
-
-
-import com.vci.ubcs.code.constant.MdmLifeCycleConstant;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
-import com.vci.starter.web.annotation.VciLifeCycle;
-import com.vci.starter.web.annotation.VciLifeCycleTrans;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 鍒嗙被妯℃澘鐨勭敓鍛藉懆鏈�
- * @author weidy
- * @date 2022-2-11
- */
-@VciLifeCycle(name = MdmLifeCycleConstant.CODE_CLASSIFY_TEMPLATE_LC,text = "鍒嗙被涓殑娴佺▼妯℃澘鐢熷懡鍛ㄦ湡",description = "",startStatus = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,
- translations={
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "鍙戝竷"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,target = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,name = "浣滃簾"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,name = "鏈彂甯冪洿鎺ュ仠鐢�"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "鍋滅敤鍚庡啀娆＄敓鏁�")
- }
-)
-public enum CodeClassifyTemplateLC implements BaseEnum {
-
- /**
- * 缂栬緫涓�
- */
- EDITING(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,"缂栬緫涓�"),
-
- /**
- * 宸插彂甯�
- */
- RELEASED(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,"宸插彂甯�"),
-
- /**
- * 鍋滅敤
- */
- DISABLED(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,"鍋滅敤");
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeClassifyTemplateLC(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeClassifyTemplateLC wenum : CodeClassifyTemplateLC.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeClassifyTemplateLC wenum : CodeClassifyTemplateLC.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeClassifyTemplateLC forValue(String value) {
- for (CodeClassifyTemplateLC wenum : CodeClassifyTemplateLC.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeDefaultLC.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeDefaultLC.java
deleted file mode 100644
index 3f097b4..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeDefaultLC.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.vci.ubcs.code.lifecycle;
-
-
-import com.vci.ubcs.code.constant.MdmLifeCycleConstant;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
-import com.vci.starter.web.annotation.VciLifeCycle;
-import com.vci.starter.web.annotation.VciLifeCycleTrans;
-import com.vci.starter.web.enumpck.BaseEnum;
-
-/**
- * 涓婚搴撴暟鎹殑榛樿鐢熷懡鍛ㄦ湡
- * @author weidy
- * @date 2022-3-2
- */
-@VciLifeCycle(name = MdmLifeCycleConstant.CODE_DEFAULT_LC,text = "涓婚搴撴暟鎹殑榛樿鐢熷懡鍛ㄦ湡",description = "",startStatus = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,
- translations={
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "鍙戝竷"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_AUDITING,name = "鎻愪氦瀹℃壒"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_AUDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,name = "瀹℃壒涓嶉�氳繃鎴栬�呯粓姝�"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_AUDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "瀹℃壒閫氳繃"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK,name = "鍥炴敹"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK,name = "鏈彂甯冪洿鎺ュ仠鐢�"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,target = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,name = "鎵ц鍋滅敤"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "鍋滅敤鍚庡啀娆＄敓鏁�"),
- @VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK,name = "鍋滅敤鍚庡洖鏀�")
- }
-)
-public enum CodeDefaultLC implements BaseEnum {
-
- /**
- * 缂栬緫涓�
- */
- EDITING(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,"缂栬緫涓�"),
-
- /**
- * 瀹℃壒涓�
- */
- AUDITING(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_AUDITING,"瀹℃壒涓�"),
-
- /**
- * 宸插彂甯�
- */
- RELEASED(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,"宸插彂甯�"),
-
- /**
- * 鐮佸�煎洖鏀�
- */
- TASK_BACK(FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_TAKEBACK,"鐮佸�煎洖鏀�"),
- /**
- * 鍋滅敤
- */
- DISABLE(FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,"鍋滅敤");
-
-
- /**
- * 鏋氫妇鐨勫��
- */
- private String value;
-
- /**
- * 鏋氫妇鏄剧ず鏂囨湰
- */
- private String text;
-
- /**
- * 鑾峰彇鏋氫妇鍊�
- *
- * @return 鏋氫妇鍊�
- */
- @Override
- public String getValue() {
- return value;
- }
-
- /**
- * 璁剧疆鏋氫妇鍊�
- *
- * @param value 鏋氫妇鍊�
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
- *
- * @return 鏄剧ず鏂囨湰
- */
- @Override
- public String getText() {
- return text;
- }
-
- /**
- * 璁剧疆鏄剧ず鏂囨湰
- *
- * @param text 鏄剧ず鏂囨湰
- */
- public void setText(String text) {
- this.text = text;
- }
-
- /**
- * 鏋勯�犲嚱鏁�
- *
- * @param value 鍊�
- * @param text 鏄剧ず鏂囨湰
- */
- private CodeDefaultLC(String value, String text) {
- this.value = value;
- this.text = text;
- }
-
- /**
- * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
- *
- * @param text 鍚嶇О
- * @return 鏋氫妇鍊�
- */
- public static String getValueByText(String text) {
- for (CodeDefaultLC wenum : CodeDefaultLC.values()) {
- if (wenum.getText().equalsIgnoreCase(text)) {
- return wenum.getValue();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
- *
- * @param value 鏋氫妇鍊�
- * @return 鍚嶇О
- */
- public static String getTextByValue(String value) {
- for (CodeDefaultLC wenum : CodeDefaultLC.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum.getText();
- }
- }
- return "";
- }
-
- /**
- * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
- *
- * @param value 鏋氫妇鍊�
- * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
- */
- public static CodeDefaultLC forValue(String value) {
- for (CodeDefaultLC wenum : CodeDefaultLC.values()) {
- if (wenum.getValue().equalsIgnoreCase(value)) {
- return wenum;
- }
- }
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeRuleLC.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeRuleLC.java
index 76fc837..500b0fc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeRuleLC.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/lifecycle/CodeRuleLC.java
@@ -1,25 +1,22 @@
package com.vci.ubcs.code.lifecycle;
-import com.vci.ubcs.code.constant.MdmLifeCycleConstant;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
-import com.vci.starter.web.annotation.VciLifeCycle;
-import com.vci.starter.web.annotation.VciLifeCycleTrans;
-import com.vci.starter.web.enumpck.BaseEnum;
+import com.vci.ubcs.code.annotation.BaseEnum;
+import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
/**
* 缂栫爜瑙勫垯鐨勭敓鍛藉懆鏈�
* @author weidy
* @date 2022-2-23
*/
-@VciLifeCycle(name = MdmLifeCycleConstant.CODE_RULE_LC,text = "缂栫爜瑙勫垯鏉跨敓鍛藉懆鏈�",description = "",startStatus = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,
+/*@VciLifeCycle(name = MdmLifeCycleConstant.CODE_RULE_LC,text = "缂栫爜瑙勫垯鏉跨敓鍛藉懆鏈�",description = "",startStatus = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,
translations={
@VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target =FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "鍙戝竷"),
@VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,target = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,name = "浣滃簾"),
@VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING,target = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,name = "鏈彂甯冪洿鎺ュ仠鐢�"),
@VciLifeCycleTrans(source = FrameWorkDefaultValueConstant.FRAMEWORK_DATA_DISABLED,target = FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_RELEASED,name = "鍋滅敤鍚庡啀娆＄敓鏁�")
}
-)
+)*/
public enum CodeRuleLC implements BaseEnum {
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
index f990f5a..b92ce23 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
@@ -1,12 +1,44 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
package com.vci.ubcs.code.mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.vci.ubcs.code.entity.CodeAllcode;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+
+import java.util.List;
+
/**
- * 鎵�鏈夌殑鐮佸�兼暟鎹搷浣滃眰
+ * 鍏ㄩ儴鐮佸�� Mapper 鎺ュ彛
*
- * @author weidy
- * @date 2022-03-01
+ * @author ludc
+ * @since 2023-04-03
*/
-public interface CodeAllCodeMapper {
+public interface CodeAllcodeMapper extends BaseMapper<CodeAllcode> {
+
+ /**
+ * 鑷畾涔夊垎椤�
+ *
+ * @param page
+ * @param CodeAllcode
+ * @return
+ */
+ List<CodeAllcodeVO> selectCodeAllcodePage(IPage page, CodeAllcodeVO CodeAllcode);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java
index dbb4d72..46d9368 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeBasicSecMapper.java
@@ -2,20 +2,29 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.vci.ubcs.code.entity.CodeBasicSecDO;
-import org.springframework.data.domain.Page;
+import com.vci.ubcs.code.entity.CodeBasicSec;
+import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import java.util.List;
import java.util.Map;
/**
* 鐮佹鍩虹淇℃伅鏁版嵁鎿嶄綔灞�
*
- * @author weidy
+ * @author ludc
* @date 2022-01-24
*/
-public interface CodeBasicSecMapper extends BaseMapper<CodeBasicSecDO> {
+public interface CodeBasicSecMapper extends BaseMapper<CodeBasicSec> {
- IPage<CodeBasicSecDO> selectByCondition(Page<CodeBasicSecDO> codeBasicSecDO, Map<String,Object> condtions);
+ /**
+ * 鑷畾涔夊垎椤�
+ *
+ * @param page
+ * @param plCodeRule
+ * @return
+ */
+ List<CodeRuleVO> selectPlCodeRulePage(IPage page, CodeRuleVO plCodeRule);
+ List<CodeBasicSec> countByCondition(Map<String,String> condtions);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeButtonMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeButtonMapper.java
deleted file mode 100644
index 3630455..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeButtonMapper.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeButtonDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeButtonMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeButtonDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeButtonDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeButtonDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeButtonDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeButtonDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeButtonDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeButtonDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeButtonDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeButtonDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeButtonDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index b80412e..0af6656 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -1,232 +1,16 @@
package com.vci.ubcs.code.mapper;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.ubcs.code.entity.CodeClassifyDO;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.entity.CodeClassify;
/**
* 涓婚搴撳垎绫绘暟鎹搷浣滃眰
*
- * @author weidy
+ * @author ludc
* @date 2022-01-20
*/
-public interface CodeClassifyMapper {
+public interface CodeClassifyMapper extends BaseMapper<CodeClassify> {
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
- /**
- * 娣诲姞鏁版嵁
- * @param record 涓婚搴撳垎绫绘暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeClassifyDO record);
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 涓婚搴撳垎绫绘暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeClassifyDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeClassifyDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeClassifyDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeClassifyDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 涓婚搴撳垎绫绘暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeClassifyDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 涓婚搴撳垎绫绘暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeClassifyDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄
- */
- List<CodeClassifyDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ煡璇㈡�绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
- /**
- * 鑾峰彇鎵�鏈夊眰绾т笅绾х殑涓婚敭
- * @param oid 鏁版嵁涓婚敭
- * @return 鏌ヨ缁撴灉 key鏄富閿紝value鏄湰娆℃煡璇㈢殑灞傜骇
- */
- Map<String,String> selectAllLevelChildOid(String oid);
-
- /**
- * 鑾峰彇鎵�鏈夊眰绾т笂绾у叧鑱斾笟鍔＄被鍨嬫暟鎹�
- * @param oid 褰撳墠鍒嗙被鐨刼id
- * @return oid,id,name,btmtypeid,btmtypename
- */
- List<CodeClassifyDO> selectAllLevelParents(String oid);
-
- /**
- * 鑾峰彇褰撳墠鍒嗙被鐨勬墍鏈変笂绾у垎绫伙紙鍚湰娆℃煡璇㈠眰绾у彿锛�
- * @param oid 涓婚敭
- * @return 鎵�鏈夌殑涓婄骇
- */
- List<CodeClassifyDO> selectAllLevelParentByOid(String oid);
-
- /**
- * 鑾峰彇杩欎釜鍒嗙被涓嬬殑涓氬姟绫诲瀷锛屽綋鍓嶆病鏈夊氨鑾峰彇涓婄骇鐨勭涓�涓笟鍔＄被鍨�
- * @param oid 褰撳墠鍒嗙被鐨刼id
- * @return oid,id,name,btmtypeid,btmtypename
- */
- CodeClassifyDO selectBtmOrParentBtm(String oid);
-
- /**
- * 鑾峰彇鎵�鏈変笅绾ф暟鎹�
- * @param oid 鏁版嵁涓婚敭
- * @return 鏌ヨ缁撴灉
- */
- List<CodeClassifyDO> selectAllLevelChild(String oid);
-
- /**
- * 鏌ヨ鎵�鏈夌殑涓嬬骇锛屽苟鍖呭惈灞傜骇鐨勮矾寰�
- * @param oid 涓婄骇鐨勪富閿�
- * @param fieldInPath 瀛楁鍦ㄨ矾寰勪腑鐨勫唴瀹�
- * @param enable 鏄惁鍙煡璇㈠惎鐢�
- * @return 鍒嗙被鐨勬暟鎹唴瀹�
- */
- List<CodeClassifyDO> selectAllLevelChildHasPath(String oid, String fieldInPath,boolean enable);
-
- /**
- * 鏌ヨ鏌愪釜鑺傜偣鐨勬墍鏈夊眰绾т笅绾х殑涓暟
- * @param oid 涓婚敭
- * @return 鎬绘暟
- */
- long countAllLevelChildOid(String oid);
-
- /**
- * 鍙嶅悜浠庡瓙绾ц幏鍙栫埗绾х殑涓婚搴撳垎绫�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- List<CodeClassifyDO> listParentClassify(String codeClassifyOid);
-
- /**
- * 鏌ヨ杩欎釜鍒嗙被鐨剅oot鑺傜偣oid
- */
- CodeClassifyDO getRootClassify(String codeClassifyOid);
-
- /**
- * 鍒ゆ柇杩欎釜鍒嗙被鏄惁灞炰簬wupin鍒嗙被鏍�
- * @param oid
- * @return
- */
- boolean isWupin(String oid);
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
- /**
- * 鏍￠獙鏄惁鍖呭惈瀛愯妭鐐�
- * @param oid 鍒嗙被鐨勪富閿�
- * @return true 琛ㄧず鍖呭惈
- */
- boolean checkHasChild(String oid);
-
- /**
- * 浣跨敤瀛楁鐨勮矾寰勶紝鏌ヨ瀵硅薄
- * @param fieldPath 瀛楁鐨勮矾寰勶紝蹇呴』浠庨《灞傝妭鐐瑰紑濮� xxx/yyy/zz鐨勬牸寮�
- * @param field 瀛楁鐨勮嫳鏂囧悕绉�
- * @return 鍒嗙被鐨勫璞�
- */
- CodeClassifyDO selectByFieldPath(String fieldPath, String field);
-
- /***
- * 鏍规嵁涓婄骇鑺傜偣鑾峰彇涓嬬骇鑺傜偣浠ｅ彿璺緞鍜屽悕绉拌矾寰�
- * @param classifyId
- * @param enable
- * @return
- */
- public List<CodeClassifyDO>getIdPathToNamePathByParentId(String classifyId,boolean enable);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyProcessTempMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyProcessTempMapper.java
deleted file mode 100644
index 1b02928..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyProcessTempMapper.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeClassifyProcessTempDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyProcessTempMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeClassifyProcessTempDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeClassifyProcessTempDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeClassifyProcessTempDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyProcessTempDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeClassifyProcessTempDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeClassifyProcessTempDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeClassifyProcessTempDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeClassifyProcessTempDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyProcessTempDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyProcessTempDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTempMapItemMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTempMapItemMapper.java
deleted file mode 100644
index ad66760..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTempMapItemMapper.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeClassifyTempMapItemDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-03-10
- */
-public interface CodeClassifyTempMapItemMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeClassifyTempMapItemDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeClassifyTempMapItemDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeClassifyTempMapItemDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTempMapItemDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeClassifyTempMapItemDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeClassifyTempMapItemDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeClassifyTempMapItemDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeClassifyTempMapItemDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTempMapItemDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTempMapItemDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateAttrMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateAttrMapper.java
deleted file mode 100644
index 546c428..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateAttrMapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateAttrDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyTemplateAttrMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeClassifyTemplateAttrDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeClassifyTemplateAttrDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeClassifyTemplateAttrDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateAttrDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeClassifyTemplateAttrDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeClassifyTemplateAttrDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeClassifyTemplateAttrDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeClassifyTemplateAttrDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateAttrDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateAttrDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateButtonMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateButtonMapper.java
deleted file mode 100644
index 1aea1d0..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateButtonMapper.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateButtonDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyTemplateButtonMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeClassifyTemplateButtonDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeClassifyTemplateButtonDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeClassifyTemplateButtonDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateButtonDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeClassifyTemplateButtonDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeClassifyTemplateButtonDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeClassifyTemplateButtonDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeClassifyTemplateButtonDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateButtonDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateButtonDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateMapMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateMapMapper.java
deleted file mode 100644
index e042813..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateMapMapper.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateMapDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyTemplateMapMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeClassifyTemplateMapDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeClassifyTemplateMapDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeClassifyTemplateMapDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateMapDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeClassifyTemplateMapDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeClassifyTemplateMapDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeClassifyTemplateMapDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeClassifyTemplateMapDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateMapDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateMapDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateMapper.java
deleted file mode 100644
index 9a364d0..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyTemplateMapper.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍒嗙被妯℃澘瀵硅薄鏁版嵁鎿嶄綔灞�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyTemplateMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 鍒嗙被妯℃澘瀵硅薄鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeClassifyTemplateDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 鍒嗙被妯℃澘瀵硅薄鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeClassifyTemplateDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeClassifyTemplateDO selectByPrimaryKey(String oid);
-
-
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeClassifyTemplateDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeClassifyTemplateDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 鍒嗙被妯℃澘瀵硅薄鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeClassifyTemplateDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 鍒嗙被妯℃澘瀵硅薄鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeClassifyTemplateDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeClassifyTemplateDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
- /**
- * 鑾峰彇鎵�鏈夊眰绾т笅绾х殑涓婚敭
- * @param oid 鏁版嵁涓婚敭
- * @return 鏌ヨ缁撴灉
- */
- List<String> selectAllLevelChildOid(String oid);
-
- /**
- * 鑾峰彇鎵�鏈変笅绾ф暟鎹�
- * @param oid 鏁版嵁涓婚敭
- * @return 鏌ヨ缁撴灉
- */
- List<CodeClassifyTemplateDO> selectAllLevelChild(String oid);
-
- /**
- * 鏌ヨ鏌愪釜鑺傜偣鐨勬墍鏈夊眰绾т笅绾х殑涓暟
- * @param oid 涓婚敭
- * @return 鎬绘暟
- */
- long countAllLevelChildOid(String oid);
-
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
- /**
- * 鏌ヨ鍒嗙被鐨勫瓙鍒嗙被鍖呭惈鐨勬ā鏉跨殑鍐呭
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return key鏄ā鏉跨殑涓婚敭锛寁alue鏄ā鏉挎墍灞炵殑鍒嗙被涓婚敭
- */
- Map<String/**妯℃澘鐨勪富閿�**/, String/**妯℃澘鐨勫垎绫�**/> selectChildHasReleaseTemplate(String codeClassifyOid);
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java
index 9881490..678fdda 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java
@@ -1,14 +1,17 @@
package com.vci.ubcs.code.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.entity.CodeClassifyValue;
/**
* 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰
*
- * @author weidy
+ * @author ludc
* @date 2022-01-24
*/
-public interface CodeClassifyValueMapper extends BaseMapper<CodeClassifyValueMapper> {
+public interface CodeClassifyValueMapper extends BaseMapper<CodeClassifyValue> {
+
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeFixedValueMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeFixedValueMapper.java
index 5f97e92..6070d0f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeFixedValueMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeFixedValueMapper.java
@@ -1,127 +1,15 @@
package com.vci.ubcs.code.mapper;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeFixedValueDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.entity.CodeFixedValue;
/**
* 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰
*
- * @author weidy
+ * @author ludc
* @date 2022-01-24
*/
-public interface CodeFixedValueMapper {
+public interface CodeFixedValueMapper extends BaseMapper<CodeFixedValue> {
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeFixedValueDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeFixedValueDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeFixedValueDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeFixedValueDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeFixedValueDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeFixedValueDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeFixedValueDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeFixedValueDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeFixedValueDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeFixedValueDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeKeyAttrRepeatRuleMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeKeyAttrRepeatRuleMapper.java
deleted file mode 100644
index 75ad029..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeKeyAttrRepeatRuleMapper.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeKeyAttrRepeatRuleDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁鎿嶄綔灞�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeKeyAttrRepeatRuleMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeKeyAttrRepeatRuleDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeKeyAttrRepeatRuleDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeKeyAttrRepeatRuleDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeKeyAttrRepeatRuleDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeKeyAttrRepeatRuleDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏍规嵁缂栧彿鎵归噺鏌ヨ瀵硅薄
- * @param ids 缂栧彿鐨勯泦鍚�
- * @return 涓氬姟瀵硅薄
- */
- List<CodeKeyAttrRepeatRuleDO> selectByIdCollection(Collection<String> ids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeKeyAttrRepeatRuleDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeKeyAttrRepeatRuleDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeKeyAttrRepeatRuleDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeKeyAttrRepeatRuleDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeKeyAttrRepeatRuleDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
deleted file mode 100644
index 9fdc6c8..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodePhaseAttrMapper.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodePhaseAttrDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 闃舵鐨勫睘鎬ф暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodePhaseAttrMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 闃舵鐨勫睘鎬ф暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodePhaseAttrDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 闃舵鐨勫睘鎬ф暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodePhaseAttrDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodePhaseAttrDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodePhaseAttrDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodePhaseAttrDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodePhaseAttrDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 闃舵鐨勫睘鎬ф暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodePhaseAttrDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 闃舵鐨勫睘鎬ф暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodePhaseAttrDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodePhaseAttrDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodePhaseAttrDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeResembleRuleMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeResembleRuleMapper.java
deleted file mode 100644
index 341f24a..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeResembleRuleMapper.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeResembleRuleDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鐩镐技鏌ヨ瑙勫垯鏁版嵁鎿嶄綔灞�
- *
- * @author weidy
- * @date 2022-04-10
- */
-public interface CodeResembleRuleMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 鐩镐技鏌ヨ瑙勫垯鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeResembleRuleDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 鐩镐技鏌ヨ瑙勫垯鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeResembleRuleDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeResembleRuleDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeResembleRuleDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeResembleRuleDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeResembleRuleDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 鐩镐技鏌ヨ瑙勫垯鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeResembleRuleDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 鐩镐技鏌ヨ瑙勫垯鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeResembleRuleDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeResembleRuleDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeResembleRuleDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java
index 0fee82c..f408ad9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java
@@ -1,155 +1,30 @@
package com.vci.ubcs.code.mapper;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeRuleDO;
-import com.vci.web.pageModel.BatchCBO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.vci.ubcs.code.entity.CodeRule;
+import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import org.apache.ibatis.annotations.Param;
-import java.util.Collection;
import java.util.List;
-import java.util.Map;
/**
* 涓绘暟鎹紪鐮佽鍒欐暟鎹搷浣滃眰
*
- * @author weidy
+ * @author ludc
* @date 2022-01-24
*/
-public interface CodeRuleMapper {
+public interface CodeRuleMapper extends BaseMapper<CodeRule> {
+
/**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 涓绘暟鎹紪鐮佽鍒欐暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeRuleDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 涓绘暟鎹紪鐮佽鍒欐暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeRuleDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeRuleDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeRuleDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeRuleDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 浣跨敤缂栧彿闆嗗悎鎵归噺鏌ヨ瀵硅薄
- * @param ids 缂栧彿鐨勯泦鍚�
- * @return 涓氬姟瀵硅薄
+ * 鑷畾涔夊垎椤�
+ *
+ * @param page
+ * @param codeRule
+ * @return
*/
- List<CodeRuleDO> selectByIdCollection(Collection<String> ids);
+ List<CodeRule> selectCodeRulePage(IPage page,@Param("codeRule") CodeRuleVO codeRule);
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeRuleDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 涓绘暟鎹紪鐮佽鍒欐暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeRuleDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 涓绘暟鎹紪鐮佽鍒欐暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeRuleDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeRuleDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeRuleDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
- /**
- * 鍒犻櫎鏁版嵁涓嶈繘琛屾寔涔呭寲锛岃浆鍖栦负batchCBO
- * @param codeRule 缂栫爜瑙勫垯瀵硅薄
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO delete4BatchCBO (CodeRuleDO codeRule);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSerialValueMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSerialValueMapper.java
deleted file mode 100644
index 1b68b5b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSerialValueMapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeSerialValueDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 娴佹按鐨勫�兼暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-03-01
- */
-public interface CodeSerialValueMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 娴佹按鐨勫�兼暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeSerialValueDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 娴佹按鐨勫�兼暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeSerialValueDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeSerialValueDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeSerialValueDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeSerialValueDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeSerialValueDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 娴佹按鐨勫�兼暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeSerialValueDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 娴佹按鐨勫�兼暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeSerialValueDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeSerialValueDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeSerialValueDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSynonymMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSynonymMapper.java
deleted file mode 100644
index 6024756..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeSynonymMapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeSynonymDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍚屼箟璇嶉厤缃暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-02-17
- */
-public interface CodeSynonymMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 鍚屼箟璇嶉厤缃暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeSynonymDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 鍚屼箟璇嶉厤缃暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeSynonymDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeSynonymDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeSynonymDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeSynonymDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeSynonymDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 鍚屼箟璇嶉厤缃暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeSynonymDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 鍚屼箟璇嶉厤缃暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeSynonymDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeSynonymDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeSynonymDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeTemplatePhaseMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeTemplatePhaseMapper.java
deleted file mode 100644
index d622317..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeTemplatePhaseMapper.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.CodeTemplatePhaseDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 妯℃澘闃舵鏁版嵁鎿嶄綔灞�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeTemplatePhaseMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 妯℃澘闃舵鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(CodeTemplatePhaseDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 妯℃澘闃舵鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<CodeTemplatePhaseDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- CodeTemplatePhaseDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeTemplatePhaseDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<CodeTemplatePhaseDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<CodeTemplatePhaseDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 妯℃澘闃舵鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(CodeTemplatePhaseDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 妯℃澘闃舵鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<CodeTemplatePhaseDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeTemplatePhaseDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<CodeTemplatePhaseDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
- /**
- * 鎵归噺淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬�
- * @param oids 涓婚敭闆嗗悎锛屼笉鑳藉ぇ浜�1000
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐨勫��
- * @return 鎵ц鐨勭粨鏋�
- */
- long batchUpdateLcStatus(Collection<String> oids, String lcStatus);
- /**
- * 鏍规嵁涓婚敭鏇存柊鐘舵��
- * @param oid 涓婚敭
- * @param lcStatus 鐢熷懡鍛ㄦ湡鐘舵��
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- int updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingDataMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingDataMapper.java
deleted file mode 100644
index 1d00f44..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingDataMapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.DockingDataDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-03-28
- */
-public interface DockingDataMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(DockingDataDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<DockingDataDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- DockingDataDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingDataDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<DockingDataDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<DockingDataDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(DockingDataDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<DockingDataDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingDataDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingDataDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingLogeMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingLogeMapper.java
deleted file mode 100644
index f145119..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingLogeMapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.DockingLogeDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇楁暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-03-28
- */
-public interface DockingLogeMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇楁暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(DockingLogeDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇楁暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<DockingLogeDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- DockingLogeDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingLogeDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<DockingLogeDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<DockingLogeDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇楁暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(DockingLogeDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇楁暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<DockingLogeDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingLogeDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingLogeDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreApplyDataInfoMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreApplyDataInfoMapper.java
deleted file mode 100644
index f0f390b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreApplyDataInfoMapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.DockingPreApplyDataInfoDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁鎿嶄綔灞�
- *
- * @author weidy
- * @date 2022-04-05
- */
-public interface DockingPreApplyDataInfoMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(DockingPreApplyDataInfoDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<DockingPreApplyDataInfoDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- DockingPreApplyDataInfoDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreApplyDataInfoDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<DockingPreApplyDataInfoDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<DockingPreApplyDataInfoDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(DockingPreApplyDataInfoDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<DockingPreApplyDataInfoDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreApplyDataInfoDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreApplyDataInfoDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreApplyDataMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreApplyDataMapper.java
deleted file mode 100644
index af32e99..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreApplyDataMapper.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.DockingPreApplyDataDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁鎿嶄綔灞�
- *
- * @author weidy
- * @date 2022-04-05
- */
-public interface DockingPreApplyDataMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(DockingPreApplyDataDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<DockingPreApplyDataDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- DockingPreApplyDataDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreApplyDataDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<DockingPreApplyDataDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<DockingPreApplyDataDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(DockingPreApplyDataDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<DockingPreApplyDataDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreApplyDataDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreApplyDataDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreAttrMappingMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreAttrMappingMapper.java
deleted file mode 100644
index b08a569..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreAttrMappingMapper.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.DockingPreAttrMappingDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 灞炴�ф槧灏勯厤缃暟鎹俊鎭暟鎹搷浣滃眰
- *
- * @author xiejun
- * @date 2023-01-06
- */
-public interface DockingPreAttrMappingMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(DockingPreAttrMappingDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<DockingPreAttrMappingDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- DockingPreAttrMappingDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreAttrMappingDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<DockingPreAttrMappingDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<DockingPreAttrMappingDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(DockingPreAttrMappingDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<DockingPreAttrMappingDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreAttrMappingDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreAttrMappingDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
- /**
- * 鏍规嵁oid鏌ヨ鏁版嵁
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- public List<DockingPreAttrMappingDO> selectByOid(String oids);
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreAttrRangeMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreAttrRangeMapper.java
deleted file mode 100644
index 6ebcf28..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreAttrRangeMapper.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.DockingPreAttrRangeDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public interface DockingPreAttrRangeMapper {
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(DockingPreAttrRangeDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<DockingPreAttrRangeDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- DockingPreAttrRangeDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreAttrRangeDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<DockingPreAttrRangeDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<DockingPreAttrRangeDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(DockingPreAttrRangeDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<DockingPreAttrRangeDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreAttrRangeDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreAttrRangeDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
- /**
- * 鏍规嵁灞炴�т富閿壒閲忚幏鍙栧璞�
- * @param attrOid 涓婚敭
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingPreAttrRangeDO> selectByAttrOid(String attrOid);
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingTaskMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingTaskMapper.java
deleted file mode 100644
index f2186b8..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingTaskMapper.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.DockingTaskDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-03-28
- */
-public interface DockingTaskMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(DockingTaskDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<DockingTaskDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- DockingTaskDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingTaskDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<DockingTaskDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<DockingTaskDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(DockingTaskDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｅ緟鎺ㄩ�佷换鍔℃暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<DockingTaskDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingTaskDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<DockingTaskDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntAuthorityMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntAuthorityMapper.java
deleted file mode 100644
index c2548bc..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntAuthorityMapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.SysIntAuthorityDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹搷浣滃眰
- *
- * @author lihang
- * @date 2022-03-07
- */
-public interface SysIntAuthorityMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(SysIntAuthorityDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<SysIntAuthorityDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- SysIntAuthorityDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntAuthorityDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<SysIntAuthorityDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<SysIntAuthorityDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(SysIntAuthorityDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<SysIntAuthorityDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntAuthorityDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntAuthorityDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntBaseMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntBaseMapper.java
deleted file mode 100644
index f724741..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntBaseMapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.SysIntBaseDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹搷浣滃眰
- *
- * @author lihang
- * @date 2022-03-07
- */
-public interface SysIntBaseMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(SysIntBaseDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<SysIntBaseDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- SysIntBaseDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntBaseDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<SysIntBaseDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<SysIntBaseDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(SysIntBaseDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<SysIntBaseDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntBaseDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntBaseDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntHeaderMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntHeaderMapper.java
deleted file mode 100644
index 302bbfd..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntHeaderMapper.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.SysIntHeaderDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-04-11
- */
-public interface SysIntHeaderMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(SysIntHeaderDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<SysIntHeaderDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- SysIntHeaderDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntHeaderDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<SysIntHeaderDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<SysIntHeaderDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(SysIntHeaderDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<SysIntHeaderDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntHeaderDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntHeaderDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
- //==
-
- /**
- * 鏍规嵁sysinfo涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param sysinfoOid 涓婚敭
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntHeaderDO> selectBySysinfoOid(String sysinfoOid);
-
- /**
- * 鎵归噺淇敼杩欎釜sysinfo鐨刪eader锛屽厛鍒犻櫎sysinfo鎵�鏈夌殑header,鍐嶆柊寤烘墍鏈夌殑
- * @param records
- */
- BaseResult updateSysinfoHeader(List<SysIntHeaderDO> records);
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntInfoMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntInfoMapper.java
deleted file mode 100644
index 52b3bc5..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntInfoMapper.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.SysIntInfoDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁鎿嶄綔灞�
- *
- * @author lihang
- * @date 2022-03-07
- */
-public interface SysIntInfoMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(SysIntInfoDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<SysIntInfoDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- SysIntInfoDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntInfoDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<SysIntInfoDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<SysIntInfoDO> selectAll(Map conditonMap);
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(SysIntInfoDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁瀵硅薄闆嗗悎
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<SysIntInfoDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntInfoDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntInfoDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntParamMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntParamMapper.java
deleted file mode 100644
index 3fc4bea..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/SysIntParamMapper.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.SysIntParamDO;
-import com.vci.web.pageModel.BatchCBO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹搷浣滃眰
- *
- * @author weidy
- * @date 2022-04-11
- */
-public interface SysIntParamMapper {
-
- /**
- * 浣跨敤涓婚敭鍒犻櫎
- * @param oid 鏁版嵁涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO deleteByPrimaryKey(String oid);
-
- /**
- * 娣诲姞鏁版嵁
- * @param record 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO insert(SysIntParamDO record);
-
- /**
- * 鎵归噺娣诲姞鏁版嵁
- * @param records 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉鏁�
- */
- BatchCBO batchInsert(List<SysIntParamDO> records);
-
- /**
- * 鏍规嵁涓婚敭鏌ヨ
- * @param oid 鏁版嵁涓婚敭
- * @return 鏁版嵁瀵硅薄
- */
- SysIntParamDO selectByPrimaryKey(String oid);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param oids 涓婚敭锛屽寘鍚崟寮曞彿,浣嗘槸涓嶈兘瓒呰繃1000
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntParamDO> selectByPrimaryKeys(String oids);
-
- /**
- * 鏍规嵁涓婚敭鎵归噺鏌ヨ瀵硅薄
- * @param oids 瀵硅薄涓婚敭,浣跨敤閫楀彿鍒嗛殧锛屼絾鏄笉鑳借秴杩�1000
- * @return 涓氬姟瀵硅薄
- */
- List<SysIntParamDO> selectByPrimaryKeyCollection(Collection<String> oids);
-
- /**
- * 鏌ヨ鎵�鏈夊垎绫�
- * @return 鏌ヨ缁撴灉
- */
- List<SysIntParamDO> selectAll();
-
- /**
- * 鏇存柊瀵硅薄
- * @param record 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞�
- * @return 鎵ц缁撴灉
- */
- BatchCBO updateByPrimaryKey(SysIntParamDO record);
-
- /**
- * 鎵归噺鏇存柊
- * @param records 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞￠泦鍚�
- * @return 鎵ц缁撴灉琛屾暟
- */
- BatchCBO batchUpdate(List<SysIntParamDO> records);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏌ヨ鏁版嵁
- * @param conditionMap 鏌ヨ鏉′欢锛�
- * @param pageHelper 鍖呮嫭鍒嗛〉锛屾帓搴�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntParamDO> selectByCondition(Map<String,String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁鏌ヨ鏉′欢鏉ユ煡璇㈡�绘暟
- * @param conditionMap 鏌ヨ鏉′欢
- * @return 鎬绘暟
- */
- Long countByCondition(Map<String,String> conditionMap);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntParamDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁鏌ヨ灏佽鍣ㄦ潵鏌ヨ鎬绘暟
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鎬绘暟
- */
- Long countByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 鏍规嵁涓婚敭鑾峰彇鍚嶇О
- * @param oid 涓婚敭
- * @return 涓枃鍚嶇О
- */
- String selectNameByOid(String oid);
-
-
-
- /**
- * 鎵归噺鍒犻櫎瀵硅薄
- * @param oids 瀵硅薄鐨勪富閿泦鍚�
- * @return 鍙楀奖鍝嶇殑琛屾暟
- */
- BatchCBO batchDeleteByOids(Collection<String> oids);
-
- //==
-
- /**
- * 鏍规嵁sysinfo涓婚敭鎵归噺鑾峰彇瀵硅薄
- * @param sysinfoOid 涓婚敭
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- List<SysIntParamDO> selectBySysinfoOid(String sysinfoOid);
-
- /**
- * 鎵归噺淇敼杩欎釜sysinfo鐨刾aram锛屽厛鍒犻櫎sysinfo鎵�鏈夌殑header,鍐嶆柊寤烘墍鏈夌殑
- * @param records
- */
- BaseResult updateSysinfoParam(List<SysIntParamDO> records);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeBasicSecServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeBasicSecServiceI.java
deleted file mode 100644
index 44d372d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeBasicSecServiceI.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeBasicSecDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.ubcs.code.dto.CodeBasicSecDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鐮佹鍩虹淇℃伅鏈嶅姟鎺ュ彛
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeBasicSecServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑鐮佹鍩虹淇℃伅
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeBasicSecVO> gridCodeBasicSec(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSecDO> codeBasicSecDOs) throws VciBaseException;
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- *
- * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃
- * @param hasFixedValue 鏄惁鏈夊浐瀹氬��
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSecDO> codeBasicSecDOs, boolean hasFixedValue) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeBasicSecDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSecDO codeBasicSecDO) throws VciBaseException;
-
- /**
- * 澧炲姞鐮佹鍩虹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeBasicSecVO addSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException;
-
- /**
- * 淇敼鐮佹鍩虹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeBasicSecVO editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎鐮佹鍩虹淇℃伅
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeBasicSec(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鐮佹鍩虹淇℃伅
- * @param oid 涓婚敭
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeBasicSecVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鐮佹鍩虹淇℃伅
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeBasicSecVO> listCodeBasicSecByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeBasicSecVO> refDataGridCodeBasicSec(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 涓婚敭鍒犻櫎鐮佹鍩虹淇℃伅
- * @param oid 鐮佹鍩虹淇℃伅涓婚敭
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeBasicSecByPrimaryKey(String oid) throws VciBaseException;
-
- /**
- * 鍏嬮殕鐮佹淇℃伅
- * @param oidList 婧愮爜娈典俊鎭富閿泦鍚�
- * @param pkCodeRule 鐩爣缂栫爜瑙勫垯
- * @return 鍏嬮殕缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- BaseResult cloneCodeBasicSec(List<String> oidList, String pkCodeRule);
-
- /**
- * 鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋�
- * @param oid 鐩爣鍒嗙被鐮佹涓婚敭
- * @return 鍒嗙被鐮佹鏍戠粨鏋�
- */
- List<Tree> gridCodeClassifySecTree(String oid);
-
- /**
- * 鏍规嵁鐮佹鍒嗙被鐨勭被鍨嬪垽鏂睘鎬ф槸鍚︽槸绌虹殑
- *
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鏈夌┖鐨勫垯浼爇ey-灞炴�у悕 value-瀛楁鍚箟锛屾病鏈夌┖鐨勫垯浼� key-success value-true
- */
- KeyValue checkAttrNullableBySecType(CodeBasicSecDTO codeBasicSecDTO);
-
- /**
- * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭
- * @param ruleOid 瑙勫垯鐨勫唴瀹�
- * @return 鐮佹鐨勫唴瀹�
- */
- List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid);
-
- /**
- * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鐨勫唴瀹�
- * @param ruleCollection 瑙勫垯涓婚敭闆嗗悎
- * @return 鐮佹鐨勫唴瀹�
- */
- List<CodeBasicSecVO> listCodeBasicSecByRuleOids(Collection<String> ruleCollection);
-
- /**
- * 鍙傜収鍒嗙被鐨勭爜娈�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鐨勫璞�
- * @return 鐮佹鐨勫唴瀹�
- */
- DataGrid<CodeBasicSecVO> refDataGridClassifySec(Map<String, String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁缂栫爜瑙勫垯鎵归噺鍒犻櫎鐮佹鍩烘湰淇℃伅
- * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭
- * @return 鎵ц缁撴灉
- */
- BatchCBO batchDeleteSecByCodeRuleOid(String codeRuleOid);
-
- /**
- * 涓婄Щ
- * @param oid 涓婚敭
- */
- void upOrderNum(String oid);
-
- /**
- * 涓嬬Щ
- * @param oid 涓婚敭
- */
- void downOrderNum(String oid);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeButtonServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeButtonServiceI.java
deleted file mode 100644
index e8e6fb4..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeButtonServiceI.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeButtonDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.CodeButtonDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeButtonVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓绘暟鎹腑鐨勬寜閽墿灞曟湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeButtonServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeButtonVO> gridCodeButton(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeButtonDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeButtonVO> codeButtonDO2VOs(Collection<CodeButtonDO> codeButtonDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeButtonDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeButtonVO codeButtonDO2VO(CodeButtonDO codeButtonDO) throws VciBaseException;
-
- /**
- * 澧炲姞涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param codeButtonDTO 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeButtonVO addSave(CodeButtonDTO codeButtonDTO) throws VciBaseException;
-
- /**
- * 淇敼涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param codeButtonDTO 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeButtonVO editSave(CodeButtonDTO codeButtonDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param codeButtonDTO 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeButton(CodeButtonDTO codeButtonDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param oid 涓婚敭
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeButtonVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeButtonVO> listCodeButtonByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収涓绘暟鎹腑鐨勬寜閽墿灞曞垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeButtonVO> refDataGridCodeButton(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 鍚敤
- * @param buttonDTO 鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BaseResult enableCodeButton(CodeButtonDTO buttonDTO);
-
- /**
- * 鍋滅敤
- * @param buttonDTO 鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- */
- BaseResult disableCodeButton(CodeButtonDTO buttonDTO);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyProcessTempServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyProcessTempServiceI.java
deleted file mode 100644
index 346c193..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyProcessTempServiceI.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeClassifyProcessTempDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyProcessTempServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyProcessTempDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyProcessTempVO> codeClassifyProcessTempDO2VOs(Collection<CodeClassifyProcessTempDO> codeClassifyProcessTempDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyProcessTempDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeClassifyProcessTempVO codeClassifyProcessTempDO2VO(CodeClassifyProcessTempDO codeClassifyProcessTempDO) throws VciBaseException;
-
- /**
- * 澧炲姞鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyProcessTempVO addSave(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) throws VciBaseException;
-
- /**
- * 淇敼鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyProcessTempVO editSave(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeClassifyProcessTemp(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param oid 涓婚敭
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyProcessTempVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeClassifyProcessTempVO> listCodeClassifyProcessTempByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉垮垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
- * @param classifyTemplateOid 妯℃澘鐨勪富閿�
- * @return 鍙楀奖鍝嶇殑鍐呭
- */
- BatchCBO codeTemplateDeleteTrigger(String classifyTemplateOid) ;
-
- /**
- * 鑾峰彇娴佺▼鐨勬ā鏉跨殑淇℃伅
- * @param codeTemplateOid 妯℃澘鐨勪富閿�
- * @param processUse 鐢ㄩ��
- * @return 妯℃澘鐨勪俊鎭�
- */
- List<CodeClassifyProcessTempVO> listProcessTemplate(String codeTemplateOid, String processUse);
-
- /**
- * 浣跨敤妯℃澘鍚嶇О鏌ヨ
- * @param codeTemplateOid 鍒嗙被妯℃澘涓婚敭
- * @param processName 妯℃澘鍚嶇О
- */
- CodeClassifyProcessTempVO getProcessTempVOByName(String codeTemplateOid,String processName);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyServiceI.java
deleted file mode 100644
index d3435af..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyServiceI.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeClassifyDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.OsAttributeVO;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.dto.CodeClassifyDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 涓婚搴撳垎绫绘湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-20
- */
-public interface CodeClassifyServiceI {
- /**
- * 鏌ヨ涓婚搴撳垎绫� 鏍�
- * @param treeQueryObject 鏍戞煡璇㈠璞�
- * @return 涓婚搴撳垎绫� 鏄剧ず鏍�
- * @throws VciBaseException 鏌ヨ鏉′欢涓嶇鍚堣姹傜殑鏃跺�欎細鎶涘嚭寮傚父
- */
- List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) throws VciBaseException;
-
- /**
- * 涓婚搴撶殑鏍�
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 涓婚搴撴樉绀烘爲
- */
- List<Tree> treeTopCodeClassify(TreeQueryObject treeQueryObject);
-
- /**
- * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
- *
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鏌ヨ缁撴灉,鏁版嵁瀵硅薄
- */
- List<CodeClassifyDO> selectCodeClassifyDOByTree(TreeQueryObject treeQueryObject);
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyVO> codeClassifyDO2VOs(Collection<CodeClassifyDO> codeClassifyDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeClassifyVO codeClassifyDO2VO(CodeClassifyDO codeClassifyDO) throws VciBaseException;
-
- /**
- * 澧炲姞涓婚搴撳垎绫�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyVO addSave(CodeClassifyDTO codeClassifyDTO) throws VciBaseException;
-
- /**
- * 淇敼涓婚搴撳垎绫�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- BaseResult editSave(CodeClassifyDTO codeClassifyDTO) throws VciBaseException;
-
-
- /**
- * 妫�鏌� 涓婚搴撳垎绫绘槸鍚﹀垹闄�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴��
- * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult checkIsCanDelete(CodeClassifyDTO codeClassifyDTO) throws VciBaseException;
-
- /**
- * 妫�鏌ユ槸鍚︽湁涓嬬骇鏄惁鍏宠仈浜嗘暟鎹�
- *
- * @param oid 涓婚敭
- * @return true 琛ㄧず鏈夊紩鐢紝false琛ㄧず娌℃湁寮曠敤
- * @throws VciBaseException 鍙傛暟涓虹┖鍜屾湁寮曠敤鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- boolean checkChildIsLinked(String oid) throws VciBaseException;
-
- /**
- * 鏍￠獙鏄惁鏈変笅绾ц妭鐐癸紝涓嶆牎楠屾槸鍚﹀叧鑱斾簡鏁版嵁
- *
- * @param oid 涓婚敭
- * @return true琛ㄧず鏈変笅绾э紝false琛ㄧず娌℃湁涓嬬骇
- * @throws VciBaseException 鍙傛暟閿欒锛屾垨鑰呮暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- boolean checkHasChild(String oid) throws VciBaseException;
-
- /**
- * 鍒犻櫎涓婚搴撳垎绫�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeClassify(CodeClassifyDTO codeClassifyDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撳垎绫�
- * @param oid 涓婚敭
- * @return 涓婚搴撳垎绫绘樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撳垎绫�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撳垎绫绘樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeClassifyVO> listCodeClassifyByOids(Collection<String> oidCollections) throws VciBaseException;
-
- /**
- * 鍙傜収鏍� 涓婚搴撳垎绫�
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 涓婚搴撳垎绫绘樉绀烘爲
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- List<Tree> referTree(TreeQueryObject treeQueryObject) throws VciBaseException;
-
- /**
- * 鍚敤銆佸仠鐢�
- * @param oid 涓婚敭
- * @param lcStatus 鐘舵��
- * @return 鎵ц缁撴灉
- */
- BaseResult updateLcStatus( String oid, String lcStatus);
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄
- */
- List<CodeClassifyDO> selectByWrapper(VciQueryWrapperForDO queryWrapper);
-
- /**
- * 浣跨敤鍒嗙被涓婚敭鑾峰彇鍒嗙被鐩稿叧鐨勬墍鏈変俊鎭�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 鍒嗙被涓婄骇锛屼笅绾х殑淇℃伅
- */
- CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid);
-
- /**
- * 鑾峰彇褰撳墠鍒嗙被鐨勯《灞傚垎绫�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 椤跺眰鍒嗙被鐨勪俊鎭�
- */
- CodeClassifyVO getTopClassifyVO(String codeClassifyOid);
-
- /**
- * 缁熻瀛愯妭鐐圭殑涓暟
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 涓暟
- */
- int countChildrenByClassifyOid(String codeClassifyOid);
- /**
- * 鑾峰彇瀛愮骇鐨勪富棰樺簱鍒嗙被
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param allLevel 鏄惁鎵�鏈夌殑灞傜骇
- * @param fieldInPath 鍦ㄨ矾寰勪腑鐨勫瓧娈�
- * @param enable 鏄惁鍙樉绀哄惎鐢�
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- List<CodeClassifyVO> listChildrenClassify(String codeClassifyOid, boolean allLevel, String fieldInPath, boolean enable);
-
- /**
- * 鍙嶅悜浠庡瓙绾ц幏鍙栫埗绾х殑涓婚搴撳垎绫�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- List<CodeClassifyVO> listParentClassify(String codeClassifyOid);
-
- /**
- * 瀵煎嚭鍒嗙被
- * @param oid 鍒嗙被涓婚敭
- * @return excel鏂囦欢璺緞
- */
- String exportClassify(String oid);
-
- /**
- * 鍒涘缓瀵煎叆妯℃澘
- * @return excel鏂囦欢璺緞
- */
- String createImportExcel();
-
- /**
- * 瀵煎叆鍒嗙被
- * @param file1 鏂囦欢鐨勪俊鎭�
- */
- void importClassify(File file1);
-
- /**
- * 鑾峰彇鍒嗙被鍏宠仈鐨勫睘鎬�
- * @param baseQueryObject 鏌ヨ瀵硅薄锛屽繀椤绘湁codeClassifyOid锛屾敮鎸乮d鍜宯ame涓ょ鏌ヨ鏉′欢
- * @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴��
- */
- DataGrid<OsAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject);
-
- /**
- * 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
- * @param idPath 缂栧彿鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- CodeClassifyVO getObjectByIdPath(String idPath);
-
- /**
- * 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
- * @param clsfNamePath 鍒嗙被鍚嶇О鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- CodeClassifyVO getObjectByClsfNamePath(String clsfNamePath);
-
- /***
- * 鏍规嵁涓婄骇鑺傜偣鑾峰彇涓嬬骇鑺傜偣浠ｅ彿璺緞鍜屽悕绉拌矾寰�
- * @param classifyId
- * @param enable
- * @return
- */
- public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId,boolean enable);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTempMapItemServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTempMapItemServiceI.java
deleted file mode 100644
index 16fee6b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTempMapItemServiceI.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeClassifyTempMapItemDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.CodeClassifyTempMapItemDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTempMapItemVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鏄犲皠瑙勫垯鐨勬槑缁嗘湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-03-10
- */
-public interface CodeClassifyTempMapItemServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑鏄犲皠瑙勫垯鐨勬槑缁�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyTempMapItemVO> gridCodeClassifyTempMapItem(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTempMapItemDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyTempMapItemVO> codeClassifyTempMapItemDO2VOs(Collection<CodeClassifyTempMapItemDO> codeClassifyTempMapItemDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTempMapItemDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeClassifyTempMapItemVO codeClassifyTempMapItemDO2VO(CodeClassifyTempMapItemDO codeClassifyTempMapItemDO) throws VciBaseException;
-
- /**
- * 澧炲姞鏄犲皠瑙勫垯鐨勬槑缁�
- * @param codeClassifyTempMapItemDTO 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTempMapItemVO addSave(CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO) throws VciBaseException;
-
- /**
- * 淇敼鏄犲皠瑙勫垯鐨勬槑缁�
- * @param codeClassifyTempMapItemDTO 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTempMapItemVO editSave(CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎鏄犲皠瑙勫垯鐨勬槑缁�
- * @param codeClassifyTempMapItemDTO 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeClassifyTempMapItem(CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鏄犲皠瑙勫垯鐨勬槑缁�
- * @param oid 涓婚敭
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTempMapItemVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鏄犲皠瑙勫垯鐨勬槑缁�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeClassifyTempMapItemVO> listCodeClassifyTempMapItemByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収鏄犲皠瑙勫垯鐨勬槑缁嗗垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyTempMapItemVO> refDataGridCodeClassifyTempMapItem(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateAttrServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateAttrServiceI.java
deleted file mode 100644
index a61cbd2..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateAttrServiceI.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeClassifyTemplateAttrDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseQueryObject;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.pageModel.OsBtmTypeAttributeVO;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateAttrDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyTemplateAttrServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyTemplateAttrVO> gridCodeClassifyTemplateAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateAttrDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrDO2VOs(Collection<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateAttrDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateAttrVO codeClassifyTemplateAttrDO2VO(CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO) throws VciBaseException;
-
- /**
- * 澧炲姞涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateAttrVO addSave(CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO) throws VciBaseException;
- List<CodeClassifyTemplateAttrVO> batchAddSave(List<CodeClassifyTemplateAttrDTO> codeClassifyTemplateAttrDTOs) throws VciBaseException;
-
- /**
- * 淇敼涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- BaseResult editSave(CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeClassifyTemplateAttr(CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param oid 涓婚敭
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateAttrVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeClassifyTemplateAttrVO> listCodeClassifyTemplateAttrByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収涓婚搴撳垎绫荤殑妯℃澘灞炴�у垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyTemplateAttrVO> refDataGridCodeClassifyTemplateAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 鏌ヨ杩欎釜妯℃澘锛屼笟鍔＄被鍨嬩笅鐨勬墍鏈夋湭閫夋嫨鐨勫睘鎬�
- * @param baseQueryObject
- * @return
- */
- DataGrid<OsBtmTypeAttributeVO> codeClassifyTemplateAttrByBtm(BaseQueryObject baseQueryObject);
-
- /**
- * 鏌ヨ杩欎釜妯℃澘锛屼笟鍔＄被鍨嬩笅宸查�夋嫨鐨勫睘鎬�
- * @param baseQueryObject
- * @return
- */
- DataGrid<OsBtmTypeAttributeVO> codeClassifyTemplateAttrByBtmHave(BaseQueryObject baseQueryObject);
-
- /**
- * 鍚屾鍒板叾浠栨ā鏉�
- * @param codeClassifyTemplateAttrDTO oid
- * @return
- */
- BaseResult copyto(CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO) throws VciBaseException;
-
- /**
- * 浣跨敤妯℃澘鐨勪富閿幏鍙栨ā鏉跨殑灞炴��--鎵归噺
- * @param templateOidCollection 妯℃澘鐨勪富閿�
- * @return 灞炴�х殑淇℃伅
- */
- List<CodeClassifyTemplateAttrVO> listCodeClassifyTemplateAttrByTemplateOids(Collection<String> templateOidCollection);
-
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateButtonServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateButtonServiceI.java
deleted file mode 100644
index 5930be2..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateButtonServiceI.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeClassifyTemplateButtonDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateButtonDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateButtonVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyTemplateButtonServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyTemplateButtonVO> gridCodeClassifyTemplateButton(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateButtonDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyTemplateButtonVO> codeClassifyTemplateButtonDO2VOs(Collection<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOs) throws VciBaseException;
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateButtonDOs 鏁版嵁瀵硅薄鍒楄〃
- * @param hasButtonVO 鏄惁鍖呭惈鎸夐挳鐨勪俊鎭�
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyTemplateButtonVO> codeClassifyTemplateButtonDO2VOs(Collection<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOs, boolean hasButtonVO) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateButtonDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateButtonVO codeClassifyTemplateButtonDO2VO(CodeClassifyTemplateButtonDO codeClassifyTemplateButtonDO) throws VciBaseException;
-
- /**
- * 澧炲姞涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateButtonVO addSave(CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) throws VciBaseException;
-
- /**
- * 淇敼涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateButtonVO editSave(CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeClassifyTemplateButton(CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param oid 涓婚敭
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateButtonVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeClassifyTemplateButtonVO> listCodeClassifyTemplateButtonByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyTemplateButtonVO> refDataGridCodeClassifyTemplateButton(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
- * @param classifyTemplateOid 妯℃澘鐨勪富閿�
- * @return 鍙楀奖鍝嶇殑鏁版嵁
- */
- BatchCBO codeTemplateDeleteTrigger(String classifyTemplateOid);
-
- /**
- * 浣跨敤妯℃澘涓婚敭鑾峰彇鎵╁睍鐨勬寜閽�
- * @param templateOid 妯℃澘鐨勪富閿�
- * @return 鎸夐挳鐨勭浉鍏崇殑淇℃伅
- */
- List<CodeClassifyTemplateButtonVO> listButtonByTemplateOid(String templateOid);
-
- /**
- * 浣跨敤妯℃澘涓婚敭鑾峰彇鎵╁睍鐨勬寜閽�
- * @param templateOid 妯℃澘鐨勪富閿�
- * @param hasButtonVO 鏄惁鍖呭惈鎸夐挳鐨勬樉绀轰俊鎭�
- * @return 鎸夐挳鐨勭浉鍏崇殑淇℃伅
- */
- List<CodeClassifyTemplateButtonVO> listButtonByTemplateOid(String templateOid,boolean hasButtonVO);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateMapServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateMapServiceI.java
deleted file mode 100644
index 3ba6d0d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateMapServiceI.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeClassifyTemplateMapDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateMapDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateMapVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓婚搴撴ā鏉挎槧灏勮鍒欐湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyTemplateMapServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyTemplateMapVO> gridCodeClassifyTemplateMap(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateMapDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyTemplateMapVO> codeClassifyTemplateMapDO2VOs(Collection<CodeClassifyTemplateMapDO> codeClassifyTemplateMapDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateMapDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateMapVO codeClassifyTemplateMapDO2VO(CodeClassifyTemplateMapDO codeClassifyTemplateMapDO) throws VciBaseException;
-
- /**
- * 澧炲姞涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param codeClassifyTemplateMapDTO 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateMapVO addSave(CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO) throws VciBaseException;
-
- /**
- * 淇敼涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param codeClassifyTemplateMapDTO 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateMapVO editSave(CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param codeClassifyTemplateMapDTO 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeClassifyTemplateMap(CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param oid 涓婚敭
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateMapVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeClassifyTemplateMapVO> listCodeClassifyTemplateMapByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収涓婚搴撴ā鏉挎槧灏勮鍒欏垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyTemplateMapVO> refDataGridCodeClassifyTemplateMap(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateServiceI.java
deleted file mode 100644
index e087563..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyTemplateServiceI.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.vci.ubcs.code.entity.CodeClassifyTemplateDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍒嗙被妯℃澘瀵硅薄鏈嶅姟鎺ュ彛
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyTemplateServiceI {
- /**
- * 鏌ヨ鍒嗙被妯℃澘瀵硅薄 鏍�
- * @param treeQueryObject 鏍戞煡璇㈠璞�
- * @return 鍒嗙被妯℃澘瀵硅薄 鏄剧ず鏍�
- * @throws VciBaseException 鏌ヨ鏉′欢涓嶇鍚堣姹傜殑鏃跺�欎細鎶涘嚭寮傚父
- */
- List<Tree> treeCodeClassifyTemplate(TreeQueryObject treeQueryObject) throws VciBaseException;
- /**
- * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
- *
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鏌ヨ缁撴灉,鏁版嵁瀵硅薄
- */
- List<CodeClassifyTemplateDO> selectCodeClassifyTemplateDOByTree(TreeQueryObject treeQueryObject);
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyTemplateVO> codeClassifyTemplateDO2VOs(Collection<CodeClassifyTemplateDO> codeClassifyTemplateDOs) throws VciBaseException;
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateDOs 鏁版嵁瀵硅薄鍒楄〃
- * @param hasAttr 鏄惁鍖呭惈灞炴��
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyTemplateVO> codeClassifyTemplateDO2VOs(Collection<CodeClassifyTemplateDO> codeClassifyTemplateDOs, boolean hasAttr) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateVO codeClassifyTemplateDO2VO(CodeClassifyTemplateDO codeClassifyTemplateDO) throws VciBaseException;
-
- /**
- * 澧炲姞鍒嗙被妯℃澘瀵硅薄
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- BaseResult<CodeClassifyTemplateVO> addSave(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException;
-
- /**
- * 淇敼鍒嗙被妯℃澘瀵硅薄
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- BaseResult editSave(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException;
-
- /**
- * 妫�鏌� 鍒嗙被妯℃澘瀵硅薄鏄惁鍒犻櫎
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄锛屽繀椤昏鏈塷id鍜宼s灞炴��
- * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult checkIsCanDelete(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException;
-
- /**
- * 妫�鏌ユ槸鍚︽湁涓嬬骇鏄惁鍏宠仈浜嗘暟鎹�
- *
- * @param oid 涓婚敭
- * @return true 琛ㄧず鏈夊紩鐢紝false琛ㄧず娌℃湁寮曠敤
- * @throws VciBaseException 鍙傛暟涓虹┖鍜屾湁寮曠敤鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- boolean checkChildIsLinked(String oid) throws VciBaseException;
-
- /**
- * 鏍￠獙鏄惁鏈変笅绾ц妭鐐癸紝涓嶆牎楠屾槸鍚﹀叧鑱斾簡鏁版嵁
- *
- * @param oid 涓婚敭
- * @return true琛ㄧず鏈変笅绾э紝false琛ㄧず娌℃湁涓嬬骇
- * @throws VciBaseException 鍙傛暟閿欒锛屾垨鑰呮暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- boolean checkHasChild(String oid) throws VciBaseException;
-
- /**
- * 鍒犻櫎鍒嗙被妯℃澘瀵硅薄
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeClassifyTemplate(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被妯℃澘瀵硅薄
- * @param oid 涓婚敭
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被妯℃澘瀵硅薄(鍖呭惈灞炴�э級
- * @param oid 涓婚敭
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyTemplateVO getObjectHasAttrByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍒嗙被妯℃澘瀵硅薄
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeClassifyTemplateVO> listCodeClassifyTemplateByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収鏍� 鍒嗙被妯℃澘瀵硅薄
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず鏍�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- List<Tree> referTree(TreeQueryObject treeQueryObject) throws VciBaseException;
-
- /**
- * 鍒嗙被妯℃澘鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeClassifyTemplateVO> gridCodeClassifyTemplate(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 鍚敤銆佸仠鐢�
- * @param oid
- * @param lcStatus
- * @return
- */
- BaseResult updateLcStatus( String oid, String lcStatus);
-
- /**
- * 鍗囩増
- */
- BaseResult Upgrade(CodeClassifyTemplateDTO codeClassifyDTO);
-
- /**
- * 妯℃澘鍏嬮殕
- */
- BaseResult copyTemplate(CodeClassifyTemplateDTO codeClassifyDTO);
-
- /**
- * 浣跨敤涓婚搴撶殑鍒嗙被涓婚敭锛岃幏鍙栫敓鏁堢殑妯℃澘
- * @param codeClassifyOid 涓婚搴撳垎绫讳富閿�
- * @param hasAttribute 鏄惁鍖呭惈灞炴��
- * @return 妯℃澘鐨勪俊鎭�
- */
- List<CodeClassifyTemplateVO> listReleaseTemplateByClassifyOid(String codeClassifyOid,boolean hasAttribute);
-
- /**
- * 鐢ㄦā鏉跨殑鐗堟湰鏉ユ帓搴�
- * @param templateVOList 妯℃澘鐨勬樉绀哄璞�
- * @return 鎺掑簭鍚庣殑鍒楄〃
- */
- List<CodeClassifyTemplateVO> sortTemplateByRevision(List<CodeClassifyTemplateVO> templateVOList);
-
- /**
- * 鏍￠獙瀛愬垎绫绘槸鍚︾浉鍚岀殑妯℃澘
- * @param codeClassifyOid 鐖跺垎绫荤殑涓婚敭
- * @return true琛ㄧず鐩稿悓
- */
- boolean checkChildHasSameTemplate(String codeClassifyOid);
- /**
- * 鑾峰彇鎵�鏈夊瓙鍒嗙被妯℃澘
- * @param codeClassifyOid 鐖跺垎绫荤殑涓婚敭
- * @return true琛ㄧず鐩稿悓
- */
- List<CodeClassifyTemplateVO> childTemplates(String codeClassifyOid);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyValueServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyValueServiceI.java
deleted file mode 100644
index 5b2fb6d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeClassifyValueServiceI.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeClassifyValueDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.Tree;
-import com.vci.starter.web.pagemodel.TreeQueryObject;
-import com.vci.ubcs.code.dto.CodeClassifyValueDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 鍒嗙被鐮佹鐨勭爜鍊兼湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeClassifyValueServiceI {
- /**
- * 鏌ヨ鍒嗙被鐮佹鐨勭爜鍊� 鏍�
- * @param treeQueryObject 鏍戞煡璇㈠璞�
- * @return 鍒嗙被鐮佹鐨勭爜鍊� 鏄剧ず鏍�
- * @throws VciBaseException 鏌ヨ鏉′欢涓嶇鍚堣姹傜殑鏃跺�欎細鎶涘嚭寮傚父
- */
- List<Tree> treeCodeClassifyValue(TreeQueryObject treeQueryObject) throws VciBaseException;
- /**
- * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
- *
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鏌ヨ缁撴灉,鏁版嵁瀵硅薄
- */
- List<CodeClassifyValueDO> selectCodeClassifyValueDOByTree(TreeQueryObject treeQueryObject);
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyValueDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeClassifyValueVO> codeClassifyValueDO2VOs(Collection<CodeClassifyValueDO> codeClassifyValueDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyValueDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeClassifyValueVO codeClassifyValueDO2VO(CodeClassifyValueDO codeClassifyValueDO) throws VciBaseException;
-
- /**
- * 澧炲姞鍒嗙被鐮佹鐨勭爜鍊�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyValueVO addSave(CodeClassifyValueDTO codeClassifyValueDTO) throws VciBaseException;
-
- /**
- * 淇敼鍒嗙被鐮佹鐨勭爜鍊�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyValueVO editSave(CodeClassifyValueDTO codeClassifyValueDTO) throws VciBaseException;
-
- /**
- * 妫�鏌� 鍒嗙被鐮佹鐨勭爜鍊兼槸鍚﹀垹闄�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴��
- * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult checkIsCanDelete(CodeClassifyValueDTO codeClassifyValueDTO) throws VciBaseException;
-
- /**
- * 妫�鏌ユ槸鍚︽湁涓嬬骇鏄惁鍏宠仈浜嗘暟鎹�
- *
- * @param oid 涓婚敭
- * @return true 琛ㄧず鏈夊紩鐢紝false琛ㄧず娌℃湁寮曠敤
- * @throws VciBaseException 鍙傛暟涓虹┖鍜屾湁寮曠敤鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- boolean checkChildIsLinked(String oid) throws VciBaseException;
-
- /**
- * 鏍￠獙鏄惁鏈変笅绾ц妭鐐癸紝涓嶆牎楠屾槸鍚﹀叧鑱斾簡鏁版嵁
- *
- * @param oid 涓婚敭
- * @return true琛ㄧず鏈変笅绾э紝false琛ㄧず娌℃湁涓嬬骇
- * @throws VciBaseException 鍙傛暟閿欒锛屾垨鑰呮暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- boolean checkHasChild(String oid) throws VciBaseException;
-
- /**
- * 鍒犻櫎鍒嗙被鐮佹鐨勭爜鍊�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeClassifyValue(CodeClassifyValueDTO codeClassifyValueDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被鐮佹鐨勭爜鍊�
- * @param oid 涓婚敭
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeClassifyValueVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍒嗙被鐮佹鐨勭爜鍊�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeClassifyValueVO> listCodeClassifyValueByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収鏍� 鍒嗙被鐮佹鐨勭爜鍊�
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀烘爲
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- List<Tree> referTree(TreeQueryObject treeQueryObject) throws VciBaseException;
-
- /**
- * 浣跨敤鐮佹鐨勪富閿幏鍙栧垎绫荤殑鐮佸�煎唴瀹�
- * @param classifySecOid 鐮佹鐨勪富閿�
- * @param parentClassifyValueOid 涓婄骇鍒嗙被鐨勪富閿�
- * @return 鍒嗙被鐮佸�肩殑鍐呭
- */
- List<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid);
-
- /**
- * 鏍规嵁鐮佹涓婚敭鍒犻櫎鍏跺瓨鍦ㄧ殑鐮佸�煎璞�
- * @param codeclassifysecoid 鍒嗙被鐮佹鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- BaseResult batchDeleteBySecOid(String codeclassifysecoid);
-
- /**
- * 鎵归噺娣诲姞鍒嗙被鐮佹鐨勭爜鍊硷紝濡傛灉淇濆瓨鐨勯泦鍚堜腑涓嶅瓨鍦ㄥ凡鍦ㄦ暟鎹簱涓殑鐮佸�煎垯鍒犻櫎銆備富瑕佹槸淇濆瓨鐮佸�肩殑搴忓彿
- * @param dtoList 鍒嗙被鐮佹鐨勭爜鍊煎垪琛�
- * @param codeclassifysecoid 鍒嗙被鐮佹鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- BaseResult batchSave4Order(List<CodeClassifyValueDTO> dtoList, String codeclassifysecoid);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeDuckingServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeDuckingServiceI.java
deleted file mode 100644
index 5661bad..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeDuckingServiceI.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.DockingDataDO;
-import com.vci.ubcs.code.entity.DockingLogeDO;
-import com.vci.ubcs.code.entity.DockingTaskDO;
-import com.vci.ubcs.code.entity.SysIntHeaderDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-
-import java.util.Map;
-
-/**
- * 涓�銆侀厤缃垎绫汇�佺郴缁熴�佹帴鍙ｆ暟鎹�
- * 1銆侀厤缃郴缁烻ysIntBaseDO
- * 2銆侀厤缃郴缁熴�佹帴鍙ｃ�佸垎绫籗ysIntInfoDO
- *
- * 浜屻�佸鐞嗛鐢宠鏁版嵁
- * 1銆佹帴鏀秞mlData
- * 2銆佸伐鑹虹郴缁熺壒娈婂鐞嗭紝鏍规嵁unique鏌ヨ缂栫爜锛屾湁宸茬粡鍙戝竷鐨勬暟鎹紝鐩存帴杩斿洖缂栫爜銆傛病鏈夋煡璇㈠埌宸茬粡鍙戝竷鐨勭紪鐮侊紙缂栬緫涓�佹彁浜や腑銆佸鏍镐腑銆佸仠鐢ㄧ瓑锛夊拰涓�鑸郴缁熶竴鏍锋寜鐓х3姝ュ鐞�
- * 3銆佽В鏋恱mlData閲屾瘡涓�涓猟ata鑺傜偣锛屽瓨鍌ㄥ叆DockingPreApplyDataDO锛宒ata鑺傜偣涓媝ros鑺傜偣瀛樺偍鍏ockingPreApplyDataInfoDO
- * 4銆佽繑鍥瀤mlData锛岄噷杈规爣璇嗕簡姣忎竴涓猟ata鐨勫鐞嗙粨鏋�
- *
- * 涓夈�佹牴鎹鐢宠鏁版嵁锛屾彃鍏ヤ富鏁版嵁
- * 1銆佸叧鑱斿垎绫�
- * 2銆佹煡璇㈠嚭DockingPreApplyDataInfoDO瀛樺偍鐨勬暟鎹紝鎸夌収鏁版嵁鏄犲皠xml锛岃浆鎹负鎴戜滑鐨刱ey锛岃繑缁欏墠绔嚜鍔ㄥ～鍏呭埌鏂板鏁版嵁鐨勯〉闈�
- * 3銆佽皟鐢ㄩ�氱敤鐨勬暟鎹柊澧炴帴鍙ｄ繚瀛樻暟鎹紝杩欎竴姝ュ拰涓绘暟鎹鐞嗘ā鍧楀姛鑳戒竴鏍�
- *
- * 鍥涖�佹帹閫佹暟鎹�
- * 1銆佸垎绫绘暟鎹拰涓绘暟鎹湁鍙樺寲鐨勬椂鍊欙紝鏁版嵁搴撹Е鍙戝櫒(TIG_CODEALLCODE_FORDOCKINGDATA,TIG_codeclsify_FORDOCKINGDATA)鑷姩鎻掑叆dockingdata
- * 2銆丏ockingScheduling鎵ц鏃讹紝鏌ヨdockingdatasendflag=false鐨勬暟鎹紝缁撳悎鏌ヨsysintinfo鏁版嵁锛屾煡璇ockingtask
- * 3銆乨ockingtask涓彇鍑烘潵鏁版嵁锛屾牴鎹産tmname鍜屾暟鎹畂id鏌ヨ鍑烘潵瑕佹帹閫佺殑鏁版嵁锛屾煡璇ysIntInfoDO锛屾牴鎹竴銆�2銆佷腑閰嶇疆鐨勪俊鎭紝鎵ц鎺ㄩ��
- *
- * @author wangyi
- * @date 2022-03-20
- */
-public interface CodeDuckingServiceI {
-
- /**
- * 浜屻��1銆�2銆�3銆�4銆�
- * 澶勭悊棰勭敵璇锋暟鎹�
- * @param xmlDatas
- * @return 鎺ユ敹鐨剎mlDate
- */
- String applicateCode(String xmlDatas);
-
- /**
- * 鍥涖��2銆�
- * 鏌ヨredis涓暟鎹紝瀵规瘮鍚庢彃鍏ockingtask
- */
- void insertCache2();
-
- /**
- * 鍥涖��1銆�2銆�3銆�
- */
- void sendData3();
-
- /**
- * 瀹氭椂浠诲姟璋冪敤
- */
- void DockingScheduing();
-
- /**
- * 鏁版嵁鍒犻櫎鐨勬椂鍊欙紝缂撳瓨鍒皉edis
- * @param oid
- */
- void cacheDeleteData(String oid,Object obj);
-
- /**
- * 鏌ヨdata鍒楄〃
- */
- DataGrid<DockingDataDO> gridData(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鏌ヨtask鍒楄〃
- */
- DataGrid<DockingTaskDO> gridTask(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 鏌ヨ闆嗘垚log鍒楄〃
- */
- DataGrid<DockingLogeDO> gridLoge(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 鏌ヨ闆嗘垚鎺ュ彛param鍒楄〃
- */
- DataGrid<SysIntHeaderDO> gridHeader(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeDuckingSyncServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeDuckingSyncServiceI.java
deleted file mode 100644
index 2d5e4a9..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeDuckingSyncServiceI.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.starter.web.pagemodel.BaseResult;
-
-/**
- * 涓�銆侀厤缃垎绫汇�佺郴缁熴�佹帴鍙ｆ暟鎹�
- * 1銆侀厤缃郴缁烻ysIntBaseDO
- * 2銆侀厤缃郴缁熴�佹帴鍙ｃ�佸垎绫籗ysIntInfoDO
- *
- * 浜屻�佸鐞嗛鐢宠鏁版嵁
- * 1銆佹帴鏀秞mlData
- * 2銆佸伐鑹虹郴缁熺壒娈婂鐞嗭紝鏍规嵁unique鏌ヨ缂栫爜锛屾湁宸茬粡鍙戝竷鐨勬暟鎹紝鐩存帴杩斿洖缂栫爜銆傛病鏈夋煡璇㈠埌宸茬粡鍙戝竷鐨勭紪鐮侊紙缂栬緫涓�佹彁浜や腑銆佸鏍镐腑銆佸仠鐢ㄧ瓑锛夊拰涓�鑸郴缁熶竴鏍锋寜鐓х3姝ュ鐞�
- * 3銆佽В鏋恱mlData閲屾瘡涓�涓猟ata鑺傜偣锛屽瓨鍌ㄥ叆DockingPreApplyDataDO锛宒ata鑺傜偣涓媝ros鑺傜偣瀛樺偍鍏ockingPreApplyDataInfoDO
- * 4銆佽繑鍥瀤mlData锛岄噷杈规爣璇嗕簡姣忎竴涓猟ata鐨勫鐞嗙粨鏋�
- *
- * 涓夈�佹牴鎹鐢宠鏁版嵁锛屾彃鍏ヤ富鏁版嵁
- * 1銆佸叧鑱斿垎绫�
- * 2銆佹煡璇㈠嚭DockingPreApplyDataInfoDO瀛樺偍鐨勬暟鎹紝鎸夌収鏁版嵁鏄犲皠xml锛岃浆鎹负鎴戜滑鐨刱ey锛岃繑缁欏墠绔嚜鍔ㄥ～鍏呭埌鏂板鏁版嵁鐨勯〉闈�
- * 3銆佽皟鐢ㄩ�氱敤鐨勬暟鎹柊澧炴帴鍙ｄ繚瀛樻暟鎹紝杩欎竴姝ュ拰涓绘暟鎹鐞嗘ā鍧楀姛鑳戒竴鏍�
- *
- * 鍥涖�佹帹閫佹暟鎹�
- * 1銆佸垎绫绘暟鎹拰涓绘暟鎹湁鍙樺寲鐨勬椂鍊欙紝鏁版嵁搴撹Е鍙戝櫒(TIG_CODEALLCODE_FORDOCKINGDATA,TIG_codeclsify_FORDOCKINGDATA)鑷姩鎻掑叆dockingdata
- * 2銆丏ockingScheduling鎵ц鏃讹紝鏌ヨdockingdatasendflag=false鐨勬暟鎹紝缁撳悎鏌ヨsysintinfo鏁版嵁锛屾煡璇ockingtask
- * 3銆乨ockingtask涓彇鍑烘潵鏁版嵁锛屾牴鎹産tmname鍜屾暟鎹畂id鏌ヨ鍑烘潵瑕佹帹閫佺殑鏁版嵁锛屾煡璇ysIntInfoDO锛屾牴鎹竴銆�2銆佷腑閰嶇疆鐨勪俊鎭紝鎵ц鎺ㄩ��
- *
- * @author wangyi
- * @date 2022-03-20
- */
-public interface CodeDuckingSyncServiceI {
-
- /**
- * 鏁版嵁瀹氭椂浠诲姟璋冪敤
- */
- void DockingDataSyncScheduing();
-
- /**
- * 鏁版嵁瀹氭椂浠诲姟璋冪敤
- */
- void DockingClassSyncScheduing();
-
- /**
- * 鎺ㄩ�佹湭瀹屾垚鐨勯泦鎴愭暟鎹�
- * @return
- */
- BaseResult sendData(String oids);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeFixedValueServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeFixedValueServiceI.java
deleted file mode 100644
index 94b73a6..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeFixedValueServiceI.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeFixedValueDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.CodeFixedValueDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍥哄畾鐮佹鐨勭爜鍊兼湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeFixedValueServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑鍥哄畾鐮佹鐨勭爜鍊�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeFixedValueVO> gridCodeFixedValue(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeFixedValueDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeFixedValueVO> codeFixedValueDO2VOs(Collection<CodeFixedValueDO> codeFixedValueDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeFixedValueDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeFixedValueVO codeFixedValueDO2VO(CodeFixedValueDO codeFixedValueDO) throws VciBaseException;
-
- /**
- * 澧炲姞鍥哄畾鐮佹鐨勭爜鍊�
- * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeFixedValueVO addSave(CodeFixedValueDTO codeFixedValueDTO) throws VciBaseException;
-
- /**
- * 淇敼鍥哄畾鐮佹鐨勭爜鍊�
- * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeFixedValueVO editSave(CodeFixedValueDTO codeFixedValueDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎鍥哄畾鐮佹鐨勭爜鍊�
- * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeFixedValue(CodeFixedValueDTO codeFixedValueDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鍥哄畾鐮佹鐨勭爜鍊�
- * @param oid 涓婚敭
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeFixedValueVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍥哄畾鐮佹鐨勭爜鍊�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeFixedValueVO> listCodeFixedValueByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収鍥哄畾鐮佹鐨勭爜鍊煎垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeFixedValueVO> refDataGridCodeFixedValue(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 浣跨敤鐮佹鐨勪富閿幏鍙栧浐瀹氱爜鐨勭爜鍊�
- * @param secOidCollection 鐮佹鐨勪富閿�
- * @return 鐮佸�兼樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鐨勬椂鍊欏嚭鐜颁簡閿欒浼氭姏鍑哄紓甯�
- */
- Map<String,List<CodeFixedValueVO>> listCodeFixedValueBySecOids(Collection<String> secOidCollection) throws VciBaseException;
-
- /**
- * 鎵归噺娣诲姞鍥哄畾鐮佹鐨勭爜鍊硷紝濡傛灉淇濆瓨鐨勯泦鍚堜腑涓嶅瓨鍦ㄥ凡鍦ㄦ暟鎹簱涓殑鐮佸�煎垯鍒犻櫎銆備富瑕佹槸淇濆瓨鐮佸�肩殑搴忓彿
- * @param dtoList 鍥哄畾鐮佹鐨勭爜鍊煎垪琛�
- * @param codefixedsecoid 鍥哄畾鐮佹鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- BaseResult<CodeFixedValueVO> batchSave4Order(List<CodeFixedValueDTO> dtoList, String codefixedsecoid);
-
- /**
- * 鏍规嵁鐮佹涓婚敭鍒犻櫎鍏跺瓨鍦ㄧ殑鐮佸�煎璞�
- * @param codefixedsecoid 鍥哄畾鐮佹鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- BaseResult<CodeFixedValueVO> batchDeleteBySecOid(String codefixedsecoid);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeKeyAttrRepeatRuleServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeKeyAttrRepeatRuleServiceI.java
deleted file mode 100644
index d024e42..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeKeyAttrRepeatRuleServiceI.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeKeyAttrRepeatRuleDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.dto.CodeKeyAttrRepeatRuleDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏈嶅姟鎺ュ彛
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeKeyAttrRepeatRuleServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeKeyAttrRepeatRuleVO> gridCodeKeyAttrRepeatRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeKeyAttrRepeatRuleDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeKeyAttrRepeatRuleVO> codeKeyAttrRepeatRuleDO2VOs(Collection<CodeKeyAttrRepeatRuleDO> codeKeyAttrRepeatRuleDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeKeyAttrRepeatRuleDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeKeyAttrRepeatRuleVO codeKeyAttrRepeatRuleDO2VO(CodeKeyAttrRepeatRuleDO codeKeyAttrRepeatRuleDO) throws VciBaseException;
-
- /**
- * 澧炲姞鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param codeKeyAttrRepeatRuleDTO 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeKeyAttrRepeatRuleVO addSave(CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO) throws VciBaseException;
-
- /**
- * 淇敼鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param codeKeyAttrRepeatRuleDTO 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeKeyAttrRepeatRuleVO editSave(CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param codeKeyAttrRepeatRuleDTO 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeKeyAttrRepeatRule(CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param oid 涓婚敭
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeKeyAttrRepeatRuleVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeKeyAttrRepeatRuleVO> listCodeKeyAttrRepeatRuleByOids(Collection<String> oidCollections) throws VciBaseException;
-
- /**
- * 缂栧彿鎵归噺鑾峰彇鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param idCollections 缂栧彿闆嗗悎
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
- */
- Collection<CodeKeyAttrRepeatRuleVO> listCodeKeyAttrRepeatRuleByIds(List<String> idCollections);
-
- /**
- * 鍙傜収鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeKeyAttrRepeatRuleVO> refDataGridCodeKeyAttrRepeatRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 浣跨敤鍒嗙被鐨勫叏閮ㄤ俊鎭潵鑾峰彇鍏抽敭灞炴�у垽鏂鍒欑殑鍐呭
- * @param classifyFullInfo 涓婚搴撳垎绫荤殑鍏ㄩ儴淇℃伅
- * @return 瑙勫垯鐨勬樉绀哄璞�
- */
- CodeKeyAttrRepeatRuleVO getRuleByClassifyFullInfo(CodeClassifyFullInfoBO classifyFullInfo);
-
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodePhaseAttrServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodePhaseAttrServiceI.java
deleted file mode 100644
index 6fb0b64..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodePhaseAttrServiceI.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodePhaseAttrDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.CodePhaseAttrDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodePhaseAttrVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 闃舵鐨勫睘鎬ф湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodePhaseAttrServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑闃舵鐨勫睘鎬�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodePhaseAttrVO> gridCodePhaseAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codePhaseAttrDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodePhaseAttrVO> codePhaseAttrDO2VOs(Collection<CodePhaseAttrDO> codePhaseAttrDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codePhaseAttrDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodePhaseAttrVO codePhaseAttrDO2VO(CodePhaseAttrDO codePhaseAttrDO) throws VciBaseException;
-
- /**
- * 澧炲姞闃舵鐨勫睘鎬�
- * @param codePhaseAttrDTO 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodePhaseAttrVO addSave(CodePhaseAttrDTO codePhaseAttrDTO) throws VciBaseException;
-
- /**
- * 淇敼闃舵鐨勫睘鎬�
- * @param codePhaseAttrDTO 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodePhaseAttrVO editSave(CodePhaseAttrDTO codePhaseAttrDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎闃舵鐨勫睘鎬�
- * @param codePhaseAttrDTO 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodePhaseAttr(CodePhaseAttrDTO codePhaseAttrDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇闃舵鐨勫睘鎬�
- * @param oid 涓婚敭
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodePhaseAttrVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇闃舵鐨勫睘鎬�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodePhaseAttrVO> listCodePhaseAttrByOids(Collection<String> oidCollections) throws VciBaseException;
-
- /**
- * 鍙傜収闃舵鐨勫睘鎬у垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodePhaseAttrVO> refDataGridCodePhaseAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 浣跨敤妯℃澘涓婚敭鍜岄樁娈电紪鍙疯幏鍙栧寘鍚殑灞炴��
- * @param templateOid 妯℃澘鐨勭紪鍙�
- * @param phaseId 闃舵鐨勭紪鍙�
- * @return 灞炴�х殑鑻辨枃鍚嶇О
- */
- List<String> listAttrByTemplateOidAndPhaseId(String templateOid, String phaseId);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeResembleRuleServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeResembleRuleServiceI.java
deleted file mode 100644
index af4aba6..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeResembleRuleServiceI.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.vci.ubcs.code.entity.CodeResembleRuleDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.CodeResembleRuleDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeResembleRuleVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鐩镐技鏌ヨ瑙勫垯鏈嶅姟鎺ュ彛
- *
- * @author weidy
- * @date 2022-04-10
- */
-public interface CodeResembleRuleServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑鐩镐技鏌ヨ瑙勫垯
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeResembleRuleVO> gridCodeResembleRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeResembleRuleDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeResembleRuleVO> codeResembleRuleDO2VOs(Collection<CodeResembleRuleDO> codeResembleRuleDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeResembleRuleDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeResembleRuleVO codeResembleRuleDO2VO(CodeResembleRuleDO codeResembleRuleDO) throws VciBaseException;
-
- /**
- * 澧炲姞鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeResembleRuleVO addSave(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException;
-
- /**
- * 淇敼鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeResembleRuleVO editSave(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeResembleRule(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鐩镐技鏌ヨ瑙勫垯
- * @param oid 涓婚敭
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeResembleRuleVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鐩镐技鏌ヨ瑙勫垯
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeResembleRuleVO> listCodeResembleRuleByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収鐩镐技鏌ヨ瑙勫垯鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeResembleRuleVO> refDataGridCodeResembleRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeRuleServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeRuleServiceI.java
deleted file mode 100644
index 68dcf47..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeRuleServiceI.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeRuleDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.CodeRuleDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓绘暟鎹紪鐮佽鍒欐湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeRuleServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑涓绘暟鎹紪鐮佽鍒�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeRuleVO> gridCodeRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeRuleDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeRuleVO> codeRuleDO2VOs(Collection<CodeRuleDO> codeRuleDOs) throws VciBaseException;
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeRuleDOs 鏁版嵁瀵硅薄鍒楄〃
- * @param hasSec 鏄惁鍖呭惈鐮佹
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeRuleVO> codeRuleDO2VOs(Collection<CodeRuleDO> codeRuleDOs, boolean hasSec) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeRuleDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeRuleVO codeRuleDO2VO(CodeRuleDO codeRuleDO) throws VciBaseException;
-
- /**
- * 澧炲姞涓绘暟鎹紪鐮佽鍒�
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeRuleVO addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException;
-
- /**
- * 淇敼涓绘暟鎹紪鐮佽鍒�
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeRuleVO editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎涓绘暟鎹紪鐮佽鍒�
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeRule(CodeRuleDTO codeRuleDTO) throws VciBaseException;
-
- /**
- * 鏍￠獙缂栫爜瑙勫垯鐨勭姸鎬佹槸鍚﹀彲浠ョ紪杈戞垨鍒犻櫎
- * @param lcStatus 缂栫爜瑙勫垯
- * @return true琛ㄧず鍙互缂栬緫鎴栧垹闄わ紝false琛ㄧず涓嶅彲浠�
- */
- boolean checkEditDelStatus(String lcStatus);
-
- /**
- * 涓婚敭鑾峰彇涓绘暟鎹紪鐮佽鍒�
- * @param oid 涓婚敭
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeRuleVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹紪鐮佽鍒�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeRuleVO> listCodeRuleByOids(Collection<String> oidCollections) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹紪鐮佽鍒�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @param hasSec 鏄惁鍖呭惈鐮佹
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeRuleVO> listCodeRuleByOids(Collection<String> oidCollections,boolean hasSec) throws VciBaseException;
-
- /**
- * 浣跨敤缂栧彿鐨勯泦鍚堣幏鍙栬鍒欑殑鍐呭
- * @param idCollection 缂栧彿鐨勯泦鍚�
- * @return 瑙勫垯鐨勫唴瀹�
- */
- List<CodeRuleVO> listCodeRuleByIds(Collection<String> idCollection);
-
- /**
- * 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeRuleVO> refDataGridCodeRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 鏌ョ湅涓绘暟鎹紪鐮佽鍒欑殑浣跨敤鑼冨洿
- * @param oid 缂栫爜瑙勫垯涓婚敭
- * @return 涓婚搴撳垎绫讳娇鐢ㄥ埌璇ョ紪鐮佽鍒欑殑鎵�鏈夐泦鍚�
- */
- Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid);
-
- /**
- * 妫�楠岀紪鐮佽鍒欐槸鍚﹀凡缁忚浣跨敤
- * @param oid 缂栫爜瑙勫垯涓婚敭
- * @return true琛ㄧず宸茬粡浣跨敤锛宖alse琛ㄧず鏈浣跨敤
- */
- boolean isAlreadyInUse(String oid);
-
- /**
- * 鍋滅敤涓庡惎鐢ㄧ紪鐮佽鍒�
- * @param oid 缂栫爜瑙勫垯涓婚敭
- * @param update enable:鍚敤 disable:鍋滅敤 release:鍙戝竷
- * @return 鎵ц缁撴灉
- */
- BaseResult updateStatus(String oid, String update);
-
- /**
- * 鍏嬮殕缂栫爜瑙勫垯
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- */
- BaseResult cloneCodeRule(CodeRuleDTO codeRuleDTO);
-
- /**
- * 浣跨敤涓婚敭鑾峰彇缂栫爜瑙勫垯鐨勫唴瀹�
- * @param oid 涓婚敭
- * @return 瑙勫垯鐨勬樉绀哄璞�
- */
- CodeRuleVO getObjectHasSecByOid(String oid);
-
- /**
- * 缂栫爜瑙勫垯娓呯┖鎵�鏈夊凡鐢熸垚鐨勭紪鐮�
- * @param oid 缂栫爜瑙勫垯涓婚敭
- * @return 鎵ц缁撴灉
- */
- BaseResult clearAllCode(String oid);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSerialAlgorithmServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSerialAlgorithmServiceI.java
deleted file mode 100644
index 2191718..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSerialAlgorithmServiceI.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.code.vo.pagemodel.CodeSerialAlgorithmVO;
-
-/**
- * 娴佹按绠楁硶绫�
- * @author weidy
- * @date 2022-2-17
- */
-public interface CodeSerialAlgorithmServiceI {
-
- /**
- * 鑾峰彇娴佹按绠楁硶鐨勫垪琛�
- * @return 娴佹按绠楁硶鐨勪俊鎭�
- */
- DataGrid<CodeSerialAlgorithmVO> gridSerialAlgorithm();
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSynonymServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSynonymServiceI.java
deleted file mode 100644
index 35dde0c..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSynonymServiceI.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.CodeSynonymDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.CodeSynonymDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeSynonymVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 鍚屼箟璇嶉厤缃湇鍔℃帴鍙�
- *
- * @author weidy
- * @date 2022-02-17
- */
-public interface CodeSynonymServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑鍚屼箟璇嶉厤缃�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeSynonymVO> gridCodeSynonym(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeSynonymDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeSynonymVO> codeSynonymDO2VOs(Collection<CodeSynonymDO> codeSynonymDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeSynonymDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeSynonymVO codeSynonymDO2VO(CodeSynonymDO codeSynonymDO) throws VciBaseException;
-
- /**
- * 澧炲姞鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeSynonymVO addSave(CodeSynonymDTO codeSynonymDTO) throws VciBaseException;
-
- /**
- * 淇敼鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeSynonymVO editSave(CodeSynonymDTO codeSynonymDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeSynonym(CodeSynonymDTO codeSynonymDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇鍚屼箟璇嶉厤缃�
- * @param oid 涓婚敭
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeSynonymVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍚屼箟璇嶉厤缃�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeSynonymVO> listCodeSynonymByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収鍚屼箟璇嶉厤缃垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeSynonymVO> refDataGridCodeSynonym(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeTemplatePhaseServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeTemplatePhaseServiceI.java
deleted file mode 100644
index cc37688..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeTemplatePhaseServiceI.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.vci.ubcs.code.entity.CodeClassifyTemplateAttrDO;
-import com.vci.ubcs.code.entity.CodeTemplatePhaseDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 妯℃澘闃舵鏈嶅姟鎺ュ彛
- *
- * @author weidy
- * @date 2022-01-24
- */
-public interface CodeTemplatePhaseServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑妯℃澘闃舵
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeTemplatePhaseDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<CodeTemplatePhaseVO> codeTemplatePhaseDO2VOs(Collection<CodeTemplatePhaseDO> codeTemplatePhaseDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeTemplatePhaseDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- CodeTemplatePhaseVO codeTemplatePhaseDO2VO(CodeTemplatePhaseDO codeTemplatePhaseDO) throws VciBaseException;
-
- /**
- * 澧炲姞妯℃澘闃舵
- * @param codeTemplatePhaseDTO 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeTemplatePhaseVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
-
- /**
- * 淇敼妯℃澘闃舵
- * @param codeTemplatePhaseDTO 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- CodeTemplatePhaseVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
-
- /**
- * 鍒犻櫎妯℃澘闃舵
- * @param codeTemplatePhaseDTO 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteCodeTemplatePhase(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException;
-
- /**
- * 妯℃澘淇敼瑙﹀彂鍔熻兘
- * @param attrDOList 灞炴�х殑鏁版嵁瀵硅薄
- * @return 鍙楀奖鍝嶇殑鏁版嵁
- */
- BatchCBO codeTemplateAttrModifyTrigger(List<CodeClassifyTemplateAttrDO> attrDOList);
-
- /**
- * 妯℃澘灞炴�у垹闄ょ殑鏃跺�欒Е鍙�
- * @param attrDOList 灞炴�х殑鏁版嵁瀵硅薄
- * @return 鍙楀奖鍝嶇殑鏁版嵁
- */
- BatchCBO codeTemplateAttrDeleteTrigger(List<CodeClassifyTemplateAttrDO> attrDOList);
-
- /**
- * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
- * @param classifyTemplateOid 妯℃澘鐨勪富閿�
- * @return 鍙楀奖鍝嶇殑鏁版嵁
- */
- BatchCBO codeTemplateDeleteTrigger(String classifyTemplateOid);
-
- /**
- * 涓婚敭鑾峰彇妯℃澘闃舵
- * @param oid 涓婚敭
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- CodeTemplatePhaseVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇妯℃澘闃舵
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<CodeTemplatePhaseVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException;
-
- /**
- * 鍙傜収妯℃澘闃舵鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 闃舵涓嶅寘鍚殑灞炴��
- * @param conditionMap 鏌ヨ瀵硅薄锛屽繀椤昏鏈夋ā鏉跨殑涓婚敭锛坈lassifyTemplateOid锛夛紝鍚﹀垯涓嶈兘纭畾灞炴��
- * @param pageHelper 鍒嗛〉瀵硅薄
- * @return 灞炴�х殑淇℃伅
- */
- DataGrid<CodeClassifyTemplateAttrVO> gridUnUsedAttribute(Map<String, String> conditionMap, PageHelper pageHelper);
-
- /**
- * 闃舵鍖呭惈鐨勫睘鎬�
- * @param conditionMap 鏌ヨ瀵硅薄锛屽繀椤昏闃舵鐨勪富閿�(codePhaseOid)
- * @param pageHelper 鍒嗛〉瀵硅薄
- * @return 灞炴�х殑淇℃伅
- */
- DataGrid<CodeClassifyTemplateAttrVO> gridUsedAttribute(Map<String, String> conditionMap, PageHelper pageHelper);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/DockingPreApplyDataInfoServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/DockingPreApplyDataInfoServiceI.java
deleted file mode 100644
index 05e38fa..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/DockingPreApplyDataInfoServiceI.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.vci.ubcs.code.entity.DockingPreApplyDataInfoDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.DockingPreApplyDataInfoDTO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyDataInfoVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏈嶅姟鎺ュ彛
- *
- * @author weidy
- * @date 2022-04-05
- */
-public interface DockingPreApplyDataInfoServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<DockingPreApplyDataInfoVO> gridDockingPreApplyDataInfo(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param dockingPreApplyDataInfoDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<DockingPreApplyDataInfoVO> dockingPreApplyDataInfoDO2VOs(Collection<DockingPreApplyDataInfoDO> dockingPreApplyDataInfoDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param dockingPreApplyDataInfoDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DockingPreApplyDataInfoVO dockingPreApplyDataInfoDO2VO(DockingPreApplyDataInfoDO dockingPreApplyDataInfoDO) throws VciBaseException;
-
- /**
- * 澧炲姞璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataInfoDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- DockingPreApplyDataInfoVO addSave(DockingPreApplyDataInfoDTO dockingPreApplyDataInfoDTO) throws VciBaseException;
-
- /**
- * 淇敼璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataInfoDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- DockingPreApplyDataInfoVO editSave(DockingPreApplyDataInfoDTO dockingPreApplyDataInfoDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataInfoDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteDockingPreApplyDataInfo(DockingPreApplyDataInfoDTO dockingPreApplyDataInfoDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param oid 涓婚敭
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- DockingPreApplyDataInfoVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<DockingPreApplyDataInfoVO> listDockingPreApplyDataInfoByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<DockingPreApplyDataInfoVO> refDataGridDockingPreApplyDataInfo(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/DockingPreApplyDataServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/DockingPreApplyDataServiceI.java
deleted file mode 100644
index 55e482d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/DockingPreApplyDataServiceI.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.DockingPreApplyDataDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.CodeOrderDTO;
-import com.vci.ubcs.code.dto.DockingPreApplyDataDTO;
-import com.vci.ubcs.code.dto.DockingPreApplyDataInfoDTO;
-import com.vci.ubcs.code.dto.PreApplyCodeOrderDTO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyDataVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏈嶅姟鎺ュ彛
- *
- * @author weidy
- * @date 2022-04-05
- */
-public interface DockingPreApplyDataServiceI {
-
-
- /***
- * 鎵归噺缁存姢鍒嗙被璁剧疆
- * @param dockingPreApplyDataDTO
- * @return
- * @throws VciBaseException
- */
- List<DockingPreApplyDataVO> batchSetDataClassId(DockingPreApplyDataDTO dockingPreApplyDataDTO)throws VciBaseException;
-
- /***
- * 鏍规嵁閫夋嫨棰濋鐢宠鐨勬暟鎹嬀閫夋暟鎹�
- * @param codeClassifyOid
- * @param templateOid
- * @param btmType
- * @param dataOids
- * @return
- * @throws VciBaseException
- */
- DataGrid<Map<String,String>> gridApplyData(String codeClassifyOid,String templateOid,String btmType,String dataOids)throws VciBaseException;
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param dockingPreApplyDataDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<DockingPreApplyDataVO> dockingPreApplyDataDO2VOs(Collection<DockingPreApplyDataDO> dockingPreApplyDataDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param dockingPreApplyDataDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DockingPreApplyDataVO dockingPreApplyDataDO2VO(DockingPreApplyDataDO dockingPreApplyDataDO) throws VciBaseException;
-
- /**
- * 澧炲姞璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- DockingPreApplyDataVO addSave(DockingPreApplyDataDTO dockingPreApplyDataDTO) throws VciBaseException;
-
- /**
- * 鍒犻櫎璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteDockingPreApplyData(DockingPreApplyDataDTO dockingPreApplyDataDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param oid 涓婚敭
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- DockingPreApplyDataVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<DockingPreApplyDataVO> listDockingPreApplyDataByOids(Collection<String> oidCollections) throws VciBaseException;
-
- /**
- * 鍙傜収璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<DockingPreApplyDataVO> refDataGridDockingPreApplyData(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- //==================
- /**
- * 鏌ヨ鎵�鏈夌殑璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<DockingPreApplyDataVO> gridDockingPreApplyData(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 鎻掑叆data鍜宒atainfo,浼氳嚜鍔ㄦ妸data閲岀殑oid,unique璧嬪�煎埌datainfo閲岃竟鍘�
- * @param dockingPreApplyDataDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @param dockingPreApplyDataInfoDTOList 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁璇︾粏淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- void addSaveDataAndInfo(DockingPreApplyDataDTO dockingPreApplyDataDTO, List<DockingPreApplyDataInfoDTO> dockingPreApplyDataInfoDTOList) throws VciBaseException;
-
- /**
- * 淇敼 datas
- * @param dockingPreApplyDataDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- BaseResult editSave(DockingPreApplyDataDTO dockingPreApplyDataDTO) throws VciBaseException;
-
- /**
- * 鏍规嵁data鐨刼id鏌ヨdata淇℃伅鍜宒atainfo淇℃伅锛屽苟涓旀嫾鎺atainfo涓簃ap
- * @param dockingPreApplyDataDTO
- * @return
- * @throws VciBaseException
- */
- BaseResult<Map<String,String>> getDataInfoMap(DockingPreApplyDataDTO dockingPreApplyDataDTO) throws VciBaseException;
-
- /**
- * 鎵归噺澶勭悊棰勭敵璇风紪鐮�
- * 1銆佽皟鐢╡ngineService.addSaveCode(orderDTO)鍏堟彃鍏ラ鐢宠鏁版嵁鍒板搴斾富棰樺簱闈欐�佹暟鎹�
- * 2銆佷慨鏀筪ockingPreApplyData鐨勫垎绫籵id鍜屽垎绫诲悕绉�
- */
- BaseResult applyData(List<PreApplyCodeOrderDTO> preApplyCodeOrderDTOList);
-
- /**
- * 鎵归噺澶勭悊棰勭敵璇风紪鐮�
- * 1銆佽皟鐢╡ngineService.addSaveCode(orderDTO)鍏堟彃鍏ラ鐢宠鏁版嵁鍒板搴斾富棰樺簱闈欐�佹暟鎹�
- * 2銆佷慨鏀筪ockingPreApplyData鐨勫垎绫籵id鍜屽垎绫诲悕绉�
- */
- BaseResult batchApplyDatas(List<CodeOrderDTO> CodeOrderDTOs);
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/DockingPreAttrMappingSeviceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/DockingPreAttrMappingSeviceI.java
deleted file mode 100644
index e642b89..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/DockingPreAttrMappingSeviceI.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.DockingPreAttrMappingDTO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
-
-import java.util.List;
-import java.util.Map;
-
-public interface DockingPreAttrMappingSeviceI {
- /***
- * 灞炴�ф槧灏勯厤缃垪琛�
- * @param clsfId
- * @param type
- * @param conditionMap
- * @param pageHelper
- * @return
- * @throws VciBaseException
- */
- DataGrid<DockingPreAttrMappingVO> gridAttrMappings(String clsfId,int type,Map<String, String> conditionMap, PageHelper pageHelper)throws VciBaseException;
- /***
- * 鏋氫妇鏄犲皠閰嶇疆鍒楄〃
- * @param attrkey
- * @param type
- * @param conditionMap
- * @param pageHelper
- * @return
- * @throws VciBaseException
- */
- DataGrid<DockingPreAttrRangeVO> gridAttrRanges(String attrkey, int type, Map<String, String> conditionMap, PageHelper pageHelper)throws VciBaseException;
- /**
- * 淇濆瓨灞炴�ф槧灏勯厤缃粍浠�
- * @param dockingPreAttrMappingDTOS 灞炴�ф槧灏勯厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
- */
- public List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingDTO> dockingPreAttrMappingDTOS)throws VciBaseException;
-
- /***
- * 鏍规嵁鏉′欢鏌ヨ灞炴�ф槧灏勯厤缃俊鎭�
- * @param conditionMap
- * @return
- * @throws VciBaseException
- */
- List<DockingPreAttrMappingVO> selectAttrMappings(Map<String, String> conditionMap)throws VciBaseException;
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java
new file mode 100644
index 0000000..61353f5
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeAllcodeService.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.code.entity.CodeAllcode;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+
+import java.util.List;
+
+/**
+ * 鍏ㄩ儴鐮佸�� 鏈嶅姟绫�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+public interface ICodeAllcodeService extends IService<CodeAllcode> {
+
+ /**
+ * 鑷畾涔夊垎椤�
+ *
+ * @param page
+ * @param CodeAllcode
+ * @return
+ */
+ IPage<CodeAllcodeVO> selectCodeAllcodePage(IPage<CodeAllcodeVO> page, CodeAllcodeVO CodeAllcode);
+
+ /**
+ * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
+ * @param wrapper 鏌ヨ灏佽鍣�
+ * @return 鏁版嵁瀵硅薄
+ */
+ List<CodeAllcode> selectByWrapper(Wrapper wrapper);
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java
new file mode 100644
index 0000000..166661b
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeBasicSecService.java
@@ -0,0 +1,21 @@
+package com.vci.ubcs.code.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.code.entity.CodeBasicSec;
+
+/**
+ * 鍥哄畾鐮佹鐨勭爜鍊兼湇鍔℃帴鍙�
+ *
+ * @author ludc
+ * @date 2022-01-24
+ */
+public interface ICodeBasicSecService extends IService<CodeBasicSec> {
+
+ /**
+ * 鏍规嵁缂栫爜瑙勫垯鎵归噺鍒犻櫎鐮佹鍩烘湰淇℃伅
+ * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭
+ * @return 鎵ц缁撴灉
+ */
+ boolean batchDeleteSecByCodeRuleOid(String codeRuleOid);
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
new file mode 100644
index 0000000..d283655
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -0,0 +1,25 @@
+package com.vci.ubcs.code.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.code.entity.CodeClassify;
+
+import java.util.List;
+
+/**
+ * 涓婚搴撳垎绫绘湇鍔℃帴鍙�
+ *
+ * @author ludc
+ * @date 2022-01-20
+ */
+public interface ICodeClassifyService extends IService<CodeClassify> {
+
+ /**
+ * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
+ * @param wrapper 鏌ヨ灏佽鍣�
+ * @return 鏁版嵁瀵硅薄
+ */
+ List<CodeClassify> selectByWrapper(Wrapper wrapper);
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java
new file mode 100644
index 0000000..72f20b3
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyValueService.java
@@ -0,0 +1,18 @@
+package com.vci.ubcs.code.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.code.entity.CodeClassifyValue;
+
+/**
+ * 鍒嗙被鐮佹鐨勭爜鍊兼湇鍔℃帴鍙�
+ *
+ * @author ludc
+ * @date 2022-01-24
+ */
+public interface ICodeClassifyValueService extends IService<CodeClassifyValue> {
+
+
+
+}
+
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeFixedValueService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeFixedValueService.java
new file mode 100644
index 0000000..bb3787d
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeFixedValueService.java
@@ -0,0 +1,15 @@
+package com.vci.ubcs.code.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.code.entity.CodeFixedValue;
+
+/**
+ * 鍥哄畾鐮佹鐨勭爜鍊兼湇鍔℃帴鍙�
+ *
+ * @author ludc
+ * @date 2022-01-24
+ */
+public interface ICodeFixedValueService extends IService<CodeFixedValue> {
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
new file mode 100644
index 0000000..f31a205
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.vci.ubcs.code.dto.CodeRuleDTO;
+import com.vci.ubcs.code.entity.CodeRule;
+import com.vci.ubcs.com.vci.starter.exception.VciBaseException;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import org.springblade.core.tool.api.R;
+
+import java.util.Collection;
+
+/**
+ * 缂栫爜瑙勫垯 鏈嶅姟绫�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+public interface ICodeRuleService extends IService<CodeRule> {
+
+ /**
+ * 鑷畾涔夊垎椤�
+ *
+ * @param page
+ * @param plCodeRule
+ * @return
+ */
+ IPage<CodeRuleVO> selectPlCodeRulePage(IPage<CodeRuleVO> page, CodeRuleVO plCodeRule);
+
+ /**
+ * 鏍￠獙缂栫爜瑙勫垯鐨勭姸鎬佹槸鍚﹀彲浠ョ紪杈戞垨鍒犻櫎
+ * @param lcStatus 缂栫爜瑙勫垯
+ * @return true琛ㄧず鍙互缂栬緫鎴栧垹闄わ紝false琛ㄧず涓嶅彲浠�
+ */
+ boolean checkEditDelStatus(String lcStatus);
+
+ /**
+ * 澧炲姞涓绘暟鎹紪鐮佽鍒�
+ * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉
+ */
+ Boolean addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException;
+
+ /**
+ * 淇敼涓绘暟鎹紪鐮佽鍒�
+ * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉
+ */
+ Boolean editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException;
+
+ /**
+ * 鍒犻櫎涓绘暟鎹紪鐮佽鍒�
+ * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
+ * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+ * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
+ */
+ R deleteCodeRule(CodeRuleDTO codeRuleDTO) throws VciBaseException;
+
+ /**
+ * 妫�楠岀紪鐮佽鍒欐槸鍚﹀凡缁忚浣跨敤
+ * @param oid 缂栫爜瑙勫垯涓婚敭
+ * @return true琛ㄧず宸茬粡浣跨敤锛宖alse琛ㄧず鏈浣跨敤
+ */
+ boolean isAlreadyInUse(String oid);
+
+ /**
+ * 鏌ョ湅涓绘暟鎹紪鐮佽鍒欑殑浣跨敤鑼冨洿
+ * @param oid 缂栫爜瑙勫垯涓婚敭
+ * @return 涓婚搴撳垎绫讳娇鐢ㄥ埌璇ョ紪鐮佽鍒欑殑鎵�鏈夐泦鍚�
+ */
+ Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid);
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineServiceI.java
deleted file mode 100644
index d3fa78a..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineServiceI.java
+++ /dev/null
@@ -1,361 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.vci.starter.web.pagemodel.*;
-import com.vci.ubcs.code.vo.pagemodel.*;
-import com.vci.web.dto.BaseModelDTO;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.UIFormItemVO;
-import com.vci.web.pageModel.UITableFieldVO;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
-import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
-import com.vci.ubcs.code.dto.CodeOrderDTO;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓绘暟鎹紩鎿庢湇鍔�
- * @author weidy
- * @date 2022-2-21
- */
-public interface MdmEngineServiceI {
-
- /**
- * 浣跨敤鍒嗙被涓婚敭鑾峰彇椤甸潰鐨勫唴瀹癸紝鍖呭惈鎸夐挳
- * @param codeClassifyOid 涓婚搴撳垎绫讳富閿�
- * @param functionId 鍔熻兘鐨勭紪鍙�
- * @return UI鐩稿叧鐨勫唴瀹�
- */
- MdmUIInfoVO getUIInfoByClassifyOid(String codeClassifyOid, String functionId);
-
- /**
- * 浣跨敤涓婚搴撳垎绫昏幏鍙杣i鐩稿叧鐨勫唴瀹癸紙涓嶅寘鍚寜閽級
- * @param codeClassifyOid 涓婚搴撶殑鍒嗙被鐨勪富閿�
- * @return UI鐩稿叧鐨勫唴瀹�
- */
- MdmUIInfoVO getTableDefineByClassifyOid(String codeClassifyOid);
-
- /**
- * 浣跨敤鍒嗙被鐨勪富閿幏鍙栬〃鏍肩殑瀹氫箟
- * @param codeClassifyOid 鍒嗙被涓婚敭
- * @param phase 闃舵鐨勫悕绉�
- * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗�)
- */
- MdmUIInfoVO getTableDefineByClassifyOid_v2(String codeClassifyOid,String phase);
-
- /**
- * 浣跨敤鍒嗙被鐨勪富閿幏鍙栧彲浠ヤ娇鐢ㄧ殑妯℃澘瀵硅薄
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 妯℃澘鐨勬樉绀哄璞�
- */
- CodeClassifyTemplateVO getUsedTemplateByClassifyOid(String codeClassifyOid);
-
- /**
- * 浣跨敤鍒嗙被鐨勪富閿幏鍙栧彲浠ヤ娇鐢ㄧ殑妯℃澘瀵硅薄
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param hasAttr 鍖呭惈灞炴��
- * @return 妯℃澘鐨勬樉绀哄璞�
- */
- CodeClassifyTemplateVO getUsedTemplateByClassifyOid(String codeClassifyOid, boolean hasAttr);
-
- /**
- * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅
- * @param codeClassifyTemplateOid 妯℃澘鐨勪富閿�
- * @return ui鐩稿叧鐨勫唴瀹�
- */
- MdmUIInfoVO getFormDefineByTemplateOid(String codeClassifyTemplateOid);
-
- /**
- * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅
- * @param codeClassifyTemplateOid 妯℃澘鐨勪富閿�
- * @param codeClassifyOid 浣跨敤妯℃澘鐨勫垎绫荤殑涓婚敭
- * @return ui鐩稿叧鐨勫唴瀹�
- */
- MdmUIInfoVO getFormDefineByTemplateOid(String codeClassifyTemplateOid,String codeClassifyOid);
-
- /**
- * 浣跨敤涓婚搴撳垎绫荤殑涓婚敭鑾峰彇琛ㄥ崟鐨勪俊鎭�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return ui鐩稿叧鐨勫唴瀹�
- */
- MdmUIInfoVO getFormDefineByClassifyOid(String codeClassifyOid);
-
- /**
- * 浣跨敤妯℃澘涓婚敭鑾峰彇ui鐩稿叧鐨勫唴瀹�
- * @param templateOid 妯℃澘鐨勪富閿�
- * @return ui鐩稿叧鐨勫唴瀹�
- */
- MdmUIInfoVO getTableDefineByTemplateOid(String templateOid);
-
- /**
- * 浣跨敤鍒嗙被涓婚敭鑾峰彇宸ュ叿鏍忎腑鐨勬寜閽俊鎭�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 鎸夐挳鐨勪俊鎭紝浼氭寜鐓ф帓搴忓彿杩涜鎺掑簭
- */
- List<CodeButtonVO> listButtonInToolbarByClassifyOid(String codeClassifyOid);
-
- /**
- * 浣跨敤妯℃澘涓婚敭鑾峰彇宸ュ叿鏍忎腑鐨勬寜閽俊鎭�
- * @param templateOid 妯℃澘鐨勪富閿�
- * @return 鎸夐挳鐨勪俊鎭紝浼氭寜鐓ф帓搴忓彿杩涜鎺掑簭
- */
- List<CodeButtonVO> listButtonInToolbarByTemplateOid(String templateOid);
-
- /**
- * 浣跨敤鍒嗙被鑾峰彇瀵瑰簲鐨勬暟鎹�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param templateOid 妯℃澘鐨勪富閿�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鐨勫璞�
- * @return 鏁版嵁锛堝寘鍚笅绾у垎绫伙級
- */
- DataGrid<Map<String, String>> gridTableDataByClassifyOid(String codeClassifyOid, String templateOid, Map<String, String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏌ヨ缂栫爜鏁版嵁鐨勫垪琛�
- * @param btmType 涓氬姟绫诲瀷
- * @param templateVO 妯℃澘鐨勫璞★紝闇�瑕佸寘鍚ā鏉跨殑灞炴��
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉瀵硅薄
- * @return 鏁版嵁鍒楄〃
- */
- DataGrid<Map<String,String>> queryGrid(String btmType, CodeClassifyTemplateVO templateVO, Map<String, String> conditionMap, PageHelper pageHelper);
-
- /**
- * 鏍规嵁妯℃澘灞炴�х敓鎴愮浉搴旂殑sql淇℃伅
- * @param btmType 涓氬姟绫诲瀷
- * @param templateVO 妯℃澘鏄剧ず瀵硅薄锛屽繀椤诲寘鍚睘鎬�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴忓璞�
- * @return sql鐨勭浉鍏充俊鎭�
- */
- CodeTemplateAttrSqlBO getSqlByTemplateVO(String btmType, CodeClassifyTemplateVO templateVO, Map<String, String> conditionMap, PageHelper pageHelper);
-
- /**
- * 灏佽寮�鍏崇殑鍐呭锛屽父鐢ㄤ簬瀵煎嚭
- * @param dataMap 鏁版嵁鐨勫唴瀹�
- * @param templateVO 妯℃澘鐨勬樉绀�
- */
- void wrapperBoolean(List<Map<String, String>> dataMap, CodeClassifyTemplateVO templateVO);
-
- /**
- * 灏佽鏌ヨ鍑烘潵鐨勬暟鎹�
- * @param dataMap 鏁版嵁鐨勬槧灏�
- * @param templateVO 妯℃澘鐨勫睘鎬�
- * @param onlySelectAttrIdList 浠呬粎鏌ヨ鐨勫睘鎬у瓧娈�
- * @param form 鏄惁涓鸿〃鍗曪紝琛ㄥ崟涓嶄細杞崲鏃堕棿鏍煎紡
- */
- void wrapperData(List<Map<String, String>> dataMap, CodeClassifyTemplateVO templateVO,
- Collection<String> onlySelectAttrIdList,boolean form);
-
- /**
- * 鑾峰彇鏋氫妇鐨勪笅鎷夐�夐」
- * @param attrVO 妯℃澘灞炴�х殑瀵硅薄
- * @return 涓嬫媺閫夐」
- */
- List<KeyValue> listComboboxItems(CodeClassifyTemplateAttrVO attrVO);
-
- /**
- * 浣跨敤鏁版嵁涓婚敭鑾峰彇鏁版嵁鐨勫叏閮ㄤ俊鎭�
- * @param oid 涓婚敭
- * @param templateOid 妯℃澘鐨勪富閿�
- * @return 鏁版嵁鐨勫唴瀹�
- */
- BaseResult<Map<String, String>> getDataByOid(String oid, String templateOid);
-
- /**
- * 浣跨敤涓婚搴撳垎绫昏幏鍙栫紪鐮佽鍒�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 缂栫爜瑙勫垯鐨勫唴瀹�
- */
- CodeRuleVO getCodeRuleByClassifyOid(String codeClassifyOid);
-
- /**
- * 浣跨敤鍒嗙被鐨勫叏閮ㄤ俊鎭幏鍙栫紪鐮佽鍒�
- * @param fullInfoBO 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @return 瑙勫垯鐨勫唴瀹�
- */
- CodeRuleVO getCodeRuleByClassifyFullInfo(CodeClassifyFullInfoBO fullInfoBO);
-
- /**
- * 浣跨敤鐮佹鐨勪富閿幏鍙栧垎绫荤殑鐮佸�煎唴瀹�
- * @param classifySecOid 鐮佹鐨勪富閿�
- * @param parentClassifyValueOid 涓婄骇鍒嗙被鐨勪富閿�
- * @return 鍒嗙被鐮佸�肩殑鍐呭
- */
- List<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid);
-
- /**
- * 鐢宠鍗曚竴缂栫爜
- * @param orderDTO 鐢宠鐨勪俊鎭紝闇�瑕佸寘鍚睘鎬х殑鍐呭鍜岀爜娈电浉鍏崇殑鍐呭
- * @return 杩斿洖缂栫爜鐨勫唴瀹�
- */
- String addSaveCode(CodeOrderDTO orderDTO);
-
- /**
- * 淇敼涓婚搴撴暟鎹�
- * @param orderDTO 鏁版嵁鐨勫唴瀹癸紝涓嶇敤鍖呭惈鐮佹鐨勫唴瀹逛簡
- */
- void editSaveCode(CodeOrderDTO orderDTO);
-
- /**
- * 鍗囩増鐨勪富棰樺簱鏁版嵁
- * @param orderDTO 鏁版嵁鐨勫唴瀹癸紝涓嶉渶瑕佸寘鍚爜娈电殑鍐呭
- */
- void upSaveCode(CodeOrderDTO orderDTO);
-
- /**
- * 淇濆瓨鍙緭鍙�夌殑淇℃伅
- * @param templateVO 妯℃澘鐨勫璞�
- * @param cboList 鏁版嵁鐨勫唴瀹�
- */
- void batchSaveSelectChar(CodeClassifyTemplateVO templateVO, List<ClientBusinessObject> cboList);
-
- /**
- * 鍒犻櫎涓婚搴撴暟鎹�
- * @param deleteBatchDTO 鏁版嵁鐨勫唴瀹癸紝蹇呴』瑕佹湁涓婚敭鍜屽垎绫讳富閿�
- */
- void deleteCode(CodeDeleteBatchDTO deleteBatchDTO);
-
- /**
- * 灏佽鍏抽敭灞炴�х殑鏌ヨ璇彞
- * @param value 褰撳墠鐨勫��
- * @param keyRuleVO 鍏抽敭灞炴�х殑鎺у埗瑙勫垯锛屽彲浠ヤ负绌�
- * @param attrId 灞炴�х殑缂栧彿
- * @param trim 鏄惁鍘婚櫎绌烘牸
- * @param ignoreCase 鏄惁涓嶅尯鍒嗗ぇ灏忓啓
- * @param ignoreWidth 鏄惁蹇界暐鍏ㄥ崐瑙�
- * @param trimAll 鏄惁蹇界暐鍏ㄩ儴绌烘牸
- * @param conditionMap 鏌ヨ鏉′欢
- */
- void wrapperKeyAttrConditionMap(String value, CodeKeyAttrRepeatRuleVO keyRuleVO, String attrId,
- boolean trim, boolean ignoreCase, boolean ignoreWidth,
- boolean trimAll, Map<String, String> conditionMap);
-
- /**
- * 鍒ゆ柇缂栫爜鐨勭爜娈垫槸鍚﹁緭鍏ユ垨鑰呴�夋嫨浜嗙爜鍊�
- * @param ruleVO 瑙勫垯鐨勬樉绀哄璞�
- * @param orderDTO 缂栫爜鐢宠鐨勫唴瀹�
- */
- void checkSecValueOnOrder(CodeRuleVO ruleVO, CodeOrderDTO orderDTO);
-
- /**
- * 浣跨敤鍒嗙被鍜岄樁娈电殑缂栧彿锛岃幏鍙栧寘鍚殑灞炴��
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param phase 闃舵鐨勫悕绉�
- * @return 灞炴�х殑鑻辨枃鍚嶇О
- */
- List<String> listPhaseAttrByClassifyOid(String codeClassifyOid, String phase);
-
- /**
- * 璺緞涓婂寘鍚綋鍓嶅垎绫荤殑鎵�鏈夊垎绫讳俊鎭�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 鍒嗙被鏍�
- */
- List<Tree> hasSelfClassifyTree(String codeClassifyOid);
-
- /**
- * 鍒嗙被娉ㄥ叆鐨勫唴瀹归瑙�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param codeTemplateOid 妯℃澘鐨勪富閿�
- * @return key鏄垎绫绘敞鍏ョ殑灞炴�э紝value鏄敞鍏ュ悗鐨勫��
- */
- Map<String, String> previewClassify(String codeClassifyOid, String codeTemplateOid);
-
- /**
- * 棰勮缁勫悎瑙勫垯
- * @param orderDTO 鐢宠缂栫爜鐨勪俊鎭�
- * @return key鏄粍鍚堣鍒欑殑灞炴�с�倂alue鏄粍鍚堝悗鐨勫�硷紝銆傚鏋滅己灏戞煇涓睘鎬х殑鍊硷紝浼氫綔涓簐alue杩斿洖
- */
- Map<String,String> previewCompRule(CodeOrderDTO orderDTO);
-
- /**
- * 淇敼鐘舵��
- * @param baseModelDTO 鏁版嵁浼犺緭瀵硅薄
- */
- void changeStatus(BaseModelDTO baseModelDTO);
-
- /**
- * 鐩镐技椤规煡璇�
- * @param orderDTO 缂栫爜鐨勭浉鍏充俊鎭�
- * @return 鏁版嵁鍒楄〃
- */
- DataGrid<Map<String, String>> resembleQuery(CodeOrderDTO orderDTO);
-
- /**
- * 浣跨敤鍒嗙被涓婚敭鑾峰彇鐩镐技鏌ヨ瑙勫垯
- * @param codeClassifyOid 鍒嗙被涓婚敭
- * @return 瑙勫垯锛屽鏋滀笉瀛樺湪浼氳繑鍥瀗ull
- */
- CodeResembleRuleVO getUseResembleRuleByClassifyOid(String codeClassifyOid);
- /**
- * 鑾峰彇浣跨敤鐨勭浉浼兼煡璇㈣鍒�
- * @param fullInfoBO 绫诲叏閮ㄤ俊鎭�
- * @param currentClassifyVO 褰撳墠鐨勫垎绫�
- * @return 瑙勫垯锛屽鏋滀笉瀛樺湪浼氳繑鍥濶ull
- */
- CodeResembleRuleVO getUseResembleRule(CodeClassifyFullInfoBO fullInfoBO, CodeClassifyVO currentClassifyVO);
-
- /**
- * 浣跨敤娴佺▼妯℃澘鑾峰彇鍦ㄩ〉闈笂鏄剧ず鐨勫睘鎬�
- * @param templateOid 妯℃澘鐨勪富閿�
- * @param executionId 娴佺▼鎵цid
- * @param processUse 妯℃澘娴佺▼鐢ㄩ��
- * @return 鐩稿叧灞炴��
- */
- List<String> getFieldByProcessTemplate(String templateOid, String executionId, String processUse);
-
- /**
- * 鏍囪娴佺▼涓笟鍔℃暟鎹槸鍚﹂�氳繃
- * @param oid 涓氬姟鏁版嵁涓婚敭
- * @param btmName 涓氬姟绫诲瀷
- * @param pass 鏄惁閫氳繃
- * @return 鎵ц缁撴灉
- */
- BaseResult markDataPassing(String oid, String btmName, Boolean pass);
-
- /**
- * 浣跨敤鍒嗙被鐨勪富閿幏鍙栦笟鍔℃暟鎹�
- * @param btmType 涓氬姟绫诲瀷
- * @param queryObject 鏌ヨ瀵硅薄
- * @return 琛ㄦ牸鐨勬樉绀哄璞″��
- */
- DataGrid<Map<String, String>> getTableDataByExecutionId(String btmType, BaseQueryObject queryObject);
-
- /**
- * 鎵归噺淇濆瓨娴佺▼鎵ц椤甸潰淇敼鐨勫唴瀹�
- * @param orderDTOList 缂栫爜鐩稿叧鐨勪俊鎭紝涓嶉渶瑕佺爜娈电殑淇℃伅
- * @return 鎵ц缁撴灉
- */
- BaseResult batchUpdateCode(List<CodeOrderDTO> orderDTOList);
-
- /**
- * 浣跨敤鍒嗙被鐨勭紪鍙疯矾寰勶紝鑾峰彇琛ㄦ牸鐨勭浉鍏冲畾涔�
- * @param codeClassifyIdPath 鍒嗙被鐨勭紪鍙疯矾寰勶紝蹇呴』鏄粠椤跺眰鑺傜偣寮�濮嬶紝xxx/yy/zz杩欐牱鐨勬牸寮�
- * @param functionId 鍔熻兘鐨勭紪鍙�
- * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鏍�)
- */
- MdmUIInfoVO getUIInfoByClassifyIdPath(String codeClassifyIdPath, String functionId);
-
- /**
- * 浣跨敤鍒嗙被鐨勭紪鍙疯矾寰勶紝鑾峰彇琛ㄥ崟鐨勭浉鍏冲畾涔�
- * @param idPath 缂栧彿鐨勮矾寰勶紝蹇呴』浠庨《灞傝妭鐐瑰紑濮嬶紝xx/yyy/zz
- * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗�)
- */
- MdmUIInfoVO getFormDefineByClassifyIdPath(String idPath);
-
- /**
- * 妯℃澘灞炴�ц浆鎹负琛ㄥ崟鐨勫瓧娈�
- *
- * @param attrVO 妯℃澘灞炴��
- * @param btmType 涓氬姟绫诲瀷
- * @return 琛ㄥ崟鐨勫瓧娈�
- */
- UIFormItemVO templateAttr2FormField(CodeClassifyTemplateAttrVO attrVO, String btmType) ;
-
- UITableFieldVO templateAttr2TableField(CodeClassifyTemplateAttrVO attrVO, boolean forEdit);
- void wrapperResembleConditionMap(String value, CodeResembleRuleVO resembleRuleVO, String attrId, Map<String, String> conditionMap);
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOServiceI.java
deleted file mode 100644
index cccdd6e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmIOServiceI.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.vo.pagemodel.*;
-import com.vci.ubcs.code.vo.universalInter.attrmap.DataObjectVO;
-import com.vci.ubcs.code.vo.universalInter.result.xml.XMLResultDataObjectDetailDO;
-import com.vci.starter.poi.bo.SheetDataSet;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.code.dto.CodeExportAttrDTO;
-import com.vci.ubcs.code.dto.CodeOrderDTO;
-
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 涓绘暟鎹鍏ュ鍑烘湇鍔�
- * @author weidy
- * @date 2022-3-6
- */
-public interface MdmIOServiceI {
-
- /**
- * 瀵煎嚭涓婚搴撶殑鏁版嵁
- * @param exportAttrDTO 瀵煎嚭鐩稿叧鐨勯厤缃紝蹇呴』瑕佹湁涓婚搴撳垎绫荤殑涓婚敭
- * @return 瀵煎嚭鐨別xcel鐨勬枃浠�
- */
- String exportCode(CodeExportAttrDTO exportAttrDTO);
-
- /**
- * 鐢熸垚瀵煎叆鐨勬枃浠�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param isHistory 鏄惁鍘嗗彶鏁版嵁瀵煎叆
- * @return excel鐨勬枃浠跺湴鍧�
- */
- String createImportExcel(String codeClassifyOid,boolean isHistory);
-
-
- /**
- * 鐢熸垚瀵煎叆鐨勬枃浠�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return excel鐨勬枃浠跺湴鍧�
- */
- String downloadTopImportExcel(String codeClassifyOid);
-
-
- /**
- * 鎵归噺鐢宠缂栫爜鏁版嵁
- * @param orderDTO 缂栫爜鐢宠淇℃伅锛屽繀椤诲寘鍚垎绫讳富閿拰鐮佹鐨勪俊鎭�
- * @param file excel鏂囦欢鐨勪俊鎭�
- * @return 鏈夐敊璇俊鎭殑excel
- */
- CodeImProtRusultVO batchImportCode(CodeOrderDTO orderDTO, File file);
-
- /***
- *鎵归噺鐢宠缂栫爜鏁版嵁
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param classifyAttr 鍒嗙被璺緞浣跨敤鐨勫睘鎬�
- * @param file excel鏂囦欢鐨勪俊鎭�
- * @return 鏈夐敊璇俊鎭殑excel
- */
- CodeImProtRusultVO batchTopImportCode(String codeClassifyOid,String classifyAttr, File file);
- /***
- * 鎵归噺鐢宠缂栫爜鏁版嵁
- * @param orderDTO 缂栫爜鐢宠淇℃伅锛屽繀椤诲寘鍚垎绫讳富閿拰鐮佹鐨勪俊鎭�
- * @param templateVO//妯℃澘瀵硅薄
- * @param dataSet//鏁版嵁瀵硅薄
- * @param isNumType 鏄惁妫�楠屾灇涓�/鍙傜収
- * @return
- */
- List<String> batchImportCode(CodeOrderDTO orderDTO, CodeClassifyTemplateVO templateVO, SheetDataSet dataSet, Map<String,String> errorMap, boolean isNumType);
-
- /**
- * 瀵煎叆鍘嗗彶鏁版嵁
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param classifyAttr 鍒嗙被璺緞浣跨敤鐨勫睘鎬�
- * @param file excel鏂囦欢鐨勪俊鎭�
- * @return 鏈夐敊璇俊鎭殑excel
- */
- CodeImProtRusultVO batchImportHistoryData(String codeClassifyOid,String classifyAttr, File file);
- /**
- * 闆嗘垚鎵归噺鐢宠鏁版嵁
- * @param orderDTO 鍒嗙被鐨勪富閿�
- * @param dataObjectVO 鏁版嵁淇℃伅
- * @param resultDataObjectDetailDOs 閿欒淇℃伅
- * @return 鏈夐敊璇俊鎭殑excel
- */
- void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs);
- /**
- * 闆嗘垚鎵归噺鏇存敼鏁版嵁
- * @param codeClassifyVO;
- * @param dataObjectVO 鏁版嵁淇℃伅
- * @param resultDataObjectDetailDOs 閿欒淇℃伅
- * @return 鏈夐敊璇俊鎭殑excel
- */
- void batchSyncEditDatas(CodeClassifyVO codeClassifyVO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs);
- /***
- * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆鐨勬暟鎹�
- * @param oid
- * @param redisOid
- * @return
- */
- public DataGrid<Map<String,String>> gridRowResemble(String oid, String redisOid);
- /***
- * 浠巖edis缂撳瓨閲岃幏鍙栧埌瀵煎叆鐨勬暟鎹�
- * @param codeClssifyOid
- * @param redisOid
- * @return
- */
- DataGrid<Map<String,String>> gridDatas(String codeClssifyOid,String redisOid);
- /***
- * 鏍规嵁瀵煎叆缂撳瓨id鑾峰彇鍒嗙被
- * @param redisOid
- * @return
- */
- public List<CodeImportTemplateVO> gridclassifys(String redisOid);
-
- /**
- * 鎵归噺鐢宠
- * @param codeImprotSaveDatVOList
- * @param isImprot
- * @return
- */
- public BaseResult batchImportData(List<CodeImprotSaveDatVO> codeImprotSaveDatVOList, String classifyAttr, boolean isImprot);
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeServiceI.java
deleted file mode 100644
index e8eac6b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmProductCodeServiceI.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.dto.CodeOrderSecDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 缂栫爜瑙勫垯鐢熸垚鐨勬湇鍔�
- * @author weidy
- * @date 2022-3-6
- */
-public interface MdmProductCodeServiceI {
-
- /**
- * 鐢熸垚缂栫爜--骞朵笖淇濆瓨鏁版嵁-鏂规硶鍔犻攣锛屽洜姝や笉鑳借繑鍥瀊atchCBO
- * @param classifyFullInfoBO 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param ruleVO 缂栫爜瑙勫垯鐨勬樉绀哄璞�
- * @param secDTOList 鍚勪釜鐮佹鐨勫��
- * @param dataCBOList 涓氬姟鏁版嵁
- */
- List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO,
- CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<ClientBusinessObject> dataCBOList);
-
- /**
- * 鍥炴敹鐮佸��
- * @param btmId 涓氬姟鏁版嵁鐨勪笟鍔＄被鍨�
- * @param businessOidCollection 涓氬姟鏁版嵁鐨勪富閿�
- * @return 鍙楀奖鍝嶇殑鏁版嵁鍐呭
- */
- BatchCBO recycleCode(String btmId, Collection<String> businessOidCollection);
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/SysIntAuthorityServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/SysIntAuthorityServiceI.java
deleted file mode 100644
index f149f84..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/SysIntAuthorityServiceI.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.SysIntAuthorityDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.SysIntAuthorityDTO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntAuthorityVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹湇鍔℃帴鍙�
- *
- * @author lihang
- * @date 2022-03-07
- */
-public interface SysIntAuthorityServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<SysIntAuthorityVO> gridSysIntAuthority(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntAuthorityDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<SysIntAuthorityVO> sysIntAuthorityDO2VOs(Collection<SysIntAuthorityDO> sysIntAuthorityDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntAuthorityDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- SysIntAuthorityVO sysIntAuthorityDO2VO(SysIntAuthorityDO sysIntAuthorityDO) throws VciBaseException;
-
- /**
- * 澧炲姞绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param sysIntAuthorityDTO 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- SysIntAuthorityVO addSave(SysIntAuthorityDTO sysIntAuthorityDTO) throws VciBaseException;
-
- /**
- * 淇敼绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param sysIntAuthorityDTO 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- SysIntAuthorityVO editSave(SysIntAuthorityDTO sysIntAuthorityDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param sysIntAuthorityDTO 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteSysIntAuthority(SysIntAuthorityDTO sysIntAuthorityDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param oid 涓婚敭
- * @return 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- SysIntAuthorityVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<SysIntAuthorityVO> listSysIntAuthorityByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収绯荤粺闆嗘垚鎺ュ彛鐨勮璇佸垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<SysIntAuthorityVO> refDataGridSysIntAuthority(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/SysIntBaseServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/SysIntBaseServiceI.java
deleted file mode 100644
index 0c8991d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/SysIntBaseServiceI.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.SysIntBaseDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.SysIntBaseDTO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntBaseVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭湇鍔℃帴鍙�
- *
- * @author lihang
- * @date 2022-03-07
- */
-public interface SysIntBaseServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<SysIntBaseVO> gridSysIntBase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntBaseDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<SysIntBaseVO> sysIntBaseDO2VOs(Collection<SysIntBaseDO> sysIntBaseDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntBaseDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- SysIntBaseVO sysIntBaseDO2VO(SysIntBaseDO sysIntBaseDO) throws VciBaseException;
-
- /**
- * 澧炲姞绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param sysIntBaseDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- SysIntBaseVO addSave(SysIntBaseDTO sysIntBaseDTO) throws VciBaseException;
-
- /**
- * 淇敼绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param sysIntBaseDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- SysIntBaseVO editSave(SysIntBaseDTO sysIntBaseDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param sysIntBaseDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteSysIntBase(SysIntBaseDTO sysIntBaseDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param oid 涓婚敭
- * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- SysIntBaseVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<SysIntBaseVO> listSysIntBaseByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<SysIntBaseVO> refDataGridSysIntBase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/SysIntInfoServiceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/SysIntInfoServiceI.java
deleted file mode 100644
index 6c3bffb..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/SysIntInfoServiceI.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.vci.ubcs.code.service;
-
-
-import com.vci.ubcs.code.entity.SysIntHeaderDO;
-import com.vci.ubcs.code.entity.SysIntInfoDO;
-import com.vci.ubcs.code.entity.SysIntParamDO;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.ubcs.code.dto.SysIntInfoDTO;
-import com.vci.ubcs.code.dto.UpdateSysInfoStatusDTO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntInfoVO;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 绯荤粺闆嗘垚鍩虹淇℃伅鏈嶅姟鎺ュ彛
- *
- * @author lihang
- * @date 2022-03-07
- */
-public interface SysIntInfoServiceI {
- /**
- * 鏌ヨ鎵�鏈夌殑绯荤粺闆嗘垚鍩虹淇℃伅
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<SysIntInfoVO> gridSysIntInfo(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- List<SysIntInfoDO> selectAll(Map conditonMap);
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntInfoDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- List<SysIntInfoVO> sysIntInfoDO2VOs(Collection<SysIntInfoDO> sysIntInfoDOs) throws VciBaseException;
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntInfoDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- SysIntInfoVO sysIntInfoDO2VO(SysIntInfoDO sysIntInfoDO) throws VciBaseException;
-
- /**
- * 澧炲姞绯荤粺闆嗘垚鍩虹淇℃伅
- * @param sysIntInfoDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- SysIntInfoVO addSave(SysIntInfoDTO sysIntInfoDTO) throws VciBaseException;
-
- /**
- * 淇敼绯荤粺闆嗘垚鍩虹淇℃伅
- * @param sysIntInfoDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- SysIntInfoVO editSave(SysIntInfoDTO sysIntInfoDTO) throws VciBaseException;
-
-
- /**
- * 鍒犻櫎绯荤粺闆嗘垚鍩虹淇℃伅
- * @param sysIntInfoDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- BaseResult deleteSysIntInfo(SysIntInfoDTO sysIntInfoDTO) throws VciBaseException;
-
- /**
- * 涓婚敭鑾峰彇绯荤粺闆嗘垚鍩虹淇℃伅
- * @param oid 涓婚敭
- * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- SysIntInfoVO getObjectByOid(String oid) throws VciBaseException;
-
- /**
- * 涓婚敭鎵归噺鑾峰彇绯荤粺闆嗘垚鍩虹淇℃伅
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- Collection<SysIntInfoVO> listSysIntInfoByOids(Collection<String> oidCollections) throws VciBaseException;
-
-
-
- /**
- * 鍙傜収绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- DataGrid<SysIntInfoVO> refDataGridSysIntInfo(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException;
-
- /**
- * 褰撳墠鎺ュ彛淇℃伅鏄惁鏈変娇鐢ㄧ洰鏍囦俊鎭�
- * @param sysOid 绯荤粺Oid
- * @param authorityOid 璁よ瘉鏂瑰紡Oid
- * @return true = 鍦ㄤ娇鐢� 锛沠alse = 鏈娇鐢�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- boolean isAlreadyUse (String sysOid,String authorityOid) throws VciBaseException;
-
- //=========浠ヤ笅绯荤粺鍙傛暟鍜岄獙璇佷俊鎭�
-
- /**
- * 鏍规嵁绯荤粺淇℃伅鏌ヨ鎺ュ彛鎵�鏈塸aram
- * @param sysInfoOid
- * @return
- */
- List<SysIntParamDO> getParamsBySystemInfoOid(String sysInfoOid);
-
- /**
- * 1銆佸厛鍒犻櫎浠ュ墠鎵�鏈塸aram
- * 2銆佸啀鏌ヨ浼犲叆鐨勬墍鏈塸aram
- * @return
- */
- BaseResult updateParams(String sysInfoOid,List<SysIntParamDO> params);
-
- /**
- * 鏍规嵁绯荤粺淇℃伅鏌ヨ鎺ュ彛鎵�鏈塰eader
- * @param sysInfoOid
- * @return
- */
- List<SysIntHeaderDO> getHeadersBySystemInfoOid(String sysInfoOid);
-
- /**
- * 1銆佸厛鍒犻櫎浠ュ墠鎵�鏈塰eader
- * 2銆佸啀鏌ヨ浼犲叆鐨勬墍鏈塰eader
- * @return
- */
- BaseResult updateHeaders(String sysInfoOid,List<SysIntHeaderDO> params);
-
- /**
- * 鏍规嵁鍒嗙被oid鏌ヨ鎵�鏈夎鎺ㄩ�佽繖涓垎绫绘暟鎹殑鎺ュ彛淇℃伅
- * @param classifyOids
- * @return
- */
- List<SysIntInfoDO> getSysInfoByClassifyOid(String[] classifyOids);
-
- /***
- * 鏇存柊鎺ュ彛閰嶇疆淇℃伅鐘舵��
- * @param sysInfoStatusDTO
- * @return
- */
- public BaseResult updateStatus(UpdateSysInfoStatusDTO sysInfoStatusDTO);
- BaseResult pushData(SysIntInfoDTO sysIntInfoDTO) throws VciBaseException;
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java
deleted file mode 100644
index 18dedfd..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/UniversalInterfaceI.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import javax.jws.WebService;
-
-/**
- * 缁熶竴鎺ュ彛
- *
- * @author xiejun
- * @date 2022-11-27
- */
-@WebService(targetNamespace = "http://code.web.vci.com/",name = "universalInterface")
-public interface UniversalInterfaceI {
- /**
- *缁熶竴鐢宠缂栫爜鎺ュ彛
- * @param data 浼犻�掔殑鏁版嵁鍙傛暟
- * @param dataType 鏍囪瘑data鏄痻ml鏍煎紡杩樻槸json鏍煎紡锛屾帴鍙ｈ繑鍥炴暟鎹篃鏄寜鐓ц繖涓牸寮忥紝浠ヤ笅鎺ュ彛绫诲悓
- * @return xml鏍煎紡/json鏍煎紡
- * @throws Throwable
- */
- public String applyCode(String data,String dataType)throws Throwable;
-
- /***
- * 缁熶竴鏇存柊鎺ュ彛
- * @param data
- * @param dataType
- * @return
- * @throws Throwable
- */
- public String syncEditData(String data,String dataType)throws Throwable;
-
- /***
- * 鏌ヨ鍒嗙被鍙�
- * @param data
- * @param dataType
- * @throws Throwable
- */
- public String queryClassify(String data,String dataType)throws Throwable;
-
- /***
- * 鏌ヨ鏁版嵁
- * @param data
- * @param dataType
- * @throws Throwable
- */
- public String queryData(String data,String dataType)throws Throwable;
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java
new file mode 100644
index 0000000..9048d7e
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllcodeServiceImpl.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.CodeAllcode;
+import com.vci.ubcs.code.mapper.CodeAllcodeMapper;
+import com.vci.ubcs.code.service.ICodeAllcodeService;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 鍏ㄩ儴鐮佸�� 鏈嶅姟瀹炵幇绫�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+@Service
+public class CodeAllcodeServiceImpl extends ServiceImpl<CodeAllcodeMapper, CodeAllcode> implements ICodeAllcodeService {
+
+ /**
+ * 鏁版嵁鎿嶄綔瀵硅薄
+ */
+ @Resource
+ private CodeAllcodeMapper codeAllcodeMapper;
+
+ @Override
+ public IPage<CodeAllcodeVO> selectCodeAllcodePage(IPage<CodeAllcodeVO> page, CodeAllcodeVO CodeAllcode) {
+ return page.setRecords(baseMapper.selectCodeAllcodePage(page, CodeAllcode));
+ }
+
+ /**
+ * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
+ * @param wrapper 鏌ヨ灏佽鍣�
+ * @return 鏁版嵁瀵硅薄
+ */
+ @Override
+ public List<CodeAllcode> selectByWrapper(Wrapper wrapper) {
+ return this.codeAllcodeMapper.selectList(wrapper);
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index ce05b52..05def53 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -1,840 +1,91 @@
package com.vci.ubcs.code.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.starter.revision.bo.TreeWrapperOptions;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciParentQueryOption;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.dto.CodeBasicSecDTO;
-import com.vci.ubcs.code.entity.CodeBasicSecDO;
-import com.vci.ubcs.code.entity.CodeClassifyValueDO;
-import com.vci.ubcs.code.entity.CodeFixedValueDO;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.CodeBasicSec;
+import com.vci.ubcs.code.entity.CodeClassifyValue;
+import com.vci.ubcs.code.entity.CodeFixedValue;
import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
-import com.vci.ubcs.code.lifecycle.CodeRuleLC;
import com.vci.ubcs.code.mapper.CodeBasicSecMapper;
import com.vci.ubcs.code.mapper.CodeClassifyValueMapper;
import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
-import com.vci.ubcs.code.service.CodeBasicSecServiceI;
-import com.vci.ubcs.code.service.CodeClassifyValueServiceI;
-import com.vci.ubcs.code.service.CodeFixedValueServiceI;
-import com.vci.ubcs.code.service.CodeRuleServiceI;
-import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import com.vci.web.enumpck.OsCodeFillTypeEnum;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.pageModel.UIFormReferVO;
-import com.vci.web.service.BdSelectInputCharServiceI;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springblade.core.tool.api.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
+import com.vci.ubcs.code.service.ICodeBasicSecService;
+import com.vci.ubcs.com.vci.starter.web.util.VciBaseUtil;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import javax.annotation.Resource;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
/**
- * 鐮佹鍩虹淇℃伅鏈嶅姟
+ * 鐮佹鍩虹淇℃伅鏈嶅姟鎺ュ彛
*
* @author weidy
* @date 2022-01-24
*/
@Service
-public class CodeBasicSecServiceImpl implements CodeBasicSecServiceI {
+public class CodeBasicSecServiceImpl extends ServiceImpl<CodeBasicSecMapper, CodeBasicSec> implements ICodeBasicSecService {
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
+ @Resource
+ private CodeBasicSecMapper codeBasicSecMapper;
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeBasicSecMapper codeBasicSecMapper;
+ /**
+ * 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰
+ */
+ @Resource
+ private CodeFixedValueMapper fixedValueMapper;
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
+ /**
+ * 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰
+ */
+ @Resource
+ private CodeClassifyValueMapper codeClassifyValueMapper;
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 涓绘暟鎹紪鐮佽鍒欐湇鍔�
- */
- @Autowired
- @Lazy
- private CodeRuleServiceI codeRuleService;
-
- /**
- * 鍒嗙被鐮佹鐨勭爜鍊兼湇鍔�
- */
- @Autowired
- private CodeClassifyValueServiceI codeClassifyValueService;
-
- /**
- * 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰
- */
- @Resource
- private CodeClassifyValueMapper codeClassifyValueMapper;
-
- /**
- * 鍥哄畾鐮佹鐨勭爜鍊肩殑鏈嶅姟
- */
- @Autowired
- private CodeFixedValueServiceI fixedValueService;
-
- /**
- * 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹搷浣滃眰
- */
- @Resource
- private CodeFixedValueMapper fixedValueMapper;
-
- /**
- * 涓婂眰鍒嗙被鐮佹鐨勫睘鎬у悕绉�
- */
- private static final String PARENT_FIELD_NAME = "parentclassifysecoid";
-
- /**
- * 涓婄骇鍒嗙被鐮佸�肩殑灞炴�у悕绉�
- */
- private static final String PARENT_CLASSIFY_VALUE_FIELD_NAME = "parentClassifyValueOid";
-
- /**
- * 鍙�夊彲杈撴湇鍔�
- */
- @Autowired
- private BdSelectInputCharServiceI charService;
-
- /**
- * 鏌ヨ鎵�鏈夌殑鐮佹鍩虹淇℃伅
- *
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeBasicSecVO> gridCodeBasicSec(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultAsc("ordernum");
- if(!conditionMap.containsKey("pkCodeRule") || StringUtils.isBlank(conditionMap.get("pkCodeRule"))){
- return new DataGrid<>();
- }
- List<CodeBasicSecDO> doList = codeBasicSecMapper.(conditionMap, pageHelper);
- DataGrid<CodeBasicSecVO> dataGrid = new DataGrid<CodeBasicSecVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeBasicSecDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeBasicSecMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- *
- * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSecDO> codeBasicSecDOs) throws VciBaseException {
- List<CodeBasicSecVO> voList = new ArrayList<CodeBasicSecVO>();
- if (!CollectionUtils.isEmpty(codeBasicSecDOs)) {
- for (CodeBasicSecDO s : codeBasicSecDOs) {
- CodeBasicSecVO vo = codeBasicSecDO2VO(s);
- if (vo != null) {
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- *
- * @param codeBasicSecDOs 鏁版嵁瀵硅薄鍒楄〃
- * @param hasFixedValue 鏄惁鏈夊浐瀹氬��
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeBasicSecVO> codeBasicSecDO2VOs(Collection<CodeBasicSecDO> codeBasicSecDOs, boolean hasFixedValue) throws VciBaseException {
- List<CodeBasicSecVO> voList = new ArrayList<CodeBasicSecVO>();
- if (!CollectionUtils.isEmpty(codeBasicSecDOs)) {
- for (CodeBasicSecDO s : codeBasicSecDOs) {
- CodeBasicSecVO vo = codeBasicSecDO2VO(s);
- if (vo != null) {
- voList.add(vo);
- }
- }
- }
- if(hasFixedValue && !CollectionUtils.isEmpty(voList)){
- List<CodeBasicSecVO> fixedSecVOList = voList.stream().filter(s -> CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equalsIgnoreCase(s.getSectype())).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(fixedSecVOList)){
- //鏌ヨ鍥哄畾鐮佺殑鐮佸��
- Map<String, List<CodeFixedValueVO>> secValueMap = fixedValueService.listCodeFixedValueBySecOids(fixedSecVOList.stream().map(CodeBasicSecVO::getOid).collect(Collectors.toList()));
- voList.stream().forEach(vo->{
- vo.setFixedValueVOList(secValueMap.getOrDefault(vo.getOid(),null));
- });
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- *
- * @param codeBasicSecDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSecDO codeBasicSecDO) throws VciBaseException {
- CodeBasicSecVO vo = new CodeBasicSecVO();
- if (codeBasicSecDO != null) {
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDO, vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- if (true) {
- //vo.setLcStatusText({lcStatusFullClassName}.getTextByValue(vo.getLcStatus()));
- }
- }
- return vo;
- }
-
- /**
- * 澧炲姞鐮佹鍩虹淇℃伅
- *
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeBasicSecVO addSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(codeBasicSecDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeBasicSecDTO.getPkCodeRule(),"缂栫爜瑙勫垯鐨勪富閿�");
- CodeRuleVO ruleVO = codeRuleService.getObjectByOid(codeBasicSecDTO.getPkCodeRule());
- if(!CodeRuleLC.EDITING.getValue().equalsIgnoreCase(ruleVO.getLcStatus())){
- throw new VciBaseException("缂栫爜瑙勫垯鐨勭姸鎬佷笉鏄��" + CodeRuleLC.EDITING.getText() + "銆戯紒涓嶅厑璁镐慨鏀�");
- }
- KeyValue attrKv = checkAttrNullableBySecType(codeBasicSecDTO);
- if (! "success".equals(attrKv.getKey())){
- throw new VciBaseException(attrKv.getValue() + "涓嶈兘涓虹┖");
- }
+ /**
+ * 鏍规嵁缂栫爜瑙勫垯鎵归噺鍒犻櫎鐮佹鍩烘湰淇℃伅
+ * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭
+ * @return 鎵ц缁撴灉
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean batchDeleteSecByCodeRuleOid(String codeRuleOid) {
+ VciBaseUtil.alertNotNull(codeRuleOid,"缂栫爜瑙勫垯涓婚敭");
+ // 1銆侀�氳繃pkcoderule浣滀负鏉′欢锛屽厛鏌ヨ瑕佸垹闄ゅ熀纭�鐮佹
+ List<CodeBasicSec> deleteList = this.codeBasicSecMapper.selectList(Wrappers.<CodeBasicSec>query().eq("pkcoderule", codeRuleOid));
+ if (CollectionUtils.isEmpty(deleteList)){
+ return true;
+ }
+ // 2銆佸啀鍒犻櫎鍩虹鐮佹
+ boolean deletFlag = codeBasicSecMapper.deleteBatchIds(deleteList.stream().map(CodeBasicSec::getOid).collect(Collectors.toSet())) > 0;
+ // 3銆佸啀鏍规嵁鍒犻櫎鍥哄畾鐮佹锛屼笡鏌ヨ鍑烘潵鐨勫熀纭�鐮佹涓繃婊ゅ嚭鍖呭惈鍥哄畾鐮佹鐨勮褰�
+ List<CodeBasicSec> fixedSecList = deleteList.stream().filter(sec -> {
+ return CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equals(sec.getSecType());
+ }).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(fixedSecList)){
+ // 灏嗚浣滀负鍒犻櫎鏉′欢鐨勫�兼斁鍦ㄤ竴涓泦鍚堥噷闈�
+ Set<String> fixedSecOidSet = fixedSecList.stream().map(CodeBasicSec::getOid).collect(Collectors.toSet());
+ // 閫氳繃澶栭敭杩涜鏌ヨ
+ List<CodeFixedValue> fixedValueS = fixedValueMapper.selectList(Wrappers.<CodeFixedValue>query().lambda().in(CodeFixedValue::getCodeFixedSecOid,fixedSecOidSet));
+ // 鏍规嵁鏌ヨ鍑烘潵鐨刬d鎵ц鍥哄畾鐮佹鎵ц鍒犻櫎
+ deletFlag = fixedValueMapper.deleteBatchIds(fixedValueS.stream().map(CodeFixedValue::getOid).collect(Collectors.toSet()))>0;
+ }
+ // 4銆佸啀鍒犻櫎鍒嗙被鐮佹
+ List<CodeBasicSec> classifySecList = deleteList.stream().filter(sec -> {
+ return CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equals(sec.getSecType());
+ }).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(classifySecList)){
+ // 灏嗚浣滀负鍒犻櫎鏉′欢鐨勫�兼斁鍦ㄤ竴涓泦鍚堥噷闈�
+ Set<String> classifySecOidSet = classifySecList.stream().map(CodeBasicSec::getOid).collect(Collectors.toSet());
+ // 閫氳繃澶栭敭杩涜鏌ヨ
+ List<CodeClassifyValue> fixedValueS = codeClassifyValueMapper.selectList(Wrappers.<CodeClassifyValue>query().lambda().in(CodeClassifyValue::getCodeClassifySecOid,classifySecOidSet));
+ // 鏍规嵁鏌ヨ鍑烘潵鐨勪富閿甶d鎵ц鍥哄畾鐮佹鎵ц鍒犻櫎
+ deletFlag = fixedValueMapper.deleteBatchIds(fixedValueS.stream().map(CodeClassifyValue::getOid).collect(Collectors.toSet()))>0;
+ }
+ return deletFlag;
+ }
-
- //灏咲TO杞崲涓篋O
- CodeBasicSecDO codeBasicSecDO = new CodeBasicSecDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDTO, codeBasicSecDO);
- //鎺掑簭鍙凤紝榛樿绛変簬褰撳墠宸叉湁鐨勬暟閲忓姞1
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("pkCodeRule",ruleVO.getOid());
- Long total = codeBasicSecMapper.countByCondition(conditionMap);
- if(total == null){
- total = 0L;
- }
- codeBasicSecDO.setOrderNum(total.intValue() + 1);
-
- //琛ヤ綅鐨勬椂鍊欙紝瑕佹帶鍒惰ˉ浣嶅瓧绗�
- if((OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType())
- || OsCodeFillTypeEnum.RIGHT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType()))
- && StringUtils.isBlank(codeBasicSecDO.getCodeFillSeparator())){
- throw new VciBaseException("褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖");
- }
- //寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸垽鏂弬鐓х殑淇℃伅鏄惁姝ｇ‘
- if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){
- if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){
- throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸～鍐� 鍙傜収閰嶇疆 鐨勫唴瀹�");
- }
- try{
- JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class);
- }catch (Throwable e){
- throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝鍙傜収閰嶇疆鐨勫唴瀹圭殑鏍煎紡涓嶆纭�,",new String[0],e);
- }
- }
- codeBasicSecMapper.insert(codeBasicSecDO);
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- if(StringUtils.isNotBlank(codeBasicSecDO.getCodeFillSeparator())){
- charService.save(MdmBtmTypeConstant.CODE_BASIC_SEC,"codefileseparator",codeBasicSecDO.getCodeFillSeparator(),sessionInfo);
- }
- return codeBasicSecDO2VO(codeBasicSecDO);
- }
-
- /**
- * 淇敼鐮佹鍩虹淇℃伅
- *
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeBasicSecVO editSave(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(codeBasicSecDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- KeyValue attrKv = checkAttrNullableBySecType(codeBasicSecDTO);
- if (! "success".equals(attrKv.getKey())){
- throw new VciBaseException(attrKv.getValue() + "涓嶈兘涓虹┖");
- }
- //灏咲TO杞崲涓篋O
- CodeBasicSecDO codeBasicSecDO = selectByOid(codeBasicSecDTO.getOid());
- boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeBasicSecDO.getPkCodeRule()).getLcStatus());
- if (!status){
- //杩斿洖閿欒淇℃伅
- throw new VciBaseException("缂栫爜瑙勫垯涓嶅厑璁哥紪杈戞垨鍒犻櫎锛�");
- } else {
- //琛ヤ綅鐨勬椂鍊欙紝瑕佹帶鍒惰ˉ浣嶅瓧绗�
- if((OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType())
- || OsCodeFillTypeEnum.RIGHT.getValue().equalsIgnoreCase(codeBasicSecDO.getCodeFillType()))
- && StringUtils.isBlank(codeBasicSecDO.getCodeFillSeparator())){
- throw new VciBaseException("褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖");
- }
- //寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸垽鏂弬鐓х殑淇℃伅鏄惁姝ｇ‘
- if(CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(codeBasicSecDO.getSecType())){
- if(StringUtils.isBlank(codeBasicSecDO.getReferConfig())){
- throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝闇�瑕佸～鍐� 鍙傜収閰嶇疆 鐨勫唴瀹�");
- }
- try{
- JSONObject.parseObject(codeBasicSecDO.getReferConfig(), UIFormReferVO.class);
- }catch (Throwable e){
- throw new VciBaseException("寮曠敤鐮佹鐨勬椂鍊欙紝鍙傜収閰嶇疆鐨勫唴瀹圭殑鏍煎紡涓嶆纭�,",new String[0],e);
- }
- }
- revisionModelUtil.copyFromDTOIgnore(codeBasicSecDTO, codeBasicSecDO);
- codeBasicSecMapper.updateByPrimaryKey(codeBasicSecDO);
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- if(StringUtils.isNotBlank(codeBasicSecDO.getCodeFillSeparator())){
- charService.save(MdmBtmTypeConstant.CODE_BASIC_SEC,"codefileseparator",codeBasicSecDO.getCodeFillSeparator(),sessionInfo);
- }
- }
- return codeBasicSecDO2VO(codeBasicSecDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- *
- * @param codeBasicSecDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeBasicSecDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeBasicSecDTO codeBasicSecDTO, CodeBasicSecDO codeBasicSecDO) {
- boService.checkTs(codeBasicSecDTO);
- if (!checkIsLinked(null, codeBasicSecDO.getOid())) {
- return BaseResult.success();
- } else {
- return BaseResult.fail(DATA_LINKED_NOT_DELETE, new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- *
- * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭
- * @param codeBasicSecOid 缂栫爜鍩虹淇℃伅涓婚敭
- * @return true琛ㄧず宸茶寮曠敤锛宖alse琛ㄧず鏈寮曠敤
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String codeRuleOid, String codeBasicSecOid) throws VciBaseException {
- boolean flag = true;
- if (StringUtils.isNotBlank(codeRuleOid)) {
- boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeRuleOid).getLcStatus());
- if (!status){
- return true;
- }
- boolean alreadyInUse = codeRuleService.isAlreadyInUse(codeRuleOid);
- if (!alreadyInUse){
- flag = false;
- }
- } else {
- boolean status = codeRuleService.checkEditDelStatus(codeRuleService.getObjectByOid(codeBasicSecMapper.selectByPrimaryKey(codeBasicSecOid).getPkCodeRule()).getLcStatus());
- if (!status){
- return true;
- }
- boolean alreadyInUse = codeRuleService.isAlreadyInUse(codeBasicSecMapper.selectByPrimaryKey(codeBasicSecOid).getPkCodeRule());
- if (!alreadyInUse){
- flag = false;
- }
- }
- return flag;
- }
-
- /**
- * 鍒犻櫎鐮佹鍩虹淇℃伅
- *
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeBasicSec(CodeBasicSecDTO codeBasicSecDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(codeBasicSecDTO, "鐮佹鍩虹淇℃伅鏁版嵁瀵硅薄", codeBasicSecDTO.getOid(), "鐮佹鍩虹淇℃伅鐨勪富閿�");
- return deleteCodeBasicSecByPrimaryKey(codeBasicSecDTO.getOid());
- }
-
- /**
- * 涓婚敭鍒犻櫎鐮佹鍩虹淇℃伅
- *
- * @param oid 鐮佹鍩虹淇℃伅涓婚敭
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeBasicSecByPrimaryKey(String oid) throws VciBaseException {
- CodeBasicSecDO codeBasicSecDO = selectByOid(oid);
- boolean isLinked = checkIsLinked(codeBasicSecDO.getPkCodeRule(), oid);
- if (isLinked) {
- return BaseResult.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�");
- }
- Map<String,String> conditionMap = new HashMap<>();
- //鎵ц鍒犻櫎鎿嶄綔
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = codeBasicSecMapper.deleteByPrimaryKey(oid);
- Set<ClientBusinessObject> deleteSet = new HashSet<>();
- deleteSet.addAll(batchCBO.getDeleteCbos());
- if (CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equals(codeBasicSecDO.getSecType())){
- conditionMap.put("codefixedsecoid",codeBasicSecDO.getOid());
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap, CodeFixedValueDO.class);
- List<CodeFixedValueDO> fixedValueDOS = fixedValueMapper.selectByWrapper(wrapper);
- BatchCBO valueCBO = fixedValueMapper.batchDeleteByOids(fixedValueDOS.stream().map(CodeFixedValueDO::getOid).collect(Collectors.toSet()));
- deleteSet.addAll(valueCBO.getDeleteCbos());
- }
- if (CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equals(codeBasicSecDO.getSecType())){
- conditionMap.put("codeclassifysecoid",codeBasicSecDO.getOid());
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap, CodeClassifyValueDO.class);
- List<CodeClassifyValueDO> classifyValueDOS = codeClassifyValueMapper.selectByWrapper(wrapper);
- if(!CollectionUtils.isEmpty(classifyValueDOS)) {
- BatchCBO valueCBO = codeClassifyValueMapper.batchDeleteByOids(classifyValueDOS.stream().map(CodeClassifyValueDO::getOid).collect(Collectors.toSet()));
- deleteSet.addAll(valueCBO.getDeleteCbos());
- }
- }
- batchCBO.setDeleteCbos(deleteSet);
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- return (batchCBO != null && batchCBO.getDeleteCbos() != null && batchCBO.getDeleteCbos().size() > 0) ? BaseResult.successMsg(DELETE_SUCCESS) : BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇鐮佹鍩虹淇℃伅
- *
- * @param oid 涓婚敭
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeBasicSecVO getObjectByOid(String oid) throws VciBaseException {
- return codeBasicSecDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- *
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeBasicSecDO selectByOid(String oid) throws VciBaseException {
- VciBaseUtil.alertNotNull(oid, "涓婚敭");
- CodeBasicSecDO codeBasicSecDO = codeBasicSecMapper.selectByPrimaryKey(oid.trim());
- if (codeBasicSecDO == null || StringUtils.isBlank(codeBasicSecDO.getOid())) {
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeBasicSecDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鐮佹鍩虹淇℃伅
- *
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeBasicSecVO> listCodeBasicSecByOids(Collection<String> oidCollections) throws VciBaseException {
- VciBaseUtil.alertNotNull(oidCollections, "鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeBasicSecDO> codeBasicSecDOList = listCodeBasicSecDOByOidCollections(oidCollections);
- return codeBasicSecDO2VOs(codeBasicSecDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- *
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeBasicSecDO> listCodeBasicSecDOByOidCollections(Collection<String> oidCollections) {
- List<CodeBasicSecDO> codeBasicSecDOList = new ArrayList<CodeBasicSecDO>();
- if (!CollectionUtils.isEmpty(oidCollections)) {
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for (Collection<String> oids : oidCollectionsList) {
- List<CodeBasicSecDO> tempDOList = codeBasicSecMapper.selectByPrimaryKeyCollection(oids);
- if (!CollectionUtils.isEmpty(tempDOList)) {
- codeBasicSecDOList.addAll(tempDOList);
- }
- }
- }
- return codeBasicSecDOList;
- }
-
-
- /**
- * 鍙傜収鐮佹鍩虹淇℃伅鍒楄〃
- *
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鐮佹鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeBasicSecVO> refDataGridCodeBasicSec(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- if (conditionMap == null) {
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeBasicSec(conditionMap, pageHelper);
- }
-
- /**
- * 鍏嬮殕鐮佹淇℃伅
- *
- * @param oidList 婧愮爜娈典俊鎭富閿泦鍚�
- * @param pkCodeRule 鐩爣缂栫爜瑙勫垯
- * @return 鍏嬮殕缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- */
- @Override
- public BaseResult cloneCodeBasicSec(List<String> oidList, String pkCodeRule) {
- boolean isLinked = checkIsLinked(pkCodeRule,null);
- if (isLinked) {
- return BaseResult.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�");
- }
- List<CodeBasicSecDO> createList = new ArrayList<>();
- List<CodeBasicSecDO> basicSecDOS = codeBasicSecMapper.selectByPrimaryKeyCollection(oidList);
- basicSecDOS.forEach(sec -> {
- CodeBasicSecDO newSecDO = new CodeBasicSecDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sec,newSecDO);
- newSecDO.setOid("");
- newSecDO.setNameOid("");
- newSecDO.setRevisionOid("");
- newSecDO.setId(newSecDO.getId() + "_copy");
- newSecDO.setName(newSecDO.getName() + "_copy");
- newSecDO.setPkCodeRule(pkCodeRule);
- createList.add(newSecDO);
- });
- codeBasicSecMapper.batchInsert(createList);
- return BaseResult.success();
- }
-
- /**
- * 鏍规嵁鐮佹鍒嗙被鐨勭被鍨嬪垽鏂睘鎬ф槸鍚︽槸绌虹殑
- *
- * @param codeBasicSecDTO 鐮佹鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鏈夌┖鐨勫垯浼爇ey-灞炴�у悕 value-瀛楁鍚箟锛屾病鏈夌┖鐨勫垯浼� key-success value-true
- */
- @Override
- public KeyValue checkAttrNullableBySecType(CodeBasicSecDTO codeBasicSecDTO) {
- VciBaseUtil.alertNotNull(codeBasicSecDTO.getSectype(), "鐮佹鍒嗙被");
- String secType = codeBasicSecDTO.getSectype();
- HashMap<String, String> attrMap = JSONObject.parseObject(JSONObject.toJSONString(codeBasicSecDTO), HashMap.class);
- Map<String, String> notNullableAttr = getNotNullableAttr(secType);
- if (notNullableAttr == null) {
- throw new VciBaseException("鐮佹鍒嗙被濉啓鍑洪敊锛岃鏌ラ獙鍚庨噸璇�");
- }
- for (String key : notNullableAttr.keySet()) {
- if (StringUtils.isBlank(WebUtil.getStringValueFromObject(attrMap.get(key)))) {
- KeyValue kv = new KeyValue();
- kv.setKey(key);
- kv.setValue(notNullableAttr.get(key));
- return kv;
- }
- }
- KeyValue kv = new KeyValue();
- kv.setKey("success");
- kv.setValue("true");
- return kv;
- }
-
- /**
- * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鍐呭
- *
- * @param ruleOid 瑙勫垯鐨勫唴瀹�
- * @return 鐮佹鐨勫唴瀹�
- */
- @Override
- public List<CodeBasicSecVO> listCodeBasicSecByRuleOid(String ruleOid) {
- if(StringUtils.isBlank(ruleOid)){
- return new ArrayList<>();
- }
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("pkCodeRule",ruleOid);
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultAsc("ordernum");
- List<CodeBasicSecDO> secDOList = codeBasicSecMapper.selectByCondition(conditionMap, pageHelper);
- return codeBasicSecDO2VOs(secDOList,true);
- }
-
- /**
- * 浣跨敤瑙勫垯鐨勪富閿幏鍙栧搴旂殑鐮佹鐨勫唴瀹�
- *
- * @param ruleCollection 瑙勫垯涓婚敭闆嗗悎
- * @return 鐮佹鐨勫唴瀹�
- */
- @Override
- public List<CodeBasicSecVO> listCodeBasicSecByRuleOids(Collection<String> ruleCollection) {
- if(CollectionUtils.isEmpty(ruleCollection)){
- return new ArrayList<>();
- }
- List<CodeBasicSecDO> secDOList = new CopyOnWriteArrayList<>();
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- VciBaseUtil.switchCollectionForOracleIn(ruleCollection).parallelStream().forEach(ruleOids->{
- WebUtil.setCurrentUserSessionInfo(sessionInfo);
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("pkcoderule", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(ruleOids.toArray(new String[0])) + ")");
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultAsc("ordernum");
- List<CodeBasicSecDO> tempSecDOs = codeBasicSecMapper.selectByCondition(conditionMap, pageHelper);
- if(!CollectionUtils.isEmpty(tempSecDOs)){
- secDOList.addAll(tempSecDOs);
- }
- });
- return codeBasicSecDO2VOs(secDOList);
- }
-
- /**
- * 鍙傜収鍒嗙被鐨勭爜娈�
- *
- * @param conditionMap 鏌ヨ鏉′欢锛屽繀椤昏鏈塸kCodeRule
- * @param pageHelper 鍒嗛〉鐨勫璞�
- * @return 鐮佹鐨勫唴瀹�
- */
- @Override
- public DataGrid<CodeBasicSecVO> refDataGridClassifySec(Map<String, String> conditionMap, PageHelper pageHelper) {
- if(CollectionUtils.isEmpty(conditionMap) || !conditionMap.containsKey("pkCodeRule")){
- return new DataGrid<>();
- }
- conditionMap.put("secType",CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue());
- return refDataGridCodeBasicSec(conditionMap,pageHelper);
- }
-
- /**
- * 鏍规嵁鐮佹绫诲瀷鑾峰彇涓嶅彲涓虹┖鐨勫瓧娈�
- *
- * @param secType 鐮佹绫诲瀷
- * @return 涓嶅彲涓虹┖鐨勫瓧娈甸泦鍚�
- */
- private Map<String, String> getNotNullableAttr(String secType) {
- Map<String, String> attrMap = new HashMap<>();
- if (CodeSecTypeEnum.CODE_ATTR_SEC.getValue().equalsIgnoreCase(secType)) {
- attrMap.put("name", "灞炴�х爜娈靛悕绉�");
- } else if (CodeSecTypeEnum.CODE_DATE_SEC.getValue().equalsIgnoreCase(secType)) {
- attrMap.put("name", "鏃ユ湡鐮佹鍚嶇О");
- attrMap.put("codeDateFormatStr", "鏃ユ湡鏍煎紡");
- } else if (CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equalsIgnoreCase(secType)) {
- attrMap.put("name", "鍥哄畾鐮佹鍚嶇О");
- attrMap.put("codeSecLengthType", "鐮佹闀垮害绫诲瀷");
- attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�");
- } else if (CodeSecTypeEnum.CODE_LEVEL_SEC.getValue().equalsIgnoreCase(secType)) {
- attrMap.put("name", "灞傜骇鐮佹鍚嶇О");
- attrMap.put("codeLevelType", "灞傜骇绫诲瀷");
- attrMap.put("valueCutType", "瀛楃鎴彇绫诲瀷");
- } else if (CodeSecTypeEnum.CODE_REFER_SEC.getValue().equalsIgnoreCase(secType)) {
- attrMap.put("name", "寮曠敤鐮佹鍚嶇О");
- } else if (CodeSecTypeEnum.CODE_SERIAL_SEC.getValue().equalsIgnoreCase(secType)) {
- attrMap.put("name", "娴佹按鐮佹鍚嶇О");
- attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�");
- attrMap.put("codeFillType", "缂栫爜琛ヤ綅鏂瑰紡");
- attrMap.put("codeFillLength", "濉厖闀垮害");
- attrMap.put("codeFillLimit", "娴佹按涓婇檺");
- attrMap.put("codeFillFlag", "娴佹按鏄惁琛ョ爜");
- } else if (CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue().equalsIgnoreCase(secType)) {
- attrMap.put("name", "鍙彉鐮佹鍚嶇О");
- attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�");
- attrMap.put("codeFillType", "缂栫爜琛ヤ綅鏂瑰紡");
- } else if (CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equalsIgnoreCase(secType)) {
- attrMap.put("name", "鍒嗙被鐮佹鍚嶇О");
- attrMap.put("codeSecLengthType", "鐮佹闀垮害绫诲瀷");
- attrMap.put("codeSecLength", "鐮佹鐨勯暱搴�");
- } else {
- attrMap = null;
- }
- return attrMap;
- }
-
- /**
- * 鏌ヨ鐩爣鍒嗙被鐮佹鎵�鍦ㄧ殑鏍戠粨鏋�
- *
- * @param oid 鐩爣鍒嗙被鐮佹涓婚敭
- * @return 鍒嗙被鐮佹鏍戠粨鏋�
- */
- @Override
- public List<Tree> gridCodeClassifySecTree(String oid) {
- VciParentQueryOption queryOption = new VciParentQueryOption(PARENT_FIELD_NAME);
- queryOption.setfOid(oid);
- queryOption.setLinkTypeFlag(false);
- queryOption.setHasSelf(true);
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(CodeBasicSecDO.class);
- wrapper.childQueryParent(queryOption);
- List<CodeBasicSecDO> doList = codeBasicSecMapper.selectByWrapper(wrapper);
- List<String> secOid = new ArrayList<>();
- doList.forEach(o -> secOid.add(o.getOid()));
- List<CodeClassifyValueVO> valueVOs = (List<CodeClassifyValueVO>) codeClassifyValueService.listCodeClassifyValueByOids(secOid);
- TreeQueryObject treeQueryObject = new TreeQueryObject();
- treeQueryObject.setMultipleSelect(false);
- treeQueryObject.setShowCheckBox(false);
- treeQueryObject.setQueryAllLevel(false);
- treeQueryObject.setValueField("oid");
- treeQueryObject.setTextField("name");
- treeQueryObject.setQueryAllRev(false);
- TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_CLASSIFY_VALUE_FIELD_NAME);
- treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
- return revisionModelUtil.doList2Trees(valueVOs,treeWrapperOptions,(CodeClassifyValueVO s) ->{
- //鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
- return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
- .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
- });
- }
-
- /**
- * 鏍规嵁缂栫爜瑙勫垯鎵归噺鍒犻櫎鐮佹鍩烘湰淇℃伅
- * @param codeRuleOid 缂栫爜瑙勫垯涓婚敭
- * @return 鎵ц缁撴灉
- */
- @Override
- public BatchCBO batchDeleteSecByCodeRuleOid(String codeRuleOid) {
- VciBaseUtil.alertNotNull(codeRuleOid,"缂栫爜瑙勫垯涓婚敭");
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("pkcoderule",codeRuleOid);
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap,CodeBasicSecDO.class);
- List<CodeBasicSecDO> deleteList = codeBasicSecMapper.selectByWrapper(wrapper);
- if (CollectionUtils.isEmpty(deleteList)){
- return new BatchCBO();
- }
- BatchCBO batchCBO = codeBasicSecMapper.batchDeleteByOids(deleteList.stream().map(CodeBasicSecDO::getOid).collect(Collectors.toSet()));
- Set<ClientBusinessObject> deleteSet = new HashSet<>();
- deleteSet.addAll(batchCBO.getDeleteCbos());
- List<CodeBasicSecDO> fixedSecList = deleteList.stream().filter(sec -> {
- return CodeSecTypeEnum.CODE_FIXED_SEC.getValue().equals(sec.getSecType());
- }).collect(Collectors.toList());
- List<CodeBasicSecDO> classifySecList = deleteList.stream().filter(sec -> {
- return CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue().equals(sec.getSecType());
- }).collect(Collectors.toList());
- Set<String> fixedSecOidSet = fixedSecList.stream().map(CodeBasicSecDO::getOid).collect(Collectors.toSet());
- Set<String> classifySecOidSet = classifySecList.stream().map(CodeBasicSecDO::getOid).collect(Collectors.toSet());
- if (!CollectionUtils.isEmpty(fixedSecOidSet)){
- StringBuilder sb = new StringBuilder();
- fixedSecOidSet.stream().forEach(oid -> {
- sb.append("'").append(oid).append("',");
- });
- String inSql = sb.toString().substring(0,sb.toString().length()-1);
- VciQueryWrapperForDO wrapperForValue = new VciQueryWrapperForDO(null,CodeFixedValueDO.class);
- PageHelper ph = new PageHelper();
- ph.setLimit(-1);
- wrapperForValue.in("codefixedsecoid",inSql);
- List<CodeFixedValueDO> fixedValueDOS = fixedValueMapper.selectByWrapper(wrapperForValue);
- BatchCBO fixedCBO = fixedValueMapper.batchDeleteByOids(fixedValueDOS.stream().map(CodeFixedValueDO::getOid).collect(Collectors.toSet()));
- deleteSet.addAll(fixedCBO.getDeleteCbos());
- }
- if (!CollectionUtils.isEmpty(classifySecOidSet)){
- StringBuilder sb = new StringBuilder();
- classifySecOidSet.stream().forEach(oid -> {
- sb.append("'").append(oid).append("',");
- });
- String inSql = sb.toString().substring(0,sb.toString().length()-1);
- VciQueryWrapperForDO wrapperForValue = new VciQueryWrapperForDO(null,CodeClassifyValueDO.class);
- PageHelper ph = new PageHelper();
- ph.setLimit(-1);
- wrapperForValue.in("codeclassifysecoid",inSql);
- List<CodeClassifyValueDO> classifyValueDOS = codeClassifyValueMapper.selectByWrapper(wrapperForValue);
- BatchCBO fixedCBO = codeClassifyValueMapper.batchDeleteByOids(classifyValueDOS.stream().map(CodeClassifyValueDO::getOid).collect(Collectors.toSet()));
- deleteSet.addAll(fixedCBO.getDeleteCbos());
- }
- batchCBO.setDeleteCbos(deleteSet);
- return batchCBO;
- }
-
- /**
- * 涓婄Щ
- *
- * @param oid 涓婚敭
- */
- @Override
- public void upOrderNum(String oid) {
- CodeBasicSecDO secDO = selectByOid(oid);
- BatchCBO batchCBO = new BatchCBO();
- WebUtil.setPersistence(false);
- if(secDO.getOrderNum() >1){
- //绛変簬1鐨勬椂鍊欎笉鑳戒笂绉讳簡
- //鎵炬瘮鑷繁灏忕殑
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("pkCodeRule",secDO.getPkCodeRule());
- conditionMap.put("ordernum",String.valueOf(secDO.getOrderNum()-1));
- List<CodeBasicSecDO> lastSecDOs = codeBasicSecMapper.selectByCondition(conditionMap,new PageHelper(-1));
- if(!CollectionUtils.isEmpty(lastSecDOs)){
- CodeBasicSecDO lastSec = lastSecDOs.get(0);
- lastSec.setOrderNum(lastSec.getOrderNum()+1);
- batchCBO.copyFromOther(codeBasicSecMapper.updateByPrimaryKey(lastSec));
- }
- secDO.setOrderNum(secDO.getOrderNum()-1);
- batchCBO.copyFromOther(codeBasicSecMapper.updateByPrimaryKey(secDO));
- }
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- }
-
- /**
- * 涓嬬Щ
- *
- * @param oid 涓婚敭
- */
- @Override
- public void downOrderNum(String oid) {
- CodeBasicSecDO secDO = selectByOid(oid);
- BatchCBO batchCBO = new BatchCBO();
- WebUtil.setPersistence(false);
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("pkCodeRule",secDO.getPkCodeRule());
- Long total = codeBasicSecMapper.countByCondition(conditionMap);
- if(secDO.getOrderNum() < total){
- //灏忎簬鎬绘暟鐨勬椂鍊欐墠涓嬬Щ
- conditionMap.put("ordernum",String.valueOf(secDO.getOrderNum()+1));
- List<CodeBasicSecDO> lastSecDOs = codeBasicSecMapper.selectByCondition(conditionMap,new PageHelper(-1));
- if(!CollectionUtils.isEmpty(lastSecDOs)){
- CodeBasicSecDO lastSec = lastSecDOs.get(0);
- lastSec.setOrderNum(lastSec.getOrderNum()-1);
- batchCBO.copyFromOther(codeBasicSecMapper.updateByPrimaryKey(lastSec));
- }
- secDO.setOrderNum(secDO.getOrderNum()+1);
- batchCBO.copyFromOther(codeBasicSecMapper.updateByPrimaryKey(secDO));
- }
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- }
}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java
deleted file mode 100644
index 401e4a7..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeButtonServiceImpl.java
+++ /dev/null
@@ -1,324 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.vci.ubcs.code.entity.CodeButtonDO;
-import com.vci.ubcs.code.mapper.CodeButtonMapper;
-import com.vci.ubcs.code.service.CodeButtonServiceI;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtil;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeButtonDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeButtonVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-/**
- * 涓绘暟鎹腑鐨勬寜閽墿灞曟湇鍔�
- * @author weidy
- * @date 2022-01-24
- */
-@Service
-public class CodeButtonServiceImpl implements CodeButtonServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeButtonMapper codeButtonMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeButtonVO> gridCodeButton(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodeButtonDO> doList = codeButtonMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeButtonVO> dataGrid=new DataGrid<CodeButtonVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeButtonDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeButtonMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeButtonDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeButtonVO> codeButtonDO2VOs(Collection<CodeButtonDO> codeButtonDOs) throws VciBaseException{
- List<CodeButtonVO> voList = new ArrayList<CodeButtonVO>();
- if(!CollectionUtils.isEmpty(codeButtonDOs)){
- for(CodeButtonDO s: codeButtonDOs){
- CodeButtonVO vo = codeButtonDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeButtonDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeButtonVO codeButtonDO2VO(CodeButtonDO codeButtonDO) throws VciBaseException{
- CodeButtonVO vo = new CodeButtonVO();
- if(codeButtonDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeButtonDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setLcStatusText(FrameworkDataLCStatus.getTextByValue(vo.getLcStatus()));
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param codeButtonDTO 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeButtonVO addSave(CodeButtonDTO codeButtonDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeButtonDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeButtonDO codeButtonDO = new CodeButtonDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeButtonDTO,codeButtonDO);
- codeButtonMapper.insert(codeButtonDO);
- return codeButtonDO2VO(codeButtonDO);
- }
-
- /**
- * 淇敼涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param codeButtonDTO 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeButtonVO editSave(CodeButtonDTO codeButtonDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeButtonDTO,"鏁版嵁瀵硅薄",codeButtonDTO.getOid(),"涓绘暟鎹腑鐨勬寜閽墿灞曚富閿�");
- //灏咲TO杞崲涓篋O
- CodeButtonDO codeButtonDO = selectByOid(codeButtonDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeButtonDTO,codeButtonDO);
- codeButtonMapper.updateByPrimaryKey(codeButtonDO);
- return codeButtonDO2VO(codeButtonDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeButtonDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeButtonDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeButtonDTO codeButtonDTO, CodeButtonDO codeButtonDO) {
- CodeButtonDO buttonDO = new CodeButtonDO();
- BeanUtil.convert(codeButtonDTO,buttonDO);
- boService.checkTs(buttonDO);
- if(!checkIsLinked(codeButtonDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
-
-
- /**
- * 鍒犻櫎涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param codeButtonDTO 涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeButton(CodeButtonDTO codeButtonDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeButtonDTO,"涓绘暟鎹腑鐨勬寜閽墿灞曟暟鎹璞�",codeButtonDTO.getOid(),"涓绘暟鎹腑鐨勬寜閽墿灞曠殑涓婚敭");
- CodeButtonDO codeButtonDO = selectByOid(codeButtonDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeButtonDTO,codeButtonDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeButtonMapper.deleteByPrimaryKey(codeButtonDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param oid 涓婚敭
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeButtonVO getObjectByOid(String oid) throws VciBaseException{
- return codeButtonDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeButtonDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeButtonDO codeButtonDO = codeButtonMapper.selectByPrimaryKey(oid.trim());
- if(codeButtonDO == null || StringUtils.isBlank(codeButtonDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeButtonDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹腑鐨勬寜閽墿灞�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeButtonVO> listCodeButtonByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeButtonDO> codeButtonDOList = listCodeButtonDOByOidCollections(oidCollections);
- return codeButtonDO2VOs(codeButtonDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeButtonDO> listCodeButtonDOByOidCollections(Collection<String> oidCollections){
- List<CodeButtonDO> codeButtonDOList = new ArrayList<CodeButtonDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeButtonDO> tempDOList = codeButtonMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeButtonDOList.addAll(tempDOList);
- }
- }
- }
- return codeButtonDOList;
- }
-
-
-
- /**
- * 鍙傜収涓绘暟鎹腑鐨勬寜閽墿灞曞垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓绘暟鎹腑鐨勬寜閽墿灞曟樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeButtonVO> refDataGridCodeButton(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeButton(conditionMap,pageHelper);
- }
-
- /**
- * 鍚敤
- *
- * @param buttonDTO 鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult enableCodeButton(CodeButtonDTO buttonDTO) {
- return changeLcStatus(buttonDTO,false);
- }
-
- /**
- * 鍋滅敤
- *
- * @param buttonDTO 鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult disableCodeButton(CodeButtonDTO buttonDTO) {
- return changeLcStatus(buttonDTO,true);
- }
-
- /**
- * 淇敼鐢熷懡鍛ㄦ湡鐨勭姸鎬侊紝濡傚仠鐢ㄥ拰鍚敤
- * @param buttonDTO 鏁版嵁浼犺緭瀵硅薄锛屽繀椤昏鏈塷id鍜宼s
- * @param disable 鏄惁涓哄仠鐢�
- * @return 鎵ц鐨勭粨鏋�
- */
- private BaseResult changeLcStatus(CodeButtonDTO buttonDTO, boolean disable){
- VciBaseUtil.alertNotNull(buttonDTO,"鏁版嵁瀵硅薄",buttonDTO.getOid(),"涓婚敭");
- CodeButtonDO buttonDO = selectByOid(buttonDTO.getOid());
- CodeButtonDO outButtonDO = new CodeButtonDO();
- BeanUtil.convert(buttonDTO,outButtonDO);
- boService.checkTs(outButtonDO);
- if(disable){
- buttonDO.setLcStatus(FrameworkDataLCStatus.DISABLED.getValue());
- }else{
- buttonDO.setLcStatus(FrameworkDataLCStatus.ENABLED.getValue());
- }
- return (codeButtonMapper.updateLcStatus(buttonDO.getOid(),buttonDO.getLcStatus()) >0 )?(BaseResult.successMsg((disable?DISABLE_SUCCESS:ENABLE_SUCCESS))):(BaseResult.fail((disable?DISABLE_FAIL:ENABLE_FAIL)));
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
deleted file mode 100644
index 67632a2..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyProcessTempServiceImpl.java
+++ /dev/null
@@ -1,359 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.vci.ubcs.code.mapper.CodeClassifyProcessTempMapper;
-import com.vci.ubcs.code.entity.CodeClassifyProcessTempDO;
-import com.vci.ubcs.code.service.CodeClassifyProcessTempServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtil;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyProcessTempVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.*;
-
-/**
- * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎湇鍔�
- * @author weidy
- * @date 2022-01-24
- */
-@Service
-public class CodeClassifyProcessTempServiceImpl implements CodeClassifyProcessTempServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyProcessTempMapper codeClassifyProcessTempMapper;
-
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyProcessTempVO> gridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodeClassifyProcessTempDO> doList = codeClassifyProcessTempMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeClassifyProcessTempVO> dataGrid=new DataGrid<CodeClassifyProcessTempVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeClassifyProcessTempDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeClassifyProcessTempMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyProcessTempDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyProcessTempVO> codeClassifyProcessTempDO2VOs(Collection<CodeClassifyProcessTempDO> codeClassifyProcessTempDOs) throws VciBaseException{
- List<CodeClassifyProcessTempVO> voList = new ArrayList<CodeClassifyProcessTempVO>();
- if(!CollectionUtils.isEmpty(codeClassifyProcessTempDOs)){
- codeClassifyProcessTempDOs.forEach(temp -> {
- CodeClassifyProcessTempVO tempVO = codeClassifyProcessTempDO2VO(temp);
- BeanUtilForVCI.copyPropertiesIgnoreCase(temp,tempVO);
- voList.add(tempVO);
- });
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyProcessTempDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyProcessTempVO codeClassifyProcessTempDO2VO(CodeClassifyProcessTempDO codeClassifyProcessTempDO) throws VciBaseException{
- CodeClassifyProcessTempVO vo = new CodeClassifyProcessTempVO();
- if(codeClassifyProcessTempDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyProcessTempDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- //澶勭悊鍏宠仈鐨勬ā鏉垮睘鎬�
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyProcessTempVO addSave(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeClassifyProcessTempDTO.getProcessVersion(),"娴佺▼妯℃澘鐨勭増鏈彿",codeClassifyProcessTempDTO.getCodeprocessuse(),"妯℃澘娴佺▼鐨勭敤閫�");
- if (StringUtils.isBlank(codeClassifyProcessTempDTO.getCodeprocessuse())){
- throw new VciBaseException("妯℃澘娴佺▼鐢ㄩ�斾笉鑳戒负绌�");
- }
- Long count = countProcessTemplate(codeClassifyProcessTempDTO);
- if(count > 0){
- throw new VciBaseException("宸插瓨鍦ㄧ浉鍚岀殑娴佺▼妯℃澘");
- }
- //灏咲TO杞崲涓篋O
- CodeClassifyProcessTempDO codeClassifyProcessTempDO = new CodeClassifyProcessTempDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- codeClassifyProcessTempMapper.insert(codeClassifyProcessTempDO);
- //鍥犱负涓氬姟绫诲瀷鏈韩娌℃湁鎺у埗鐗堟湰锛屾墍鏈夊己鍒剁粰鐗堟湰revisionValue璁剧疆鍊硷紝骞冲彴涔熶細鍙樻垚绌恒�傘�傘�傘��
- //鐗堟湰鍙蜂笉鑳戒娇鐢ㄩ粯璁ょ殑灞炴��
- return codeClassifyProcessTempDO2VO(codeClassifyProcessTempDO);
- }
-
- /**
- * 鑾峰彇娴佺▼妯℃澘鏄惁宸茬粡瀛樺湪浜�
- * @param codeClassifyProcessTempDTO 鏁版嵁浼犺緭瀵硅薄
- * @return 涓暟
- */
- private Long countProcessTemplate(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) {
- String templateName = codeClassifyProcessTempDTO.getName();
- if (StringUtils.isBlank(templateName)){
- throw new VciBaseException("妯℃澘娴佺▼鍚嶇О涓嶈兘涓虹┖");
- }
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codeProcessUse",codeClassifyProcessTempDTO.getCodeprocessuse());
- conditionMap.put("id",codeClassifyProcessTempDTO.getId());
- conditionMap.put("classifyTemplateOid", codeClassifyProcessTempDTO.getClassifyTemplateOid());
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap,CodeClassifyProcessTempDO.class);
- Long count = codeClassifyProcessTempMapper.countByWrapper(wrapper);
- return count;
- }
-
- /**
- * 淇敼鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyProcessTempVO editSave(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"鏁版嵁瀵硅薄",codeClassifyProcessTempDTO.getOid(),"鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉夸富閿�",codeClassifyProcessTempDTO.getProcessVersion(),"娴佺▼妯℃澘鐨勭増鏈彿",codeClassifyProcessTempDTO.getName(),"娴佺▼妯℃澘鐨勫悕绉�");
- //灏咲TO杞崲涓篋O
- CodeClassifyProcessTempDO codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- codeClassifyProcessTempMapper.updateByPrimaryKey(codeClassifyProcessTempDO);
- return codeClassifyProcessTempDO2VO(codeClassifyProcessTempDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeClassifyProcessTempDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeClassifyProcessTempDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO, CodeClassifyProcessTempDO codeClassifyProcessTempDO) {
- CodeClassifyProcessTempDO tempDO = new CodeClassifyProcessTempDO();
- BeanUtil.convert(codeClassifyProcessTempDTO,tempDO);
- boService.checkTs(tempDO);
- if(!checkIsLinked(codeClassifyProcessTempDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param codeClassifyProcessTempDTO 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeClassifyProcessTemp(CodeClassifyProcessTempDTO codeClassifyProcessTempDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyProcessTempDTO,"鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎暟鎹璞�",codeClassifyProcessTempDTO.getOid(),"鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉跨殑涓婚敭");
- CodeClassifyProcessTempDO codeClassifyProcessTempDO = selectByOid(codeClassifyProcessTempDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeClassifyProcessTempDTO,codeClassifyProcessTempDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeClassifyProcessTempMapper.deleteByPrimaryKey(codeClassifyProcessTempDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param oid 涓婚敭
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyProcessTempVO getObjectByOid(String oid) throws VciBaseException{
- return codeClassifyProcessTempDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeClassifyProcessTempDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeClassifyProcessTempDO codeClassifyProcessTempDO = codeClassifyProcessTempMapper.selectByPrimaryKey(oid.trim());
- if(codeClassifyProcessTempDO == null || StringUtils.isBlank(codeClassifyProcessTempDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeClassifyProcessTempDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeClassifyProcessTempVO> listCodeClassifyProcessTempByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeClassifyProcessTempDO> codeClassifyProcessTempDOList = listCodeClassifyProcessTempDOByOidCollections(oidCollections);
- return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeClassifyProcessTempDO> listCodeClassifyProcessTempDOByOidCollections(Collection<String> oidCollections){
- List<CodeClassifyProcessTempDO> codeClassifyProcessTempDOList = new ArrayList<CodeClassifyProcessTempDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeClassifyProcessTempDO> tempDOList = codeClassifyProcessTempMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeClassifyProcessTempDOList.addAll(tempDOList);
- }
- }
- }
- return codeClassifyProcessTempDOList;
- }
-
-
-
- /**
- * 鍙傜収鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉垮垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉挎樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyProcessTempVO> refDataGridCodeClassifyProcessTemp(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeClassifyProcessTemp(conditionMap,pageHelper);
- }
-
- /**
- * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
- *
- * @param classifyTemplateOid 妯℃澘鐨勪富閿�
- * @return 鍙楀奖鍝嶇殑鍐呭
- */
- @Override
- public BatchCBO codeTemplateDeleteTrigger(String classifyTemplateOid) {
- BatchCBO batchCBO = new BatchCBO();
- if(StringUtils.isBlank(classifyTemplateOid)){
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("classifyTemplateOid",classifyTemplateOid);
- List<CodeClassifyProcessTempDO> processTempDOS = codeClassifyProcessTempMapper.selectByCondition(conditionMap, new PageHelper(-1));
- if(!CollectionUtils.isEmpty(processTempDOS)){
- batchCBO.copyFromOther(codeClassifyProcessTempMapper.batchDeleteByOids(processTempDOS.stream().map(CodeClassifyProcessTempDO::getOid).collect(Collectors.toList())));
- }
- }
- return batchCBO;
- }
-
- /**
- * 鑾峰彇娴佺▼鐨勬ā鏉跨殑淇℃伅
- *
- * @param codeTemplateOid 妯℃澘鐨勪富閿�
- * @param processUse 鐢ㄩ��
- * @return 妯℃澘鐨勪俊鎭�
- */
- @Override
- public List<CodeClassifyProcessTempVO> listProcessTemplate(String codeTemplateOid, String processUse) {
- if(StringUtils.isBlank(codeTemplateOid) || StringUtils.isBlank(processUse)){
- return new ArrayList<>();
- }
- Map<String,String> conditionMap =new HashMap<>();
- conditionMap.put("classifyTemplateOid",codeTemplateOid);
- conditionMap.put("codeprocessuse",processUse);
- return codeClassifyProcessTempDO2VOs(codeClassifyProcessTempMapper.selectByCondition(conditionMap,null));
- }
-
- @Override
- public CodeClassifyProcessTempVO getProcessTempVOByName(String codeTemplateOid,String processName) {
- if (StringUtils.isBlank(processName)){
- return new CodeClassifyProcessTempVO();
- }
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("classifyTemplateOid",codeTemplateOid);
- conditionMap.put("name",processName);
- return codeClassifyProcessTempDO2VO(codeClassifyProcessTempMapper.selectByCondition(conditionMap,null).get(0));
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
deleted file mode 100644
index 34795a6..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ /dev/null
@@ -1,1026 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.vci.ubcs.code.mapper.CodeClassifyMapper;
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateMapper;
-import com.vci.ubcs.code.entity.CodeClassifyDO;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateDO;
-import com.vci.ubcs.code.service.CodeClassifyServiceI;
-import com.vci.ubcs.code.service.CodeDuckingServiceI;
-import com.vci.ubcs.code.service.CodeKeyAttrRepeatRuleServiceI;
-import com.vci.ubcs.code.service.CodeRuleServiceI;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.starter.poi.bo.ReadExcelOption;
-import com.vci.starter.poi.bo.WriteExcelData;
-import com.vci.starter.poi.bo.WriteExcelOption;
-import com.vci.starter.poi.constant.ExcelLangCodeConstant;
-import com.vci.starter.poi.util.ExcelUtil;
-import com.vci.starter.revision.bo.TreeWrapperOptions;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.util.*;
-import com.vci.starter.web.wrapper.VciParentQueryOption;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.pageModel.OsAttributeVO;
-import com.vci.web.pageModel.OsBtmTypeAttributeVO;
-import com.vci.web.pageModel.OsBtmTypeVO;
-import com.vci.web.service.OsAttributeServiceI;
-import com.vci.web.service.OsBtmServiceI;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang.StringUtils;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.dto.CodeClassifyDTO;
-import com.vci.ubcs.code.po.CodeClassifyPO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.*;
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.*;
-
-/**
- * 涓婚搴撳垎绫绘湇鍔�
- * @author weidy
- * @date 2022-01-20
- */
-@Service
-public class CodeClassifyServiceImpl implements CodeClassifyServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyMapper codeClassifyMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 瑙勫垯鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private CodeRuleServiceI codeRuleService;
-
- /**
- * 鍏抽敭灞炴�х殑鏈嶅姟
- */
- @Autowired
- private CodeKeyAttrRepeatRuleServiceI keyAttrRepeatRuleService;
-
- /**
- * 鏁版嵁闆嗘垚
- */
- @Autowired
- @Lazy
- private CodeDuckingServiceI codeDuckingServiceI;
-
- /**
- * 涓氬姟绫诲瀷鐨勬湇鍔�
- */
- @Autowired
- private OsBtmServiceI btmService;
-
- /**
- * 灞炴�ф湇鍔�
- */
- @Autowired
- private OsAttributeServiceI attributeService;
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyTemplateMapper codeClassifyTemplateMapper;
-
- /**
- * 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
- */
- public static final String PARENT_FIELD_NAME = "parentCodeClassifyOid";
- /**
- * 鏌ヨ涓婚搴撳垎绫� 鏍�
- * @param treeQueryObject 鏍戞煡璇㈠璞�
- * @return 涓婚搴撳垎绫� 鏄剧ず鏍�
- * @throws VciBaseException 鏌ヨ鏉′欢涓嶇鍚堣姹傜殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) throws VciBaseException {
- List<CodeClassifyDO> doList =selectCodeClassifyDOByTree(treeQueryObject);
- List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
- TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME.toLowerCase(Locale.ROOT));
- treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
- List<Tree> tree= revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{
- //鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
- return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
- .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
- });
- Iterator var6 = tree.listIterator();
- while(var6.hasNext()){
- Tree trees = (Tree) var6.next();
- boolean checkHasChild=codeClassifyMapper.checkHasChild(trees.getOid());
- if(checkHasChild){
- trees.setLeaf(false);
- }else{
- trees.setLeaf(true);
- }
- }
- return tree;
- }
-
- /**
- * 涓婚搴撶殑鏍�
- *
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 涓婚搴撴樉绀烘爲
- */
- @Override
- public List<Tree> treeTopCodeClassify(TreeQueryObject treeQueryObject) {
- if(treeQueryObject == null){
- treeQueryObject = new TreeQueryObject();
- }
- if(treeQueryObject.getConditionMap() == null){
- treeQueryObject.setConditionMap(new HashMap<>());
- }
- treeQueryObject.getConditionMap().put(PARENT_FIELD_NAME, QueryOptionConstant.ISNULL);
- return treeCodeClassify(treeQueryObject);
- }
-
- /**
- * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
- *
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鏌ヨ缁撴灉,鏁版嵁瀵硅薄
- */
- @Override
- public List<CodeClassifyDO> selectCodeClassifyDOByTree(TreeQueryObject treeQueryObject) {
- VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(null,CodeClassifyDO.class);
- VciParentQueryOption parentQueryOption = new VciParentQueryOption();
- parentQueryOption.setParentFieldName(PARENT_FIELD_NAME);
- queryWrapperForDO.parentQueryChild(treeQueryObject,parentQueryOption);
- if(StringUtils.isBlank(treeQueryObject.getSort())) {
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultAsc("id");
- queryWrapperForDO.setPageHelper(pageHelper);
- }
- return codeClassifyMapper.selectByWrapper(queryWrapperForDO);
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyVO> codeClassifyDO2VOs(Collection<CodeClassifyDO> codeClassifyDOs) throws VciBaseException{
- List<CodeClassifyVO> voList = new ArrayList<CodeClassifyVO>();
- if(!CollectionUtils.isEmpty(codeClassifyDOs)){
- for(CodeClassifyDO s: codeClassifyDOs){
- CodeClassifyVO vo = codeClassifyDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyVO codeClassifyDO2VO(CodeClassifyDO codeClassifyDO) throws VciBaseException{
- CodeClassifyVO vo = new CodeClassifyVO();
- if(codeClassifyDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setLcStatusText(FrameworkDataLCStatus.getTextByValue(vo.getLcStatus()));
- }
- return vo;
- }
-
- /**
- * 澧炲姞涓婚搴撳垎绫�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyVO addSave(CodeClassifyDTO codeClassifyDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeClassifyDO codeClassifyDO = new CodeClassifyDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyDTO,codeClassifyDO);
- if(StringUtils.isNotBlank(codeClassifyDO.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyDO.getBtmTypeId())){
- throw new VciBaseException("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
- }
- BatchCBO cbo_insert = codeClassifyMapper.insert(codeClassifyDO);
-
-// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊
-// ClientBusinessObject[] clientBusinessObjects = cbo_insert.getCreateCboArray();
-// if(clientBusinessObjects.length!=0);
-// {
-// codeDuckingServiceI.insertCache1(CACHE_TYPE_CLASSIFY_ADD,FRAMEWORK_DATA_ENABLED,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, codeClassifyDO.getOid(), DateUtils.addHours(new Date(),1));
-// }
-
- return codeClassifyDO2VO(codeClassifyDO);
- }
-
- /**
- * 淇敼涓婚搴撳垎绫�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public BaseResult editSave(CodeClassifyDTO codeClassifyDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyDTO,"鏁版嵁瀵硅薄",codeClassifyDTO.getOid(),"涓婚搴撳垎绫讳富閿�");
-
- //妫�鏌s
- CodeClassifyDO codeClassifyDOCopyFromDTO = new CodeClassifyDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyDTO,codeClassifyDOCopyFromDTO);
- boolean tsBoolean = boService.checkTs(codeClassifyDOCopyFromDTO);
- if(!tsBoolean){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
- return BaseResult.fail("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
- }
-
- //灏咲TO杞崲涓篋O
- CodeClassifyDO codeClassifyDO = selectByOid(codeClassifyDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeClassifyDTO,codeClassifyDO);
- if(StringUtils.isNotBlank(codeClassifyDO.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyDO.getBtmTypeId())){
- throw new VciBaseException("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
- }
- codeClassifyMapper.updateByPrimaryKey(codeClassifyDO);
-
-// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆傚彧鏈夊惎鐢ㄧ姸鎬佺殑鍒嗙被鎵嶆帹閫�
-// if(FRAMEWORK_DATA_ENABLED.equals(codeClassifyDO.getLcStatus()));
-// {
-// codeDuckingServiceI.insertCache1(CACHE_TYPE_CLASSIFY_EDIT,FRAMEWORK_DATA_ENABLED,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, codeClassifyDO.getOid(), codeClassifyDTO.getTs());
-// }
-
- return BaseResult.success(codeClassifyDO2VO(codeClassifyDO));
- }
-
-/**
- * 妫�鏌� 涓婚搴撳垎绫绘槸鍚﹀垹闄�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴��
- * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
-@Override
-public BaseResult checkIsCanDelete(CodeClassifyDTO codeClassifyDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyDTO,"鏁版嵁浼犺緭瀵硅薄",codeClassifyDTO.getOid(),"涓婚敭");
- CodeClassifyDO codeClassifyDO = selectByOid(codeClassifyDTO.getOid());
- return checkIsCanDeleteForDO(codeClassifyDTO,codeClassifyDO);
-}
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeClassifyDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeClassifyDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeClassifyDTO codeClassifyDTO, CodeClassifyDO codeClassifyDO) {
- CodeClassifyDO tsDO = new CodeClassifyDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyDTO,tsDO);
- boService.checkTs(tsDO);
- //鏍￠獙涓嬬骇鏄惁鏈夊紩鐢�
- if(checkChildIsLinked(codeClassifyDO.getOid())){
- return BaseResult.fail(DATA_CASCADE_LINKED_NOT_DELETE,new String[]{""});
- }
- return BaseResult.success(checkHasChild(codeClassifyDO.getOid()));
- }
- /**
- * 妫�鏌ユ槸鍚︽湁涓嬬骇鏄惁鍏宠仈浜嗘暟鎹�
- *
- * @param oid 涓婚敭
- * @return true 琛ㄧず鏈夊紩鐢紝false琛ㄧず娌℃湁寮曠敤
- * @throws VciBaseException 鍙傛暟涓虹┖鍜屾湁寮曠敤鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public boolean checkChildIsLinked(String oid) throws VciBaseException {
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- Map<String,String> childOids = codeClassifyMapper.selectAllLevelChildOid(oid.trim());
- if(!CollectionUtils.isEmpty(childOids)){
- for(String childOid: childOids.keySet()){
- if(!checkIsLinked(childOid)){
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
- /**
- * 鏍￠獙鏄惁鏈変笅绾ц妭鐐癸紝涓嶆牎楠屾槸鍚﹀叧鑱斾簡鏁版嵁
- *
- * @param oid 涓婚敭
- * @return true琛ㄧず鏈変笅绾э紝false琛ㄧず娌℃湁涓嬬骇
- * @throws VciBaseException 鍙傛暟閿欒锛屾垨鑰呮暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public boolean checkHasChild(String oid) throws VciBaseException {
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- return codeClassifyMapper.checkHasChild(oid.trim());
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎涓婚搴撳垎绫�
- * @param codeClassifyDTO 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeClassify(CodeClassifyDTO codeClassifyDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyDTO,"涓婚搴撳垎绫绘暟鎹璞�",codeClassifyDTO.getOid(),"涓婚搴撳垎绫荤殑涓婚敭");
- CodeClassifyDO codeClassifyDO = selectByOid(codeClassifyDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeClassifyDTO,codeClassifyDO);
-
- //鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateDO.class);
- queryWrapper.addQueryMap("codeClassifyOid",codeClassifyDTO.getOid());
- List<CodeClassifyTemplateDO> codeClassifyTemplateDOListHaveTemplate = codeClassifyTemplateMapper.selectByWrapper(queryWrapper);
- if(codeClassifyTemplateDOListHaveTemplate.size()>0){
- return BaseResult.fail("鍒嗙被鍏宠仈妯℃澘锛岃鍏堝垹闄�!");
- }
-
- //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆�
- //1銆佹煡璇㈣鍒犻櫎鐨勭埗绫绘暟鎹�
- List<CodeClassifyDO> deletes = new ArrayList<CodeClassifyDO>();
- deletes.add(codeClassifyDO);
-
- if(baseResult.isSuccess()) {
- //鎵句笅绾х殑锛岃繖涓槸鍙互鍒犻櫎鐨勬椂鍊�
- Map<String,String> childrenOids = codeClassifyMapper.selectAllLevelChildOid(codeClassifyDO.getOid().trim());
- if (!CollectionUtils.isEmpty(childrenOids)) {
- Collection<Collection<String>> childrenCollections = VciBaseUtil.switchCollectionForOracleIn(childrenOids.keySet());
- for(Collection<String> s : childrenCollections){
-
- //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆�
- //2銆佹煡璇㈣鍒犻櫎鐨勫瓙绫绘暟鎹�
- List<CodeClassifyDO> codeClassifyDOList = codeClassifyMapper.selectByPrimaryKeyCollection(s);
- deletes.addAll(codeClassifyDOList);
-
- codeClassifyMapper.batchDeleteByOids(s);
- }
-
- }
- }else{
- return baseResult;
- }
-
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeClassifyMapper.deleteByPrimaryKey(codeClassifyDO.getOid());
-
- //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�
- for (CodeClassifyDO codeClassifyDO1:deletes){
- //codeDuckingServiceI.insertCache1(CACHE_TYPE_CLASSIFY_DELETE,FRAMEWORK_DATA_DISABLED,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, codeClassifyDO1.getOid(), DateUtils.addHours(new Date(),1));//杩欓噷鏄綋鍓嶆椂闂�
-
- //瀛樺偍瑕佸垹闄ょ殑鏁版嵁
- codeDuckingServiceI.cacheDeleteData(codeClassifyDO1.getOid(), codeClassifyDO1);
- }
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撳垎绫�
- * @param oid 涓婚敭
- * @return 涓婚搴撳垎绫绘樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyVO getObjectByOid(String oid) throws VciBaseException{
- return codeClassifyDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeClassifyDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeClassifyDO codeClassifyDO = codeClassifyMapper.selectByPrimaryKey(oid.trim());
- if(codeClassifyDO == null || StringUtils.isBlank(codeClassifyDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeClassifyDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撳垎绫�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撳垎绫绘樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeClassifyVO> listCodeClassifyByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeClassifyDO> codeClassifyDOList = listCodeClassifyDOByOidCollections(oidCollections);
- return codeClassifyDO2VOs(codeClassifyDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeClassifyDO> listCodeClassifyDOByOidCollections(Collection<String> oidCollections){
- List<CodeClassifyDO> codeClassifyDOList = new ArrayList<CodeClassifyDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeClassifyDO> tempDOList = codeClassifyMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeClassifyDOList.addAll(tempDOList);
- }
- }
- }
- return codeClassifyDOList;
- }
-
-
-
- /**
- * 鍙傜収鏍� 涓婚搴撳垎绫�
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 涓婚搴撳垎绫绘樉绀烘爲
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public List<Tree> referTree(TreeQueryObject treeQueryObject) throws VciBaseException{
- if(treeQueryObject == null){
- treeQueryObject = new TreeQueryObject();
- }
- if(treeQueryObject.getConditionMap() == null){
- treeQueryObject.setConditionMap(new HashMap<>());
- }
- if(treeQueryObject.getConditionMap().containsKey(LC_STATUS)) {
- treeQueryObject.getConditionMap().remove(LC_STATUS);
- }
- if(treeQueryObject.getExtandParamsMap() ==null || !treeQueryObject.getExtandParamsMap().containsKey(REFER_SHOW_DISABLED_QUERY_KEY)) {
- }
- treeQueryObject.getConditionMap().put(LC_STATUS, FRAMEWORK_DATA_ENABLED);
- return treeCodeClassify(treeQueryObject);
- }
-
- /**
- * 鍚敤銆佸仠鐢�
- * @param oid 涓婚敭
- * @param lcStatus 鐘舵��
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult updateLcStatus(String oid, String lcStatus){
-
- //鏌ヨ淇敼鍓峵s
- CodeClassifyDO codeClassifyDO_old = selectByOid(oid);//涓昏鏄负浜嗘煡璇s
-
- //鍚敤銆佸仠鐢�
- int u = codeClassifyMapper.updateLcStatus(oid,lcStatus);
-
-// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆�
-// if(u!=0) {
-// codeDuckingServiceI.insertCache1(lcStatus,lcStatus,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, oid, codeClassifyDO_old.getTs());
-// }
- BaseResult baseResult = u==0?BaseResult.error("淇敼澶辫触锛�"):BaseResult.success("淇敼鎴愬姛");
- return baseResult;
- }
-
- /**
- * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
- * @param queryWrapper 鏌ヨ灏佽鍣�
- * @return 鏁版嵁瀵硅薄
- */
- @Override
- public List<CodeClassifyDO> selectByWrapper(VciQueryWrapperForDO queryWrapper) {
- return codeClassifyMapper.selectByWrapper(queryWrapper);
- }
-
- /**
- * 浣跨敤鍒嗙被涓婚敭鑾峰彇鍒嗙被鐩稿叧鐨勬墍鏈変俊鎭�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 鍒嗙被涓婄骇锛屼笅绾х殑淇℃伅
- */
- @Override
- public CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid) {
- VciBaseUtil.alertNotNull(codeClassifyOid,"鍒嗙被鐨勪富閿�");
- CodeClassifyFullInfoBO fullInfo = new CodeClassifyFullInfoBO();
- CodeClassifyDO classifyDO = selectByOid(codeClassifyOid);
- //鏌ヨ涓婄骇
- fullInfo.setCurrentClassifyVO(codeClassifyDO2VO(classifyDO));
- fullInfo.setParentClassifyVOs(codeClassifyDO2VOs(codeClassifyMapper.selectAllLevelParentByOid(codeClassifyOid)));
- if(!CollectionUtils.isEmpty(fullInfo.getParentClassifyVOs())){
- fullInfo.setTopClassifyVO(fullInfo.getParentClassifyVOs().stream().filter(s->StringUtils.isBlank(s.getParentcodeclassifyoid())).findFirst().orElseGet(()->null));
- }
- return fullInfo;
- }
-
- /**
- * 鑾峰彇褰撳墠鍒嗙被鐨勯《灞傚垎绫�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 椤跺眰鍒嗙被鐨勪俊鎭�
- */
- @Override
- public CodeClassifyVO getTopClassifyVO(String codeClassifyOid) {
- VciBaseUtil.alertNotNull(codeClassifyOid,"鍒嗙被鐨勪富閿�");
- List<CodeClassifyDO> classifyDOS = codeClassifyMapper.selectAllLevelParentByOid(codeClassifyOid);
- if(!CollectionUtils.isEmpty(classifyDOS)){
- CodeClassifyDO classifyDO = classifyDOS.stream().filter(s -> StringUtils.isBlank(s.getParentCodeClassifyOid())).findFirst().orElseGet(() -> null);
- if(classifyDO!=null){
- return codeClassifyDO2VO(classifyDO);
- }
- }
- return null;
- }
-
- /**
- * 缁熻瀛愯妭鐐圭殑涓暟
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 涓暟
- */
- @Override
- public int countChildrenByClassifyOid(String codeClassifyOid) {
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("parentCodeClassifyOid",codeClassifyOid);
- return codeClassifyMapper.countByCondition(conditionMap).intValue();
- }
-
- /**
- * 鑾峰彇瀛愮骇鐨勪富棰樺簱鍒嗙被
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param allLevel 鏄惁鎵�鏈夌殑灞傜骇
- * @param fieldInPath 鍦ㄨ矾寰勪腑鐨勫瓧娈�
- * @param enable 鏄惁鍙樉绀哄惎鐢�
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- @Override
- public List<CodeClassifyVO> listChildrenClassify(String codeClassifyOid, boolean allLevel, String fieldInPath, boolean enable) {
- if(allLevel){
- List<CodeClassifyDO> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath,enable);
- if(!CollectionUtils.isEmpty(classifyDOS)){
- classifyDOS = classifyDOS.stream().filter(s->FRAMEWORK_DATA_ENABLED.equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
- }
- return codeClassifyDO2VOs(classifyDOS);
- }else{
- //鍙煡璇竴鏉★紝閭ath灏辨病蹇呰鏌ヨ浜�
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("parentcodeclassifyoid",codeClassifyOid);
- if (enable){
- conditionMap.put(VciQueryWrapperForDO.LC_STATUS_FIELD,FRAMEWORK_DATA_ENABLED);
- }
- return codeClassifyDO2VOs(codeClassifyMapper.selectByCondition(conditionMap,new PageHelper(-1)));
- }
- }
-
- /**
- * 鍙嶅悜浠庡瓙绾ц幏鍙栫埗绾х殑涓婚搴撳垎绫�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- @Override
- public List<CodeClassifyVO> listParentClassify(String codeClassifyOid){
- List<CodeClassifyDO> classifyDOS = codeClassifyMapper.listParentClassify(codeClassifyOid);
- return codeClassifyDO2VOs(classifyDOS);
- }
-
- /**
- * 瀵煎嚭鍒嗙被
- *
- * @param oid 鍒嗙被涓婚敭
- * @return excel鏂囦欢璺緞
- */
- @Override
- public String exportClassify(String oid) {
- VciBaseUtil.alertNotNull(oid,"鍒嗙被鐨勪富閿�");
- CodeClassifyVO classifyVO = getObjectByOid(oid);
- classifyVO.setDataLevel(0);
- classifyVO.setPath(classifyVO.getId());
- List<CodeClassifyVO> codeClassifyVOS = listChildrenClassify(oid, true, "id", false);
- if(codeClassifyVOS ==null){
- codeClassifyVOS = new ArrayList<>();
- }
- codeClassifyVOS.add(classifyVO);
-
- //鏌ヨ涓�涓嬭鍒欑殑缂栧彿锛屽拰鍏抽敭灞炴�ч噸澶嶈鍒�
- List<String> codeRuleOids = codeClassifyVOS.stream().filter(s -> StringUtils.isNotBlank(s.getCoderuleoid())).map(CodeClassifyVO::getCoderuleoid).collect(Collectors.toList());
- Map<String, CodeRuleVO> ruleVOMap = new HashMap<>();
- if(!CollectionUtils.isEmpty(codeRuleOids)){
- VciBaseUtil.switchCollectionForOracleIn(codeRuleOids).stream().forEach(ruleOids->{
- Collection<CodeRuleVO> ruleVOS = codeRuleService.listCodeRuleByOids(ruleOids);
- ruleVOMap.putAll( Optional.ofNullable(ruleVOS).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getOid(),t->t)));
- });
- }
- //鎵惧叧閿睘鎬ц鍒�
- List<String> keyRuleOids = codeClassifyVOS.stream().filter(s -> StringUtils.isNotBlank(s.getCodekeyattrrepeatoid())).map(CodeClassifyVO::getCodekeyattrrepeatoid).collect(Collectors.toList());
- Map<String, CodeKeyAttrRepeatRuleVO> keyRuleVOMap = new HashMap<>();
- if(!CollectionUtils.isEmpty(keyRuleOids)){
- VciBaseUtil.switchCollectionForOracleIn(keyRuleOids).stream().forEach(ruleOids->{
- Collection<CodeKeyAttrRepeatRuleVO> ruleVOS = keyAttrRepeatRuleService.listCodeKeyAttrRepeatRuleByOids(ruleOids);
- keyRuleVOMap.putAll( Optional.ofNullable(ruleVOS).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getOid(),t->t)));
- });
- }
- //ok,鍐檈xcel
- String excelName = LocalFileUtil.getDefaultTempFolder() + File.separator + "瀵煎嚭鍒嗙被.xls";
- try {
- new File(excelName).createNewFile();
- } catch (Throwable e) {
- throw new VciBaseException(LangBaseUtil.getErrorMsg(e), new String[]{excelName}, e);
- }
- List<WriteExcelData> excelDataList = new ArrayList<>();
- excelDataList.add(new WriteExcelData(0,0,"鍒嗙被缂栧彿"));
- excelDataList.add(new WriteExcelData(0,1,"鍒嗙被鍚嶇О"));
- excelDataList.add(new WriteExcelData(0,2,"涓氬姟绫诲瀷缂栧彿"));
- excelDataList.add(new WriteExcelData(0,3,"涓氬姟绫诲瀷鍚嶇О"));
- excelDataList.add(new WriteExcelData(0,4,"缂栫爜瑙勫垯缂栧彿"));
- excelDataList.add(new WriteExcelData(0,5,"缂栫爜瑙勫垯鍚嶇О"));
- excelDataList.add(new WriteExcelData(0,6,"鏌ラ噸瑙勫垯缂栧彿"));
- excelDataList.add(new WriteExcelData(0,7,"鏌ラ噸瑙勫垯鍚嶇О"));
- excelDataList.add(new WriteExcelData(0,8,"鍒嗙被璺緞"));
- excelDataList.add(new WriteExcelData(0,9,"鐘舵��"));
- excelDataList.add(new WriteExcelData(0,10,"鍒嗙被灞傜骇"));
- excelDataList.add(new WriteExcelData(0,11,"鎻忚堪"));
- for (int i = 0; i < codeClassifyVOS.size(); i++) {
- CodeClassifyVO vo = codeClassifyVOS.get(i);
- excelDataList.add(new WriteExcelData(i+1,0,vo.getId()));
- excelDataList.add(new WriteExcelData(i+1,1,vo.getName()));
- excelDataList.add(new WriteExcelData(i+1,2,vo.getBtmtypeid()));
- excelDataList.add(new WriteExcelData(i+1,3,vo.getBtmtypename()));
- excelDataList.add(new WriteExcelData(i+1,4,StringUtils.isNotBlank(vo.getCoderuleoid())?ruleVOMap.getOrDefault(vo.getCoderuleoid(),new CodeRuleVO()).getId():""));
- excelDataList.add(new WriteExcelData(i+1,5,StringUtils.isNotBlank(vo.getCoderuleoid())?ruleVOMap.getOrDefault(vo.getCoderuleoid(),new CodeRuleVO()).getName():""));
- excelDataList.add(new WriteExcelData(i+1,6,StringUtils.isNotBlank(vo.getCodekeyattrrepeatoid())?keyRuleVOMap.getOrDefault(vo.getCodekeyattrrepeatoid(),new CodeKeyAttrRepeatRuleVO()).getId():""));
- excelDataList.add(new WriteExcelData(i+1,7,StringUtils.isNotBlank(vo.getCodekeyattrrepeatoid())?keyRuleVOMap.getOrDefault(vo.getCodekeyattrrepeatoid(),new CodeKeyAttrRepeatRuleVO()).getName():""));
- excelDataList.add(new WriteExcelData(i+1,8,vo.getOid().equalsIgnoreCase(classifyVO.getOid())?vo.getPath():classifyVO.getPath() + vo.getPath()));
- excelDataList.add(new WriteExcelData(i+1,9,FrameworkDataLCStatus.getTextByValue(vo.getLcStatus())));
- excelDataList.add(new WriteExcelData(i+1,10,vo.getDataLevel()));
- excelDataList.add(new WriteExcelData(i+1,11,vo.getDescription()));
- }
- WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
- ExcelUtil.writeDataToFile(excelName, excelOption);
- return excelName;
- }
-
- /**
- * 鍒涘缓瀵煎叆妯℃澘
- *
- * @return excel鏂囦欢璺緞
- */
- @Override
- public String createImportExcel() {
- //ok,鍐檈xcel
- String excelName = LocalFileUtil.getDefaultTempFolder() + File.separator + "鍒嗙被瀵煎叆妯℃澘.xls";
- try {
- new File(excelName).createNewFile();
- } catch (Throwable e) {
- throw new VciBaseException(LangBaseUtil.getErrorMsg(e), new String[]{excelName}, e);
- }
- List<WriteExcelData> excelDataList = new ArrayList<>();
- WriteExcelData excelData = new WriteExcelData(0, 0, "鍒嗙被缂栧彿");
- excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
- excelDataList.add(excelData);
- WriteExcelData excelData1 = new WriteExcelData(0, 1, "鍒嗙被鍚嶇О");
- excelData1.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
- excelDataList.add(excelData1);
- excelDataList.add(new WriteExcelData(0,2,"涓氬姟绫诲瀷缂栧彿"));
- excelDataList.add(new WriteExcelData(0,3,"缂栫爜瑙勫垯缂栧彿"));
- excelDataList.add(new WriteExcelData(0,4,"鏌ラ噸瑙勫垯缂栧彿"));
- WriteExcelData excelData2 = new WriteExcelData(0, 5, "鍒嗙被璺緞");
- excelData2.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
- excelDataList.add(excelData2);
- excelDataList.add(new WriteExcelData(0,6,"鐘舵��"));
- WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
- ExcelUtil.writeDataToFile(excelName, excelOption);
- return excelName;
- }
-
- /**
- * 瀵煎叆鍒嗙被
- *
- * @param file1 鏂囦欢鐨勪俊鎭�
- * @return 閿欒鏂囦欢鐨勫湴鍧�
- */
- @Override
- public void importClassify(File file1) {
- VciBaseUtil.alertNotNull(file1,"excel鏂囦欢");
- if(!file1.exists()){
- throw new VciBaseException("瀵煎叆鐨別xcel鏂囦欢涓嶅瓨鍦�,{0}",new String[]{file1.getPath()});
- }
- ReadExcelOption excelOption = new ReadExcelOption();
- List<CodeClassifyPO> poList = null;
- try{
- poList = ExcelUtil.readDataObjectFromExcel(file1,CodeClassifyPO.class,excelOption,(value,po,fieldName)->{
- po.setLcStatus(FrameworkDataLCStatus.getValueByText(po.getLcStatusText()));
- if(StringUtils.isBlank(po.getLcStatusText())){
- po.setLcStatus(FrameworkDataLCStatus.ENABLED.getValue());
- }
- });
- }catch (Exception e){
- if(logger.isErrorEnabled()){
- logger.error("璇诲彇excel鍐呭鐨勬椂鍊欏嚭鐜颁簡閿欒",e);
- }
- throw new VciBaseException(LangBaseUtil.getErrorMsg(e),new String[]{},e);
- }
- //鍘婚櫎鏁磋閮芥槸绌虹殑鎯呭喌
-
- if(CollectionUtils.isEmpty(poList)){
- throw new VciBaseException(ExcelLangCodeConstant.IMPORT_CONTENT_NULL,new String[]{});
- }
-
- poList = poList.stream().filter(s->!(StringUtils.isBlank(s.getId()) && StringUtils.isBlank(s.getName()) && StringUtils.isBlank(s.getPath()))).collect(Collectors.toList());
-
- List<CodeClassifyDO> classifyDOList = new ArrayList<>();
- //鐪嬬湅璺緞鏄惁鏈夐噸澶�
- Map<String/**璺緞**/, Long/**涓暟**/> pathCountMap = poList.stream().filter(s->StringUtils.isNotBlank(s.getPath())).collect(Collectors.groupingBy(s -> s.getPath(), Collectors.counting()));
- List<String> repeatPaths = Optional.ofNullable(pathCountMap).orElse(new HashMap<>()).entrySet().stream().filter(entry -> entry.getValue() > 1).map(entry -> entry.getKey()).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(repeatPaths)){
- //鏈夐噸澶嶇殑鍐呭
- List<String> rowIndexList = new ArrayList<>();
- poList.stream().forEach(po->{
- if(repeatPaths.contains(po.getPath())){
- rowIndexList.add(po.getRowIndex());
- }
- });
- throw new VciBaseException("璺緞鏈夐噸澶�,{0}",new String[]{rowIndexList.stream().collect(Collectors.joining(","))});
- }
-
- Map<String, CodeRuleVO> ruleVOMap = Optional.ofNullable(codeRuleService.listCodeRuleByIds(
- poList.stream().filter(s->StringUtils.isNotBlank(s.getCodeRuleId())).map(CodeClassifyPO::getCodeRuleId).collect(Collectors.toList()))
- ).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t,(o1,o2)->o2));
-
- Map<String,CodeKeyAttrRepeatRuleVO> keyRuleVOMap =Optional.ofNullable(keyAttrRepeatRuleService.listCodeKeyAttrRepeatRuleByIds(
- poList.stream().filter(s->StringUtils.isNotBlank(s.getKeyRepeatRuleId())).map(CodeClassifyPO::getKeyRepeatRuleId).collect(Collectors.toList()))
- ).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t,(o1,o2)->o2));
-
- Map<String, OsBtmTypeVO> btmVOMap = Optional.ofNullable(btmService.listBtmByIds(
- poList.stream().filter(s -> StringUtils.isNotBlank(s.getBtmTypeId())).map(CodeClassifyPO::getBtmTypeId).collect(Collectors.toList()))
- ).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t,(o1,o2)->o2));
-
- Map<String/**璺緞**/,String/**涓婚敭**/> oidPathMap = new HashMap<>();
-
- //鎴戜滑闇�瑕佹煡璇㈡墍鏈夊凡缁忓瓨鍦ㄧ殑鍒嗙被锛屼富瑕佹槸璺緞锛岀敤鏉ュ垽鏂垎绫荤殑鏁版嵁
- List<CodeClassifyDO> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("", "id", false);
- Map<String/**璺緞**/, CodeClassifyDO/**宸茬粡瀛樺湪鐨勬暟鎹�**/> pathDOMap = Optional.ofNullable(existClassifyDOs).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> {
- String path = s.getPath();
- if(StringUtils.isNotBlank(path) && path.startsWith("#")){
- return path.substring(1);
- }
- return path;
- }, t -> t));
- poList.stream().forEach(po->{
- CodeClassifyDO classifyDO = new CodeClassifyDO();
- VciBaseUtil.alertNotNull(po.getId(),"鍒嗙被缂栧彿",po.getName(),"鍒嗙被鍚嶇О",po.getPath(),"鍒嗙被璺緞");
- if(StringUtils.isNotBlank(po.getBtmTypeId()) && !btmVOMap.containsKey(po.getBtmTypeId().toLowerCase(Locale.ROOT))){
- throw new VciBaseException("绗瑊0}琛岀殑涓氬姟绫诲瀷{1}鍦ㄧ郴缁熶腑涓嶅瓨鍦�",new String[]{String.valueOf(VciBaseUtil.getInt(po.getRowIndex())+1),po.getBtmTypeId()});
- }
- if(StringUtils.isNotBlank(po.getCodeRuleId()) && !ruleVOMap.containsKey(po.getCodeRuleId().toLowerCase(Locale.ROOT))){
- throw new VciBaseException("绗瑊0}琛岀殑缂栫爜瑙勫垯{1}鍦ㄧ郴缁熶腑涓嶅瓨鍦�",new String[]{String.valueOf(po.getRowIndex()+1),po.getCodeRuleId()});
- }
- if(StringUtils.isNotBlank(po.getKeyRepeatRuleId()) && !keyRuleVOMap.containsKey(po.getKeyRepeatRuleId().toLowerCase(Locale.ROOT))){
- throw new VciBaseException("绗瑊0}琛岀殑鍏抽敭灞炴�ф煡閲嶈鍒檣1}鍦ㄧ郴缁熶腑涓嶅瓨鍦�",new String[]{String.valueOf(po.getRowIndex()+1),po.getKeyRepeatRuleId()});
- }
- classifyDO.setOid(VciBaseUtil.getPk());
- classifyDO.setId(po.getId());
- classifyDO.setName(po.getName());
- classifyDO.setDescription(po.getDescription());
- oidPathMap.put(po.getPath(),classifyDO.getOid());
- if(StringUtils.isNotBlank(po.getBtmTypeId())){
- OsBtmTypeVO typeVO = btmVOMap.get(po.getBtmTypeId().toLowerCase(Locale.ROOT));
- classifyDO.setBtmTypeId(typeVO.getId());
- classifyDO.setBtmTypeName(typeVO.getName());
- }
- if(StringUtils.isNotBlank(po.getCodeRuleId())){
- CodeRuleVO codeRuleVO = ruleVOMap.get(po.getCodeRuleId().toLowerCase(Locale.ROOT));
- classifyDO.setCodeRuleOid(codeRuleVO.getOid());
- }
- if(StringUtils.isNotBlank(po.getKeyRepeatRuleId())){
- CodeKeyAttrRepeatRuleVO repeatRuleVO = keyRuleVOMap.get(po.getKeyRepeatRuleId());
- classifyDO.setCodeKeyAttrRepeatOid(repeatRuleVO.getOid());
- }
- classifyDO.setLcStatus(po.getLcStatus());
- classifyDO.setPath(po.getPath());
- classifyDOList.add(classifyDO);
- });
- //瑕佺湅瀛樺湪鐨勶紝淇敼璺緞瀵瑰簲鐨勪富閿�
- Map<String/**璺緞**/,String/**涓婚敭**/> catchedOidPathMap = new HashMap<>();
- if(!CollectionUtils.isEmpty(oidPathMap)){
- oidPathMap.forEach((path,oid)->{
- if(pathDOMap.containsKey(path)){
- //璇存槑瀛樺湪
- catchedOidPathMap.put(path,pathDOMap.get(path).getOid());
- }else{
- catchedOidPathMap.put(path,oid);
- }
- });
- }
- List<CodeClassifyDO> addClassifyDOList = new ArrayList<>();
- List<CodeClassifyDO> editClassifyDOList = new ArrayList<>();
- classifyDOList.stream().forEach(classifyDO->{
-
- //瑕佺湅涓婄骇鏄笉鏄瓨鍦ㄥ摝
- String parentPath = classifyDO.getPath();
- if(parentPath.contains("#")) {
- parentPath = parentPath.substring(0, parentPath.lastIndexOf("#"));
- }
- if((!catchedOidPathMap.containsKey(parentPath) && !pathDOMap.containsKey(parentPath) )&& !classifyDO.getPath().equalsIgnoreCase(classifyDO.getId())){
- throw new VciBaseException("鍒嗙被缂栧彿[{0}],鍒嗙被鍚嶇О[{1}]锛岃矾寰勪负[{2}]鐨勪笂绾у垎绫诲湪绯荤粺涓紝鍦ㄦ湰娆″鍏ョ殑鏁版嵁鍜岀郴缁熶腑鍧囨病鏈夋壘鍒�",new String[]{classifyDO.getId(),classifyDO.getName(),classifyDO.getPath()});
- }
- if (!classifyDO.getPath().equalsIgnoreCase(classifyDO.getId())){
- //涓嶆槸椤剁骇鐨勬椂鍊欙紝瑕佽缃笂绾х殑涓婚敭
-
- classifyDO.setParentCodeClassifyOid(catchedOidPathMap.containsKey(parentPath)?catchedOidPathMap.get(parentPath):pathDOMap.get(parentPath).getOid());
- }
- if(classifyDO.getPath().equalsIgnoreCase(classifyDO.getId()) && StringUtils.isBlank(classifyDO.getBtmTypeId())){
- throw new VciBaseException("鍒嗙被缂栧彿[{0}],鍒嗙被鍚嶇О[{1}]锛屾槸椤跺眰鍒嗙被锛岄渶瑕佽缃笟鍔＄被鍨嬬紪鍙�",new String[]{classifyDO.getId(),classifyDO.getName()});
- }
- if(pathDOMap.containsKey(classifyDO.getPath())){
- //瀛樺湪锛岄渶瑕佷慨鏀瑰璞�
- classifyDO.setOid(catchedOidPathMap.get(classifyDO.getPath()));
- CodeClassifyDO classifyDOInDB = pathDOMap.get(classifyDO.getPath());
- classifyDOInDB.setId(classifyDO.getId());
- classifyDOInDB.setName(classifyDO.getName());
- classifyDOInDB.setDescription(classifyDO.getDescription());
- classifyDOInDB.setBtmTypeId(classifyDO.getBtmTypeId());
- classifyDOInDB.setBtmTypeName(classifyDO.getBtmTypeName());
- classifyDOInDB.setCodeRuleOid(classifyDO.getCodeRuleOid());
- classifyDOInDB.setCodeRuleOidName(classifyDO.getCodeRuleOidName());
- classifyDOInDB.setParentCodeClassifyOid(classifyDO.getParentCodeClassifyOid());
- classifyDOInDB.setCodeKeyAttrRepeatOid(classifyDO.getCodeKeyAttrRepeatOid());
- classifyDOInDB.setCodeKeyAttrRepeatOidName(classifyDO.getCodeKeyAttrRepeatOidName());
- if(classifyDOInDB.getOrderNum() == null){
- classifyDOInDB.setOrderNum(0);
- }
- editClassifyDOList.add(classifyDOInDB);
- }else{
- //鏄柊鐨勶紝鐩存帴娣诲姞灏辫浜�
- //鍒ゆ柇鍙锋�庝箞澶勭悊?
- classifyDO.setOrderNum(0);
- addClassifyDOList.add(classifyDO);
- }
- });
- if(!CollectionUtils.isEmpty(editClassifyDOList)){
- VciBaseUtil.switchCollectionForOracleIn(editClassifyDOList).stream().forEach(classifyDOs->{
- codeClassifyMapper.batchUpdate(classifyDOs.stream().collect(Collectors.toList()));
- });
- }
- if(!CollectionUtils.isEmpty(addClassifyDOList)){
- revisionModelUtil.wrapperForBatchAdd(addClassifyDOList);
- VciBaseUtil.switchCollectionForOracleIn(addClassifyDOList).stream().forEach(classifyDOs->{
- codeClassifyMapper.batchInsert(classifyDOs.stream().collect(Collectors.toList()));
- });
- }
-
- }
-
- /**
- * 鑾峰彇鍒嗙被鍏宠仈鐨勫睘鎬�
- *
- * @param baseQueryObject 鏌ヨ瀵硅薄锛屽繀椤绘湁codeClassifyOid锛屾敮鎸乮d鍜宯ame涓ょ鏌ヨ鏉′欢
- * @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴��
- */
- @Override
- public DataGrid<OsAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) {
- if(baseQueryObject == null){
- baseQueryObject = new BaseQueryObject();
- }
- if(baseQueryObject.getConditionMap() == null){
- baseQueryObject.setConditionMap(new HashMap<>());
- }
- String classifyOid = baseQueryObject.getConditionMap().getOrDefault("codeClassifyOid","");
- String id = baseQueryObject.getConditionMap().getOrDefault("id","");
- String name = baseQueryObject.getConditionMap().getOrDefault("name","");
- if(StringUtils.isBlank(classifyOid)){
- return new DataGrid<>();
- }
- CodeClassifyVO topClassifyVO = getTopClassifyVO(classifyOid);
- if(topClassifyVO == null || StringUtils.isBlank(topClassifyVO.getBtmtypeid())){
- return new DataGrid<>();
- }
- List<OsBtmTypeAttributeVO> unDefaultAttributes = btmService.listAttributeByBtmId(topClassifyVO.getBtmtypeid());
- List<OsAttributeVO> attributeVOS = new ArrayList<>();
- if(!CollectionUtils.isEmpty(unDefaultAttributes)){
- unDefaultAttributes.stream().forEach(attr->{
- OsAttributeVO attributeVO = new OsAttributeVO();
- BeanUtil.convert(attr,attributeVO);
- attributeVO.setAttributeDataType(attr.getAttrDataType());
- attributeVO.setAttrLength(attr.getAttributeLength());
- attributeVO.setBtmTypeId(attr.getReferBtmTypeId());
- attributeVO.setBtmTypeName(attr.getReferBtmTypeName());
- boolean add = true;
- if(StringUtils.isNotBlank(id) && !attributeVO.getId().contains(id.replace("*",""))){
- add = false;
- }
- if(StringUtils.isNotBlank(name) && !attributeVO.getId().contains(name.replace("*",""))){
- add = false;
- }
- if(add){
- attributeVOS.add(attributeVO);
- }
- });
- }
- if(!CollectionUtils.isEmpty(attributeService.getDefaultAttributeVOs())){
- attributeService.getDefaultAttributeVOs().stream().forEach(attr->{
- boolean add = true;
- if(StringUtils.isNotBlank(id) && !attr.getId().contains(id.replace("*",""))){
- add = false;
- }
- if(StringUtils.isNotBlank(name) && !attr.getId().contains(name.replace("*",""))){
- add = false;
- }
- if(add){
- attributeVOS.add(attr);
- }
- });
- }
- DataGrid<OsAttributeVO> dataGrid = new DataGrid<>();
- dataGrid.setData(attributeVOS);
- dataGrid.setTotal(attributeVOS.size());
- return dataGrid;
- }
-
- /**
- * 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
- *
- * @param idPath 缂栧彿鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- @Override
- public CodeClassifyVO getObjectByIdPath(String idPath) {
- CodeClassifyDO classifyDO = codeClassifyMapper.selectByFieldPath(idPath, VciQueryWrapperForDO.ID_FIELD);
- return codeClassifyDO2VO(classifyDO);
- }
- /**
- * 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
- *
- * @param clsfNamePath 缂栧彿鐨勮矾寰勶紝涓�瀹氳浠庢渶椤跺眰鑺傜偣寮�濮嬶紝鏍煎紡涓簒xx/yyy/zz 杩欐牱
- * @return 鍒嗙被鐨勬樉绀哄璞�
- */
- @Override
- public CodeClassifyVO getObjectByClsfNamePath(String clsfNamePath){
- CodeClassifyDO classifyDO = codeClassifyMapper.selectByFieldPath(clsfNamePath, "name");
- return codeClassifyDO2VO(classifyDO);
- }
-
- /***
- * 鏍规嵁涓婄骇鑺傜偣鑾峰彇涓嬬骇鑺傜偣浠ｅ彿璺緞鍜屽悕绉拌矾寰�
- * @param codeClassifyId
- * @param enable
- * @return
- */
- @Override
- public List<CodeClassifyVO> getIdPathToNamePathByParentId(String codeClassifyId,boolean enable){
-
- List<CodeClassifyDO> classifyDOs= codeClassifyMapper.getIdPathToNamePathByParentId(codeClassifyId,enable);
- return codeClassifyDO2VOs(classifyDOs);
-
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTempMapItemServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTempMapItemServiceImpl.java
deleted file mode 100644
index cfa5bdb..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTempMapItemServiceImpl.java
+++ /dev/null
@@ -1,297 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.vci.ubcs.code.mapper.CodeClassifyTempMapItemMapper;
-import com.vci.ubcs.code.entity.CodeClassifyTempMapItemDO;
-import com.vci.ubcs.code.service.CodeClassifyTempMapItemServiceI;
-import com.vci.ubcs.code.service.CodeClassifyTemplateAttrServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeClassifyTempMapItemDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTempMapItemVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-/**
- * 鏄犲皠瑙勫垯鐨勬槑缁嗘湇鍔�
- * @author weidy
- * @date 2022-03-10
- */
-@Service
-public class CodeClassifyTempMapItemServiceImpl implements CodeClassifyTempMapItemServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyTempMapItemMapper codeClassifyTempMapItemMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 鍒嗙被妯℃澘灞炴�х殑鏈嶅姟
- */
- @Autowired
- private CodeClassifyTemplateAttrServiceI attrService;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑鏄犲皠瑙勫垯鐨勬槑缁�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyTempMapItemVO> gridCodeClassifyTempMapItem(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodeClassifyTempMapItemDO> doList = codeClassifyTempMapItemMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeClassifyTempMapItemVO> dataGrid=new DataGrid<CodeClassifyTempMapItemVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- //濉厖鏄犲皠鏄庣粏涓垎绫绘ā鏉垮睘鎬х殑鍊�
- List<String> attrOidList = doList.stream().map(CodeClassifyTempMapItemDO::getClassifyTemplateAttrOid).collect(Collectors.toList());
- List<CodeClassifyTemplateAttrVO> attrVOS = (List<CodeClassifyTemplateAttrVO>) attrService.listCodeClassifyTemplateAttrByOids(attrOidList);
- attrVOS.forEach(attr -> {
- doList.stream().filter(item -> {
- return item.getClassifyTemplateAttrOid().equals(attr.getOid());
- }).forEach(item -> {
- item.setClassifyAttrId(attr.getId());
- item.setClassifyAttrName(attr.getName());
- });
- });
- dataGrid.setData(codeClassifyTempMapItemDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeClassifyTempMapItemMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTempMapItemDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyTempMapItemVO> codeClassifyTempMapItemDO2VOs(Collection<CodeClassifyTempMapItemDO> codeClassifyTempMapItemDOs) throws VciBaseException{
- List<CodeClassifyTempMapItemVO> voList = new ArrayList<CodeClassifyTempMapItemVO>();
- if(!CollectionUtils.isEmpty(codeClassifyTempMapItemDOs)){
- for(CodeClassifyTempMapItemDO s: codeClassifyTempMapItemDOs){
- CodeClassifyTempMapItemVO vo = codeClassifyTempMapItemDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTempMapItemDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTempMapItemVO codeClassifyTempMapItemDO2VO(CodeClassifyTempMapItemDO codeClassifyTempMapItemDO) throws VciBaseException{
- CodeClassifyTempMapItemVO vo = new CodeClassifyTempMapItemVO();
- if(codeClassifyTempMapItemDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTempMapItemDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞鏄犲皠瑙勫垯鐨勬槑缁�
- * @param codeClassifyTempMapItemDTO 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTempMapItemVO addSave(CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTempMapItemDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeClassifyTempMapItemDO codeClassifyTempMapItemDO = new CodeClassifyTempMapItemDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTempMapItemDTO,codeClassifyTempMapItemDO);
- codeClassifyTempMapItemMapper.insert(codeClassifyTempMapItemDO);
- return codeClassifyTempMapItemDO2VO(codeClassifyTempMapItemDO);
- }
-
- /**
- * 淇敼鏄犲皠瑙勫垯鐨勬槑缁�
- * @param codeClassifyTempMapItemDTO 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTempMapItemVO editSave(CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTempMapItemDTO,"鏁版嵁瀵硅薄",codeClassifyTempMapItemDTO.getOid(),"鏄犲皠瑙勫垯鐨勬槑缁嗕富閿�");
- //灏咲TO杞崲涓篋O
- CodeClassifyTempMapItemDO codeClassifyTempMapItemDO = selectByOid(codeClassifyTempMapItemDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeClassifyTempMapItemDTO,codeClassifyTempMapItemDO);
- codeClassifyTempMapItemMapper.updateByPrimaryKey(codeClassifyTempMapItemDO);
- return codeClassifyTempMapItemDO2VO(codeClassifyTempMapItemDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeClassifyTempMapItemDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeClassifyTempMapItemDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO, CodeClassifyTempMapItemDO codeClassifyTempMapItemDO) {
- CodeClassifyTempMapItemDO tsDO = new CodeClassifyTempMapItemDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTempMapItemDTO,tsDO);
- boService.checkTs(tsDO);
- if(!checkIsLinked(codeClassifyTempMapItemDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎鏄犲皠瑙勫垯鐨勬槑缁�
- * @param codeClassifyTempMapItemDTO 鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeClassifyTempMapItem(CodeClassifyTempMapItemDTO codeClassifyTempMapItemDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTempMapItemDTO,"鏄犲皠瑙勫垯鐨勬槑缁嗘暟鎹璞�",codeClassifyTempMapItemDTO.getOid(),"鏄犲皠瑙勫垯鐨勬槑缁嗙殑涓婚敭");
- CodeClassifyTempMapItemDO codeClassifyTempMapItemDO = selectByOid(codeClassifyTempMapItemDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeClassifyTempMapItemDTO,codeClassifyTempMapItemDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeClassifyTempMapItemMapper.deleteByPrimaryKey(codeClassifyTempMapItemDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇鏄犲皠瑙勫垯鐨勬槑缁�
- * @param oid 涓婚敭
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTempMapItemVO getObjectByOid(String oid) throws VciBaseException{
- return codeClassifyTempMapItemDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeClassifyTempMapItemDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeClassifyTempMapItemDO codeClassifyTempMapItemDO = codeClassifyTempMapItemMapper.selectByPrimaryKey(oid.trim());
- if(codeClassifyTempMapItemDO == null || StringUtils.isBlank(codeClassifyTempMapItemDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeClassifyTempMapItemDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鏄犲皠瑙勫垯鐨勬槑缁�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeClassifyTempMapItemVO> listCodeClassifyTempMapItemByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeClassifyTempMapItemDO> codeClassifyTempMapItemDOList = listCodeClassifyTempMapItemDOByOidCollections(oidCollections);
- return codeClassifyTempMapItemDO2VOs(codeClassifyTempMapItemDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeClassifyTempMapItemDO> listCodeClassifyTempMapItemDOByOidCollections(Collection<String> oidCollections){
- List<CodeClassifyTempMapItemDO> codeClassifyTempMapItemDOList = new ArrayList<CodeClassifyTempMapItemDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeClassifyTempMapItemDO> tempDOList = codeClassifyTempMapItemMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeClassifyTempMapItemDOList.addAll(tempDOList);
- }
- }
- }
- return codeClassifyTempMapItemDOList;
- }
-
-
-
- /**
- * 鍙傜収鏄犲皠瑙勫垯鐨勬槑缁嗗垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鏄犲皠瑙勫垯鐨勬槑缁嗘樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyTempMapItemVO> refDataGridCodeClassifyTempMapItem(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeClassifyTempMapItem(conditionMap,pageHelper);
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
deleted file mode 100644
index 0b14181..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ /dev/null
@@ -1,728 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateMapper;
-import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateAttrDO;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateDO;
-import com.vci.ubcs.code.service.CodeClassifyTemplateAttrServiceI;
-import com.vci.ubcs.code.service.CodeTemplatePhaseServiceI;
-import com.vci.ubcs.code.utils.PatternUtil;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.enumpck.VciFieldTypeEnum;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.util.BeanUtil;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.util.VciDateUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.pageModel.OsBtmTypeAttributeVO;
-import com.vci.web.pageModel.UIFormReferVO;
-import com.vci.web.service.BdSelectInputCharServiceI;
-import com.vci.web.service.OsAttributeServiceI;
-import com.vci.web.service.OsBtmServiceI;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateAttrDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-/**
- * 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф湇鍔�
- * @author weidy
- * @date 2022-01-24
- */
-@Service
-public class CodeClassifyTemplateAttrServiceImpl implements CodeClassifyTemplateAttrServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyTemplateAttrMapper codeClassifyTemplateAttrMapper;
-
- /**
- * 妯℃澘鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyTemplateMapper codeClassifyTemplateMapper;
-
- /**
- * 妯℃澘鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeTemplatePhaseServiceI codeTemplatePhaseServiceI;
-
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 鏌ヨ杩欎釜涓氬姟绫诲瀷鐨勬墍鏈夊睘鎬�
- */
- @Autowired
- private OsBtmServiceI btmService;
-
- /**
- * 鍙�夊彲杈撴湇鍔�
- */
- @Autowired
- private BdSelectInputCharServiceI charService;
-
- /**
- * 灞炴�х殑鏈嶅姟
- */
- @Autowired
- private OsAttributeServiceI attributeService;
-
- /**
- * 鏌ヨ鎵�鏈夌殑涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyTemplateAttrVO> gridCodeClassifyTemplateAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- DataGrid<CodeClassifyTemplateAttrVO> dataGrid=new DataGrid<CodeClassifyTemplateAttrVO>();
- //娌℃湁浼犻�掑弬鏁帮紝灏变笉鎵ц鏌ヨ閫昏緫
- if(conditionMap.size()==0){
- dataGrid.setData(new ArrayList<>());
- dataGrid.setTotal(0);
- return dataGrid;
- }
-
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultAsc("ordernum");
- List<CodeClassifyTemplateAttrDO> doList = codeClassifyTemplateAttrMapper.selectByCondition(conditionMap,pageHelper);
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeClassifyTemplateAttrDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeClassifyTemplateAttrMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateAttrDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrDO2VOs(Collection<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOs) throws VciBaseException{
- List<CodeClassifyTemplateAttrVO> voList = new ArrayList<CodeClassifyTemplateAttrVO>();
- if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOs)){
- for(CodeClassifyTemplateAttrDO s: codeClassifyTemplateAttrDOs){
- CodeClassifyTemplateAttrVO vo = codeClassifyTemplateAttrDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateAttrDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateAttrVO codeClassifyTemplateAttrDO2VO(CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO) throws VciBaseException{
- CodeClassifyTemplateAttrVO vo = new CodeClassifyTemplateAttrVO();
- if(codeClassifyTemplateAttrDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateAttrDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setAttributeDataTypeText(VciFieldTypeEnum.getTextByValue(vo.getAttributedatatype()));
- }
- return vo;
- }
-
- /**
- * 澧炲姞涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateAttrVO addSave(CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateAttrDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO = new CodeClassifyTemplateAttrDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateAttrDTO,codeClassifyTemplateAttrDO);
- codeClassifyTemplateAttrMapper.insert(codeClassifyTemplateAttrDO);
- return codeClassifyTemplateAttrDO2VO(codeClassifyTemplateAttrDO);
- }
-
- /**
- * 鎵归噺娣诲姞
- * @param codeClassifyTemplateAttrDTOs 鏁版嵁浼犺緭瀵硅薄
- * @return 淇濆瓨鍚庣殑鏄剧ず瀵硅薄
- * @throws VciBaseException 鎵ц鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyTemplateAttrVO> batchAddSave(List<CodeClassifyTemplateAttrDTO> codeClassifyTemplateAttrDTOs) throws VciBaseException{
- if(CollectionUtils.isEmpty(codeClassifyTemplateAttrDTOs)){
- return new ArrayList<>();
- }
-
- //鍙栨墍鏈夊睘鎬х殑鑻辨枃鍚嶇О锛岀涓変釜楠岃瘉闇�瑕佺敤鍒�
- Map<String,CodeClassifyTemplateAttrDTO> attrDTOMap =codeClassifyTemplateAttrDTOs.stream().collect(Collectors.toMap(s->s.getId().toLowerCase(Locale.ROOT), t->t));
-
- //鎵惧睘鎬т腑鏂囧悕瀛楅噸澶�
- Map<String, Long> nameCountMap = codeClassifyTemplateAttrDTOs.stream().collect(Collectors.groupingBy(s -> s.getName(), Collectors.counting()));
- List<String> repeatNameList = nameCountMap.keySet().stream().filter(s -> nameCountMap.get(s) > 1).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(repeatNameList)){
- throw new VciBaseException("妯℃澘灞炴�т腑鏂囧悕绉般�恵0}銆戦噸澶�",new String[]{ repeatNameList.stream().collect(Collectors.joining(","))});
- }
- //鎵惧睘鎬ц嫳鏂囧悕瀛楅噸澶�
- Map<String, Long> idCountMap = codeClassifyTemplateAttrDTOs.stream().collect(Collectors.groupingBy(s -> s.getId().toLowerCase(Locale.ROOT), Collectors.counting()));
- List<String> repeatIdList = idCountMap.keySet().stream().filter(s -> idCountMap.get(s) > 1).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(repeatIdList)){
- throw new VciBaseException("妯℃澘灞炴�ц嫳鏂囧悕绉般�恵0}銆戦噸澶�",new String[]{ repeatIdList.stream().collect(Collectors.joining(","))});
- }
-
- //妯℃澘oid
- String CLASSIFYTEMPLATEOID = null;
- //杞崲
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOInsert = new ArrayList<CodeClassifyTemplateAttrDO>();
- List<String> prefix = new ArrayList<>();
- List<String> suffix = new ArrayList<>();
- List<String> dateFormates = new ArrayList<>();
- for (CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO:codeClassifyTemplateAttrDTOs){
- VciBaseUtil.alertNotNull(codeClassifyTemplateAttrDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO = new CodeClassifyTemplateAttrDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateAttrDTO,codeClassifyTemplateAttrDO);
- codeClassifyTemplateAttrDOInsert.add(codeClassifyTemplateAttrDO);
-
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDO.getPrefixValue())){
- prefix.add(codeClassifyTemplateAttrDO.getPrefixValue());
- }
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDO.getSuffixValue())){
- suffix.add(codeClassifyTemplateAttrDO.getSuffixValue());
- }
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDO.getCodeDateFormat())){
- dateFormates.add(codeClassifyTemplateAttrDO.getCodeDateFormat());
- }
- //鍒ゆ柇浼犺繃鏉ョ殑鏋氫妇娉ㄥ叆鏄惁鏄痡sonArr鏍煎紡
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDO.getEnumString())&&!checkKVArr(codeClassifyTemplateAttrDO.getEnumString())){
- throw new VciBaseException("{0}{1}灞炴�х殑鏋氫妇娉ㄥ叆鏁版嵁鏍煎紡閿欒!",new String[]{codeClassifyTemplateAttrDO.getId(),codeClassifyTemplateAttrDO.getName()});
- }
- //鍒嗙被娉ㄥ叆
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDO.getClassifyInvokeAttr())
- && !CodeLevelTypeEnum.MIN.getValue().equalsIgnoreCase(codeClassifyTemplateAttrDO.getClassifyInvokeLevel())
- && VciBaseUtil.getInt(codeClassifyTemplateAttrDO.getClassifyInvokeLevel()) < 0){
- throw new VciBaseException("{0}{1}灞炴�х殑鏄垎绫绘敞鍏ワ紝浣嗘槸娉ㄥ叆灞傜骇涓嶈兘灏忎簬0!",new String[]{codeClassifyTemplateAttrDO.getId(),codeClassifyTemplateAttrDO.getName()});
- }
-
- //鍒ゆ柇浼犺繃鏉ョ殑鍙傜収閰嶇疆鏄惁鏄痡son鏍煎紡
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDO.getReferConfig())&&!checkKVObj(codeClassifyTemplateAttrDO.getReferConfig())){
- throw new VciBaseException("{0}{1}灞炴�х殑鍙傜収閰嶇疆鏁版嵁鏍煎紡閿欒!",new String[]{codeClassifyTemplateAttrDO.getId(),codeClassifyTemplateAttrDO.getName()});
- }
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDO.getCodeDateFormat()) && !checkDateFormat(codeClassifyTemplateAttrDO.getCodeDateFormat())){
- throw new VciBaseException("{0}{1}灞炴�х殑鏃堕棿鏍煎紡涓嶇鍚堣姹�",new String[]{codeClassifyTemplateAttrDO.getId(),codeClassifyTemplateAttrDO.getName()});
- }
- //濡傛灉鏄粍鍚堣鍒欙紝閲岄潰浣跨敤鐨勫睘鎬т笉鑳界己澶憋紝涔熼兘寰楁樉绀�
- String componentrule = codeClassifyTemplateAttrDTO.getComponentrule();
- boolean isContainsDynamicParameter = PatternUtil.isContainsDynamicParameter(componentrule);
- if(isContainsDynamicParameter){
- List<String> userdAttrList = PatternUtil.getKeyListByContent(componentrule);//鍖呭惈鐨勬墍鏈�${xxx}涓殑xxx
- if(!CollectionUtils.isEmpty(userdAttrList)){
- String unExistAttr = userdAttrList.stream().filter(s -> !attrDTOMap.containsKey(s.toLowerCase(Locale.ROOT))).collect(Collectors.joining(","));
- if(StringUtils.isNotBlank(unExistAttr)){
- throw new VciBaseException("{0}灞炴�ф槸缁勫悎瑙勫垯锛屼絾鏄鍒欓噷鍖呭惈鐨勫睘鎬{1}]鍦ㄥ綋鍓嶆ā鏉夸腑涓嶅瓨鍦�!",new String[]{codeClassifyTemplateAttrDO.getName(), unExistAttr});
- }
- //瑕佺湅鐪嬭〃鍗曟槸鍚︽樉绀�
- String unFormDisplayAttr = userdAttrList.stream().filter(s -> !VciBaseUtil.getBoolean(attrDTOMap.getOrDefault(s.toLowerCase(Locale.ROOT),
- new CodeClassifyTemplateAttrDTO()).getFormdisplayflag())).collect(Collectors.joining(","));
- if(StringUtils.isNotBlank(unFormDisplayAttr)){
- throw new VciBaseException("{0}灞炴�ф槸缁勫悎瑙勫垯锛屼絾鏄鍒欓噷鍖呭惈鐨勫睘鎬{1}]鍦ㄥ綋鍓嶆ā鏉夸腑娌℃湁璁剧疆 琛ㄥ崟鏄剧ず ",new String[]{codeClassifyTemplateAttrDO.getName(),unFormDisplayAttr});
- }
- }
- }
-
- if(CLASSIFYTEMPLATEOID==null){
- CLASSIFYTEMPLATEOID = codeClassifyTemplateAttrDTO.getClassifytemplateoid();
- }
-
- }
-
- //鎵ц鏁版嵁淇濆瓨鎿嶄綔
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
-
- //鍏堥兘鍒犱簡
- VciQueryWrapperForDO deleteAttrWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
- deleteAttrWrapper.addQueryMap("CLASSIFYTEMPLATEOID",CLASSIFYTEMPLATEOID);
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDODelete = codeClassifyTemplateAttrMapper.selectByWrapper(deleteAttrWrapper);
-
- //oids
- List<String> oids = new ArrayList<String>();
- for (CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO:codeClassifyTemplateAttrDODelete){
- oids.add(codeClassifyTemplateAttrDO.getOid());
- }
- BatchCBO batchCBOTemplateDelete = new BatchCBO();
- if(!CollectionUtils.isEmpty(oids)){
- batchCBOTemplateDelete = codeClassifyTemplateAttrMapper.batchDeleteByOids(oids);
- }
-
- //鍐嶆柊澧�
- if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOInsert)){
- BatchCBO batchCBOTemplateAdd = codeClassifyTemplateAttrMapper.batchInsert(codeClassifyTemplateAttrDOInsert);
- batchCBOTemplateDelete.copyFromOther(batchCBOTemplateAdd);
- }
-
- //璋冪敤闃舵
- if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOInsert)){
- BatchCBO batchCBO0 = codeTemplatePhaseServiceI.codeTemplateAttrModifyTrigger(codeClassifyTemplateAttrDOInsert);
- batchCBOTemplateDelete.copyFromOther(batchCBO0);
- }
-
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- //澶勭悊鍙緭鍙�夌殑瀛楃
- if(!CollectionUtils.isEmpty(prefix)){
- charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"prefix",prefix,sessionInfo);
- }
- if(!CollectionUtils.isEmpty(suffix)){
- charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"suffix",suffix,sessionInfo);
- }
- if(!CollectionUtils.isEmpty(dateFormates)){
- charService.saveBySameNamespaceAndFlag(MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR,"dateFormates",dateFormates,sessionInfo);
- }
-
- WebUtil.setPersistence(true);//鎵ц淇濆瓨
- boService.persistenceBatch(batchCBOTemplateDelete);//涓�璧锋墽琛屼繚瀛�
- return codeClassifyTemplateAttrDO2VOs(codeClassifyTemplateAttrDOInsert);
- }
-
- /**
- * 淇敼涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public BaseResult editSave(CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateAttrDTO,"鏁版嵁瀵硅薄",codeClassifyTemplateAttrDTO.getOid(),"涓婚搴撳垎绫荤殑妯℃澘灞炴�т富閿�");
-
- //鍒ゆ柇浼犺繃鏉ョ殑鏋氫妇娉ㄥ叆鏄惁鏄痡sonArr鏍煎紡
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getEnumString())&&!checkKVArr(codeClassifyTemplateAttrDTO.getEnumString())){
- throw new VciBaseException("鏋氫妇娉ㄥ叆鏁版嵁鏍煎紡閿欒!");
- }
-
- //鍒ゆ柇浼犺繃鏉ョ殑鍙傜収閰嶇疆鏄惁鏄痡son鏍煎紡
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getReferbtmid())&&!checkKVObj(codeClassifyTemplateAttrDTO.getReferbtmid())){
- throw new VciBaseException("鏋氫妇娉ㄥ叆鏁版嵁鏍煎紡閿欒!");
- }
-
-
- //妫�鏌s
- CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDOCopyFromDTO = new CodeClassifyTemplateAttrDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateAttrDTO,codeClassifyTemplateAttrDOCopyFromDTO);
- boolean tsBoolean = boService.checkTs(codeClassifyTemplateAttrDOCopyFromDTO);
- if(!tsBoolean){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
- return BaseResult.fail("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
- }
-
- //灏咲TO杞崲涓篋O
- CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO = selectByOid(codeClassifyTemplateAttrDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeClassifyTemplateAttrDTO,codeClassifyTemplateAttrDO);
- codeClassifyTemplateAttrMapper.updateByPrimaryKey(codeClassifyTemplateAttrDO);
- return BaseResult.success(codeClassifyTemplateAttrDO2VO(codeClassifyTemplateAttrDO));
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeClassifyTemplateAttrDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeClassifyTemplateAttrDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO, CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO) {
- boService.checkTs(codeClassifyTemplateAttrDO);
- if(!checkIsLinked(codeClassifyTemplateAttrDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param codeClassifyTemplateAttrDTO 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeClassifyTemplateAttr(CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateAttrDTO,"涓婚搴撳垎绫荤殑妯℃澘灞炴�ф暟鎹璞�",codeClassifyTemplateAttrDTO.getOid(),"涓婚搴撳垎绫荤殑妯℃澘灞炴�х殑涓婚敭");
- CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO = selectByOid(codeClassifyTemplateAttrDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeClassifyTemplateAttrDTO,codeClassifyTemplateAttrDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeClassifyTemplateAttrMapper.deleteByPrimaryKey(codeClassifyTemplateAttrDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param oid 涓婚敭
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateAttrVO getObjectByOid(String oid) throws VciBaseException{
- return codeClassifyTemplateAttrDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeClassifyTemplateAttrDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO = codeClassifyTemplateAttrMapper.selectByPrimaryKey(oid.trim());
- if(codeClassifyTemplateAttrDO == null || StringUtils.isBlank(codeClassifyTemplateAttrDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeClassifyTemplateAttrDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撳垎绫荤殑妯℃澘灞炴��
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeClassifyTemplateAttrVO> listCodeClassifyTemplateAttrByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = listCodeClassifyTemplateAttrDOByOidCollections(oidCollections);
- return codeClassifyTemplateAttrDO2VOs(codeClassifyTemplateAttrDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeClassifyTemplateAttrDO> listCodeClassifyTemplateAttrDOByOidCollections(Collection<String> oidCollections){
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = new ArrayList<CodeClassifyTemplateAttrDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeClassifyTemplateAttrDO> tempDOList = codeClassifyTemplateAttrMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeClassifyTemplateAttrDOList.addAll(tempDOList);
- }
- }
- }
- return codeClassifyTemplateAttrDOList;
- }
-
- /**
- * 鍙傜収涓婚搴撳垎绫荤殑妯℃澘灞炴�у垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyTemplateAttrVO> refDataGridCodeClassifyTemplateAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeClassifyTemplateAttr(conditionMap,pageHelper);
- }
-
- /**
- * 鏌ヨ杩欎釜妯℃澘锛屼笟鍔＄被鍨嬩笅鐨勬墍鏈夋湭閫夋嫨鐨勫睘鎬�
- * @param baseQueryObject
- * @return
- */
- @Override
- public DataGrid<OsBtmTypeAttributeVO> codeClassifyTemplateAttrByBtm(BaseQueryObject baseQueryObject){
- if(baseQueryObject.getConditionMap() == null){
- baseQueryObject.setConditionMap(new HashMap<>());
- }
- DataGrid<OsBtmTypeAttributeVO> dataGrid=new DataGrid<OsBtmTypeAttributeVO>();
- //妯℃澘oid
- String templateAttrOid = baseQueryObject.getConditionMap().get("oid");
- String name = baseQueryObject.getConditionMap().getOrDefault("name","");
- String id = baseQueryObject.getConditionMap().getOrDefault("id","");
-
- //娌℃湁oid涓嶆墽琛岄�昏緫
- if(StringUtils.isBlank(templateAttrOid)){
- dataGrid.setData(new ArrayList<>());
- dataGrid.setTotal(0);
- return dataGrid;
- }
-
- //鏌ヨ妯℃澘瀵硅薄
- CodeClassifyTemplateDO codeClassifyTemplateDO = codeClassifyTemplateMapper.selectByPrimaryKey(templateAttrOid);
-
- //杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
- List<OsBtmTypeAttributeVO> boAttrs = this.btmService.listAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
-
- //鎶婇粯璁ょ殑灞炴�т篃娣诲姞鍒癰oAttrs
- if(boAttrs == null){
- boAttrs = new ArrayList<>();
- }
- if(!CollectionUtils.isEmpty(attributeService.getDefaultAttributeVOs())){
- List<OsBtmTypeAttributeVO> finalBoAttrs = boAttrs;
- attributeService.getDefaultAttributeVOs().stream().forEach(attr-> {
- OsBtmTypeAttributeVO attributeVO = new OsBtmTypeAttributeVO();
- BeanUtil.convert(attr, attributeVO);
- if (VciQueryWrapperForDO.ID_FIELD.equalsIgnoreCase(attributeVO.getId())) {
- attributeVO.setName("浼佷笟缂栫爜");
- }
- if ("name".equalsIgnoreCase(attributeVO.getId())) {
- attributeVO.setName("闆嗗洟鐮�");
- }
- attributeVO.setAttrDataType(attr.getAttributeDataType());
- attributeVO.setAttributeLength(attr.getAttrLength());
- attributeVO.setReferBtmTypeId(attr.getBtmTypeId());
- attributeVO.setReferBtmTypeName(attr.getBtmTypeName());
- finalBoAttrs.add(attributeVO);
- });
- boAttrs = finalBoAttrs;
- }
-
- //杩欎釜妯℃澘涓嬪凡缁忔湁鐨勫睘鎬�
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
- queryWrapper.addQueryMap("CLASSIFYTEMPLATEOID",templateAttrOid);
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrMapper.selectByWrapper(queryWrapper);
- List<String> btmOids = new ArrayList<String>();
- for (CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO:codeClassifyTemplateAttrDOList){
- btmOids.add(codeClassifyTemplateAttrDO.getId());
- }
-
- //杩囨护鎺夊凡缁忓瓨鍦ㄧ殑灞炴��
- List<OsBtmTypeAttributeVO> boAttrss = new ArrayList<OsBtmTypeAttributeVO>();
- for (OsBtmTypeAttributeVO osBtmTypeAttributeVO:boAttrs){
- if(!btmOids.contains(osBtmTypeAttributeVO.getId())){
- //鐪嬬湅鏄笉鏄湁妯＄硦鏌ヨ
- boolean inSearch = true;
- if(StringUtils.isNotBlank(name) && !osBtmTypeAttributeVO.getName().contains(name.replace("*",""))){
- inSearch = false;
- }
- if(StringUtils.isNotBlank(id) && !osBtmTypeAttributeVO.getId().contains(id.replace("*",""))){
- inSearch = false;
- }
- if(inSearch) {
- boAttrss.add(osBtmTypeAttributeVO);
- }
- }
- }
- dataGrid.setData(boAttrss);
- dataGrid.setTotal(boAttrss.size());
- return dataGrid;
- }
-
- /**
- * 鏌ヨ杩欎釜妯℃澘锛屼笟鍔＄被鍨嬩笅宸查�夋嫨鐨勫睘鎬�
- * @param baseQueryObject
- * @return
- */
- @Override
- public DataGrid<OsBtmTypeAttributeVO> codeClassifyTemplateAttrByBtmHave(BaseQueryObject baseQueryObject){
- DataGrid<OsBtmTypeAttributeVO> dataGrid=new DataGrid<OsBtmTypeAttributeVO>();
- //妯℃澘oid
- String templateAttrOid = baseQueryObject.getConditionMap().get("oid");
-
- //娌℃湁oid涓嶆墽琛岄�昏緫
- if(StringUtils.isBlank(templateAttrOid)){
- dataGrid.setData(new ArrayList<>());
- dataGrid.setTotal(0);
- return dataGrid;
- }
-
- //鏌ヨ妯℃澘瀵硅薄
- CodeClassifyTemplateDO codeClassifyTemplateDO = codeClassifyTemplateMapper.selectByPrimaryKey(templateAttrOid);
-
- //杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
- List<OsBtmTypeAttributeVO> boAttrs = this.btmService.listAttributeByBtmIdHasDefault(codeClassifyTemplateDO.getBtmTypeId());
-
- //杩欎釜妯℃澘涓嬪凡缁忔湁鐨勫睘鎬�
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
- queryWrapper.addQueryMap("CLASSIFYTEMPLATEOID",templateAttrOid);
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrMapper.selectByWrapper(queryWrapper);
- List<String> btmOids = new ArrayList<String>();
- for (CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO:codeClassifyTemplateAttrDOList){
- btmOids.add(codeClassifyTemplateAttrDO.getId());
- }
-
- //杩囨护鎺夐櫎浜嗚嚜韬殑鍒殑灞炴��
- List<OsBtmTypeAttributeVO> boAttrss = new ArrayList<OsBtmTypeAttributeVO>();
- for (OsBtmTypeAttributeVO osBtmTypeAttributeVO:boAttrs){
- if(btmOids.contains(osBtmTypeAttributeVO.getId())){
- boAttrss.add(osBtmTypeAttributeVO);
- }
- }
- dataGrid.setData(boAttrss);
- dataGrid.setTotal(boAttrss.size());
- return dataGrid;
- }
- /**
- * 鍚屾鍒板叾浠栨ā鏉�
- * @param codeClassifyTemplateAttrDTO oid
- * @return
- */
- @Override
- public BaseResult copyto(CodeClassifyTemplateAttrDTO codeClassifyTemplateAttrDTO) throws VciBaseException{
-
- String templateAttrOid = codeClassifyTemplateAttrDTO.getOid();
-
- //鏌ヨ鍑烘潵瑕佸鍒剁殑瀵硅薄
- CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO = selectByOid(templateAttrOid);
- String id = codeClassifyTemplateAttrDO.getId();//鑻辨枃鍚嶇О
- String classfyTemplateOid = codeClassifyTemplateAttrDO.getClassifyTemplateOid();
-
- //鏌ヨ鍏朵粬id=id鐨勬ā鏉垮睘鎬�
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
- queryWrapper.addQueryMap("id",id);
- //鎵�鏈塱d=id鐨勬ā鏉垮睘鎬�
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrMapper.selectByWrapper(queryWrapper);
- //瑕佸垹闄ょ殑妯℃澘灞炴�х殑oids
- List<String> deleteOids = new ArrayList<String>();
- //瑕佷慨鏀圭殑妯℃澘灞炴�у璞�
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOListInsert = new ArrayList<CodeClassifyTemplateAttrDO>();
- for (CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDOi:codeClassifyTemplateAttrDOList){
- String oid = codeClassifyTemplateAttrDOi.getOid();
- String templateOldOid = codeClassifyTemplateAttrDOi.getClassifyTemplateOid();
-
- CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDOInsert = new CodeClassifyTemplateAttrDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateAttrDO,codeClassifyTemplateAttrDOInsert);
- codeClassifyTemplateAttrDOInsert.setOid(oid);
- codeClassifyTemplateAttrDOInsert.setClassifyTemplateOid(templateOldOid);
- codeClassifyTemplateAttrDOListInsert.add(codeClassifyTemplateAttrDOInsert);
-
- deleteOids.add(codeClassifyTemplateAttrDOi.getOid());
- }
-
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
-
- //鍒犻櫎
- BatchCBO batchCBOTemplateAttrDelete = codeClassifyTemplateAttrMapper.batchDeleteByOids(deleteOids);
-
- //鍐嶆柊澧�
- BatchCBO batchCBOTemplateAttrInsert = codeClassifyTemplateAttrMapper.batchInsert(codeClassifyTemplateAttrDOListInsert);
- batchCBOTemplateAttrDelete.copyFromOther(batchCBOTemplateAttrInsert);
-
- WebUtil.setPersistence(true);//鎵ц淇濆瓨
- boService.persistenceBatch(batchCBOTemplateAttrDelete);//涓�璧锋墽琛屼繚瀛�
-
- return BaseResult.success();
- }
-
- /**
- * 浣跨敤妯℃澘鐨勪富閿幏鍙栨ā鏉跨殑灞炴��--鎵归噺
- *
- * @param templateOidCollection 妯℃澘鐨勪富閿�
- * @return 灞炴�х殑淇℃伅
- */
- @Override
- public List<CodeClassifyTemplateAttrVO> listCodeClassifyTemplateAttrByTemplateOids(Collection<String> templateOidCollection) {
- if(CollectionUtils.isEmpty(templateOidCollection)){
- return new ArrayList<>();
- }
- List<CodeClassifyTemplateAttrDO> attrDOList = new ArrayList<>();
- VciBaseUtil.switchCollectionForOracleIn(templateOidCollection).stream().forEach(templateOids->{
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("classifytemplateoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(templateOids.toArray(new String[0])) + ")");
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultAsc("orderNum");
- List<CodeClassifyTemplateAttrDO> attrDOS = codeClassifyTemplateAttrMapper.selectByCondition(conditionMap, pageHelper);
- if(!CollectionUtils.isEmpty(attrDOS)){
- attrDOList.addAll(attrDOS);
- }
- });
- return codeClassifyTemplateAttrDO2VOs(attrDOList);
- }
-
- public boolean checkKVArr(String kvString){
- boolean isKV = true;
- try {
- JSONObject.parseArray(kvString, KeyValue.class);
- }catch (Exception e){
- isKV=false;
- }
- return isKV;
- }
- public boolean checkKVObj(String kvString){
- boolean isKV = true;
- try {
- JSONObject.parseObject(kvString, UIFormReferVO.class);
- }catch (Exception e){
- isKV=false;
- }
- return isKV;
- }
-
- /**
- * 鏍￠獙鏃堕棿鏍煎紡
- * @param dateFormat 鏃堕棿鏍煎紡
- * @return true琛ㄧず鏍￠獙閫氳繃
- */
- public boolean checkDateFormat(String dateFormat){
- try{
- VciDateUtil.date2Str(new Date(),dateFormat);
- return true;
- }catch (Throwable e){
- return false;
- }
- }
-
-
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
deleted file mode 100644
index 6a7a7b8..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
+++ /dev/null
@@ -1,382 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateButtonMapper;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateButtonDO;
-import com.vci.ubcs.code.service.CodeButtonServiceI;
-import com.vci.ubcs.code.service.CodeClassifyTemplateButtonServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtil;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateButtonDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeButtonVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateButtonVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-/**
- * 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽湇鍔�
- * @author weidy
- * @date 2022-01-24
- */
-@Service
-public class CodeClassifyTemplateButtonServiceImpl implements CodeClassifyTemplateButtonServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyTemplateButtonMapper codeClassifyTemplateButtonMapper;
-
- /**
- * 鎸夐挳鐨勬湇鍔�
- */
- @Autowired
- private CodeButtonServiceI buttonService;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyTemplateButtonVO> gridCodeClassifyTemplateButton(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- final String[] classifyTemplateOid = {""};
- if(conditionMap!=null){
- conditionMap.forEach((key,value)->{
- if("classifytemplateoid".equalsIgnoreCase(key)){
- classifyTemplateOid[0] = value;
- }
- });
- }
- if(StringUtils.isBlank(classifyTemplateOid[0])){
- return new DataGrid<>();
- }
-
- List<CodeClassifyTemplateButtonDO> doList = codeClassifyTemplateButtonMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeClassifyTemplateButtonVO> dataGrid=new DataGrid<CodeClassifyTemplateButtonVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeClassifyTemplateButtonDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeClassifyTemplateButtonMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateButtonDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyTemplateButtonVO> codeClassifyTemplateButtonDO2VOs(Collection<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOs) throws VciBaseException{
- return codeClassifyTemplateButtonDO2VOs(codeClassifyTemplateButtonDOs,false);
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateButtonDOs 鏁版嵁瀵硅薄鍒楄〃
- * @param hasButtonVO 鏄惁鍖呭惈鎸夐挳鐨勪俊鎭�
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyTemplateButtonVO> codeClassifyTemplateButtonDO2VOs(Collection<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOs, boolean hasButtonVO) throws VciBaseException{
- List<CodeClassifyTemplateButtonVO> voList = new ArrayList<CodeClassifyTemplateButtonVO>();
- if(!CollectionUtils.isEmpty(codeClassifyTemplateButtonDOs)){
- for(CodeClassifyTemplateButtonDO s: codeClassifyTemplateButtonDOs){
- CodeClassifyTemplateButtonVO vo = codeClassifyTemplateButtonDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- if(hasButtonVO && !CollectionUtils.isEmpty(voList)){
- //鑾峰彇鎸夐挳鐨勬樉绀哄璞�
- List<CodeButtonVO> buttonVOList = new ArrayList<>();
- VciBaseUtil.switchCollectionForOracleIn(voList.stream().map(CodeClassifyTemplateButtonVO::getClassifybuttonoid).collect(Collectors.toList())).stream().forEach(buttonOids->{
- buttonVOList.addAll(buttonService.listCodeButtonByOids(buttonOids));
- });
- Map<String, CodeButtonVO> buttonVOMap = Optional.ofNullable(buttonVOList).orElseGet(() -> new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
- voList.stream().forEach(vo->{
- vo.setButtonVO(buttonVOMap.getOrDefault(vo.getClassifybuttonoid(),null));
- });
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateButtonDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateButtonVO codeClassifyTemplateButtonDO2VO(CodeClassifyTemplateButtonDO codeClassifyTemplateButtonDO) throws VciBaseException{
- CodeClassifyTemplateButtonVO vo = new CodeClassifyTemplateButtonVO();
- if(codeClassifyTemplateButtonDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateButtonDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateButtonVO addSave(CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateButtonDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeClassifyTemplateButtonDTO.getClassifytemplateoid(),"妯℃澘鐨勪富閿�");
- //灏咲TO杞崲涓篋O
- CodeClassifyTemplateButtonDO codeClassifyTemplateButtonDO = new CodeClassifyTemplateButtonDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateButtonDTO,codeClassifyTemplateButtonDO);
- if(codeClassifyTemplateButtonDO.getOrderNum()== null){
- //鏌ヨ鍏ㄩ儴
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("classifytemplateoid",codeClassifyTemplateButtonDTO.getClassifytemplateoid());
- Long count = codeClassifyTemplateButtonMapper.countByCondition(conditionMap);
- if(count == null){
- count = 0L;
- }
- codeClassifyTemplateButtonDO.setOrderNum(Long.valueOf(count + 1L).intValue());
- }
- codeClassifyTemplateButtonMapper.insert(codeClassifyTemplateButtonDO);
- return codeClassifyTemplateButtonDO2VO(codeClassifyTemplateButtonDO);
- }
-
- /**
- * 淇敼涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateButtonVO editSave(CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateButtonDTO,"鏁版嵁瀵硅薄",codeClassifyTemplateButtonDTO.getOid(),"涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽富閿�");
- //灏咲TO杞崲涓篋O
- CodeClassifyTemplateButtonDO codeClassifyTemplateButtonDO = selectByOid(codeClassifyTemplateButtonDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeClassifyTemplateButtonDTO,codeClassifyTemplateButtonDO);
- codeClassifyTemplateButtonMapper.updateByPrimaryKey(codeClassifyTemplateButtonDO);
- return codeClassifyTemplateButtonDO2VO(codeClassifyTemplateButtonDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeClassifyTemplateButtonDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeClassifyTemplateButtonDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO, CodeClassifyTemplateButtonDO codeClassifyTemplateButtonDO) {
- CodeClassifyTemplateButtonDO tsDO = new CodeClassifyTemplateButtonDO();
- BeanUtil.convert(codeClassifyTemplateButtonDTO,tsDO);
- boService.checkTs(tsDO);
- if(!checkIsLinked(codeClassifyTemplateButtonDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param codeClassifyTemplateButtonDTO 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeClassifyTemplateButton(CodeClassifyTemplateButtonDTO codeClassifyTemplateButtonDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateButtonDTO,"涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽暟鎹璞�",codeClassifyTemplateButtonDTO.getOid(),"涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽殑涓婚敭");
- CodeClassifyTemplateButtonDO codeClassifyTemplateButtonDO = selectByOid(codeClassifyTemplateButtonDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeClassifyTemplateButtonDTO,codeClassifyTemplateButtonDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeClassifyTemplateButtonMapper.deleteByPrimaryKey(codeClassifyTemplateButtonDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param oid 涓婚敭
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateButtonVO getObjectByOid(String oid) throws VciBaseException{
- return codeClassifyTemplateButtonDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeClassifyTemplateButtonDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeClassifyTemplateButtonDO codeClassifyTemplateButtonDO = codeClassifyTemplateButtonMapper.selectByPrimaryKey(oid.trim());
- if(codeClassifyTemplateButtonDO == null || StringUtils.isBlank(codeClassifyTemplateButtonDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeClassifyTemplateButtonDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeClassifyTemplateButtonVO> listCodeClassifyTemplateButtonByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOList = listCodeClassifyTemplateButtonDOByOidCollections(oidCollections);
- return codeClassifyTemplateButtonDO2VOs(codeClassifyTemplateButtonDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeClassifyTemplateButtonDO> listCodeClassifyTemplateButtonDOByOidCollections(Collection<String> oidCollections){
- List<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOList = new ArrayList<CodeClassifyTemplateButtonDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeClassifyTemplateButtonDO> tempDOList = codeClassifyTemplateButtonMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeClassifyTemplateButtonDOList.addAll(tempDOList);
- }
- }
- }
- return codeClassifyTemplateButtonDOList;
- }
-
-
-
- /**
- * 鍙傜収涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓婚搴撻噷妯℃澘鍖呭惈鐨勬寜閽樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyTemplateButtonVO> refDataGridCodeClassifyTemplateButton(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeClassifyTemplateButton(conditionMap,pageHelper);
- }
-
- /**
- * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
- *
- * @param classifyTemplateOid 妯℃澘鐨勪富閿�
- * @return 鍙楀奖鍝嶇殑鏁版嵁
- */
- @Override
- public BatchCBO codeTemplateDeleteTrigger(String classifyTemplateOid) {
- BatchCBO batchCBO = new BatchCBO();
- if(StringUtils.isNotBlank(classifyTemplateOid)){
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("classifyTemplateOid",classifyTemplateOid);
- List<CodeClassifyTemplateButtonDO> templateButtonDOS = codeClassifyTemplateButtonMapper.selectByCondition(conditionMap, new PageHelper(-1));
- if(!CollectionUtils.isEmpty(templateButtonDOS)){
- batchCBO.copyFromOther(codeClassifyTemplateButtonMapper.batchDeleteByOids(templateButtonDOS.stream().map(CodeClassifyTemplateButtonDO::getOid).collect(Collectors.toList())));
- }
- }
- return batchCBO;
- }
-
- /**
- * 浣跨敤妯℃澘涓婚敭鑾峰彇鎵╁睍鐨勬寜閽�
- *
- * @param templateOid 妯℃澘鐨勪富閿�
- * @return 鎸夐挳鐨勭浉鍏崇殑淇℃伅
- */
- @Override
- public List<CodeClassifyTemplateButtonVO> listButtonByTemplateOid(String templateOid) {
- return listButtonByTemplateOid(templateOid,false);
- }
-
- /**
- * 浣跨敤妯℃澘涓婚敭鑾峰彇鎵╁睍鐨勬寜閽�
- *
- * @param templateOid 妯℃澘鐨勪富閿�
- * @param hasButtonVO 鏄惁鍖呭惈鎸夐挳鐨勬樉绀轰俊鎭�
- * @return 鎸夐挳鐨勭浉鍏崇殑淇℃伅
- */
- @Override
- public List<CodeClassifyTemplateButtonVO> listButtonByTemplateOid(String templateOid, boolean hasButtonVO) {
- if(StringUtils.isBlank(templateOid)){
- return new ArrayList<>();
- }
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("classifyTemplateOid",templateOid);
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultAsc("orderNum");
- List<CodeClassifyTemplateButtonDO> templateButtonDOS = codeClassifyTemplateButtonMapper.selectByCondition(conditionMap, pageHelper);
- return codeClassifyTemplateButtonDO2VOs(templateButtonDOS,hasButtonVO);
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateMapServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateMapServiceImpl.java
deleted file mode 100644
index b20ff3f..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateMapServiceImpl.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateMapMapper;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateMapDO;
-import com.vci.ubcs.code.service.CodeClassifyTemplateMapServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateMapDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateMapVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.*;
-
-/**
- * 涓婚搴撴ā鏉挎槧灏勮鍒欐湇鍔�
- * @author weidy
- * @date 2022-01-24
- */
-@Service
-public class CodeClassifyTemplateMapServiceImpl implements CodeClassifyTemplateMapServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyTemplateMapMapper codeClassifyTemplateMapMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyTemplateMapVO> gridCodeClassifyTemplateMap(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodeClassifyTemplateMapDO> doList = codeClassifyTemplateMapMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeClassifyTemplateMapVO> dataGrid=new DataGrid<CodeClassifyTemplateMapVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeClassifyTemplateMapDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeClassifyTemplateMapMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateMapDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyTemplateMapVO> codeClassifyTemplateMapDO2VOs(Collection<CodeClassifyTemplateMapDO> codeClassifyTemplateMapDOs) throws VciBaseException{
- List<CodeClassifyTemplateMapVO> voList = new ArrayList<CodeClassifyTemplateMapVO>();
- if(!CollectionUtils.isEmpty(codeClassifyTemplateMapDOs)){
- for(CodeClassifyTemplateMapDO s: codeClassifyTemplateMapDOs){
- CodeClassifyTemplateMapVO vo = codeClassifyTemplateMapDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateMapDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateMapVO codeClassifyTemplateMapDO2VO(CodeClassifyTemplateMapDO codeClassifyTemplateMapDO) throws VciBaseException{
- CodeClassifyTemplateMapVO vo = new CodeClassifyTemplateMapVO();
- if(codeClassifyTemplateMapDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateMapDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-// if(true){
-// vo.setLcStatusText({lcStatusFullClassName}.getTextByValue(vo.getLcStatus()));
-// }
- }
- return vo;
- }
-
- /**
- * 澧炲姞涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param codeClassifyTemplateMapDTO 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateMapVO addSave(CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateMapDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeClassifyTemplateMapDO codeClassifyTemplateMapDO = new CodeClassifyTemplateMapDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateMapDTO,codeClassifyTemplateMapDO);
- codeClassifyTemplateMapMapper.insert(codeClassifyTemplateMapDO);
- return codeClassifyTemplateMapDO2VO(codeClassifyTemplateMapDO);
- }
-
- /**
- * 淇敼涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param codeClassifyTemplateMapDTO 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateMapVO editSave(CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateMapDTO,"鏁版嵁瀵硅薄",codeClassifyTemplateMapDTO.getOid(),"涓婚搴撴ā鏉挎槧灏勮鍒欎富閿�");
- //灏咲TO杞崲涓篋O
- CodeClassifyTemplateMapDO codeClassifyTemplateMapDO = selectByOid(codeClassifyTemplateMapDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeClassifyTemplateMapDTO,codeClassifyTemplateMapDO);
- codeClassifyTemplateMapMapper.updateByPrimaryKey(codeClassifyTemplateMapDO);
- return codeClassifyTemplateMapDO2VO(codeClassifyTemplateMapDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeClassifyTemplateMapDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeClassifyTemplateMapDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO, CodeClassifyTemplateMapDO codeClassifyTemplateMapDO) {
- if(!checkIsLinked(codeClassifyTemplateMapDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param codeClassifyTemplateMapDTO 涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeClassifyTemplateMap(CodeClassifyTemplateMapDTO codeClassifyTemplateMapDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateMapDTO,"涓婚搴撴ā鏉挎槧灏勮鍒欐暟鎹璞�",codeClassifyTemplateMapDTO.getOid(),"涓婚搴撴ā鏉挎槧灏勮鍒欑殑涓婚敭");
- CodeClassifyTemplateMapDO codeClassifyTemplateMapDO = selectByOid(codeClassifyTemplateMapDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeClassifyTemplateMapDTO,codeClassifyTemplateMapDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeClassifyTemplateMapMapper.deleteByPrimaryKey(codeClassifyTemplateMapDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param oid 涓婚敭
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateMapVO getObjectByOid(String oid) throws VciBaseException{
- return codeClassifyTemplateMapDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeClassifyTemplateMapDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeClassifyTemplateMapDO codeClassifyTemplateMapDO = codeClassifyTemplateMapMapper.selectByPrimaryKey(oid.trim());
- if(codeClassifyTemplateMapDO == null || StringUtils.isBlank(codeClassifyTemplateMapDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeClassifyTemplateMapDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓婚搴撴ā鏉挎槧灏勮鍒�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeClassifyTemplateMapVO> listCodeClassifyTemplateMapByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeClassifyTemplateMapDO> codeClassifyTemplateMapDOList = listCodeClassifyTemplateMapDOByOidCollections(oidCollections);
- return codeClassifyTemplateMapDO2VOs(codeClassifyTemplateMapDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeClassifyTemplateMapDO> listCodeClassifyTemplateMapDOByOidCollections(Collection<String> oidCollections){
- List<CodeClassifyTemplateMapDO> codeClassifyTemplateMapDOList = new ArrayList<CodeClassifyTemplateMapDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeClassifyTemplateMapDO> tempDOList = codeClassifyTemplateMapMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeClassifyTemplateMapDOList.addAll(tempDOList);
- }
- }
- }
- return codeClassifyTemplateMapDOList;
- }
-
-
-
- /**
- * 鍙傜収涓婚搴撴ā鏉挎槧灏勮鍒欏垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓婚搴撴ā鏉挎槧灏勮鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyTemplateMapVO> refDataGridCodeClassifyTemplateMap(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeClassifyTemplateMap(conditionMap,pageHelper);
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateServiceImpl.java
deleted file mode 100644
index 3b55707..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateServiceImpl.java
+++ /dev/null
@@ -1,1086 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.vci.corba.common.VCIError;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.starter.revision.bo.TreeWrapperOptions;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciParentQueryOption;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.dto.CodeClassifyTemplateDTO;
-import com.vci.ubcs.code.lifecycle.CodeClassifyTemplateLC;
-import com.vci.ubcs.code.mapper.*;
-import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.service.*;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientBusinessObjectOperation;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.*;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-/**
- * 鍒嗙被妯℃澘瀵硅薄鏈嶅姟
- * @author weidy
- * @date 2022-01-24
- */
-@Service
-public class CodeClassifyTemplateServiceImpl implements CodeClassifyTemplateServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyTemplateMapper codeClassifyTemplateMapper;
-
- /**
- * 妯℃澘娴佺▼鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyProcessTempMapper codeClassifyProcessTempDaoI;
-
- /**
- * 妯℃澘娴佺▼鎿嶄綔灞�
- */
- @Resource
- private CodeTemplatePhaseMapper codeTemplatePhaseDaoI;
-
- /**
- * 妯℃澘娴佺▼鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyTemplateButtonMapper codeClassifyTemplateButtonDaoI;
-
- /**
- * 妯℃澘娴佺▼鎿嶄綔灞�
- */
- @Resource
- private CodePhaseAttrMapper codePhaseAttrDaoI;
-
- /**
- * 鍒嗙被
- */
- @Resource
- private CodeClassifyMapper codeClassifyDaoI;
-
- /**
- * 妯℃澘闃舵
- */
- @Resource
- private CodeTemplatePhaseServiceI codeTemplatePhaseServiceI;
-
- /**
- * 妯℃澘娴佺▼
- */
- @Resource
- private CodeClassifyProcessTempServiceI codeClassifyProcessTempServiceI;
-
- /**
- * 妯℃澘鎸夐挳
- */
- @Resource
- private CodeClassifyTemplateButtonServiceI codeClassifyTemplateButtonServiceI;
-
-
- /**
- * 妯℃澘灞炴��
- */
- @Resource
- private CodeClassifyTemplateAttrMapper codeClassifyTemplateAttrDaoI;
-
- /**
- * 妯℃澘灞炴�х殑鏈嶅姟
- */
- @Lazy
- @Autowired(required = false)
- private CodeClassifyTemplateAttrServiceI templateAttrService;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
- */
- private static final String PARENT_FIELD_NAME = "";
- /**
- * 鏌ヨ鍒嗙被妯℃澘瀵硅薄 鏍�
- * @param treeQueryObject 鏍戞煡璇㈠璞�
- * @return 鍒嗙被妯℃澘瀵硅薄 鏄剧ず鏍�
- * @throws VciBaseException 鏌ヨ鏉′欢涓嶇鍚堣姹傜殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public List<Tree> treeCodeClassifyTemplate(TreeQueryObject treeQueryObject) throws VciBaseException{
- List<CodeClassifyTemplateDO> doList =selectCodeClassifyTemplateDOByTree(treeQueryObject);
- List<CodeClassifyTemplateVO> voList = codeClassifyTemplateDO2VOs(doList);
- TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
- treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
- return revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyTemplateVO s) ->{
- //鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
- return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
- .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
- });
- }
- /**
- * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
- *
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鏌ヨ缁撴灉,鏁版嵁瀵硅薄
- */
- @Override
- public List<CodeClassifyTemplateDO> selectCodeClassifyTemplateDOByTree(TreeQueryObject treeQueryObject) {
- VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(null,CodeClassifyTemplateDO.class);
- VciParentQueryOption parentQueryOption = new VciParentQueryOption();
- parentQueryOption.setParentFieldName(PARENT_FIELD_NAME);
- queryWrapperForDO.parentQueryChild(treeQueryObject,parentQueryOption);
- return codeClassifyTemplateMapper.selectByWrapper(queryWrapperForDO);
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyTemplateVO> codeClassifyTemplateDO2VOs(Collection<CodeClassifyTemplateDO> codeClassifyTemplateDOs) throws VciBaseException{
- return codeClassifyTemplateDO2VOs(codeClassifyTemplateDOs,false);
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateDOs 鏁版嵁瀵硅薄鍒楄〃
- * @param hasAttr 鏄惁鍖呭惈灞炴��
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyTemplateVO> codeClassifyTemplateDO2VOs(Collection<CodeClassifyTemplateDO> codeClassifyTemplateDOs,boolean hasAttr) throws VciBaseException{
- List<CodeClassifyTemplateVO> voList = new ArrayList<CodeClassifyTemplateVO>();
- if(!CollectionUtils.isEmpty(codeClassifyTemplateDOs)){
- for(CodeClassifyTemplateDO s: codeClassifyTemplateDOs){
- CodeClassifyTemplateVO vo = codeClassifyTemplateDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- if(hasAttr){
- //涓�涓垎绫婚噷闈㈡�讳笉鑳借秴杩�1000涓敓鏁堢殑鐗堟湰鍚э紒锛侊紒
- VciBaseUtil.switchCollectionForOracleIn(voList.stream().map(CodeClassifyTemplateVO::getOid).collect(Collectors.toList())).forEach(tempOids->{
- List<CodeClassifyTemplateAttrVO> attrVOList = templateAttrService.listCodeClassifyTemplateAttrByTemplateOids(tempOids);
- if(!CollectionUtils.isEmpty(attrVOList)){
- Map<String, List<CodeClassifyTemplateAttrVO>> attrVOMap = attrVOList.stream().collect(Collectors.groupingBy(s -> s.getClassifytemplateoid()));
- voList.stream().forEach(templateVO->{
- if(attrVOMap.containsKey(templateVO.getOid())){
- templateVO.setAttributes(attrVOMap.get(templateVO.getOid()));
- }
- });
- }
- });
-
- }
- return voList;
- }
-
-
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyTemplateDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateVO codeClassifyTemplateDO2VO(CodeClassifyTemplateDO codeClassifyTemplateDO) throws VciBaseException{
- CodeClassifyTemplateVO vo = new CodeClassifyTemplateVO();
- if(codeClassifyTemplateDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setLcStatusText(CodeClassifyTemplateLC.getTextByValue(vo.getLcStatus()));
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞鍒嗙被妯℃澘瀵硅薄
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public BaseResult<CodeClassifyTemplateVO> addSave(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeClassifyTemplateDO codeClassifyTemplateDO = new CodeClassifyTemplateDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateDTO,codeClassifyTemplateDO);
-
- //鏌ヨ鍒嗙被浠ュ強涓婄骇鍒嗙被鐨勪笟鍔＄被鍨媌tmtypeid銆乥tmtypename
- List<CodeClassifyDO> codeClassifyDOList = codeClassifyDaoI.selectAllLevelParents(codeClassifyTemplateDTO.getCodeclassifyoid());
-
- //鎵�鏈夊垎绫婚兘娌℃湁涓氬姟绫诲瀷锛岃繑鍥炴彁绀�
- if(codeClassifyDOList.size()==0){
- return BaseResult.fail("娣诲姞妯℃澘娣诲姞澶辫触,鍒嗙被鍜屼笂绾у垎绫婚兘娌℃湁鍏宠仈涓氬姟绫诲瀷锛�");
- }
-
- //璁剧疆btmtypeid鍜宯ame
- CodeClassifyDO codeClassifyDO = codeClassifyDOList.get(0);
- codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId());
- codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
- codeClassifyTemplateDO.setLcStatus(FRAMEWORK_RELEASE_EDITING);
- codeClassifyTemplateMapper.insert(codeClassifyTemplateDO);
- //榛樿娣诲姞妯℃澘灞炴��
-// List<CodeClassifyTemplateAttrDO> attrDOList = new ArrayList<>();
-
-// CodeClassifyTemplateAttrDO codeAttr = new CodeClassifyTemplateAttrDO();
-// codeAttr.setId("id");
-// codeAttr.setName("浼佷笟缂栫爜");
-// codeAttr.setAttributeDataType("VTString");
-// codeAttr.setAttrTableWidth(150);
-// codeAttr.setOrderNum(1);
-// codeAttr.setFormDisplayFlag(BooleanEnum.TRUE.getValue());
-// codeAttr.setTableDisplayFlag(BooleanEnum.TRUE.getValue());
-// codeAttr.setClassifyTemplateOid(codeClassifyTemplateDO.getOid());
-// attrDOList.add(codeAttr);
-//
-//
-// CodeClassifyTemplateAttrDO groupAttr = new CodeClassifyTemplateAttrDO();
-// groupAttr.setId("name");
-// groupAttr.setName("闆嗗洟鐮�");
-// groupAttr.setAttributeDataType("VTString");
-// groupAttr.setAttrTableWidth(150);
-// groupAttr.setOrderNum(2);
-// groupAttr.setFormDisplayFlag(BooleanEnum.TRUE.getValue());
-// groupAttr.setTableDisplayFlag(BooleanEnum.TRUE.getValue());
-// groupAttr.setClassifyTemplateOid(codeClassifyTemplateDO.getOid());
-// attrDOList.add(groupAttr);
-//
-// CodeClassifyTemplateAttrDO descAttr = new CodeClassifyTemplateAttrDO();
-// descAttr.setId("description");
-// descAttr.setName("鎻忚堪");
-// descAttr.setAttrTableWidth(150);
-// descAttr.setAttributeDataType("VTString");
-// descAttr.setOrderNum(3);
-// descAttr.setFormDisplayFlag(BooleanEnum.TRUE.getValue());
-// descAttr.setTableDisplayFlag(BooleanEnum.TRUE.getValue());
-// descAttr.setClassifyTemplateOid(codeClassifyTemplateDO.getOid());
-// attrDOList.add(descAttr);
-//
-// CodeClassifyTemplateAttrDO statusAttr = new CodeClassifyTemplateAttrDO();
-// statusAttr.setId("lcstatus");
-// statusAttr.setName("鐘舵��");
-// statusAttr.setAttrTableWidth(70);
-// statusAttr.setOrderNum(4);
-// statusAttr.setFormDisplayFlag(BooleanEnum.TRUE.getValue());
-// statusAttr.setTableDisplayFlag(BooleanEnum.TRUE.getValue());
-// statusAttr.setAttributeDataType("VTString");
-// statusAttr.setClassifyTemplateOid(codeClassifyTemplateDO.getOid());
-// attrDOList.add(statusAttr);
-//
-//
-// CodeClassifyTemplateAttrDO secAttr = new CodeClassifyTemplateAttrDO();
-// secAttr.setId("secretgrade");
-// secAttr.setName("瀵嗙骇");
-// secAttr.setAttrTableWidth(70);
-// secAttr.setAttributeDataType(VciFieldTypeEnum.VTInteger.name());
-// secAttr.setEnumId("Enumsecretgrade");
-// secAttr.setEnumName("瀵嗙骇");
-// secAttr.setOrderNum(4);
-// secAttr.setFormDisplayFlag(BooleanEnum.TRUE.getValue());
-// secAttr.setTableDisplayFlag(BooleanEnum.TRUE.getValue());
-// secAttr.setClassifyTemplateOid(codeClassifyTemplateDO.getOid());
-// attrDOList.add(secAttr);
-
- return BaseResult.success(codeClassifyTemplateDO2VO(codeClassifyTemplateDO));
- }
-
- /**
- * 淇敼鍒嗙被妯℃澘瀵硅薄
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public BaseResult editSave(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateDTO,"鏁版嵁瀵硅薄",codeClassifyTemplateDTO.getOid(),"鍒嗙被妯℃澘瀵硅薄涓婚敭");
- //妫�鏌s
- CodeClassifyTemplateDO codeClassifyTemplateDOCopyFromDTO = new CodeClassifyTemplateDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateDTO,codeClassifyTemplateDOCopyFromDTO);
- boolean tsBoolean = boService.checkTs(codeClassifyTemplateDOCopyFromDTO);
- if(!tsBoolean){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
- return BaseResult.fail("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
- }
-
- //灏咲TO杞崲涓篋O
- CodeClassifyTemplateDO codeClassifyTemplateDO = selectByOid(codeClassifyTemplateDTO.getOid());
- String lcstatus = codeClassifyTemplateDO.getLcStatus();
- String versionvalue = codeClassifyTemplateDO.getVersionValue();
-
- //鍙湁缂栬緫涓墠鑳戒慨鏀�
- if(!CodeClassifyTemplateLC.EDITING.getValue().equals(codeClassifyTemplateDO.getLcStatus())){
- return BaseResult.fail("鍙湁缂栬緫涓殑锛屾ā鏉挎墠鑳戒慨鏀癸紒");
- }
- revisionModelUtil.copyFromDTOIgnore(codeClassifyTemplateDTO,codeClassifyTemplateDO);
- //涓嶄慨鏀圭増鏈彿鍜岀姸鎬�
- codeClassifyTemplateDO.setLcStatus(lcstatus);
- codeClassifyTemplateDO.setVersionValue(versionvalue);
- codeClassifyTemplateMapper.updateByPrimaryKey(codeClassifyTemplateDO);
- return BaseResult.success(codeClassifyTemplateDO2VO(codeClassifyTemplateDO));
- }
-
- /**
- * 妫�鏌� 鍒嗙被妯℃澘瀵硅薄鏄惁鍒犻櫎
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄锛屽繀椤昏鏈塷id鍜宼s灞炴��
- * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult checkIsCanDelete(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyTemplateDTO,"鏁版嵁浼犺緭瀵硅薄",codeClassifyTemplateDTO.getOid(),"涓婚敭");
- CodeClassifyTemplateDO codeClassifyTemplateDO = selectByOid(codeClassifyTemplateDTO.getOid());
- return checkIsCanDeleteForDO(codeClassifyTemplateDTO,codeClassifyTemplateDO);
- }
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeClassifyTemplateDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeClassifyTemplateDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeClassifyTemplateDTO codeClassifyTemplateDTO, CodeClassifyTemplateDO codeClassifyTemplateDO) {
- CodeClassifyTemplateDO codeClassifyTemplateDOCopyFromDTO = new CodeClassifyTemplateDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyTemplateDTO,codeClassifyTemplateDOCopyFromDTO);
- boService.checkTs(codeClassifyTemplateDOCopyFromDTO);
- //鏍￠獙涓嬬骇鏄惁鏈夊紩鐢�
- if(checkChildIsLinked(codeClassifyTemplateDO.getOid())){
- return BaseResult.fail(DATA_CASCADE_LINKED_NOT_DELETE,new String[]{""});
- }
- return BaseResult.success(checkHasChild(codeClassifyTemplateDO.getOid()));
- }
- /**
- * 妫�鏌ユ槸鍚︽湁涓嬬骇鏄惁鍏宠仈浜嗘暟鎹�
- *
- * @param oid 涓婚敭
- * @return true 琛ㄧず鏈夊紩鐢紝false琛ㄧず娌℃湁寮曠敤
- * @throws VciBaseException 鍙傛暟涓虹┖鍜屾湁寮曠敤鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public boolean checkChildIsLinked(String oid) throws VciBaseException {
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- List<String> childOids = codeClassifyTemplateMapper.selectAllLevelChildOid(oid.trim());
- if(!CollectionUtils.isEmpty(childOids)){
- for(String childOid: childOids){
- if(!checkIsLinked(childOid)){
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
- /**
- * 鏍￠獙鏄惁鏈変笅绾ц妭鐐癸紝涓嶆牎楠屾槸鍚﹀叧鑱斾簡鏁版嵁
- *
- * @param oid 涓婚敭
- * @return true琛ㄧず鏈変笅绾э紝false琛ㄧず娌℃湁涓嬬骇
- * @throws VciBaseException 鍙傛暟閿欒锛屾垨鑰呮暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public boolean checkHasChild(String oid) throws VciBaseException {
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- return codeClassifyTemplateMapper.countAllLevelChildOid(oid.trim()) > 0;
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎鍒嗙被妯℃澘瀵硅薄
- * @param codeClassifyTemplateDTO 鍒嗙被妯℃澘瀵硅薄鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeClassifyTemplate(CodeClassifyTemplateDTO codeClassifyTemplateDTO) throws VciBaseException{
- checkIsCanDelete(codeClassifyTemplateDTO);
- VciBaseUtil.alertNotNull(codeClassifyTemplateDTO,"鍒嗙被妯℃澘瀵硅薄鏁版嵁瀵硅薄",codeClassifyTemplateDTO.getOid(),"鍒嗙被妯℃澘瀵硅薄鐨勪富閿�");
-
- CodeClassifyTemplateDO codeClassifyTemplateDO = selectByOid(codeClassifyTemplateDTO.getOid());
-
- //鍙湁缂栬緫涓墠鑳藉垹
- if(!CodeClassifyTemplateLC.EDITING.getValue().equals(codeClassifyTemplateDO.getLcStatus())){
- return BaseResult.fail("鍙湁缂栬緫涓殑锛屾ā鏉挎墠鑳藉垹闄わ紒");
- }
- BaseResult baseResult = checkIsCanDeleteForDO(codeClassifyTemplateDTO,codeClassifyTemplateDO);
-
- //妯℃澘oid
- String templateOid = codeClassifyTemplateDTO.getOid();
-
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
- BatchCBO batchCBO = new BatchCBO();
-
- if(baseResult.isSuccess()) {
- //鎵句笅绾х殑锛岃繖涓槸鍙互鍒犻櫎鐨勬椂鍊�
- List<String> childrenOids = codeClassifyTemplateMapper.selectAllLevelChildOid(codeClassifyTemplateDO.getOid().trim());
- if (!CollectionUtils.isEmpty(childrenOids)) {
- Collection<Collection<String>> childrenCollections = VciBaseUtil.switchCollectionForOracleIn(childrenOids);
- for (Collection<String> s : childrenCollections) {
- BatchCBO batchCBOi = codeClassifyTemplateMapper.batchDeleteByOids(s);
- batchCBO.copyFromOther(batchCBOi);
- }
- }
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO_delete = codeClassifyTemplateMapper.deleteByPrimaryKey(codeClassifyTemplateDO.getOid());
- batchCBO.copyFromOther(batchCBO_delete);
-
- //鍒犻櫎妯℃澘灞炴��
- VciQueryWrapperForDO templateQueryWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
- templateQueryWrapper.addQueryMap("classifyTemplateOid",templateOid);
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrDaoI.selectByWrapper(templateQueryWrapper);
-
- if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOList)) {
- List<String> templateAttrOids = new ArrayList<String>();
- for (CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO:codeClassifyTemplateAttrDOList){
- templateAttrOids.add(codeClassifyTemplateAttrDO.getOid());
- }
- BatchCBO batchCBO_templateAttr_delete = codeClassifyTemplateAttrDaoI.batchDeleteByOids(templateAttrOids);
- batchCBO.copyFromOther(batchCBO_templateAttr_delete);
- }
-
- //璋冪敤妯℃澘闃舵鏂规硶
- BatchCBO batchCBO_phase = codeTemplatePhaseServiceI.codeTemplateDeleteTrigger(templateOid);
- batchCBO.copyFromOther(batchCBO_phase);
-
-
-
- //璋冪敤妯℃澘鎸夐挳鏂规硶
- BatchCBO batchCBO_button = codeClassifyTemplateButtonServiceI.codeTemplateDeleteTrigger(templateOid);
- batchCBO.copyFromOther(batchCBO_button);
-
- //璋冪敤妯℃澘娴佺▼鏂规硶
- BatchCBO batchCBO_process = codeClassifyProcessTempServiceI.codeTemplateDeleteTrigger(templateOid);
- batchCBO.copyFromOther(batchCBO_process);
-
- WebUtil.setPersistence(true);//鎵ц淇濆瓨
- boService.persistenceBatch(batchCBO);//涓�璧锋墽琛屼繚瀛�
-
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被妯℃澘瀵硅薄
- * @param oid 涓婚敭
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateVO getObjectByOid(String oid) throws VciBaseException{
- return codeClassifyTemplateDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被妯℃澘瀵硅薄(鍖呭惈灞炴�э級
- *
- * @param oid 涓婚敭
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyTemplateVO getObjectHasAttrByOid(String oid) throws VciBaseException {
- List<CodeClassifyTemplateDO> doList = new ArrayList<>();
- doList.add(selectByOid(oid));
- List<CodeClassifyTemplateVO> templateVOS = codeClassifyTemplateDO2VOs(doList, true);
- return CollectionUtils.isEmpty(templateVOS)?null:templateVOS.get(0);
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeClassifyTemplateDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeClassifyTemplateDO codeClassifyTemplateDO = codeClassifyTemplateMapper.selectByPrimaryKey(oid.trim());
- if(codeClassifyTemplateDO == null || StringUtils.isBlank(codeClassifyTemplateDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeClassifyTemplateDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍒嗙被妯℃澘瀵硅薄
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeClassifyTemplateVO> listCodeClassifyTemplateByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeClassifyTemplateDO> codeClassifyTemplateDOList = listCodeClassifyTemplateDOByOidCollections(oidCollections);
- return codeClassifyTemplateDO2VOs(codeClassifyTemplateDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeClassifyTemplateDO> listCodeClassifyTemplateDOByOidCollections(Collection<String> oidCollections){
- List<CodeClassifyTemplateDO> codeClassifyTemplateDOList = new ArrayList<CodeClassifyTemplateDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeClassifyTemplateDO> tempDOList = codeClassifyTemplateMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeClassifyTemplateDOList.addAll(tempDOList);
- }
- }
- }
- return codeClassifyTemplateDOList;
- }
-
-
-
- /**
- * 鍙傜収鏍� 鍒嗙被妯℃澘瀵硅薄
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鍒嗙被妯℃澘瀵硅薄鏄剧ず鏍�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public List<Tree> referTree(TreeQueryObject treeQueryObject) throws VciBaseException{
- if(treeQueryObject == null){
- treeQueryObject = new TreeQueryObject();
- }
- if(treeQueryObject.getConditionMap() == null){
- treeQueryObject.setConditionMap(new HashMap<>());
- }
- if(treeQueryObject.getConditionMap().containsKey(LC_STATUS)) {
- treeQueryObject.getConditionMap().remove(LC_STATUS);
- }
- treeQueryObject.getConditionMap().put(LC_STATUS,CodeClassifyTemplateLC.RELEASED.getValue());
- return treeCodeClassifyTemplate(treeQueryObject);
- }
-
- /**
- * 鍒嗙被妯℃澘鍒楄〃
- *
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeClassifyTemplateVO> gridCodeClassifyTemplate(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- DataGrid<CodeClassifyTemplateVO> dataGrid=new DataGrid<CodeClassifyTemplateVO>();
- //娌℃湁浼犲垎绫籭d锛屼笉鎵ц鏌ヨ閫昏緫锛岀洿鎺ヨ繑鍥�
- if(conditionMap.size()==0){
- dataGrid.setData(new ArrayList<>());
- dataGrid.setTotal(0);
- return dataGrid;
- }
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("revisionSeq");
- List<CodeClassifyTemplateDO> doList = codeClassifyTemplateMapper.selectByCondition(conditionMap,pageHelper);
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeClassifyTemplateDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeClassifyTemplateMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鍚敤銆佸仠鐢�
- * @param oid
- * @param lcStatus
- * @return
- */
- @Override
- public BaseResult updateLcStatus( String oid, String lcStatus){
-
- //鍋滅敤鐨勬椂鍊欙紝楠岃瘉妯℃澘鏄惁涓哄凡鍙戝竷
- if(CodeClassifyTemplateLC.DISABLED.getValue().equals(lcStatus)){
- CodeClassifyTemplateDO codeClassifyTemplateDO = codeClassifyTemplateMapper.selectByPrimaryKey(oid);
- if(!CodeClassifyTemplateLC.RELEASED.getValue().equals(codeClassifyTemplateDO.getLcStatus())){
- return BaseResult.fail("妯℃澘鏈惎鐢紝涓嶈兘鍋滅敤锛�");
- }
- }
- //鍚敤銆佸仠鐢�
- int u = codeClassifyTemplateMapper.updateLcStatus(oid,lcStatus);
-
- return u==0?BaseResult.error("淇敼澶辫触锛�"):BaseResult.success("淇敼鎴愬姛");
- }
-
- /**
- * 鍗囩増
- * @param codeClassifyDTO
- */
- @Override
- public BaseResult Upgrade(CodeClassifyTemplateDTO codeClassifyDTO){
-
- //鏃х殑妯℃澘oid
- String templateOldOid = codeClassifyDTO.getOid();
- //鍙湁宸插彂甯冪殑鎵嶈兘鍗囩増
- CodeClassifyTemplateDO codeClassifyTemplateDOOld = codeClassifyTemplateMapper.selectByPrimaryKey(templateOldOid);
- if(!FRAMEWORK_RELEASE_RELEASED.equals(codeClassifyTemplateDOOld.getLcStatus())){
- return BaseResult.fail("璇ユā鏉挎湭鍙戝竷锛屼笉鑳藉崌鐗堬紒");
- }
-
- ClientBusinessObjectOperation clientBusinessObjectOperation = new ClientBusinessObjectOperation();
-
- //闇�瑕佹柊澧炵殑鍗囩骇妯℃澘
- ClientBusinessObject clientBusinessObject_template = boService.selectCBOByOid(codeClassifyDTO.getOid(), "codeclstemplate");
- ClientBusinessObject clientBusinessObject_template_insert = null;
- try {
- clientBusinessObject_template_insert = clientBusinessObjectOperation.reviseBusinessObject(clientBusinessObject_template, "");
- }catch (VCIError e){
- e.printStackTrace();
- logger.error("===============>鍒嗙被妯℃澘-鍗囩増澶嶅埗鍑洪敊oid锛� "+templateOldOid+",mes"+e.error_message);
- return BaseResult.error("鍗囩増鍑洪敊");
- }
-
-
- CodeClassifyTemplateDO codeClassifyTemplateDO = new CodeClassifyTemplateDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyDTO,codeClassifyTemplateDO);
- WebUtil.copyValueToObjectFromCbos(clientBusinessObject_template_insert,codeClassifyTemplateDO);
- //modify by weidy@2022-2-27
- //鍗囩増鍚庝笉鑳戒娇鐢╥nsert鏂规硶锛屽洜涓洪偅涓案杩滄槸鏂板涓�鏉℃暟鎹紝
- //涓婃柟鍏堜粠dto杞粰do锛岀劧鍚庢妸鍗囩増鐨勫垵濮嬪寲鐨勫睘鎬ф嫹璐濈粰do锛屾渶鍚庡啀浠巇o鎷疯礉鍒癱bo涓�
- WebUtil.copyValueToCboFromObj(clientBusinessObject_template_insert,codeClassifyTemplateDO);
- //鍗囩増杩囧悗鐨勬ā鏉縪id
- String templateNewOid = codeClassifyTemplateDO.getOid();
-
- //闇�瑕佸鍒剁殑妯℃澘灞炴��
- //鏌ヨ鑰佹ā鏉夸笅杈圭殑鎵�鏈夊睘鎬э紝璧嬪�兼柊妯℃澘oid
- VciQueryWrapperForDO codeClassifyTemplateAttrQuery = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
- codeClassifyTemplateAttrQuery.addQueryMap("classifyTemplateOid",templateOldOid);
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrDaoI.selectByWrapper(codeClassifyTemplateAttrQuery);
- for (CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO :codeClassifyTemplateAttrDOList){
- String attrOid = VciBaseUtil.getPk();
- codeClassifyTemplateAttrDO.setOid(attrOid);
- codeClassifyTemplateAttrDO.setClassifyTemplateOid(templateNewOid);
- }
-
- //澶嶅埗妯℃澘娴佺▼
- List<CodeClassifyProcessTempDO> codeClassifyProcessTempDOList = copyTemplateProcess(templateOldOid,templateNewOid);
-
- //澶嶅埗妯℃澘闃舵锛岄樁娈靛睘鎬�
- Map phase_attrMap = copyTemplatePhase_attr(templateOldOid,templateNewOid);
-
- List<CodeTemplatePhaseDO> codeClassifyPhaseDOList = (ArrayList<CodeTemplatePhaseDO>)phase_attrMap.get("phase");//妯℃澘闃舵
- List<CodePhaseAttrDO> codePhaseAttrDOList = (ArrayList<CodePhaseAttrDO>)phase_attrMap.get("phaseAttr");//闃舵灞炴��
-
- //澶嶅埗妯℃澘鎸夐挳
- List<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOList = copyTemplateButton(templateOldOid,templateNewOid);
-
- //涓�璧蜂繚瀛樻暟鎹�
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
- //淇濆瓨妯℃澘
- BatchCBO batchCBOTemplate = new BatchCBO();
- //batchCBO淇濆瓨鐨勬椂鍊欐病鏈夎兘澶熻嚜鍔╱pdate婧愭暟鎹殑isLastR
- //batchCBOTemplate.getCreateCbos().add(clientBusinessObject_template_insert);
- //浣跨敤saveRevisionBuisnessObject鍙互瑙ｅ喅杩欎釜闂锛岃繖閲屽厛鏆傛椂鎵ц涓ゆ淇濆瓨
- try {
- clientBusinessObjectOperation.saveRevisionBuinessObject(clientBusinessObject_template_insert);
- } catch (VCIError vciError) {
- throw new VciBaseException("鍗囩増淇濆瓨鍑洪敊浜�",new String[0],vciError);
- }
- // end --modify by lihang @20220408
- //codeClassifyTemplateMapper.insert(codeClassifyTemplateDO);
- //淇濆瓨妯℃澘灞炴��
- if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOList)){
- BatchCBO batchCBOTemplateAttr = codeClassifyTemplateAttrDaoI.batchInsert(codeClassifyTemplateAttrDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplateAttr);
- }
-
- //淇濆瓨妯℃澘娴佺▼
- if(!CollectionUtils.isEmpty(codeClassifyProcessTempDOList)) {
- BatchCBO batchCBOTemplateProcessAttr = codeClassifyProcessTempDaoI.batchInsert(codeClassifyProcessTempDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplateProcessAttr);
- }
- //妯℃澘闃舵
- if(!CollectionUtils.isEmpty(codeClassifyPhaseDOList)) {
- BatchCBO batchCBOTemplatePhaseAttr = codeTemplatePhaseDaoI.batchInsert(codeClassifyPhaseDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplatePhaseAttr);
- }
-
- //妯℃澘闃舵灞炴��
- if(!CollectionUtils.isEmpty(codePhaseAttrDOList)) {
- BatchCBO batchCBOTemplatePhaseAttrAttr = codePhaseAttrDaoI.batchInsert(codePhaseAttrDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplatePhaseAttrAttr);
- }
-
- //妯℃澘鎸夐挳
- if(!CollectionUtils.isEmpty(codeClassifyTemplateButtonDOList)) {
- BatchCBO batchCBOTemplateButtonAttr = codeClassifyTemplateButtonDaoI.batchInsert(codeClassifyTemplateButtonDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplateButtonAttr);
- }
-
- WebUtil.setPersistence(true);//鎵ц淇濆瓨
-
- boService.persistenceBatch(batchCBOTemplate);//涓�璧锋墽琛屼繚瀛�
-
- return BaseResult.success("鍗囩増鎴愬姛锛�");
- }
-
- @Override
- public BaseResult copyTemplate(CodeClassifyTemplateDTO codeClassifyDTO){
-
- //鏃х殑妯℃澘oid
- String oldOid = codeClassifyDTO.getOid();
- //鏂扮殑妯℃澘oid
- String newOid = VciBaseUtil.getPk();
- //鍒嗙被oid,澶嶅埗杩囨潵鐨勬柊鐨勫垎绫籵id
- String codeClassifyOid = codeClassifyDTO.getCodeclassifyoid();
-
- //澶嶅埗妯℃澘
- CodeClassifyTemplateDO codeClassifyTemplateDO_old = codeClassifyTemplateMapper.selectByPrimaryKey(oldOid);//鏃фā鏉�
-
- //楠岃瘉锛屼笟鍔＄被鍨嬫槸涓嶆槸涓�鑷�
- CodeClassifyDO codeClassifyDO_old = codeClassifyDaoI.selectBtmOrParentBtm(codeClassifyTemplateDO_old.getCodeClassifyOid());
- if(codeClassifyDO_old==null){
- return BaseResult.fail("澶嶅埗鐨勬ā鏉挎墍灞炲垎绫讳互鍙婁笂绾ф病鏈変笟鍔＄被鍨嬶紝璇烽噸鏂伴�夋嫨!");
- }
-
- //鎵惧綋鍓嶅垎绫讳笅鐨勪笟鍔＄被鍨�
- CodeClassifyDO codeClassifyDO_new = codeClassifyDaoI.selectBtmOrParentBtm(codeClassifyOid);
- if(codeClassifyDO_new==null){
- return BaseResult.fail("褰撳墠鍒嗙被娌℃湁涓氬姟绫诲瀷锛岃閲嶆柊閫夋嫨!");
- }
-
- if(!codeClassifyDO_old.getBtmTypeId().equals(codeClassifyDO_new.getBtmTypeId())){
- return BaseResult.fail("閫夋嫨鐨勫垎绫诲拰褰撳墠鍒嗙被涓氬姟绫诲瀷涓嶄竴鑷达紝璇烽噸鏂伴�夋嫨!");
- }
-
- codeClassifyTemplateDO_old.setId(codeClassifyDTO.getId());//鑻辨枃鍚嶇О
- codeClassifyTemplateDO_old.setName(codeClassifyDTO.getName());//涓枃鍚嶇О
- codeClassifyTemplateDO_old.setDescription(codeClassifyDTO.getDescription());//鎻忚堪
- codeClassifyTemplateDO_old.setCodeClassifyOid(codeClassifyOid);//鍒嗙被oid
- codeClassifyTemplateDO_old.setOid(newOid);
- List<CodeClassifyTemplateDO> codeClassifyTemplateDOList = new ArrayList<CodeClassifyTemplateDO>();
- codeClassifyTemplateDOList.add(codeClassifyTemplateDO_old);
-
- //澶嶅埗妯℃澘灞炴��
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = copyTemplateAttr(oldOid,newOid);
-
- //澶嶅埗妯℃澘娴佺▼
- List<CodeClassifyProcessTempDO> codeClassifyProcessTempDOList = copyTemplateProcess(oldOid,newOid);
-
- //澶嶅埗妯℃澘闃舵锛岄樁娈靛睘鎬�
- Map phase_attrMap = copyTemplatePhase_attr(oldOid,newOid);
-
- List<CodeTemplatePhaseDO> codeClassifyPhaseDOList = (ArrayList<CodeTemplatePhaseDO>)phase_attrMap.get("phase");//妯℃澘闃舵
- List<CodePhaseAttrDO> codePhaseAttrDOList = (ArrayList<CodePhaseAttrDO>)phase_attrMap.get("phaseAttr");//闃舵灞炴��
-
- //澶嶅埗妯℃澘鎸夐挳
- List<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOList = copyTemplateButton(oldOid,newOid);
-
- //涓�璧蜂繚瀛樻暟鎹�
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
- //淇濆瓨妯℃澘
- BatchCBO batchCBOTemplate = codeClassifyTemplateMapper.batchInsert(codeClassifyTemplateDOList);
- //淇濆瓨妯℃澘灞炴��
- if(!CollectionUtils.isEmpty(codeClassifyTemplateAttrDOList)) {
- BatchCBO batchCBOTemplateAttr = codeClassifyTemplateAttrDaoI.batchInsert(codeClassifyTemplateAttrDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplateAttr);
- }
-
- //淇濆瓨妯℃澘娴佺▼
- if(!CollectionUtils.isEmpty(codeClassifyProcessTempDOList)) {
- BatchCBO batchCBOTemplateProcessAttr = codeClassifyProcessTempDaoI.batchInsert(codeClassifyProcessTempDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplateProcessAttr);
- }
-
- //妯℃澘闃舵
- if(!CollectionUtils.isEmpty(codeClassifyPhaseDOList)) {
- BatchCBO batchCBOTemplatePhaseAttr = codeTemplatePhaseDaoI.batchInsert(codeClassifyPhaseDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplatePhaseAttr);
- }
-
- //妯℃澘闃舵灞炴��
- if(!CollectionUtils.isEmpty(codePhaseAttrDOList)) {
- BatchCBO batchCBOTemplatePhaseAttrAttr = codePhaseAttrDaoI.batchInsert(codePhaseAttrDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplatePhaseAttrAttr);
- }
-
- //妯℃澘鎸夐挳
- if(!CollectionUtils.isEmpty(codeClassifyTemplateButtonDOList)) {
- BatchCBO batchCBOTemplateButtonAttr = codeClassifyTemplateButtonDaoI.batchInsert(codeClassifyTemplateButtonDOList);
- batchCBOTemplate.copyFromOther(batchCBOTemplateButtonAttr);
- }
-
-
- WebUtil.setPersistence(true);//鎵ц淇濆瓨
-
- boService.persistenceBatch(batchCBOTemplate);//涓�璧锋墽琛屼繚瀛�
- return BaseResult.success("澶嶅埗鎴愬姛锛�");
-
- }
-
- /**
- * 浣跨敤涓婚搴撶殑鍒嗙被涓婚敭锛岃幏鍙栫敓鏁堢殑妯℃澘
- *
- * @param codeClassifyOid 涓婚搴撳垎绫讳富閿�
- * @param hasAttribute 鏄惁鍖呭惈灞炴��
- * @return 妯℃澘鐨勪俊鎭�
- */
- @Override
- public List<CodeClassifyTemplateVO> listReleaseTemplateByClassifyOid(String codeClassifyOid, boolean hasAttribute) {
- VciBaseUtil.alertNotNull(codeClassifyOid,"涓婚搴撳垎绫讳富閿�");
- List<CodeClassifyTemplateDO> templateDOS = selectOnlyTemplateByClassifyOid(codeClassifyOid);
- if(CollectionUtils.isEmpty(templateDOS)){
- throw new VciBaseException("褰撳墠鍒嗙被锛屼互鍙婂叾涓婄骇鍒嗙被閮芥病鏈夎缃ā鏉�");
- }
- List<CodeClassifyTemplateVO> templateVOList = codeClassifyTemplateDO2VOs(templateDOS, true);
- return sortTemplateByRevision(templateVOList);
- }
-
- /**
- * 鐢ㄦā鏉跨殑鐗堟湰鏉ユ帓搴�
- * @param templateVOList 妯℃澘鐨勬樉绀哄璞�
- * @return 鎺掑簭鍚庣殑鍒楄〃
- */
- @Override
- public List<CodeClassifyTemplateVO> sortTemplateByRevision(List<CodeClassifyTemplateVO> templateVOList){
- if(!CollectionUtils.isEmpty(templateVOList) && templateVOList.size() >1){
- //鑾峰彇鐗堟湰鍙锋渶澶х殑閭ｄ釜
- templateVOList = templateVOList.stream().sorted((o1,o2)->
- Integer.valueOf(o1.getRevisionSeq()).compareTo(Integer.valueOf(o2.getRevisionValue()))
- ).collect(Collectors.toList());
- }
- return templateVOList;
- }
-
- /**
- * 鏍￠獙瀛愬垎绫绘槸鍚︾浉鍚岀殑妯℃澘
- *
- * @param codeClassifyOid 鐖跺垎绫荤殑涓婚敭
- * @return true琛ㄧず鐩稿悓
- */
- @Override
- public boolean checkChildHasSameTemplate(String codeClassifyOid) {
- Map<String/**妯℃澘鐨勪富閿�**/,String/**鍒嗙被鐨勪富閿�**/> childHasTemplateMap =codeClassifyTemplateMapper.selectChildHasReleaseTemplate(codeClassifyOid);
- if(!CollectionUtils.isEmpty(childHasTemplateMap) && childHasTemplateMap.values().stream().collect(Collectors.toSet()).size()>1){
- return false;
- }
- return true;
- }
-
- /**
- *鏍规嵁鐖跺垎绫籭d鍘绘煡鎵惧彾瀛愯妭鐐圭殑妯℃澘锛屽鏋滄病鏌ュ埌鍒欒涓烘ā鏉垮湪涓婂眰寤虹珛锛屽垯鏍规嵁鍒嗙被鍘绘煡褰撳墠妯℃澘
- * @param codeClassifyOid 鐖跺垎绫荤殑涓婚敭
- * @return
- */
- @Override
- public List<CodeClassifyTemplateVO> childTemplates(String codeClassifyOid){
- List<CodeClassifyTemplateVO> codeClassifyTemplateVOList=new ArrayList<>();
- Map<String/**妯℃澘鐨勪富閿�**/,String/**鍒嗙被鐨勪富閿�**/> childHasTemplateMap =codeClassifyTemplateMapper.selectChildHasReleaseTemplate(codeClassifyOid);
- Set<String> templateOid = childHasTemplateMap.keySet();
- List<CodeClassifyTemplateDO> classifyTemplateDOS=new ArrayList<>();
- if(!CollectionUtils.isEmpty(templateOid)) {
- classifyTemplateDOS= this.listCodeClassifyTemplateDOByOidCollections(templateOid);
- }else{
- classifyTemplateDOS=selectOnlyTemplateByClassifyOid(codeClassifyOid);
- }
- List<CodeClassifyTemplateVO> templateVOList = codeClassifyTemplateDO2VOs(classifyTemplateDOS, true);
- if(!CollectionUtils.isEmpty(templateVOList)){
- codeClassifyTemplateVOList.addAll(templateVOList);
- }
- return codeClassifyTemplateVOList;
- }
- /**
- * 浣跨敤鍒嗙被涓婚敭閫掑綊鏌ヨ
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 妯℃澘鐨勬暟鎹璞�
- */
- private List<CodeClassifyTemplateDO> selectOnlyTemplateByClassifyOid(String codeClassifyOid){
- //1.鐩存帴鏌ヨ锛岀湅鐪嬭繖涓垎绫讳笅闈㈡湁娌℃湁鍙戝竷鐘舵�佺殑妯℃澘
- //2.濡傛灉娌℃湁锛屽垯寰�涓婃壘鍒嗙被鐨勫唴瀹癸紝杩欎釜鍒嗙被灞傜骇涓嶄細澶锛屾墍浠ョ洿鎺ラ�掑綊鍗冲彲
- //3.濡傛灉鍒嗙被涓嬮潰娣诲姞浜嗘ā鏉匡紝浣嗘槸娌℃湁鍙戝竷锛屽垯璇存槑妯℃澘鍙兘杩樺湪缂栬緫鐨勭姸鎬侊紝渚濈劧浣跨敤涓婄骇鍒嗙被
-
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codeClassifyOid",codeClassifyOid);
- conditionMap.put("lcstatus",CodeClassifyTemplateLC.RELEASED.getValue());
- List<CodeClassifyTemplateDO> templateDOS = codeClassifyTemplateMapper.selectByCondition(conditionMap, new PageHelper(-1));
- if(CollectionUtils.isEmpty(templateDOS)){
- //閫掑綊鎵句笂绾х殑妯℃澘
- CodeClassifyDO classifyDO = codeClassifyDaoI.selectByPrimaryKey(codeClassifyOid);
- if(StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
- //璇存槑宸茬粡鏄《浜嗭紝涔熸病鎵惧埌鐨勮瘽锛岄偅灏辫繑鍥炰簡
- return null;
- }
- return selectOnlyTemplateByClassifyOid(classifyDO.getParentCodeClassifyOid());
- }else{
- return templateDOS;
- }
- }
-
- /**
- * 澶嶅埗妯℃澘锛屾ā鏉垮睘鎬�
- * @param templateOldOid
- * @param templateNewOid
- * @param codeClassifyDTO 妯℃澘鍚嶇О锛屾ā鏉跨紪鍙凤紝鎻忚堪
- * @return map tamplate:(List<CodeClassifyTemplateDO>) templateAttr:(List<CodeClassifyTemplateAttrDO>)
- */
- public Map copyTemplate_attr(String templateOldOid,String templateNewOid,String codeckassfyOid,CodeClassifyTemplateDTO codeClassifyDTO){
- templateNewOid = templateNewOid==null?VciBaseUtil.getPk():VciBaseUtil.getPk();
- VciQueryWrapperForDO codeClassifyTemplateQuery = new VciQueryWrapperForDO(CodeClassifyTemplateDO.class);
- codeClassifyTemplateQuery.addQueryMap("oid",templateOldOid);
- List<CodeClassifyTemplateDO> codeClassifyTemplateDOList = codeClassifyTemplateMapper.selectByWrapper(codeClassifyTemplateQuery);
- for (CodeClassifyTemplateDO codeClassifyTemplateDO:codeClassifyTemplateDOList){
- codeClassifyTemplateDO.setOid(templateNewOid);
- codeClassifyTemplateDO.setCodeClassifyOid(codeckassfyOid);
- codeClassifyTemplateDO.setId(codeClassifyDTO.getId());
- codeClassifyTemplateDO.setName(codeClassifyDTO.getName());
- codeClassifyTemplateDO.setDescription(codeClassifyDTO.getDescription());
-
- }
-
- //澶嶅埗妯℃澘灞炴��
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = copyTemplateAttr(templateOldOid,templateNewOid);
- Map template_attrMap = new HashMap();
- template_attrMap.put("tamplate",codeClassifyTemplateDOList);
- template_attrMap.put("templateAttr",codeClassifyTemplateAttrDOList);
- return template_attrMap;
- }
-
- /**
- * 澶嶅埗妯℃澘灞炴��
- */
- public List<CodeClassifyTemplateAttrDO> copyTemplateAttr(String templateOldOid,String templateNewOid){
- VciQueryWrapperForDO codeClassifyTemplateAttrQuery = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
- codeClassifyTemplateAttrQuery.addQueryMap("classifyTemplateOid",templateOldOid);
- List<CodeClassifyTemplateAttrDO> codeClassifyTemplateAttrDOList = codeClassifyTemplateAttrDaoI.selectByWrapper(codeClassifyTemplateAttrQuery);
- for (CodeClassifyTemplateAttrDO codeClassifyTemplateAttrDO :codeClassifyTemplateAttrDOList){
- String attrOid = VciBaseUtil.getPk();
- codeClassifyTemplateAttrDO.setOid(attrOid);
- codeClassifyTemplateAttrDO.setClassifyTemplateOid(templateNewOid);
- }
- return codeClassifyTemplateAttrDOList;
- }
-
- /**
- * 澶嶅埗妯℃澘娴佺▼
- */
- public List<CodeClassifyProcessTempDO> copyTemplateProcess(String templateOldOid,String templateNewOid){
- VciQueryWrapperForDO processWrapper = new VciQueryWrapperForDO(CodeClassifyProcessTempDO.class);
- processWrapper.addQueryMap("classifyTemplateOid",templateOldOid);
- List<CodeClassifyProcessTempDO> codeClassifyProcessTempDOList = codeClassifyProcessTempDaoI.selectByWrapper(processWrapper);//瑕佷繚瀛樼殑鏂扮殑妯℃澘娴佺▼
- for (CodeClassifyProcessTempDO codeClassifyProcessTempDO:codeClassifyProcessTempDOList){
- String newOid = VciBaseUtil.getPk();
- codeClassifyProcessTempDO.setOid(newOid);
- //codeClassifyProcessTempDO.setCodeClassifyOid(templateNewOid);
- codeClassifyProcessTempDO.setClassifyTemplateOid(templateNewOid);
- //modify by lihang - @20220406 璁剧疆妯℃澘涓婚敭浣嶇疆鍑洪敊锛屽鑷村崌鐗堢殑妯℃澘涓殑娴佺▼鏄┖鐨勩��
- }
- return codeClassifyProcessTempDOList;
- }
-
- /**
- * 澶嶅埗妯℃澘闃舵锛屾ā鏉垮睘鎬�
- * @param templateOldOid
- * @param templateNewOid
- * @return map phase:(List<CodeTemplatePhaseDO>) phaseAttr:(List<CodePhaseAttrDO>)
- */
- public Map copyTemplatePhase_attr(String templateOldOid,String templateNewOid){
- //妯℃澘闃舵
- VciQueryWrapperForDO phaseWrapper = new VciQueryWrapperForDO(CodeTemplatePhaseDO.class);
- phaseWrapper.addQueryMap("codeClassifyTemplateOid",templateOldOid);
- List<CodeTemplatePhaseDO> codeClassifyPhaseDOList = codeTemplatePhaseDaoI.selectByWrapper(phaseWrapper);//瑕佷繚瀛樼殑鏂扮殑妯℃澘娴佺▼
- Map<String,String> phaseKeyMap = new HashMap<String,String>();//闇�瑕佸鍒剁殑妯℃澘闃舵灞炴��,key:value,妯℃澘闃舵鑰乷id:妯℃澘灞炴�ф柊oid
- List<String> phaseOidList = new ArrayList<String>();
- for (CodeTemplatePhaseDO codeTemplatePhaseDO:codeClassifyPhaseDOList){
- String oldoid = codeTemplatePhaseDO.getOid();
- String newOid = VciBaseUtil.getPk();
- codeTemplatePhaseDO.setOid(newOid);
- codeTemplatePhaseDO.setCodeClassifyTemplateOid(templateNewOid);
- phaseKeyMap.put(oldoid,newOid);
- phaseOidList.add(oldoid);
- }
-
- //妯℃澘闃舵鐨勫睘鎬�
- List<CodePhaseAttrDO> codePhaseAttrDOList = new ArrayList<CodePhaseAttrDO>();
- if(!CollectionUtils.isEmpty(phaseOidList)){//size()==0涓嬭竟鏂规硶浼氭姤閿�
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codephaseoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(phaseOidList.toArray(new String[0])) + ")");
- codePhaseAttrDOList = codePhaseAttrDaoI.selectByCondition(conditionMap,new PageHelper(-1));
- }
- for (CodePhaseAttrDO codePhaseAttrDO:codePhaseAttrDOList){
- String oldPhaseoid = codePhaseAttrDO.getCodePhaseOid();
- String newOid = VciBaseUtil.getPk();
- codePhaseAttrDO.setOid(newOid);
- codePhaseAttrDO.setCodePhaseOid(phaseKeyMap.get(oldPhaseoid));
- }
- Map phaseMap = new HashMap();
- phaseMap.put("phase",codeClassifyPhaseDOList);
- phaseMap.put("phaseAttr",codePhaseAttrDOList);
- return phaseMap;
- }
-
- /**
- * 澶嶅埗妯℃澘鎸夐挳
- */
- public List<CodeClassifyTemplateButtonDO> copyTemplateButton(String templateOldOid,String templateNewOid){
- VciQueryWrapperForDO buttonWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateButtonDO.class);
- buttonWrapper.addQueryMap("classifyTemplateOid",templateOldOid);
- List<CodeClassifyTemplateButtonDO> codeClassifyTemplateButtonDOList = codeClassifyTemplateButtonDaoI.selectByWrapper(buttonWrapper);
- for (CodeClassifyTemplateButtonDO codeClassifyTemplateButtonDO:codeClassifyTemplateButtonDOList){
- String newOid = VciBaseUtil.getPk();
- codeClassifyTemplateButtonDO.setOid(newOid);
- codeClassifyTemplateButtonDO.setClassifyTemplateOid(templateNewOid);
- }
- return codeClassifyTemplateButtonDOList;
- }
-
-
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
index 0046bb0..ba1e151 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyValueServiceImpl.java
@@ -1,481 +1,14 @@
package com.vci.ubcs.code.service.impl;
-import com.vci.ubcs.code.dao.CodeBasicSecDaoI;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.CodeClassifyValue;
import com.vci.ubcs.code.mapper.CodeClassifyValueMapper;
-import com.vci.ubcs.code.entity.CodeBasicSecDO;
-import com.vci.ubcs.code.entity.CodeClassifyValueDO;
-import com.vci.ubcs.code.service.CodeClassifyValueServiceI;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.starter.revision.bo.TreeWrapperOptions;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.pagemodel.Tree;
-import com.vci.starter.web.pagemodel.TreeQueryObject;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciParentQueryOption;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeClassifyValueDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
+import com.vci.ubcs.code.service.ICodeClassifyValueService;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.LC_STATUS;
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-/**
- * 鍒嗙被鐮佹鐨勭爜鍊兼湇鍔�
- * @author weidy
- * @date 2022-01-24
- */
@Service
-public class CodeClassifyValueServiceImpl implements CodeClassifyValueServiceI {
+public class CodeClassifyValueServiceImpl extends ServiceImpl<CodeClassifyValueMapper, CodeClassifyValue> implements ICodeClassifyValueService {
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeClassifyValueMapper codeClassifyValueMapper;
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 鐮佹鐨勪俊鎭�
- */
- @Autowired
- private CodeBasicSecDaoI basicSecMapper;
-
- /**
- * 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
- */
- private static final String PARENT_FIELD_NAME = "parentClassifyValueOid";
- /**
- * 鏌ヨ鍒嗙被鐮佹鐨勭爜鍊� 鏍�
- * @param treeQueryObject 鏍戞煡璇㈠璞�
- * @return 鍒嗙被鐮佹鐨勭爜鍊� 鏄剧ず鏍�
- * @throws VciBaseException 鏌ヨ鏉′欢涓嶇鍚堣姹傜殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public List<Tree> treeCodeClassifyValue(TreeQueryObject treeQueryObject) throws VciBaseException{
- // List<CodeClassifyValueDO> doList =selectCodeClassifyValueDOByTree(treeQueryObject);
- List<CodeClassifyValueDO> doList =selectCodeClassifyValueDO4Tree(treeQueryObject);
- List<CodeClassifyValueVO> voList = codeClassifyValueDO2VOs(doList);
- TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
- treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
- return revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyValueVO s) ->{
- //鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
- return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
- .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
- });
- }
- /**
- * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
- *
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鏌ヨ缁撴灉,鏁版嵁瀵硅薄
- */
- @Override
- public List<CodeClassifyValueDO> selectCodeClassifyValueDOByTree(TreeQueryObject treeQueryObject) {
- VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(treeQueryObject.getConditionMap(),CodeClassifyValueDO.class);
- PageHelper ph = new PageHelper();
- ph.addDefaultAsc("ordernum");
- queryWrapperForDO.setPageHelper(ph);
- VciParentQueryOption parentQueryOption = new VciParentQueryOption();
- parentQueryOption.setParentFieldName(PARENT_FIELD_NAME);
- //queryWrapperForDO.parentQueryChild(treeQueryObject,parentQueryOption);
- parentQueryOption.setHasSelf(true);
- queryWrapperForDO.childQueryParent(parentQueryOption);
- return codeClassifyValueMapper.selectByWrapper(queryWrapperForDO);
- }
-
- private List<CodeClassifyValueDO> selectCodeClassifyValueDO4Tree(TreeQueryObject treeQueryObject){
- Map<String, String> conditionMap = treeQueryObject.getConditionMap();
- String currentSecOid = conditionMap.get("codeclassifysecoid");
- String sql = "select oid from PLATFORMBTM_CODEBASICSEC start with oid = '"+currentSecOid+"' connect by prior PARENTCLASSIFYSECOID = OID";
- List<ClientBusinessObject> targetParentList = boService.queryBySql(sql, new HashMap<>());
- Set<String> secOidList = targetParentList.stream().map(ClientBusinessObject::getOid).collect(Collectors.toSet());
- conditionMap.clear();
- StringBuilder oidStrBuilder = new StringBuilder();
- secOidList.forEach(oid -> oidStrBuilder.append("'").append(oid).append("',"));
- String oidStr = oidStrBuilder.toString().substring(0,oidStrBuilder.toString().length() -1);
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(null,CodeClassifyValueDO.class);
- PageHelper ph = new PageHelper();
- ph.addDefaultAsc("ordernum");
- ph.setLimit(-1);
- wrapper.setPageHelper(ph);
- wrapper.in("codeclassifysecoid",oidStr);
- return codeClassifyValueMapper.selectByWrapper(wrapper);
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyValueDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeClassifyValueVO> codeClassifyValueDO2VOs(Collection<CodeClassifyValueDO> codeClassifyValueDOs) throws VciBaseException{
- List<CodeClassifyValueVO> voList = new ArrayList<CodeClassifyValueVO>();
- if(!CollectionUtils.isEmpty(codeClassifyValueDOs)){
- for(CodeClassifyValueDO s: codeClassifyValueDOs){
- CodeClassifyValueVO vo = codeClassifyValueDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeClassifyValueDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyValueVO codeClassifyValueDO2VO(CodeClassifyValueDO codeClassifyValueDO) throws VciBaseException{
- CodeClassifyValueVO vo = new CodeClassifyValueVO();
- if(codeClassifyValueDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyValueDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞鍒嗙被鐮佹鐨勭爜鍊�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyValueVO addSave(CodeClassifyValueDTO codeClassifyValueDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyValueDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //娣诲姞瀵圭爜鍊煎瓙鐖剁骇鐨勫垽鏂�
- if(StringUtils.isNotBlank(codeClassifyValueDTO.getParentclassifyvalueoid())){
- String parentclassifyvalueoid = codeClassifyValueDTO.getParentclassifyvalueoid();
- String codeclassifysecoid = codeClassifyValueDTO.getCodeclassifysecoid();
- CodeClassifyValueDO parentDO = codeClassifyValueMapper.selectByPrimaryKey(parentclassifyvalueoid);
- if (parentDO.getCodeClassifySecOid().equalsIgnoreCase(codeclassifysecoid)){
- throw new VciBaseException("涓嶅厑璁稿湪鐖剁爜鍊间腑鐩存帴娣诲姞瀛愮爜鍊�");
- }
- }
- //灏咲TO杞崲涓篋O
- CodeClassifyValueDO codeClassifyValueDO = new CodeClassifyValueDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyValueDTO,codeClassifyValueDO);
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codeclassifysecoid", codeClassifyValueDO.getCodeClassifySecOid());
- conditionMap.put("parentclassifyvalueoid",codeClassifyValueDO.getParentClassifyValueOid());
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap,CodeClassifyValueDO.class);
- List<CodeClassifyValueDO> existList = codeClassifyValueMapper.selectByWrapper(wrapper);
- codeClassifyValueDO.setOrderNum(existList.size() + 1);
- codeClassifyValueMapper.insert(codeClassifyValueDO);
- return codeClassifyValueDO2VO(codeClassifyValueDO);
- }
-
- /**
- * 淇敼鍒嗙被鐮佹鐨勭爜鍊�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyValueVO editSave(CodeClassifyValueDTO codeClassifyValueDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyValueDTO,"鏁版嵁瀵硅薄",codeClassifyValueDTO.getOid(),"鍒嗙被鐮佹鐨勭爜鍊间富閿�");
- //灏咲TO杞崲涓篋O
- CodeClassifyValueDO codeClassifyValueDO = selectByOid(codeClassifyValueDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeClassifyValueDTO,codeClassifyValueDO);
- codeClassifyValueMapper.updateByPrimaryKey(codeClassifyValueDO);
- return codeClassifyValueDO2VO(codeClassifyValueDO);
- }
-
-/**
- * 妫�鏌� 鍒嗙被鐮佹鐨勭爜鍊兼槸鍚﹀垹闄�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝蹇呴』瑕佹湁oid鍜宼s灞炴��
- * @return 鎵ц缁撴灉 success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
-@Override
-public BaseResult checkIsCanDelete(CodeClassifyValueDTO codeClassifyValueDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyValueDTO,"鏁版嵁浼犺緭瀵硅薄",codeClassifyValueDTO.getOid(),"涓婚敭");
- CodeClassifyValueDO codeClassifyValueDO = selectByOid(codeClassifyValueDTO.getOid());
- return checkIsCanDeleteForDO(codeClassifyValueDTO,codeClassifyValueDO);
}
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeClassifyValueDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeClassifyValueDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeClassifyValueDTO codeClassifyValueDTO, CodeClassifyValueDO codeClassifyValueDO) {
- //boService.checkTs(codeClassifyValueDTO);
- //鏍￠獙涓嬬骇鏄惁鏈夊紩鐢�
- if(checkChildIsLinked(codeClassifyValueDO.getOid())){
- return BaseResult.fail(DATA_CASCADE_LINKED_NOT_DELETE,new String[]{""});
- }
- return BaseResult.success(checkHasChild(codeClassifyValueDO.getOid()));
- }
- /**
- * 妫�鏌ユ槸鍚︽湁涓嬬骇鏄惁鍏宠仈浜嗘暟鎹�
- *
- * @param oid 涓婚敭
- * @return true 琛ㄧず鏈夊紩鐢紝false琛ㄧず娌℃湁寮曠敤
- * @throws VciBaseException 鍙傛暟涓虹┖鍜屾湁寮曠敤鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public boolean checkChildIsLinked(String oid) throws VciBaseException {
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- List<String> childOids = codeClassifyValueMapper.selectAllLevelChildOid(oid.trim());
- if(!CollectionUtils.isEmpty(childOids)){
- for(String childOid: childOids){
- if(!checkIsLinked(childOid)){
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
- /**
- * 鏍￠獙鏄惁鏈変笅绾ц妭鐐癸紝涓嶆牎楠屾槸鍚﹀叧鑱斾簡鏁版嵁
- *
- * @param oid 涓婚敭
- * @return true琛ㄧず鏈変笅绾э紝false琛ㄧず娌℃湁涓嬬骇
- * @throws VciBaseException 鍙傛暟閿欒锛屾垨鑰呮暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public boolean checkHasChild(String oid) throws VciBaseException {
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- return codeClassifyValueMapper.countAllLevelChildOid(oid.trim()) > 0;
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎鍒嗙被鐮佹鐨勭爜鍊�
- * @param codeClassifyValueDTO 鍒嗙被鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeClassifyValue(CodeClassifyValueDTO codeClassifyValueDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeClassifyValueDTO,"鍒嗙被鐮佹鐨勭爜鍊兼暟鎹璞�",codeClassifyValueDTO.getOid(),"鍒嗙被鐮佹鐨勭爜鍊肩殑涓婚敭");
- CodeClassifyValueDO codeClassifyValueDO = selectByOid(codeClassifyValueDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeClassifyValueDTO,codeClassifyValueDO);
- if(baseResult.isSuccess()) {
- //鎵句笅绾х殑锛岃繖涓槸鍙互鍒犻櫎鐨勬椂鍊�
- List<String> childrenOids = codeClassifyValueMapper.selectAllLevelChildOid(codeClassifyValueDO.getOid().trim());
- if (!CollectionUtils.isEmpty(childrenOids)) {
- Collection<Collection<String>> childrenCollections = VciBaseUtil.switchCollectionForOracleIn(childrenOids);
- for(Collection<String> s : childrenCollections){
- codeClassifyValueMapper.batchDeleteByOids(s);
- }
- }
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeClassifyValueMapper.deleteByPrimaryKey(codeClassifyValueDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇鍒嗙被鐮佹鐨勭爜鍊�
- * @param oid 涓婚敭
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeClassifyValueVO getObjectByOid(String oid) throws VciBaseException{
- return codeClassifyValueDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeClassifyValueDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeClassifyValueDO codeClassifyValueDO = codeClassifyValueMapper.selectByPrimaryKey(oid.trim());
- if(codeClassifyValueDO == null || StringUtils.isBlank(codeClassifyValueDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeClassifyValueDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍒嗙被鐮佹鐨勭爜鍊�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeClassifyValueVO> listCodeClassifyValueByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeClassifyValueDO> codeClassifyValueDOList = listCodeClassifyValueDOByOidCollections(oidCollections);
- return codeClassifyValueDO2VOs(codeClassifyValueDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeClassifyValueDO> listCodeClassifyValueDOByOidCollections(Collection<String> oidCollections){
- List<CodeClassifyValueDO> codeClassifyValueDOList = new ArrayList<CodeClassifyValueDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeClassifyValueDO> tempDOList = codeClassifyValueMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeClassifyValueDOList.addAll(tempDOList);
- }
- }
- }
- return codeClassifyValueDOList;
- }
-
-
-
- /**
- * 鍙傜収鏍� 鍒嗙被鐮佹鐨勭爜鍊�
- * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
- * @return 鍒嗙被鐮佹鐨勭爜鍊兼樉绀烘爲
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public List<Tree> referTree(TreeQueryObject treeQueryObject) throws VciBaseException{
- if(treeQueryObject == null){
- treeQueryObject = new TreeQueryObject();
- }
- if(treeQueryObject.getConditionMap() == null){
- treeQueryObject.setConditionMap(new HashMap<>());
- }
- if(treeQueryObject.getConditionMap().containsKey(LC_STATUS)) {
- treeQueryObject.getConditionMap().remove(LC_STATUS);
- }
- return treeCodeClassifyValue(treeQueryObject);
- }
-
- /**
- * 浣跨敤鐮佹鐨勪富閿幏鍙栧垎绫荤殑鐮佸�煎唴瀹�
- *
- * @param classifySecOid 鐮佹鐨勪富閿�
- * @param parentClassifyValueOid 涓婄骇鍒嗙被鐨勪富閿�
- * @return 鍒嗙被鐮佸�肩殑鍐呭
- */
- @Override
- public List<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid) {
- if(StringUtils.isBlank(classifySecOid)){
- return new ArrayList<>();
- }
- CodeBasicSecDO secDO = basicSecMapper.selectByPrimaryKey(classifySecOid);
- if(secDO == null || StringUtils.isBlank(secDO.getOid())){
- throw new VciBaseException("鐮佹鐨勫唴瀹瑰湪绯荤粺涓笉瀛樺湪");
- }
- if(StringUtils.isNotBlank(secDO.getParentClassifySecOid()) && StringUtils.isBlank(parentClassifyValueOid)){
- return new ArrayList<>();
- //鍥犱负鏈変笂绾у垎绫荤殑鏃跺�欙紝蹇呴』鍏堥�夋嫨涓婄骇鍒嗙被鐨勫唴瀹�
- }
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codeClassifySecOid",classifySecOid);
- if(StringUtils.isNotBlank(parentClassifyValueOid)){
- conditionMap.put("parentClassifyValueOid",parentClassifyValueOid);
- }
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultAsc("ordernum");
- List<CodeClassifyValueDO> valueDOList = codeClassifyValueMapper.selectByCondition(conditionMap, pageHelper);
- return codeClassifyValueDO2VOs(valueDOList);
- }
-
- /**
- * 鏍规嵁鐮佹涓婚敭鍒犻櫎鍏跺瓨鍦ㄧ殑鐮佸�煎璞�
- * @param codeclassifysecoid 鍒嗙被鐮佹鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult batchDeleteBySecOid(String codeclassifysecoid) {
- VciBaseUtil.alertNotNull(codeclassifysecoid,"鍒嗙被鐮佹鐨勪富閿�");
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codeClassifySecOid",codeclassifysecoid);
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap,CodeClassifyValueDO.class);
- List<CodeClassifyValueDO> valueDOList = codeClassifyValueMapper.selectByWrapper(wrapper);
- codeClassifyValueMapper.batchDeleteByOids(valueDOList.stream().map(CodeClassifyValueDO::getOid).collect(Collectors.toList()));
- return BaseResult.success();
- }
-
- /**
- * 鎵归噺娣诲姞鍒嗙被鐮佹鐨勭爜鍊笺�備富瑕佹槸淇濆瓨鐮佸�肩殑搴忓彿
- * @param dtoList 鍒嗙被鐮佹鐨勭爜鍊煎垪琛�
- * @param codeclassifysecoid 鍒嗙被鐮佹鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult batchSave4Order(List<CodeClassifyValueDTO> dtoList, String codeclassifysecoid) {
- VciBaseUtil.alertNotNull(codeclassifysecoid,"鍒嗙被鐮佹涓婚敭");
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codeClassifySecOid",codeclassifysecoid);
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap,CodeClassifyValueDO.class);
- List<CodeClassifyValueDO> valueDOList = codeClassifyValueMapper.selectByWrapper(wrapper);
- List<CodeClassifyValueDO> updateList = new ArrayList<>();
- dtoList.forEach(dto -> {
- if( StringUtils.isNotBlank( dto.getOid() )){
- List<CodeClassifyValueDO> collect = valueDOList.stream().filter(value -> {
- return dto.getOid().equals(value.getOid());
- }).collect(Collectors.toList());
- collect.forEach(ccv -> {
- ccv.setOrderNum(dto.getOrdernum());
- ccv.setId(dto.getId());
- ccv.setName(dto.getName());
- updateList.add(ccv);
- });
- }
- });
- codeClassifyValueMapper.batchUpdate(updateList);
- return BaseResult.success();
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingServiceImpl.java
deleted file mode 100644
index 2e7013e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingServiceImpl.java
+++ /dev/null
@@ -1,1104 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import cn.hutool.json.XML;
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.constant.MdmDuckingConstant;
-import com.vci.starter.web.enumpck.UserSecretEnum;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.mapper.*;
-import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.service.*;
-import com.vci.ubcs.code.utils.*;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.redis.RedisService;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.PlatformClientUtil;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.DockingPreApplyDataDTO;
-import com.vci.ubcs.code.dto.DockingPreApplyDataInfoDTO;
-
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntInfoVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant.*;
-
-/**
- * 涓婚搴撻泦鎴愭湇鍔�
- * @author wangyi
- * @date 2022-03-20
- */
-@Service
-public class CodeDuckingServiceImpl implements CodeDuckingServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 闆嗘垚鎺ㄩ�佷换鍔℃暟鎹搷浣滃眰
- */
- @Resource
- private DockingTaskMapper dockingTaskDaoI;
-
- /**
- * 闆嗘垚鎺ㄩ�佷换鍔℃暟鎹搷浣滃眰
- */
- @Resource
- private DockingDataMapper dockingDataDaoI;
-
- /**
- * 闆嗘垚鏃ュ織鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private DockingLogeMapper dockingLogeDaoI;
-
- /**
- * 闆嗘垚鎺ュ彛head鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private SysIntHeaderMapper sysIntHeaderDaoI;
-
- /**
- * 妯℃澘灞炴�ф暟鎹搷浣滃眰
- */
- @Resource
- @Lazy
- private CodeClassifyMapper codeClassifyDaoI;
-
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 缂撳瓨鏈嶅姟
- */
- @Autowired
- private RedisService redisService;
-
- /**
- * 鏁版嵁鏈嶅姟
- */
- @Autowired(required = false)
- @Lazy
- private MdmEngineServiceI mdmEngineServiceI;
-
- /**
- * 缂栫爜棰勭敵璇锋湇鍔�
- */
- @Autowired(required = false)
- @Lazy
- private DockingPreApplyDataServiceI dockingPreApplyDataServiceI;
-
- /**
- * 瑕佹帹閫佺郴缁熺殑鏈嶅姟
- */
- @Autowired
- private SysIntInfoServiceI sysIntInfoServiceI;
-
- /**
- * 鍒嗙被鏈嶅姟
- */
- @Autowired
- private CodeClassifyServiceI codeClassifyServiceI;
-
-
- @Value("${docking.tuhao:tuhao}")
- public String tuhao;
-
- @Value("${docking.tranTemp:D:\\PLT-2022\\web\\tranTemp}")
- public String tranTemp;
-
- @Value("${docking.preXmlTemp:D:\\PLT-2022\\web\\preXmlTemp}")
- public String preXmlTemp;
-
- /**
- * 浜屻��1銆�2銆�3銆�4銆�
- * 澶勭悊棰勭敵璇锋暟鎹�
- * @param xmlDatas
- * @return 鎺ユ敹鐨剎mlDate
- */
- @Override
- public String applicateCode(String xmlDatas){
-
- long start = System.currentTimeMillis();
-
- Map<String,Object> datasMap = null;
-
- //瑙ｆ瀽xmlData
- try {
- datasMap = XmlUtil.readPreXmlData(xmlDatas);
- }catch (Exception e){
- logger.info("鎺ユ敹棰勭敵璇锋暟鎹紝瑙ｆ瀽xmlData澶辫触锛寈mlDatas: "+xmlDatas+",e: "+e.getMessage());
- e.printStackTrace();
- //杩斿洖鎻愮ず
- return XmlUtil.writePreBackXmlData(MdmDuckingConstant.XML_CODE_FAIL,"瑙ｆ瀽xmlData澶辫触,e: "+e.getMessage(),null);
- }
-
- List<XmlData> xmlDataList = Collections.synchronizedList(new ArrayList<XmlData>());
- String systemid = datasMap.getOrDefault(MdmDuckingConstant.XML_SYSTEMID,"").toString();
- List<Map<String,Object>> dataMapList = (ArrayList<Map<String,Object>>)datasMap.get(MdmDuckingConstant.XML_DATAS);
-
- //璁板綍杩欐鏁版嵁淇℃伅,骞朵笖鎶妜mldata鍐欏叆鏂囦欢
- String currentDate = DateUtils.getCurrentDate(DateUtils.DATE_TO_STRING_DETAIAL_PATTERN);
- File preXmlFile = new File(preXmlTemp+ File.separator+systemid+"-"+currentDate+".xml");
-
- try {
- FileUtils.write(preXmlFile, xmlDatas);
- }catch (Exception e){
- logger.error(currentDate+" 鎺ユ敹"+systemid+"绯荤粺棰勭敵璇锋暟鎹紝鍐欏叆鏂囦欢澶辫触锛乪:"+e.getMessage()+",xmlDatas: "+xmlDatas);
- e.printStackTrace();
- }
-
- //澶勭悊姣忎竴鏉＄敵璇风殑鏁版嵁
- ExecutorService pool = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()+1);
-
- SessionInfo sessionInfo = WebUtil.getSessionInfo();
- CountDownLatch countDownLatch = new CountDownLatch(dataMapList.size());
- for (int i =0;i<dataMapList.size();i++){
- Map<String,Object> dataMap = dataMapList.get(i);
- pool.execute(()-> {
- String unique = dataMap.getOrDefault(MdmDuckingConstant.XML_UNIQUE,"").toString();
- String type = dataMap.getOrDefault(MdmDuckingConstant.XML_TYPE,"").toString();
-
- //瑕佹彃鍏ョ殑data
- DockingPreApplyDataDTO dockingPreApplyDataDO = new DockingPreApplyDataDTO();
- //瑕佹彃鍏ョ殑datainfo
- List<DockingPreApplyDataInfoDTO> dockingPreApplyDataInfoDOList = new ArrayList<DockingPreApplyDataInfoDTO>();
- XmlData xmlData_ = new XmlData();
-
- try {
- WebUtil.setSessionInfo(sessionInfo);
-
- String num = "";
- String datacode = "";
- String datamsg = "";
- String datamsglog = "";
-
- //state=400锛屽鐞嗘垚鍔燂紝娌℃湁鎵惧埌缂栫爜
- datamsg = "鎺ユ敹棰勭敵璇锋暟鎹紝鏈煡璇㈠埌瀵瑰簲缂栫爜锛岃祴鐮佸悗鎺ㄩ�佺紪鐮佷俊鎭�";
- datacode = MdmDuckingConstant.XML_STATE_400;
- XmlData xmlData = new XmlData();
- xmlData.setState(MdmDuckingConstant.XML_STATE_400);
- xmlData.setMsg(datamsg);
- xmlData.setUnique(unique);
- xmlData.setNum(null);
- logger.info(datamsg+"锛宒ata: "+dataMap.get(unique)+",num: ");
- xmlData_ = xmlData;
-
- //濡傛灉鏄疢PM闆嗘垚杩囨潵鐨勬暟鎹紝unique浣滀负鍥惧彿鏌ヨ
- if(MdmDuckingConstant.XML_SYSTEMID_MPM.equals(systemid)&& StringUtils.isNotEmpty(unique)) {
-
- //1銆佸厛鏌ヨ杩欎釜unique鏍规嵁鍥惧彿鏌ヨ锛屾湁鏁版嵁灏卞氨杩斿洖
- Map conditonMap = new HashMap();
- conditonMap.put("tuhao",unique);
-// conditonMap.put("lcstatus",FRAMEWORK_RELEASE_RELEASED);
- List<ClientBusinessObject> clientBusinessObjectList = boService.queryCBO(type,conditonMap);
-
- if(clientBusinessObjectList.size()>0) {
- num = clientBusinessObjectList.get(0).getId();
- String lcstatus = clientBusinessObjectList.get(0).getLcStatus();
- datamsg = "鎺ユ敹棰勭敵璇锋暟鎹紝鏈煡璇㈠埌瀵瑰簲缂栫爜锛岃祴鐮佸悗鎺ㄩ�佺紪鐮佷俊鎭�";
- if(FRAMEWORK_RELEASE_RELEASED.equals(lcstatus)) {
- datamsg = "鎺ユ敹棰勭敵璇锋暟鎹紝鏌ヨ缂栫爜鎴愬姛";
- datamsglog = datamsg+"锛宒ata: " + dataMap.get(unique) + ",num: " + num;
- datacode = MdmDuckingConstant.XML_STATE_200;
-
- }else if(FRAMEWORK_RELEASE_SUBMIT.equals(lcstatus)){
- datamsglog = datamsg+"锛岀紪鐮佹暟鎹姸鎬�:宸叉彁浜わ紝data: " + dataMap.get(unique) + ",num: " + num;
- datacode = MdmDuckingConstant.XML_STATE_400;
-
- }else if(FRAMEWORK_RELEASE_AUDITING.equals(lcstatus)){
- datamsglog = datamsg+"锛岀紪鐮佹暟鎹姸鎬�:瀹℃牳涓紝data: " + dataMap.get(unique) + ",num: " + num;
- datacode = MdmDuckingConstant.XML_STATE_400;
-
- }else if(FRAMEWORK_RELEASE_EDITING.equals(lcstatus)){
- datamsglog = datamsg+"锛岀紪鐮佹暟鎹姸鎬�:缂栬緫涓紝data: " + dataMap.get(unique) + ",num: " + num;
- datacode = MdmDuckingConstant.XML_STATE_400;
-
- }else if(FRAMEWORK_DATA_DISABLED.equals(lcstatus)){
- datamsglog = datamsg+"锛岀紪鐮佹暟鎹姸鎬�:鍋滅敤锛宒ata: " + dataMap.get(unique) + ",num: " + num;
- datacode = MdmDuckingConstant.XML_STATE_400;
- }
- xmlData.setState(datacode);
- xmlData.setMsg(datamsg);
- xmlData.setUnique(unique);
- xmlData.setNum(num);
- logger.info(datamsglog);
- xmlData_ = xmlData;
- }
- }
- dockingPreApplyDataDO.setNum(num);
- dockingPreApplyDataDO.setDatacode(datacode);
- dockingPreApplyDataDO.setDatamsg(datamsg);
-
- //2銆佹牴鎹畊nique鏌ヨDockingPreApplyDataDO锛屾湁鏁版嵁灏变慨鏀瑰埆鐨勬墍鏈夌殑usedflag=false,璁剧疆杩欎釜涓簍rue
- //3銆佸啀鎻掑叆DockingPreApplyDataDO鍜孌ockingPreApplyDataInfoDO
- //鍏跺疄锛�2銆佸拰3銆佽繖涓ゆ鍦╠ockingPreApplyDataServiceI.addSaveDataAndInfo锛堬級杩欎釜鏂规硶涓竴璧峰仛浜�
-
- String dataoid = redisService.getUUIDEveryDay();
-// String dataoid = "1";
- dockingPreApplyDataDO.setOid(dataoid);
- dockingPreApplyDataDO.setPreapplyoid("1");
- dockingPreApplyDataDO.setUniquecode(unique);
- dockingPreApplyDataDO.setType(type);
- dockingPreApplyDataDO.setSystemid(systemid);
-
- Object attro = dataMap.get(MdmDuckingConstant.XML_PROS);
-
- //瑕佹彃鍏ョ殑datainfo
- List<Map<String,String>> attrList = null;
- if (attro == null) {
- attrList = new ArrayList<Map<String,String>>();
- }else {
- attrList = (ArrayList<Map<String,String>>)attro;
- }
-
- String mpm_model = null;
- String mpm_parttype = null;
- String mpm_unit = null;
- for (Map<String, String> attrMap : attrList) {
- String datainfooid = redisService.getUUIDEveryDay();
-// datainfooid = "1";
- String key = attrMap.getOrDefault(MdmDuckingConstant.XML_KEY,"");
- String mean = attrMap.getOrDefault(MdmDuckingConstant.XML_MEAN,"");
- String text = attrMap.getOrDefault(MdmDuckingConstant.XML_TEXT,"");
-
- DockingPreApplyDataInfoDTO dockingPreApplyDataInfoDO = new DockingPreApplyDataInfoDTO();
- dockingPreApplyDataInfoDO.setDataoid(dataoid);
- dockingPreApplyDataInfoDO.setOid(datainfooid);
- dockingPreApplyDataInfoDO.setKey(key);
- dockingPreApplyDataInfoDO.setValue(text);
- dockingPreApplyDataInfoDO.setMean(mean);
- dockingPreApplyDataInfoDOList.add(dockingPreApplyDataInfoDO);
-
- //鍙栦笁涓��
- if(MdmDuckingConstant.XML_MPM_MODEL.equals(key)){//鍙朚PM瑙勬牸
- mpm_model = text;
- dockingPreApplyDataDO.setModel(mpm_model);
- }
- if(MdmDuckingConstant.XML_MPM_PARTTYPE.equals(key)){//鍙朚PM闆朵欢鍨嬪彿
- mpm_parttype = text;
- dockingPreApplyDataDO.setParttype(mpm_parttype);
- }
- if(MdmDuckingConstant.XML_MPM_UNIT.equals(key)){//鍗曚綅
- mpm_unit = text;
- dockingPreApplyDataDO.setUnit(mpm_unit);
- }
- }
-
- dockingPreApplyDataServiceI.addSaveDataAndInfo(dockingPreApplyDataDO, dockingPreApplyDataInfoDOList);
-
- } catch (Exception e) {
- String datamsg = "鎺ユ敹棰勭敵璇锋暟鎹け璐ワ紒锛宒ata: "+dataMap.get(unique)+",e: "+e.getMessage();
- XmlData xmlData = new XmlData();
- xmlData.setState(MdmDuckingConstant.XML_STATE_500);
- xmlData.setMsg(datamsg);
- xmlData.setUnique(unique);
- xmlData.setNum(null);
- logger.error(datamsg+".dockingPreApplyDataDO锛� "+dockingPreApplyDataDO+",dockingPreApplyDataInfoDOList: "+dockingPreApplyDataInfoDOList);
- xmlData_ = xmlData;
-
- e.printStackTrace();
- }finally {
- xmlDataList.add(xmlData_);
- countDownLatch.countDown();
- }
- });
- }
-
- //绛夊緟鎵�鏈夌嚎绋嬫墽琛屽畬鎴�
- try {
- countDownLatch.await();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-
- String backXmlData = XmlUtil.writePreBackXmlData(MdmDuckingConstant.XML_CODE_SUCCESS,"鎺ユ敹棰勭敵璇锋暟鎹垚鍔燂紒",xmlDataList);
-
-
- long end = System.currentTimeMillis();
-
- //鎷兼帴杩斿洖鐨剎mlData
- int dataMapSise = dataMapList.size();
- int xmlDataSise = xmlDataList.size();
- System.out.println("========================dataMapSise锛� "+dataMapSise+",xmlDataSise:"+xmlDataSise);
-
- System.out.println("========================澶勭悊棰勭敵璇锋暟鎹竴鍏辫�楁椂 "+(end-start)/1000+"绉�");
- return backXmlData;
- }
-
- /**
- * 鍥涖��1銆�2銆�3
- * 鏌ヨredis涓暟鎹紝瀵规瘮鍚庢彃鍏ockingtask
- */
- @Override
- public void insertCache2(){
-
- initSysadmin();
-
- //sysintinfo鏌ヨ瑕佹帹閫佺殑涓婚搴撳拰鐩稿叧绯荤粺淇℃伅
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("usedflag","true");
- List<SysIntInfoDO> sysIntInfoVOList = sysIntInfoServiceI.selectAll(conditionMap);
-
- //distinct鍑轰富棰樺簱btmname,瀛樺偍key-value缁撴瀯鐨勫垎绫绘暟鎹紝杩欓噷鐨勫垎绫绘槸涓婚搴搑oot鑺傜偣
- Set<String> btmtypeidSet = new HashSet<>();
- Map<String ,List<SysIntInfoDO>> sysIntInfoDOMap = new HashMap<String ,List<SysIntInfoDO>>();//key=classifyoid,value=list<map>
- for (SysIntInfoDO sysIntInfoVOi:sysIntInfoVOList){
- btmtypeidSet.add(sysIntInfoVOi.getBtmTypeId());
- List<SysIntInfoDO> SysIntInfoVOListi = sysIntInfoDOMap.get(sysIntInfoVOi.getClassifyoid());
- if(SysIntInfoVOListi==null){
- SysIntInfoVOListi = new ArrayList<SysIntInfoDO>();
- }
- SysIntInfoVOListi.add(sysIntInfoVOi);
- sysIntInfoDOMap.put(sysIntInfoVOi.getClassifyoid(),SysIntInfoVOListi);
- }
-
- //鏌ヨdockingdata:oid,classifyoid,btmid,btmoid,sendtype,classifyid,classifyname
-// List<Map> dataList = getDockingDatas();
- VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(DockingDataDO.class);
- queryWrapperForDO.addQueryMap("sendflag","false");
- List<DockingDataDO> dataList = dockingDataDaoI.selectByWrapper(queryWrapperForDO);
-
- for (DockingDataDO mapi:dataList){
-
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = new BatchCBO();
-
- String dataoid = mapi.getOid();//data瀵硅薄鐨刼id
- String classifyoid = mapi.getClassifyoid();
- String id = mapi.getId();
- String uniquecode = mapi.getUniquecode();
- String btmid = mapi.getBtmid();
- String btmoid = mapi.getBtmoid();
- String sendtype = mapi.getSendtype();
- String classifyid = mapi.getClassifyid();
- String classifyname = mapi.getClassifyname();
-
- //璁剧疆uniquecode
- if(StringUtils.isEmpty(uniquecode)){
- uniquecode = getTuhao(btmoid);//鏌ヨ鍥惧彿
- if(StringUtils.isNotEmpty(uniquecode)) {
- updateDockingDatasUniqueCode(dataoid, uniquecode);
- }
- }
- List<SysIntInfoDO> effectiveSysIntInfoVOs=new ArrayList<>();
- String rootClassifyoid = "";
- String pushType="1";
- if(MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.equalsIgnoreCase(classifyoid)){//杩欎釜瀵瑰簲sysintinfo涓殑涓婚搴搃d锛屽鏋滄槸鍒嗙被鏁版嵁锛屽氨鏄疍OCKING_DEFAULT_CLASSIFY=CODECLASSIFY
- rootClassifyoid = MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY;
- //鍒ゆ柇鏄惁灞炰簬鍒嗙被鏍�,濡傛灉鏄粍缁囥�佷汉鍛樸�侀檮褰曚箣绫荤殑涓嶇敓鎴愪换鍔�,骞朵笖鑷姩娓呴櫎杩欎釜data
- boolean iswupin = codeClassifyDaoI.isWupin(btmoid);
- if(!"TakeBack".equals(sendtype)&&!iswupin){
- boolean u = delteDockingData(dataoid);
- logger.error("闆嗘垚data鍒犻櫎闈炲垎绫籨ata澶辫触锛乨ataoid:"+dataoid);
- continue;
- }
- pushType="2";
- rootClassifyoid=btmoid;
- }else {
- /* CodeClassifyDO rootClassify = codeClassifyDaoI.getRootClassify(classifyoid);//root鍒嗙被
- if(rootClassify==null){
- continue;//璇存槑杩欎釜鍒嗙被琚垹鎺変簡锛屼笉鍋氬鐞�
- }
- rootClassifyoid = rootClassify.getOid();*/
- rootClassifyoid=classifyoid;
- }
-
- List<CodeClassifyDO> parentLeveDO= codeClassifyDaoI.selectAllLevelParentByOid(rootClassifyoid);
- if(CollectionUtils.isEmpty(parentLeveDO)){
- continue;//璇存槑杩欎釜鍒嗙被琚垹鎺変簡锛屼笉鍋氬鐞�
- }
- Map<String, CodeClassifyDO> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
- String finalPushType = pushType;
- oidCodeclassifyDOMap.keySet().forEach(oid->{
- if(sysIntInfoDOMap.containsKey(oid)){
- List<SysIntInfoDO> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
- sysIntInfoDOS.stream().forEach(sysIntInfoDO -> {
- String sysPushType= sysIntInfoDO.getPushType();
- if(sysPushType.equalsIgnoreCase(finalPushType)){
- effectiveSysIntInfoVOs.add(sysIntInfoDO);
- }
- });
-
-
- }
- });
- if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
- continue;
- }
- List<DockingTaskDO> dockingTaskDO_insert = new ArrayList<DockingTaskDO>();
- for (SysIntInfoDO sysIntInfoVOi:effectiveSysIntInfoVOs){
- // String sysinfoclassifyoid = sysIntInfoVOi.getClassifyoid();//intinfo鐨刢lassifyoid
- // if(!rootClassifyoid.equals(sysinfoclassifyoid)){
- // continue;
- // }
- DockingTaskDO dockingTaskDO = new DockingTaskDO();
- String oid=redisService.getUUIDEveryDay();
- // logger.error("===================================================oid: "+redisService.getUUIDEveryDay());
- dockingTaskDO.setOid(oid);
- dockingTaskDO.setSendflag(MdmDuckingConstant.SEND_FLAG_FALSE);
- dockingTaskDO.setId(id);//缂栫爜
- dockingTaskDO.setUniquecode(uniquecode);
- dockingTaskDO.setBtmoid(btmoid);//鏁版嵁oid
- dockingTaskDO.setBtmid(btmid);//鏁版嵁涓氬姟绫诲瀷id
- dockingTaskDO.setClassifyid(classifyid);//鏁版嵁鍦ㄥ垎绫籭d
- dockingTaskDO.setClassifyoid(classifyoid);//鏁版嵁鎵�鍦ㄥ垎绫籵id
- dockingTaskDO.setClassifyname(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
- dockingTaskDO.setSendtype(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
- dockingTaskDO.setDataoid(dataoid);
-
- //intinfo
- dockingTaskDO.setSysinfooid(sysIntInfoVOi.getOid());//intinfo鐨刼id
- dockingTaskDO.setSystemoid(sysIntInfoVOi.getSysbaseoid());//绯荤粺oid
- dockingTaskDO.setSystemcode(sysIntInfoVOi.getSysbaseid());//绯荤粺缂栫爜
- dockingTaskDO.setSystemname(sysIntInfoVOi.getSysbasename());//绯荤粺name
-
- dockingTaskDO_insert.add(dockingTaskDO);
- }
-
- BatchCBO bi = null;
- if(dockingTaskDO_insert.size()!=0) {
- bi = dockingTaskDaoI.batchInsert(dockingTaskDO_insert);
- batchCBO.copyFromOther(bi);
- }
-
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
-
- //dockingTaskDaoI.updateByPrimaryKey鏂规硶鎶ラ敊浜嗭紝鎵�浠ユ墜鍐欎簡杩欎釜
- boolean u = updateDockingDatasSendFlag(dataoid, MdmDuckingConstant.SEND_FLAG_TRUE);
- if(!u){
- logger.error("闆嗘垚data鍒嗚В浠诲姟澶辫触锛乨ataoid:"+dataoid);
- continue;
- }
-
- }
- }
-
- /**
- * 鍥涖��3銆�
- * 1銆�
- */
- @Override
- public void sendData3(){
-
- initSysadmin();
-
- //鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
- queryWrapper.addQueryMap("sendFlag", MdmDuckingConstant.SEND_FLAG_FALSE);
- List<DockingTaskDO> dockingTaskDOS = dockingTaskDaoI.selectByWrapper(queryWrapper);
-
- //姣忎釜task渚濇鎵ц鎺ㄩ��
- for (DockingTaskDO dockingTaskDO:dockingTaskDOS){
-
- //姣忎釜task涓�涓簨鍔★紝寮�鍚�
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = new BatchCBO();
-
- String paramString = null;
-
- //鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
- String systeminfooid = dockingTaskDO.getSysinfooid();//sysininfo 鐨刼id
- String systemcode = dockingTaskDO.getSystemcode();
- String systemname = dockingTaskDO.getSystemname();
- String systemoid = dockingTaskDO.getSystemoid();
- String dataid = dockingTaskDO.getId();//缂栫爜
- String uniquecode = dockingTaskDO.getUniquecode();//uniquecode
-
- //鏌ヨ鎺ㄩ�佹帴鍙ｅ弬鏁�
- SysIntInfoVO sysIntInfoVO = sysIntInfoServiceI.getObjectByOid(systeminfooid);
- String url = sysIntInfoVO.getRequesturl();//url
- String type = sysIntInfoVO.getInterfacetype().toLowerCase(Locale.ROOT);//get/post/webserver/corba
- String paramType = sysIntInfoVO.getParamtype();//xml/json
- String returnType = sysIntInfoVO.getReturntype();//xml/json
- String interfaceFunction = sysIntInfoVO.getInterfaceFunction();//涓昏鏄痺ebservice鐨勬柟娉曞悕
- String namespace = sysIntInfoVO.getNamespace();//namespace
- String soapaction = sysIntInfoVO.getSoapaction();//soapaction
- String targName = sysIntInfoVO.getTargName();//targName
- String cxfaxis = sysIntInfoVO.getCxfaxis();//webservice鏄痗xf/axis
-
- //鏌ヨparam
- List<SysIntParamDO> sysIntParamDOList = sysIntInfoServiceI.getParamsBySystemInfoOid(systeminfooid);
- //鏌ヨheader
- List<SysIntHeaderDO> sysIntHeaderDOList = sysIntInfoServiceI.getHeadersBySystemInfoOid(systeminfooid);
-
- //鏌ヨ瑕佹帹閫佺殑鏁版嵁
- String btmoid = dockingTaskDO.getBtmoid();//鏁版嵁oid
- String btmid = dockingTaskDO.getBtmid();//鏁版嵁btmid
- String classifyoid = dockingTaskDO.getClassifyoid();
- String classifyid = dockingTaskDO.getClassifyid();
- String classifyname= dockingTaskDO.getClassifyname();
- String sendtype = dockingTaskDO.getSendtype();
-
- //缁勮鏁版嵁
- XmlData xmlData = new XmlData();
- xmlData.setSendtype(sendtype);
-
- if(!MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.equals(btmid)) {
- xmlData.setType(btmid);
- }
-
- String ret_xml = null;
- String id = null;
- String name = null;
- String idpath = null;
- String namepath = null;
- //琛ㄧず鏄垎绫讳俊鎭暟鎹�
- if(MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.equals(btmid)){
- xmlData.setNamepath("");
- xmlData.setIdpath("");
- xmlData.setNum("");
-
- CodeClassifyDO codeClassifyDO = null;
- try {
- codeClassifyDO = codeClassifyDaoI.selectByPrimaryKey(btmoid);
- }catch (Exception e){
-
- }
-
- String classifyoid_parent = "";
- int orderNum = 0;
- if(codeClassifyDO==null){//鏌ヤ笉鍒版暟鎹紝璇存槑琚垹闄や簡锛屼粠DOCKING_CACHE2_DELETE鍙�
- CodeClassifyDO codeClassifyDOJson = (CodeClassifyDO)redisService.getCacheObject(MdmDuckingConstant.DOCKING_CACHE2_DELETE+btmoid);
-
- if(codeClassifyDOJson==null){
- BatchCBO insertLoge = taskFail(systemcode,systemname,systemoid,classifyoid,classifyid,classifyname,dataid,uniquecode,"",url,"涓绘暟鎹郴缁熸湭鏌ヨ鍒板垹闄ょ殑鏁版嵁锛屾湭鎵ц鎺ㄩ�併��");
- batchCBO.copyFromOther(insertLoge);
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- }
- id = codeClassifyDOJson.getId();
- name = codeClassifyDOJson.getName();
- orderNum = codeClassifyDOJson.getOrderNum();
- classifyoid_parent = codeClassifyDOJson.getParentCodeClassifyOid();
- }else {
- id = codeClassifyDO.getId();
- name = codeClassifyDO.getName();
- orderNum = codeClassifyDO.getOrderNum();
- classifyoid_parent = codeClassifyDO.getParentCodeClassifyOid();
- }
-
- //鐖剁骇,idpath,namepath,鍒嗙被鏁版嵁瑙嗗浘涓病鏈夋煡璇㈠嚭璺緞锛岄渶瑕佹墜鍔ㄥ幓鏌ヨ
- CodeClassifyDO codeClassifyDO_parent = null;
- try {
- codeClassifyDO_parent = codeClassifyDaoI.selectByPrimaryKey(classifyoid_parent);
- xmlData.setParentId(codeClassifyDO_parent.getId());
-
- //idpath,namepath
-
- List<CodeClassifyDO> codeClassifyDOList = codeClassifyDaoI.listParentClassify(codeClassifyDO_parent.getOid());
- for (int i=codeClassifyDOList.size()-1;i>=0;i--){
- CodeClassifyDO codeClassifyDOi=codeClassifyDOList.get(i);
- String idi = codeClassifyDOi.getId();
- String namei = codeClassifyDOi.getName();
- idpath = idpath==null?idi:idpath+"#"+idi;
- namepath = namepath==null?namei:namepath+"#"+namei;
- }
- }catch (Exception e){
-
- }
-
- idpath = idpath==null?id:idpath+"#"+id;
- namepath = namepath==null?name:namepath+"#"+name;
-
- //鏌ヨ鍒嗙被璺緞
- xmlData.setName(name);
- xmlData.setNamepath(namepath);
- xmlData.setIdpath(idpath);
- xmlData.setId(id);
- xmlData.setOrderNum(orderNum);
-
- List<XmlData> xmlDataList = new ArrayList<XmlData>();
- xmlDataList.add(xmlData);
- ret_xml = XmlUtil.writeSendXmlData_classify(xmlDataList);//xml鏍煎紡鏁版嵁
- }else {
- Map<String, String> data = null;
- try {
- //琛ㄧず鏄富鏁版嵁
- CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid);
- BaseResult<Map<String, String>> baseResult = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid());
-
- if (baseResult == null) {
- JSONObject josni = redisService.getCacheObject(MdmDuckingConstant.DOCKING_CACHE2_DELETE + btmoid);
- data = (Map) josni;
- } else {
- data = baseResult.getObj();
- }
- }catch (Throwable e){
- BatchCBO failCbo = taskFail(systemcode,systemname,systemoid,classifyoid,classifyid,classifyname,dataid,uniquecode,paramString,url,"鏈煡璇㈠埌鐩稿簲鏁版嵁锛�");
- batchCBO.copyFromOther(failCbo);
- continue;
- }
-
- //澶勭悊璁￠噺鍗曚綅绛夎浆鎹�
-// data = tran(data);
-
- //濡傛灉鏄泦鎴恊rp閮ㄩ棬鏁版嵁闆嗘垚锛宲arentcode=null寤虹珛涓�绾ч儴闂�,鏃犱汉鏈烘瘮杈冨彧鏈夐儴闂紝娌℃湁绉戝,鎵�浠ョ郴缁熺殑绉戝鍏跺疄灏辨槸浠栦滑鐨勯儴闂�
- if("organization".equals(btmid.toLowerCase())){
- String materialclassify = data.get("materialclassify");
- if("绉戝".equals(materialclassify)){
- data.put("parentcode","");
- }
- }
- //鏁版嵁杞崲d
- String tran_xml = null;
- try {
- //D:\MDM_important\PLT-2022\web\tranTemp\+绯荤粺鍚嶇О,浼氬幓鎵捐繖涓枃浠惰鍙栨暟鎹浆鎹俊鎭�
- tran_xml = FileUtils.readFileToString(new File(tranTemp+File.separator+systemcode+".xml"),"utf-8");
- }catch (IOException e){
- e.printStackTrace();
- }
- if(StringUtils.isNotEmpty(tran_xml)){
- //閫氳繃tran_xml瀵筪ata鏁版嵁杞崲
- Map<String,Object> tran_map = null;
- try {
- tran_map = XmlUtil.readTranXml(tran_xml,btmid);
- }catch (Exception e){
- e.printStackTrace();
- }
- if(tran_map!=null){//璇诲彇鍒拌繖涓猙tmid璁剧疆鐨勮浆鎹㈠叧绯讳簡鎵嶅仛澶勭悊
- for (String key:tran_map.keySet()){//key=materialtype
- Object data_pro_mapo = tran_map.get(key);//data_pro_map
- if(data_pro_mapo!=null){//杩欎釜鍊艰缃浆鎹簡鎵嶅鐞�
- Map<String,String> data_pro_map = (Map<String,String>)data_pro_mapo;
- String mdm_value = data.get(key);
- String system_value = data_pro_map.get(mdm_value);
- if(StringUtils.isNotEmpty(mdm_value)){
- data.put(key,system_value);
- }
- }
- }
- }
- }
-
- String unique = null;
- List<Pro> pros = new ArrayList<Pro>();
- String codeclassifyoid = null;
- for (String key:data.keySet()){
- Pro pro = new Pro();
- pro.setKey(key);
- pro.setMean("");
- pro.setValue(data.getOrDefault(key,""));
- pros.add(pro);
- if(tuhao.equals(key)){
- unique = data.getOrDefault(key,"");
- }
- if("oid".equals(key)){
- codeclassifyoid = data.getOrDefault(key,"");
- }
- }
- xmlData.setNum(data.getOrDefault("id",""));
- xmlData.setPros(pros);
- xmlData.setUnique(unique);
-
- //鏌ヨ鍒嗙被璺緞,涓绘暟鎹湪瑙嗗浘涓凡缁忔煡璇㈠嚭浜嗚矾寰勶紝鍙笉杩囨槸,闂撮殧鐨�
- namepath = classifyname.replaceAll(",","#");
- idpath = classifyid.replaceAll(",","#");
-
- xmlData.setNamepath(namepath);
- xmlData.setIdpath(idpath);
-
- List<XmlData> xmlDataList = new ArrayList<XmlData>();
- xmlDataList.add(xmlData);
- ret_xml = XmlUtil.writeSendXmlData(xmlDataList);//xml鏍煎紡鏁版嵁
- }
-
- //鍒囨崲xml/json
- String sendString = null;
- String backString = null;
- if(paramType.equals(MdmDuckingConstant.DATATYPE_JSON)){
- sendString = XML.toJSONObject(ret_xml).toString();
- }else {
- sendString = ret_xml;
- }
- logger.info("绯荤粺锛�"+systemcode);
- logger.info("鎺ュ彛鍦板潃:"+url);
- logger.info("鎺ュ彛鍑芥暟:"+interfaceFunction);
- logger.info("鎺ュ彛浼犻�掑弬鏁�:"+sendString);
- //鎺ㄩ�佹暟鎹�
- try {
- if (type.equals(MdmDuckingConstant.URLTYPE_GET)) {//GET璇锋眰
- String sendurl = url + "?" + MdmDuckingConstant.PARAM_XMLDATA + "=" + sendString;
- //鎷兼帴param
- for (SysIntParamDO sysIntParamDO : sysIntParamDOList) {
- sendurl = sendurl + "&" + sysIntParamDO.getParamkey() + "=" + sysIntParamDO.getParamvalue();
- }
- paramString=sendurl;
- backString = HttpUtils.get(sendurl);
- } else if (type.equals(MdmDuckingConstant.URLTYPE_POST)) {//POST璇锋眰
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- for (SysIntParamDO sysIntParamDO : sysIntParamDOList) {
- params.add(sysIntParamDO.getParamkey(), sysIntParamDO.getParamvalue());
- }
- paramString=params.toString();
- MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
- for (SysIntHeaderDO sysIntHeaderDO : sysIntHeaderDOList) {
- headers.add(sysIntHeaderDO.getHeaderkey(), sysIntHeaderDO.getHeaderalue());
- }
- backString = HttpUtils.post(url, params, headers);
- } else if (type.equals(MdmDuckingConstant.URLTYPE_WEBSERVICE)) {//webserver璇锋眰
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- for (SysIntParamDO sysIntParamDO : sysIntParamDOList) {
- params.add(sysIntParamDO.getParamkey(), sysIntParamDO.getParamvalue());
- }
- paramString=sendString;
- MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
- for (SysIntHeaderDO sysIntHeaderDO : sysIntHeaderDOList) {
- headers.add(sysIntHeaderDO.getHeaderkey(), sysIntHeaderDO.getHeaderalue());
- }
- backString = WsErpClientUtil.sendMsg(url, namespace, soapaction,interfaceFunction,targName, paramString, 10000);
- } else {//corba鎺ュ彛
-
- }
- paramString=sendString;
- }catch (Exception e){
- e.printStackTrace();
- BatchCBO failCbo = taskFail(systemcode,systemname,systemoid,classifyoid,classifyid,classifyname,dataid,uniquecode,paramString,url,"鎺ㄩ�佹暟鎹け璐ワ紒");
- batchCBO.copyFromOther(failCbo);
- }
- logger.info("鎺ュ彛杩斿洖鍙傛暟:"+backString);
- //瑙ｆ瀽杩旇繕鍙傛暟
- try {
- BackXml backXml = null;
- if(returnType.equals(MdmDuckingConstant.DATATYPE_JSON)){
- backXml = XmlUtil.readSendJsonData(backString);//鐩墠鍙鍙栦富鏁版嵁json杩斿洖淇℃伅
- }else {
- if(MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.equals(btmid)){
- backXml = XmlUtil.readSendXmlData_classify(backString);//鍒嗙被xml杩斿洖淇℃伅
- }else {
- backXml = XmlUtil.readSendXmlData(backString);//涓绘暟鎹畑ml杩斿洖淇℃伅
- }
- }
- List<XmlData> datas = backXml.getDatas();
- boolean isSend = false;
- for (XmlData xmlDatai:datas){
- String xml_datacode = xmlDatai.getState();
- String xml_datamsg = xmlDatai.getMsg();
- if(MdmDuckingConstant.XML_DATACODE_200.equals(xml_datacode)){
- BatchCBO insertLoge = taskSuccess(systemcode,systemname,systemoid,classifyoid,classifyid,classifyname,dataid,uniquecode,paramString,url,xml_datamsg);
- batchCBO.copyFromOther(insertLoge);
- isSend = true;
- }else if(MdmDuckingConstant.XML_DATACODE_500.equals(xml_datacode)){
- BatchCBO failCbo = taskFail(systemcode,systemname,systemoid,classifyoid,classifyid,classifyname,dataid,uniquecode,paramString,url,xml_datamsg);
- batchCBO.copyFromOther(failCbo);
- }else if("true".equals(xml_datacode.toLowerCase())){
- BatchCBO insertLoge = taskSuccess(systemcode,systemname,systemoid,classifyoid,classifyid,classifyname,dataid,uniquecode,paramString,url,xml_datamsg);
- batchCBO.copyFromOther(insertLoge);
- isSend = true;
- }else if("false".equals(xml_datacode)){
- BatchCBO failCbo = taskFail(systemcode,systemname,systemoid,classifyoid,classifyid,classifyname,dataid,uniquecode,paramString,url,xml_datamsg);
- batchCBO.copyFromOther(failCbo);
- }else{
- BatchCBO failCbo = taskFail(systemcode,systemname,systemoid,classifyoid,classifyid,classifyname,dataid,uniquecode,paramString,url,"杩旇繕xml鏍煎紡涓嶆纭紝缂哄皯code!");
- batchCBO.copyFromOther(failCbo);
- }
- }
-
- //鍏ㄩ兘鎺ユ敹鎴愬姛鐨勬儏鍐典笅,淇敼dockingtask sendflag涓哄凡鍙戦��
- if(isSend) {
- dockingTaskDO.setSendflag(MdmDuckingConstant.SEND_FLAG_TRUE);
- BatchCBO updateTask = dockingTaskDaoI.updateByPrimaryKey(dockingTaskDO);
- batchCBO.copyFromOther(updateTask);
- }
-
- }catch (Exception e){
- e.printStackTrace();
- BatchCBO failCbo = taskFail(systemcode,systemname,systemoid,classifyoid,classifyid,classifyname,dataid,uniquecode,paramString,url,"瑙ｆ瀽杩旇繕鏁版嵁澶辫触锛�");
- batchCBO.copyFromOther(failCbo);
- }
-
- //姣忎竴涓猼ask涓�涓簨鐗�
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
-
- }
- }
-
- public static Map<String,String> tranMap = new HashMap<String,String>();
- public Map<String,String> tran(Map<String,String> data){
- if(tranMap.isEmpty()){
-// tranMap.put("jiliangdw","jiliangdwname");
- }
-
- for (String key:tranMap.keySet()){
- String tran_key = tranMap.get(key);
- String tran_key_value = data.get(tran_key);
- if(StringUtils.isNotEmpty(tran_key_value)){
- data.put(key,tran_key_value);
- }
- }
- data.put("shifoupihaoguanli","0");
- return data;
- }
-
- /**
- * 瀹氭椂浠诲姟鎺ㄩ��
- */
- @Override
- public void DockingScheduing(){
- //data 2 task
- insertCache2();
-
- //鎺ㄩ�佹暟鎹�
- sendData3();
- }
-
- /**
- * 鏁版嵁鍒犻櫎鐨勬椂鍊欙紝缂撳瓨鍒皉edis
- * @param oid
- */
- @Override
- public void cacheDeleteData(String oid,Object obj){
- logger.info("鍒犻櫎鏁版嵁鎻掑叆redis,key: "+ MdmDuckingConstant.DOCKING_CACHE2_DELETE+",oid: "+oid+",obj: "+obj);
- redisService.setCacheObject(MdmDuckingConstant.DOCKING_CACHE2_DELETE + oid, obj);
- }
-
- @Override
- public DataGrid<DockingDataDO> gridData(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- pageHelper.addDefaultAsc("sendflag");
- List<DockingDataDO> doList = dockingDataDaoI.selectByCondition(conditionMap,pageHelper);
-
- DataGrid<DockingDataDO> dataGrid=new DataGrid<DockingDataDO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(doList);
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(dockingDataDaoI.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- @Override
- public DataGrid<DockingTaskDO> gridTask(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- pageHelper.addDefaultAsc("sendflag");
- List<DockingTaskDO> doList = dockingTaskDaoI.selectByCondition(conditionMap,pageHelper);
-
- DataGrid<DockingTaskDO> dataGrid=new DataGrid<DockingTaskDO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(doList);
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(dockingTaskDaoI.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- @Override
- public DataGrid<DockingLogeDO> gridLoge(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<DockingLogeDO> doList = dockingLogeDaoI.selectByCondition(conditionMap,pageHelper);
-
- DataGrid<DockingLogeDO> dataGrid=new DataGrid<DockingLogeDO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(doList);
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(dockingLogeDaoI.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- @Override
- public DataGrid<SysIntHeaderDO> gridHeader(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<SysIntHeaderDO> doList = sysIntHeaderDaoI.selectByCondition(conditionMap,pageHelper);
-
- DataGrid<SysIntHeaderDO> dataGrid=new DataGrid<SysIntHeaderDO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(doList);
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(sysIntHeaderDaoI.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
- /**
- * 鎺ㄩ�佹垚鍔�,鎻掑叆dockingtask锛屽悓鏃惰褰昹oge
- * @param systemcode
- * @param systemname
- * @param systemoid
- * @param paramString
- * @param url
- */
- public BatchCBO taskSuccess(String systemcode,String systemname,String systemoid,String classifyoid,String classifyid,String classifyname,String id,String uniquecode,String paramString,String url,String msg){
- String oid=redisService.getUUIDEveryDay();
- DockingLogeDO dockingLogeDO = new DockingLogeDO();
- dockingLogeDO.setOid(oid);
- dockingLogeDO.setSystemcode(systemcode);
- dockingLogeDO.setSystemname(systemname);
- dockingLogeDO.setSystemoid(systemoid);
- dockingLogeDO.setClassifyoid(classifyoid);
- dockingLogeDO.setClassifyid(classifyid);
- dockingLogeDO.setClassifyname(classifyname);
- dockingLogeDO.setId(id);
- dockingLogeDO.setUniquecode(uniquecode);
- /** if(paramString.length()>100){
- paramString = paramString.substring(0,100);
- }***/
- dockingLogeDO.setParamstring(paramString);
- dockingLogeDO.setType(MdmDuckingConstant.DATA_LOGE_OUT);
-
-// dockingLogeDO.setReturnstring(retString);
- dockingLogeDO.setMsg(msg);
- dockingLogeDO.setInterfacestatus(MdmDuckingConstant.INTERFACE_STATUS_TRUE);
- BatchCBO insert = dockingLogeDaoI.insert(dockingLogeDO);
- logger.info("闆嗘垚鎺ㄩ�佹暟鎹垚鍔�,systemcode:"+systemcode+",systemname:"+systemcode+",url:"+url+",param:"+paramString);
- return insert;
- }
-
- /**
- * 鎺ㄩ�佸け璐�,鎻掑叆dockingtask锛屽悓鏃惰褰昹oge
- * @param systemcode
- * @param systemname
- * @param systemoid
- * @param paramString
- * @param url
- */
- public BatchCBO taskFail(String systemcode,String systemname,String systemoid,String classifyoid,String classifyid,String classifyname,String id,String uniquecode,String paramString,String url,String msg){
- String oid=redisService.getUUIDEveryDay();
- DockingLogeDO dockingLogeDO = new DockingLogeDO();
- dockingLogeDO.setOid(oid);
- dockingLogeDO.setSystemcode(systemcode);
- dockingLogeDO.setSystemname(systemname);
- dockingLogeDO.setSystemoid(systemoid);
- dockingLogeDO.setClassifyoid(classifyoid);
- dockingLogeDO.setClassifyid(classifyid);
- dockingLogeDO.setClassifyname(classifyname);
- dockingLogeDO.setId(id);
- dockingLogeDO.setUniquecode(uniquecode);
- /** if(StringUtils.isNotEmpty(paramString)&¶mString.length()>100){
- paramString = paramString.substring(0,100);
- }***/
- dockingLogeDO.setParamstring(paramString);
- dockingLogeDO.setType(MdmDuckingConstant.DATA_LOGE_OUT);
-
- dockingLogeDO.setMsg(msg);
- dockingLogeDO.setInterfacestatus(MdmDuckingConstant.INTERFACE_STATUS_FALSE);
- BatchCBO insert = dockingLogeDaoI.insert(dockingLogeDO);
-
- logger.error("闆嗘垚鎺ㄩ�佹暟鎹け璐�,systemcode:"+systemcode+",systemname:"+systemcode+",url:"+url+",param:"+paramString+",e:"+msg);
- return insert;
- }
- public void initSysadmin(){
- SessionInfo sessionInfo = new SessionInfo();
- sessionInfo.setUserId("sysAdmin");
- sessionInfo.setUserName("绯荤粺绠＄悊鍛�");
- sessionInfo.setIp(WebUtil.getLocalIp());
- sessionInfo.setUserOid("193C026F-7DB8-27B4-F383-4E8BE083FB07");
- sessionInfo.setUserSecret(UserSecretEnum.PRIVACY.getValue()+"");
- WebUtil.setSessionInfo(sessionInfo);
- }
-
- /**
- * dockingdata鏌ヨ闇�瑕佹帹閫佺殑鏁版嵁
- * @return
- */
- public List<Map> getDockingDatas(){
- String sql = "select oid,id,classifyoid,btmid,btmoid,sendtype,classifyid,classifyname from PLATFORMBTM_codedockingDATA where sendflag = 'false'";
- List<Map> datas = boService.queryBySqlForMap(sql,null);
- return datas;
- }
-
- /**
- * dockingdata鍒犻櫎
- * @return
- */
- public boolean delteDockingData(String oid){
- boolean u = false;
- String sql = "delete from PLATFORMBTM_codedockingDATA where oid = '"+oid+"'";
- try {
- u=platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
- }catch (Exception e){
-
- }
- return u;
- }
-
- /**
- * 鏌ヨ鍥惧彿
- * @return
- */
- public String getTuhao(String oid){
- String tuhao = "";
- String sql = "select tuhao from PLATFORMBTM_wupin where oid = '"+oid+"'";
- List<Map> datas = boService.queryBySqlForMap(sql,null);
- if(datas!=null&&datas.size()!=0){
- tuhao = datas.get(0).getOrDefault("tuhao","").toString();
- }
- return tuhao;
- }
-
- @Autowired
- private PlatformClientUtil platformClientUtil;
- /**
- * dockingdata鏍规嵁oid淇敼sendflag
- * @param oid
- * @param sendflag
- * @return
- */
- public boolean updateDockingDatasSendFlag(String oid,String sendflag){
- boolean u=false;
- String sql = "update PLATFORMBTM_codedockingdata set sendFlag = '"+sendflag+"' where oid='"+oid+"'";
- try {
- u=platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
- }catch (Exception e){
-
- }
- return u;
- }
-
- public boolean updateDockingDatasUniqueCode(String oid,String uniquecode){
- boolean u=false;
- String sql = "update PLATFORMBTM_codedockingdata set uniquecode = '"+uniquecode+"' where oid='"+oid+"'";
- try {
- u=platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
- }catch (Exception e){
-
- }
- return u;
- }
-
-
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
deleted file mode 100644
index 9cfa1ed..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ /dev/null
@@ -1,634 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.constant.MdmDuckingConstant;
-import com.vci.ubcs.code.mapper.CodeClassifyMapper;
-import com.vci.ubcs.code.mapper.DockingDataMapper;
-import com.vci.ubcs.code.mapper.DockingLogeMapper;
-import com.vci.ubcs.code.mapper.DockingTaskMapper;
-import com.vci.ubcs.code.dto.datapush.classify.JsonRootDataDTO;
-import com.vci.ubcs.code.dto.datapush.classify.NodeClassifyDTO;
-import com.vci.ubcs.code.dto.datapush.classify.NodeDataDTO;
-import com.vci.ubcs.code.dto.datapush.classify.NodeLibraryDTO;
-import com.vci.ubcs.code.dto.datapush.data.NodeJosnDTO;
-import com.vci.ubcs.code.dto.datapush.data.NodeObjectDTO;
-import com.vci.ubcs.code.dto.datapush.data.NodeProDTO;
-import com.vci.ubcs.code.dto.datapush.data.NodedataDTO;
-import com.vci.ubcs.code.dto.datapush.result.ResultJsonDTO;
-import com.vci.ubcs.code.dto.datapush.result.ResultNodeDataDTO;
-import com.vci.ubcs.code.dto.datapush.result.ResultNodeObjectDTO;
-import com.vci.ubcs.code.service.CodeDuckingSyncServiceI;
-import com.vci.ubcs.code.service.MdmEngineServiceI;
-import com.vci.ubcs.code.service.SysIntInfoServiceI;
-import com.vci.ubcs.code.utils.HttpUtils;
-import com.vci.ubcs.code.utils.WsErpClientUtil;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.enumpck.UserSecretEnum;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.*;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.redis.RedisService;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.PlatformClientUtil;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntInfoVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-/**
- * 涓婚搴撻泦鎴愭湇鍔�
- * @author wangyi
- * @date 2022-03-20
- */
-@Service
-public class CodeDuckingSyncServiceImpl implements CodeDuckingSyncServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 闆嗘垚鎺ㄩ�佷换鍔℃暟鎹搷浣滃眰
- */
- @Resource
- private DockingTaskMapper dockingTaskDaoI;
-
- /**
- * 闆嗘垚鎺ㄩ�佷换鍔℃暟鎹搷浣滃眰
- */
- @Resource
- private DockingDataMapper dockingDataDaoI;
-
- /**
- * 闆嗘垚鏃ュ織鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private DockingLogeMapper dockingLogeDaoI;
-
- /**
- * 妯℃澘灞炴�ф暟鎹搷浣滃眰
- */
- @Resource
- private CodeClassifyMapper codeClassifyDaoI;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- private WebBoServiceI boService;
-
- /**
- * 缂撳瓨鏈嶅姟
- */
- @Autowired
- private RedisService redisService;
-
- /**
- * 鏁版嵁鏈嶅姟
- */
- @Autowired(required = false)
- @Lazy
- private MdmEngineServiceI mdmEngineServiceI;
-
-
- /**
- * 瑕佹帹閫佺郴缁熺殑鏈嶅姟
- */
- @Autowired
- private SysIntInfoServiceI sysIntInfoServiceI;
-
- @Value("${dataSyncPush.dataParamName:xmlData}")
- public String DATA_PARAM_NAME;
-
- /**
- * 瀹氭椂浠诲姟鎺ㄩ��
- */
- @Override
- public void DockingDataSyncScheduing(){
- // insertCache2();
- initPushDataTaks(1);
- sendpushDataForService();
- }
-
- /**
- * 鍒嗙被瀹氭椂浠诲姟鎺ㄩ��
- */
- @Override
- public void DockingClassSyncScheduing(){
- initPushDataTaks(2);//鍒嗙被鎺ㄩ��
- sendpushClsfForService();
- }
-
- /**
- * 鎵嬪姩鎺ㄩ�佷负瀹屾垚鐨勬暟鎹�
- * @param oids
- * @return
- */
- @Override
- public BaseResult sendData(String oids) {
- VciBaseUtil.alertNotNull(oids,"绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁瀵硅薄",oids,"绯荤粺闆嗘垚鍩虹淇℃伅鐨勪富閿�");
- List<String> dockingTaskOidList=new ArrayList<>();
- dockingTaskOidList= VciBaseUtil.str2List(oids);
- List<DockingTaskDO> newDockingTaskDOs= this.dockingTaskDaoI.selectByPrimaryKeyCollection(dockingTaskOidList);
- Map<String,List<DockingTaskDO>> typeDockingTaskDOMap=new HashMap<>();
- newDockingTaskDOs.stream().forEach(newDockingTaskDO->{
- String btmId=newDockingTaskDO.getBtmid();
- if(btmId.equalsIgnoreCase(MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT))){
- List<DockingTaskDO> dockingTaskDOList= typeDockingTaskDOMap.get(MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
- if(CollectionUtils.isEmpty(dockingTaskDOList)){
- dockingTaskDOList=new ArrayList<>();
- }
- dockingTaskDOList.add(newDockingTaskDO);
- typeDockingTaskDOMap.put(MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT),dockingTaskDOList);
- }else{
- List<DockingTaskDO> dockingTaskDOList= typeDockingTaskDOMap.get("data");
- if(CollectionUtils.isEmpty(dockingTaskDOList)){
- dockingTaskDOList=new ArrayList<>();
- }
- dockingTaskDOList.add(newDockingTaskDO);
- typeDockingTaskDOMap.put("data",dockingTaskDOList);
- }
- });
- typeDockingTaskDOMap.keySet().forEach(type->{
- List<DockingTaskDO> DockingTaskDO=typeDockingTaskDOMap.get(type);
- if(!CollectionUtils.isEmpty(DockingTaskDO)){
- if(type.equalsIgnoreCase(MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT))){
- this.sendpushClsfForService(DockingTaskDO);
- }else{
- this.sendpushDataForService(DockingTaskDO);
- }
- }
- });
- return BaseResult.successMsg("鎵嬪姩鎺ㄩ�佸畬鎴�,璇锋牳瀵规槸鍚︽帹閫佹垚鍔�");
- }
- /***
- * 鏌ヨredis涓暟鎹紝瀵规瘮鍚庢彃鍏ockingtask
- * @param type
- */
- private void initPushDataTaks(int type){
- initSysadmin();
- //sysintinfo鏌ヨ瑕佹帹閫佺殑涓婚搴撳拰鐩稿叧绯荤粺淇℃伅
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("usedflag","true");
- conditionMap.put("pushType",type==2?"2":"1") ;//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫�
-
- List<SysIntInfoDO> sysIntInfoVOList = sysIntInfoServiceI.selectAll(conditionMap);
- if(CollectionUtils.isEmpty(sysIntInfoVOList)){
- String title=type==2?"鍒嗙被鎺ㄩ��":"鏁版嵁鎺ㄩ��";
- logger.info("info->鎵�鏈夐泦鎴愮郴缁燂紝鏈煡璇㈠埌鐩稿叧鐨勩��"+title+"銆戠殑鎺ュ彛閰嶇疆淇℃伅锛岄厤缃�");
- return;
- }
- Map<String ,List<SysIntInfoDO>> sysIntInfoDOMap = new HashMap<String ,List<SysIntInfoDO>>();//key=classifyoid,value=list<map>
- for (SysIntInfoDO sysIntInfoVOi:sysIntInfoVOList){
- List<SysIntInfoDO> SysIntInfoVOListi = sysIntInfoDOMap.get(sysIntInfoVOi.getClassifyoid());
- if(SysIntInfoVOListi==null){
- SysIntInfoVOListi = new ArrayList<SysIntInfoDO>();
- }
- SysIntInfoVOListi.add(sysIntInfoVOi);
- sysIntInfoDOMap.put(sysIntInfoVOi.getClassifyoid(),SysIntInfoVOListi);
- }
- //鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
- VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(DockingDataDO.class);
- queryWrapperForDO.addQueryMap("sendflag","false");
- if(type==2){
- queryWrapperForDO.addQueryMap("btmTypeId", MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
- }else {
- queryWrapperForDO.addQueryMap("btmTypeId", QueryOptionConstant.NOTIN + "(" + VciBaseUtil.toInSql(MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT)) + ")");
- }
- List<DockingDataDO> dataList = dockingDataDaoI.selectByWrapper(queryWrapperForDO);
-
- for (DockingDataDO mapi:dataList){
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = new BatchCBO();
- String dataoid = mapi.getOid();//data瀵硅薄鐨刼id
- String classifyoid = mapi.getClassifyoid();
- String id = mapi.getId();
- String uniquecode = mapi.getUniquecode();
- String btmid = mapi.getBtmid();
- String btmoid = mapi.getBtmoid();
- String sendtype = mapi.getSendtype();
- String classifyid = mapi.getClassifyid();
- String classifyname = mapi.getClassifyname();
- String curentClassOid=null;
- if(type==2){
- curentClassOid=btmoid;
- }else{
- curentClassOid=classifyoid;
- }
- List<SysIntInfoDO> effectiveSysIntInfoVOs=new ArrayList<>();
- //鏍规嵁褰撳墠鏁版嵁鐨刬d锛屾煡璇㈣幏鍙栧摢浜涚郴缁熼渶瑕佸仛闆嗘垚
- List<CodeClassifyDO> parentLeveDO= codeClassifyDaoI.selectAllLevelParentByOid(curentClassOid);
- if(CollectionUtils.isEmpty(parentLeveDO)){
- continue;//璇存槑杩欎釜鍒嗙被琚垹鎺変簡锛屼笉鍋氬鐞�
- }
- Map<String, CodeClassifyDO> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
-
- oidCodeclassifyDOMap.keySet().forEach(oid->{
- if(sysIntInfoDOMap.containsKey(oid)){
- List<SysIntInfoDO> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
- effectiveSysIntInfoVOs.addAll(sysIntInfoDOS);
- }
- });
- //濡傛灉鏍￠獙鐨勭郴缁熸帴鍙ｄ俊鎭笉瀛樺湪锛屽垯鏁版嵁涓嶄笉寰�淇℃伅閲屾帹閫�
- if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
- continue;
- }
- List<DockingTaskDO> dockingTaskDO_insert = new ArrayList<DockingTaskDO>();
- for (SysIntInfoDO sysIntInfoVOi:effectiveSysIntInfoVOs){
- DockingTaskDO dockingTaskDO = new DockingTaskDO();
- dockingTaskDO.setOid(redisService.getUUIDEveryDay());
- dockingTaskDO.setSendflag(MdmDuckingConstant.SEND_FLAG_FALSE);
- dockingTaskDO.setId(id);//缂栫爜
- dockingTaskDO.setUniquecode(uniquecode);
- dockingTaskDO.setBtmoid(btmoid);//鏁版嵁oid
- dockingTaskDO.setBtmid(btmid);//鏁版嵁涓氬姟绫诲瀷id
- dockingTaskDO.setClassifyid(classifyid);//鏁版嵁鍦ㄥ垎绫籭d
- dockingTaskDO.setClassifyoid(classifyoid);//鏁版嵁鎵�鍦ㄥ垎绫籵id
- dockingTaskDO.setClassifyname(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
- dockingTaskDO.setSendtype(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
- dockingTaskDO.setDataoid(dataoid);
-
- //intinfo
- dockingTaskDO.setSysinfooid(sysIntInfoVOi.getOid());//intinfo鐨刼id
- dockingTaskDO.setSystemoid(sysIntInfoVOi.getSysbaseoid());//绯荤粺oid
- dockingTaskDO.setSystemcode(sysIntInfoVOi.getSysbaseid());//绯荤粺缂栫爜
- dockingTaskDO.setSystemname(sysIntInfoVOi.getSysbasename());//绯荤粺name
- dockingTaskDO_insert.add(dockingTaskDO);
- }
-
- BatchCBO bi = null;
- if(dockingTaskDO_insert.size()!=0) {
- bi = dockingTaskDaoI.batchInsert(dockingTaskDO_insert);
- batchCBO.copyFromOther(bi);
- }
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- //dockingTaskDaoI.updateByPrimaryKey鏂规硶鎶ラ敊浜嗭紝鎵�浠ユ墜鍐欎簡杩欎釜
- boolean u = updateDockingDatasSendFlag(dataoid, MdmDuckingConstant.SEND_FLAG_TRUE);
- if(!u){
- logger.error("闆嗘垚data鍒嗚В浠诲姟澶辫触锛乨ataoid:"+dataoid);
- continue;
- }
-
- }
- }
- private void sendpushDataForService (){
- initSysadmin();
- //鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
- queryWrapper.addQueryMap("sendFlag", MdmDuckingConstant.SEND_FLAG_FALSE);
- queryWrapper.addQueryMap("btmId", QueryOptionConstant.NOTIN + "(" + VciBaseUtil.toInSql(MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.toUpperCase(Locale.ROOT)) + ")");
- List<DockingTaskDO> dockingTaskDOS = dockingTaskDaoI.selectByWrapper(queryWrapper);
- sendpushDataForService(dockingTaskDOS);
- }
- /***
- * 鍙戦�佺紪鐮佷富鏁版嵁
- */
- private void sendpushDataForService (List<DockingTaskDO> dockingTaskDOS){
-
- //姣忎釜task渚濇鎵ц鎺ㄩ��
- for (DockingTaskDO dockingTaskDO:dockingTaskDOS){
- //姣忎釜task涓�涓簨鍔★紝寮�鍚�
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = new BatchCBO();
- String paramString="";
- String sendString="";
- String backString="";
- try {
- //鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
- String systeminfooid = dockingTaskDO.getSysinfooid();//sysininfo 鐨刼id
- String classifyoid = dockingTaskDO.getClassifyoid();
- //鏌ヨ瑕佹帹閫佺殑鏁版嵁
- String btmoid = dockingTaskDO.getBtmoid();//鏁版嵁btmid
- //琛ㄧず鏄富鏁版嵁
- CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid);
- BaseResult<Map<String, String>> baseResult = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid());
- List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyTemplateVO.getAttributes();
- Map<String/**鑻辨枃鍚嶇О**/, String/**涓枃鍚嶇О**/> attrIdNameMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t.getName(), (o1, o2) -> o2));
- Map<String, String> data = new HashMap<>();
- if (baseResult == null) {
- JSONObject josni = redisService.getCacheObject(MdmDuckingConstant.DOCKING_CACHE2_DELETE + btmoid);
- data = (Map) josni;
- } else {
- data = baseResult.getObj();
- }
- List<NodeProDTO> nodeProDTOS = new ArrayList<>();
- Map<String, String> finalData = data;
- attrIdNameMap.keySet().forEach(field -> {
- String outName = attrIdNameMap.get(field);
- if (finalData.containsKey(field)) {
- String Value = finalData.get(field);
- NodeProDTO nodeProDTO = new NodeProDTO();
- nodeProDTO.setFiledName(field);
- nodeProDTO.setOutname(outName);
- nodeProDTO.setFiledValue(Value);
- nodeProDTOS.add(nodeProDTO);
- }
- });
-
- String[] classCodeLeves = dockingTaskDO.getClassifyid().split(",");
- NodeJosnDTO nodeJosnDTO = new NodeJosnDTO();
- NodedataDTO nodeDataDTO = new NodedataDTO();
- NodeObjectDTO nodeObjectDTO = new NodeObjectDTO();
- nodeObjectDTO.setCode(dockingTaskDO.getId());//璁剧疆缂栫爜
- nodeObjectDTO.setClassCode(classCodeLeves[0]);
- nodeObjectDTO.setStatus(data.get("lcstatus"));
- nodeObjectDTO.setLibrary(classCodeLeves[classCodeLeves.length - 1]);
- nodeObjectDTO.setPro(nodeProDTOS);
- List<NodeObjectDTO> nodeObjectDTOS = new ArrayList<>();
- nodeObjectDTOS.add(nodeObjectDTO);
- nodeDataDTO.setObject(nodeObjectDTOS);
- nodeJosnDTO.setData(nodeDataDTO);
- //鏌ヨ鎺ㄩ�佹帴鍙ｅ弬鏁�
- SysIntInfoVO sysIntInfoVO = sysIntInfoServiceI.getObjectByOid(systeminfooid);
- String paramType = sysIntInfoVO.getParamtype();//xml/json
- if (paramType.equals(MdmDuckingConstant.DATATYPE_JSON)) {
- Object object = JSONObject.toJSON(nodeJosnDTO);
- sendString = object.toString();
- } else {
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(NodedataDTO.class);
- xStream.autodetectAnnotations(true);
- sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
- }
- //璋冪敤鎺ュ彛
- callInterface(sendString,sysIntInfoVO, dockingTaskDO, batchCBO);
- }catch (Throwable e){
- e.printStackTrace();
- }finally {
- //姣忎竴涓猼ask涓�涓簨鐗�
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- }
- }
- }
- public void sendpushClsfForService(){
- initSysadmin();
- //鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
- queryWrapper.addQueryMap("sendFlag",MdmDuckingConstant.SEND_FLAG_FALSE);
- queryWrapper.addQueryMap("btmId", MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY.toUpperCase(Locale.ROOT));
- List<DockingTaskDO> dockingTaskDOS = dockingTaskDaoI.selectByWrapper(queryWrapper);
- sendpushClsfForService(dockingTaskDOS);
- }
- /***
- * 鍙戦�佸垎绫绘暟鎹�
- */
- private void sendpushClsfForService(List<DockingTaskDO> dockingTaskDOS){
- //姣忎釜task渚濇鎵ц鎺ㄩ��
- for (DockingTaskDO dockingTaskDO:dockingTaskDOS){
- //姣忎釜task涓�涓簨鍔★紝寮�鍚�
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = new BatchCBO();
- String paramString="";
- String sendString="";
- String backString="";
- //鏌ヨ绯荤粺鎺ュ彛淇℃伅,ip method,dataType
- String systeminfooid = dockingTaskDO.getSysinfooid();//sysininfo 鐨刼id
- try {
- //鏌ヨ瑕佹帹閫佺殑鏁版嵁
- String btmoid = dockingTaskDO.getBtmoid();//鏁版嵁btmid
- JsonRootDataDTO jsonRootDataDTO=new JsonRootDataDTO();
- CodeClassifyDO codeClassifyDO=codeClassifyDaoI.selectByPrimaryKey(btmoid);
- List<NodeClassifyDTO>nodeClassifyDTOList=new ArrayList<>();
- NodeClassifyDTO nodeClassifyDTO=new NodeClassifyDTO();
- nodeClassifyDTO.setClassCode(codeClassifyDO.getId());//鍒嗙被浠ｅ彿
- nodeClassifyDTO.setDescription(codeClassifyDO.getDescription());//鍒嗙被鎻忚堪
- nodeClassifyDTO.setFullPathName(codeClassifyDO.getPath());//鍏ㄨ矾寰�
- nodeClassifyDTO.setLcStatus(codeClassifyDO.getLcStatus());//鐘舵��
- // CodeClassifyDO parentClassDo=codeClassifyDaoI.selectByPrimaryKey(codeClassifyDO.getParentCodeClassifyOid());
- nodeClassifyDTO.setPid(codeClassifyDO.getId());//鐖秈d鑺傜偣
- nodeClassifyDTO.setId(codeClassifyDO.getOid());//鍒嗙被oid
- nodeClassifyDTO.setName(codeClassifyDO.getName());//鍒嗙被鍚嶇О
- nodeClassifyDTOList.add(nodeClassifyDTO);
- NodeLibraryDTO nodeLibraryDTO=new NodeLibraryDTO();
- nodeLibraryDTO.setClassify(nodeClassifyDTOList);
- CodeClassifyDO rootClassify=codeClassifyDaoI.getRootClassify(btmoid);
- nodeLibraryDTO.setId(rootClassify.getOid());
- nodeLibraryDTO.setName(rootClassify.getName());
- NodeDataDTO nodeDataDTO=new NodeDataDTO();
- nodeDataDTO.setLibrary(nodeLibraryDTO);
- jsonRootDataDTO.setData(nodeDataDTO);
-
- //鏌ヨ鎺ㄩ�佹帴鍙ｅ弬鏁�
- SysIntInfoVO sysIntInfoVO = sysIntInfoServiceI.getObjectByOid(systeminfooid);
- String paramType = sysIntInfoVO.getParamtype();//xml/json
- if(paramType.equals(MdmDuckingConstant.DATATYPE_JSON)){
- Object object = JSONObject.toJSON(jsonRootDataDTO);
- sendString = object.toString();
- }else{
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(NodeDataDTO.class);
- xStream.autodetectAnnotations(true);
- sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
- }
- //璋冪敤鎺ュ彛
- callInterface(sendString,sysIntInfoVO,dockingTaskDO,batchCBO);
- }catch (Throwable e){
- e.printStackTrace();
- }finally {
- //姣忎竴涓猼ask涓�涓簨鐗�
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- }
- }
- }
-
- /***
- * 璋冪敤鎺ュ彛
- * @param sysIntInfoVO
- * @throws Throwable
- */
- private void callInterface(String sendString , SysIntInfoVO sysIntInfoVO,DockingTaskDO dockingTaskDO,BatchCBO batchCBO) throws Throwable{
- String paramString = "";
-
- String backString = "";
- String msg="";
- String url = sysIntInfoVO.getRequesturl();//url
- List<ResultNodeObjectDTO> resultNodeObjectDTOS =new ArrayList<>();
- try {
-
- String type = sysIntInfoVO.getInterfacetype().toLowerCase(Locale.ROOT);//get/post/webserver/corba
- String paramType = sysIntInfoVO.getParamtype();//xml/json
- String returnType = sysIntInfoVO.getReturntype();//xml/json
- String requestmethod= sysIntInfoVO.getRequestmethod();
- String interfaceFunction = sysIntInfoVO.getInterfaceFunction();//涓昏鏄痺ebservice鐨勬柟娉曞悕
- String namespace = sysIntInfoVO.getNamespace();//namespace
- String soapaction = sysIntInfoVO.getSoapaction();//soapaction
- String targName = sysIntInfoVO.getTargName();//targName
- String cxfaxis = sysIntInfoVO.getCxfaxis();//webservice鏄痗xf/axis
- //鏌ヨparam
- List<SysIntParamDO> sysIntParamDOList = sysIntInfoServiceI.getParamsBySystemInfoOid(sysIntInfoVO.getOid());
- //鏌ヨheader
- List<SysIntHeaderDO> sysIntHeaderDOList = sysIntInfoServiceI.getHeadersBySystemInfoOid(sysIntInfoVO.getOid());
- if(type.equals(MdmDuckingConstant.URLTYPE_HTTP)) {
- if (requestmethod.equals(MdmDuckingConstant.URLTYPE_GET)) {//GET璇锋眰
- String sendurl = url + "?" + DATA_PARAM_NAME + "=" + sendString;
- //鎷兼帴param
- for (SysIntParamDO sysIntParamDO : sysIntParamDOList) {
- sendurl = sendurl + "&" + sysIntParamDO.getParamkey() + "=" + sysIntParamDO.getParamvalue();
- }
- paramString = sendurl;
- backString = HttpUtils.get(sendurl);
- } else if (requestmethod.equals(MdmDuckingConstant.URLTYPE_POST)) {//POST璇锋眰
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- for (SysIntParamDO sysIntParamDO : sysIntParamDOList) {
- params.add(sysIntParamDO.getParamkey(), sysIntParamDO.getParamvalue());
- }
- params.add(DATA_PARAM_NAME,sendString);
- paramString = params.toString();
- MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
- for (SysIntHeaderDO sysIntHeaderDO : sysIntHeaderDOList) {
- headers.add(sysIntHeaderDO.getHeaderkey(), sysIntHeaderDO.getHeaderalue());
- }
- backString = HttpUtils.post(url, params, headers);
- }
- if(backString.startsWith("\"")){
- backString=backString.substring(backString.indexOf("\"")+1);
- }
- if(backString.endsWith("\"")){
- backString=backString.substring(0,backString.lastIndexOf("\""));
- }
- if(backString.contains("\n")){
- String res="\n";
- backString= backString.replaceAll(res,"");
- }
- if(backString.contains("\\")){
- String res="\\\\\"";
- backString= backString.replaceAll(res,"\"").trim();
- }
- }else if (type.equals(MdmDuckingConstant.URLTYPE_WEBSERVICE)) {//webserver璇锋眰
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- for (SysIntParamDO sysIntParamDO : sysIntParamDOList) {
- params.add(sysIntParamDO.getParamkey(), sysIntParamDO.getParamvalue());
- }
- paramString = sendString;
- MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
- for (SysIntHeaderDO sysIntHeaderDO : sysIntHeaderDOList) {
- headers.add(sysIntHeaderDO.getHeaderkey(), sysIntHeaderDO.getHeaderalue());
- }
- backString = WsErpClientUtil.sendMsg(url, namespace, soapaction, interfaceFunction, targName, sendString, 10000);
-
- } else {//corba鎺ュ彛
- //paramString=sendString;
- // backString = jacorbClient.getBOFactoryService().sendCode(sendString);
- }
-
- ResultJsonDTO resultJsonDTO = new ResultJsonDTO();
- if(returnType.equals(MdmDuckingConstant.DATATYPE_JSON)){
- resultJsonDTO =JSONObject.toJavaObject(JSONObject.parseObject(backString), ResultJsonDTO.class);
- }else {
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(ResultNodeDataDTO.class);
- xStream.autodetectAnnotations(true);
- ResultNodeDataDTO resultNodeDataDTO = (ResultNodeDataDTO) xStream.fromXML(backString);
- resultJsonDTO.setData(resultNodeDataDTO);
- }
- ResultNodeDataDTO resultNodeDataDTO=resultJsonDTO.getData();
- resultNodeObjectDTOS=resultNodeDataDTO.getObject();
-
- }catch (Throwable e){
- msg="璋冪敤鎺ュ彛澶辫触:"+e;
- e.printStackTrace();
- // throw new Throwable("璋冪敤鎺ュ彛澶辫触:"+e);
- ResultNodeObjectDTO resultNodeObjectDTO=new ResultNodeObjectDTO();
- resultNodeObjectDTO.setErroid("1");
- resultNodeObjectDTO.setMsg(msg);
- resultNodeObjectDTO.setCode(sysIntInfoVO.getPushType().equalsIgnoreCase("2")?dockingTaskDO.getClassifyid():dockingTaskDO.getId());
- resultNodeObjectDTO.setOid(dockingTaskDO.getBtmoid());
- resultNodeObjectDTOS.add(resultNodeObjectDTO);
- }finally {
- boolean isSend = false;
- for (ResultNodeObjectDTO resultNodeObjectDTO:resultNodeObjectDTOS){
- String erroid = resultNodeObjectDTO.getErroid();
- msg = resultNodeObjectDTO.getMsg();
- if("0".equals(erroid)){
- isSend = true;
- }else if("1".equals(erroid)){
- isSend=false;
- }else{
- isSend=false;
- }
- DockingLogeDO dockingLogeDO = new DockingLogeDO();
- String oid=redisService.getUUIDEveryDay();
- dockingLogeDO.setOid(oid);
- dockingLogeDO.setSystemcode(dockingTaskDO.getSystemcode());
- dockingLogeDO.setSystemname(dockingTaskDO.getSystemname());
- dockingLogeDO.setSystemoid(dockingTaskDO.getSystemoid());
- dockingLogeDO.setClassifyoid(dockingTaskDO.getClassifyoid());
- dockingLogeDO.setClassifyid(dockingTaskDO.getClassifyid());
- dockingLogeDO.setClassifyname(dockingTaskDO.getClassifyname());
- dockingLogeDO.setId(dockingTaskDO.getId());
- dockingLogeDO.setUniquecode(dockingTaskDO.getUniquecode());
- dockingLogeDO.setParamstring(paramString);
- dockingLogeDO.setReturnstring(backString);
- dockingLogeDO.setInterfacestatus(isSend?"true":"false");
- dockingLogeDO.setType(MdmDuckingConstant.DATA_LOGE_OUT);
- dockingLogeDO.setMsg(msg);
- logger.error("闆嗘垚鎺ㄩ�佹暟鎹�,systemcode:"+dockingTaskDO.getSystemcode()+",systemname:"+dockingTaskDO.getSystemname()+",url:"+url+",param:"+paramString+",e:"+msg);
- BatchCBO dockingLogeDOBo = dockingLogeDaoI.insert(dockingLogeDO);
- batchCBO.copyFromOther(dockingLogeDOBo);
- }
- //鍏ㄩ兘鎺ユ敹鎴愬姛鐨勬儏鍐典笅,淇敼dockingtask sendflag涓哄凡鍙戦��
- if(isSend) {
- dockingTaskDO.setSendflag(MdmDuckingConstant.SEND_FLAG_TRUE);
- BatchCBO updateTask = dockingTaskDaoI.updateByPrimaryKey(dockingTaskDO);
- batchCBO.copyFromOther(updateTask);
- }
- }
- }
- public void initSysadmin(){
- SessionInfo sessionInfo = new SessionInfo();
- sessionInfo.setUserId("sysAdmin");
- sessionInfo.setUserName("绯荤粺绠＄悊鍛�");
- sessionInfo.setIp(WebUtil.getLocalIp());
- sessionInfo.setUserOid("193C026F-7DB8-27B4-F383-4E8BE083FB07");
- sessionInfo.setUserSecret(UserSecretEnum.PRIVACY.getValue()+"");
- WebUtil.setSessionInfo(sessionInfo);
- }
-
- @Autowired
- private PlatformClientUtil platformClientUtil;
- /**
- * dockingdata鏍规嵁oid淇敼sendflag
- * @param oid
- * @param sendflag
- * @return
- */
- public boolean updateDockingDatasSendFlag(String oid,String sendflag){
- boolean u=false;
- String sql = "update PLATFORMBTM_codedockingdata set sendFlag = '"+sendflag+"' where oid='"+oid+"'";
- try {
- u=platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
- }catch (Exception e){
-
- }
- return u;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
index 400c525..1bf6076 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeFixedValueServiceImpl.java
@@ -1,35 +1,10 @@
package com.vci.ubcs.code.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.CodeFixedValue;
import com.vci.ubcs.code.mapper.CodeFixedValueMapper;
-import com.vci.ubcs.code.entity.CodeFixedValueDO;
-import com.vci.ubcs.code.service.CodeFixedValueServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeFixedValueDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
+import com.vci.ubcs.code.service.ICodeFixedValueService;
import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
/**
* 鍥哄畾鐮佹鐨勭爜鍊兼湇鍔�
@@ -37,341 +12,8 @@
* @date 2022-01-24
*/
@Service
-public class CodeFixedValueServiceImpl implements CodeFixedValueServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeFixedValueMapper codeFixedValueMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑鍥哄畾鐮佹鐨勭爜鍊�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeFixedValueVO> gridCodeFixedValue(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultAsc("ordernum");
- if(conditionMap == null){
- conditionMap = new HashMap<>();
- }
- String secOid = conditionMap.getOrDefault("codefixedsecoid", "");
- if(StringUtils.isBlank(secOid)){
- return new DataGrid<>();
- }
- List<CodeFixedValueDO> doList = codeFixedValueMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeFixedValueVO> dataGrid=new DataGrid<CodeFixedValueVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeFixedValueDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeFixedValueMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeFixedValueDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeFixedValueVO> codeFixedValueDO2VOs(Collection<CodeFixedValueDO> codeFixedValueDOs) throws VciBaseException{
- List<CodeFixedValueVO> voList = new ArrayList<CodeFixedValueVO>();
- if(!CollectionUtils.isEmpty(codeFixedValueDOs)){
- for(CodeFixedValueDO s: codeFixedValueDOs){
- CodeFixedValueVO vo = codeFixedValueDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeFixedValueDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeFixedValueVO codeFixedValueDO2VO(CodeFixedValueDO codeFixedValueDO) throws VciBaseException{
- CodeFixedValueVO vo = new CodeFixedValueVO();
- if(codeFixedValueDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞鍥哄畾鐮佹鐨勭爜鍊�
- * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeFixedValueVO addSave(CodeFixedValueDTO codeFixedValueDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeFixedValueDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeFixedValueDO codeFixedValueDO = new CodeFixedValueDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueDTO,codeFixedValueDO);
- codeFixedValueMapper.insert(codeFixedValueDO);
- return codeFixedValueDO2VO(codeFixedValueDO);
- }
-
- /**
- * 淇敼鍥哄畾鐮佹鐨勭爜鍊�
- * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeFixedValueVO editSave(CodeFixedValueDTO codeFixedValueDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeFixedValueDTO,"鏁版嵁瀵硅薄",codeFixedValueDTO.getOid(),"鍥哄畾鐮佹鐨勭爜鍊间富閿�");
- //灏咲TO杞崲涓篋O
- CodeFixedValueDO codeFixedValueDO = selectByOid(codeFixedValueDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeFixedValueDTO,codeFixedValueDO);
- codeFixedValueMapper.updateByPrimaryKey(codeFixedValueDO);
- return codeFixedValueDO2VO(codeFixedValueDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeFixedValueDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeFixedValueDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeFixedValueDTO codeFixedValueDTO, CodeFixedValueDO codeFixedValueDO) {
- //boService.checkTs(codeFixedValueDTO);
- if(!checkIsLinked(codeFixedValueDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎鍥哄畾鐮佹鐨勭爜鍊�
- * @param codeFixedValueDTO 鍥哄畾鐮佹鐨勭爜鍊兼暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeFixedValue(CodeFixedValueDTO codeFixedValueDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeFixedValueDTO,"鍥哄畾鐮佹鐨勭爜鍊兼暟鎹璞�",codeFixedValueDTO.getOid(),"鍥哄畾鐮佹鐨勭爜鍊肩殑涓婚敭");
- CodeFixedValueDO codeFixedValueDO = selectByOid(codeFixedValueDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeFixedValueDTO,codeFixedValueDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeFixedValueMapper.deleteByPrimaryKey(codeFixedValueDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇鍥哄畾鐮佹鐨勭爜鍊�
- * @param oid 涓婚敭
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeFixedValueVO getObjectByOid(String oid) throws VciBaseException{
- return codeFixedValueDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeFixedValueDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeFixedValueDO codeFixedValueDO = codeFixedValueMapper.selectByPrimaryKey(oid.trim());
- if(codeFixedValueDO == null || StringUtils.isBlank(codeFixedValueDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeFixedValueDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍥哄畾鐮佹鐨勭爜鍊�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeFixedValueVO> listCodeFixedValueByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeFixedValueDO> codeFixedValueDOList = listCodeFixedValueDOByOidCollections(oidCollections);
- return codeFixedValueDO2VOs(codeFixedValueDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeFixedValueDO> listCodeFixedValueDOByOidCollections(Collection<String> oidCollections){
- List<CodeFixedValueDO> codeFixedValueDOList = new ArrayList<CodeFixedValueDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeFixedValueDO> tempDOList = codeFixedValueMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeFixedValueDOList.addAll(tempDOList);
- }
- }
- }
- return codeFixedValueDOList;
- }
+public class CodeFixedValueServiceImpl extends ServiceImpl<CodeFixedValueMapper, CodeFixedValue> implements ICodeFixedValueService {
- /**
- * 鍙傜収鍥哄畾鐮佹鐨勭爜鍊煎垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鍥哄畾鐮佹鐨勭爜鍊兼樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeFixedValueVO> refDataGridCodeFixedValue(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeFixedValue(conditionMap,pageHelper);
- }
-
- /**
- * 浣跨敤鐮佹鐨勪富閿幏鍙栧浐瀹氱爜鐨勭爜鍊�
- *
- * @param secOidCollection 鐮佹鐨勪富閿�
- * @return 鐮佸�兼樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鐨勬椂鍊欏嚭鐜颁簡閿欒浼氭姏鍑哄紓甯�
- */
- @Override
- public Map<String, List<CodeFixedValueVO>> listCodeFixedValueBySecOids(Collection<String> secOidCollection) throws VciBaseException {
- if(CollectionUtils.isEmpty(secOidCollection)){
- return new HashMap<>();
- }
- List<CodeFixedValueVO> voList = new ArrayList<>();
- VciBaseUtil.switchCollectionForOracleIn(secOidCollection).forEach(secOids->{
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codefixedsecoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(secOids.toArray(new String[0])) + ")");
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultAsc("ordernum");
- List<CodeFixedValueDO> valueDOS = codeFixedValueMapper.selectByCondition(conditionMap, pageHelper);
- voList.addAll(codeFixedValueDO2VOs(Optional.ofNullable(valueDOS).orElseGet(() -> new ArrayList<>())));
- });
- return voList.stream().collect(Collectors.groupingBy(CodeFixedValueVO::getCodefixedsecoid));
- }
-
- /**
- * 鎵归噺娣诲姞鍥哄畾鐮佹鐨勭爜鍊硷紝濡傛灉淇濆瓨鐨勯泦鍚堜腑涓嶅瓨鍦ㄥ凡鍦ㄦ暟鎹簱涓殑鐮佸�煎垯鍒犻櫎銆備富瑕佹槸淇濆瓨鐮佸�肩殑搴忓彿
- * @param dtoList 鍥哄畾鐮佹鐨勭爜鍊煎垪琛�
- * @param codefixedsecoid 鍥哄畾鐮佹鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult<CodeFixedValueVO> batchSave4Order(List<CodeFixedValueDTO> dtoList, String codefixedsecoid) {
- VciBaseUtil.alertNotNull(codefixedsecoid,"鍥哄畾鐮佹涓婚敭");
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codefixedsecoid",codefixedsecoid);
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap,CodeFixedValueDO.class);
- List<CodeFixedValueDO> doList = codeFixedValueMapper.selectByWrapper(wrapper);
- List<CodeFixedValueDO> updateList = new ArrayList<>();
- List<String> deleteOidList = new ArrayList<>();
- dtoList.forEach(dto -> {
- if (StringUtils.isNotBlank(dto.getOid())){
- List<CodeFixedValueDO> valueDOList = doList.stream().filter(value -> {
- return value.getOid().equals(dto.getOid());
- }).collect(Collectors.toList());
- valueDOList.forEach(valueDO -> {
- valueDO.setId(dto.getId());
- valueDO.setName(dto.getName());
- valueDO.setOrderNum(dto.getOrdernum());
- updateList.add(valueDO);
- });
- }else{
- throw new VciBaseException("鍥哄畾鐮佹涓婚敭涓嶈兘涓虹┖");
- }
- });
- if (doList.size() != dtoList.size()){
- List<String> oidList = dtoList.stream().map(CodeFixedValueDTO::getOid).collect(Collectors.toList());
- List<CodeFixedValueDO> deleteList = new ArrayList<>();
- for (CodeFixedValueDO value : doList) {
- if (!oidList.contains(value.getOid())){
- deleteList.add(value);
- }
- }
- deleteOidList = deleteList.stream().map(CodeFixedValueDO::getOid).collect(Collectors.toList());
- }
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = codeFixedValueMapper.batchUpdate(updateList);
- if (!CollectionUtils.isEmpty(deleteOidList)) {
- BatchCBO batchDeleteByOids = codeFixedValueMapper.batchDeleteByOids(deleteOidList);
- batchCBO.setDeleteCbos(batchDeleteByOids.getDeleteCbos());
- }
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- return BaseResult.success();
- }
-
- /**
- * 鏍规嵁鐮佹涓婚敭鍒犻櫎鍏跺瓨鍦ㄧ殑鐮佸�煎璞�
- * @param codefixedsecoid 鍥哄畾鐮佹鐨勪富閿�
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult<CodeFixedValueVO> batchDeleteBySecOid(String codefixedsecoid) {
- VciBaseUtil.alertNotNull(codefixedsecoid,"鍥哄畾鐮佹涓婚敭");
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codefixedvalueoid",codefixedsecoid);
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap,CodeFixedValueDO.class);
- List<CodeFixedValueDO> doList = codeFixedValueMapper.selectByWrapper(wrapper);
- codeFixedValueMapper.batchDeleteByOids(doList.stream().map(CodeFixedValueDO::getOid).collect(Collectors.toList()));
- return BaseResult.success();
- }
}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatRuleServiceImpl.java
deleted file mode 100644
index 2b42eba..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeKeyAttrRepeatRuleServiceImpl.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.vci.ubcs.code.mapper.CodeKeyAttrRepeatRuleMapper;
-import com.vci.ubcs.code.entity.CodeKeyAttrRepeatRuleDO;
-import com.vci.ubcs.code.service.CodeKeyAttrRepeatRuleServiceI;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtil;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.dto.CodeKeyAttrRepeatRuleDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-/**
- * 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏈嶅姟
- * @author weidy
- * @date 2022-01-24
- */
-@Service
-public class CodeKeyAttrRepeatRuleServiceImpl implements CodeKeyAttrRepeatRuleServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeKeyAttrRepeatRuleMapper codeKeyAttrRepeatRuleMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeKeyAttrRepeatRuleVO> gridCodeKeyAttrRepeatRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodeKeyAttrRepeatRuleDO> doList = codeKeyAttrRepeatRuleMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeKeyAttrRepeatRuleVO> dataGrid=new DataGrid<CodeKeyAttrRepeatRuleVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeKeyAttrRepeatRuleDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeKeyAttrRepeatRuleMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeKeyAttrRepeatRuleDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeKeyAttrRepeatRuleVO> codeKeyAttrRepeatRuleDO2VOs(Collection<CodeKeyAttrRepeatRuleDO> codeKeyAttrRepeatRuleDOs) throws VciBaseException{
- List<CodeKeyAttrRepeatRuleVO> voList = new ArrayList<CodeKeyAttrRepeatRuleVO>();
- if(!CollectionUtils.isEmpty(codeKeyAttrRepeatRuleDOs)){
- for(CodeKeyAttrRepeatRuleDO s: codeKeyAttrRepeatRuleDOs){
- CodeKeyAttrRepeatRuleVO vo = codeKeyAttrRepeatRuleDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeKeyAttrRepeatRuleDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeKeyAttrRepeatRuleVO codeKeyAttrRepeatRuleDO2VO(CodeKeyAttrRepeatRuleDO codeKeyAttrRepeatRuleDO) throws VciBaseException{
- CodeKeyAttrRepeatRuleVO vo = new CodeKeyAttrRepeatRuleVO();
- if(codeKeyAttrRepeatRuleDO != null) {
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeKeyAttrRepeatRuleDO, vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setLcStatusText(FrameworkDataLCStatus.getTextByValue(vo.getLcStatus()));
- }
- return vo;
- }
-
- /**
- * 澧炲姞鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param codeKeyAttrRepeatRuleDTO 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeKeyAttrRepeatRuleVO addSave(CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeKeyAttrRepeatRuleDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeKeyAttrRepeatRuleDO codeKeyAttrRepeatRuleDO = new CodeKeyAttrRepeatRuleDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeKeyAttrRepeatRuleDTO,codeKeyAttrRepeatRuleDO);
- codeKeyAttrRepeatRuleMapper.insert(codeKeyAttrRepeatRuleDO);
- return codeKeyAttrRepeatRuleDO2VO(codeKeyAttrRepeatRuleDO);
- }
-
- /**
- * 淇敼鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param codeKeyAttrRepeatRuleDTO 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeKeyAttrRepeatRuleVO editSave(CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeKeyAttrRepeatRuleDTO,"鏁版嵁瀵硅薄",codeKeyAttrRepeatRuleDTO.getOid(),"鍏抽敭鏁版嵁鏌ラ噸瑙勫垯涓婚敭");
- //灏咲TO杞崲涓篋O
- CodeKeyAttrRepeatRuleDO codeKeyAttrRepeatRuleDO = selectByOid(codeKeyAttrRepeatRuleDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeKeyAttrRepeatRuleDTO,codeKeyAttrRepeatRuleDO);
- codeKeyAttrRepeatRuleMapper.updateByPrimaryKey(codeKeyAttrRepeatRuleDO);
- return codeKeyAttrRepeatRuleDO2VO(codeKeyAttrRepeatRuleDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeKeyAttrRepeatRuleDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeKeyAttrRepeatRuleDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO, CodeKeyAttrRepeatRuleDO codeKeyAttrRepeatRuleDO) {
- CodeKeyAttrRepeatRuleDO repeatRuleDO = new CodeKeyAttrRepeatRuleDO();
- BeanUtil.convert(codeKeyAttrRepeatRuleDTO,repeatRuleDO);
- boService.checkTs(repeatRuleDO);
- if(!checkIsLinked(codeKeyAttrRepeatRuleDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param codeKeyAttrRepeatRuleDTO 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeKeyAttrRepeatRule(CodeKeyAttrRepeatRuleDTO codeKeyAttrRepeatRuleDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeKeyAttrRepeatRuleDTO,"鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏁版嵁瀵硅薄",codeKeyAttrRepeatRuleDTO.getOid(),"鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鐨勪富閿�");
- CodeKeyAttrRepeatRuleDO codeKeyAttrRepeatRuleDO = selectByOid(codeKeyAttrRepeatRuleDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeKeyAttrRepeatRuleDTO,codeKeyAttrRepeatRuleDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeKeyAttrRepeatRuleMapper.deleteByPrimaryKey(codeKeyAttrRepeatRuleDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param oid 涓婚敭
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeKeyAttrRepeatRuleVO getObjectByOid(String oid) throws VciBaseException{
- return codeKeyAttrRepeatRuleDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeKeyAttrRepeatRuleDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeKeyAttrRepeatRuleDO codeKeyAttrRepeatRuleDO = codeKeyAttrRepeatRuleMapper.selectByPrimaryKey(oid.trim());
- if(codeKeyAttrRepeatRuleDO == null || StringUtils.isBlank(codeKeyAttrRepeatRuleDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeKeyAttrRepeatRuleDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeKeyAttrRepeatRuleVO> listCodeKeyAttrRepeatRuleByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeKeyAttrRepeatRuleDO> codeKeyAttrRepeatRuleDOList = listCodeKeyAttrRepeatRuleDOByOidCollections(oidCollections);
- return codeKeyAttrRepeatRuleDO2VOs(codeKeyAttrRepeatRuleDOList);
- }
-
- /**
- * 缂栧彿鎵归噺鑾峰彇鍏抽敭鏁版嵁鏌ラ噸瑙勫垯
- *
- * @param idCollections 缂栧彿闆嗗悎
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄
- */
- @Override
- public Collection<CodeKeyAttrRepeatRuleVO> listCodeKeyAttrRepeatRuleByIds(List<String> idCollections) {
- List<CodeKeyAttrRepeatRuleDO> codeKeyAttrRepeatRuleDOList = listCodeKeyAttrRepeatRuleDOByIdCollections(idCollections);
- return codeKeyAttrRepeatRuleDO2VOs(codeKeyAttrRepeatRuleDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param idCollections 缂栧彿鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeKeyAttrRepeatRuleDO> listCodeKeyAttrRepeatRuleDOByIdCollections(Collection<String> idCollections){
- List<CodeKeyAttrRepeatRuleDO> codeKeyAttrRepeatRuleDOList = new ArrayList<CodeKeyAttrRepeatRuleDO>();
- if(!CollectionUtils.isEmpty(idCollections)){
- Collection<Collection<String>> idCollectionsList = VciBaseUtil.switchCollectionForOracleIn(idCollections);
- for(Collection<String> ids: idCollectionsList){
- List<CodeKeyAttrRepeatRuleDO> tempDOList = codeKeyAttrRepeatRuleMapper.selectByIdCollection(ids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeKeyAttrRepeatRuleDOList.addAll(tempDOList);
- }
- }
- }
- return codeKeyAttrRepeatRuleDOList;
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeKeyAttrRepeatRuleDO> listCodeKeyAttrRepeatRuleDOByOidCollections(Collection<String> oidCollections){
- List<CodeKeyAttrRepeatRuleDO> codeKeyAttrRepeatRuleDOList = new ArrayList<CodeKeyAttrRepeatRuleDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeKeyAttrRepeatRuleDO> tempDOList = codeKeyAttrRepeatRuleMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeKeyAttrRepeatRuleDOList.addAll(tempDOList);
- }
- }
- }
- return codeKeyAttrRepeatRuleDOList;
- }
-
-
-
- /**
- * 鍙傜収鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鍏抽敭鏁版嵁鏌ラ噸瑙勫垯鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeKeyAttrRepeatRuleVO> refDataGridCodeKeyAttrRepeatRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeKeyAttrRepeatRule(conditionMap,pageHelper);
- }
-
- /**
- * 浣跨敤鍒嗙被鐨勫叏閮ㄤ俊鎭潵鑾峰彇鍏抽敭灞炴�у垽鏂鍒欑殑鍐呭
- *
- * @param classifyFullInfo 涓婚搴撳垎绫荤殑鍏ㄩ儴淇℃伅
- * @return 瑙勫垯鐨勬樉绀哄璞�
- */
- @Override
- public CodeKeyAttrRepeatRuleVO getRuleByClassifyFullInfo(CodeClassifyFullInfoBO classifyFullInfo) {
- VciBaseUtil.alertNotNull(classifyFullInfo,"涓婚搴撳垎绫荤殑淇℃伅");
- String keyAttrRuleOid = classifyFullInfo.getCurrentClassifyVO().getCodekeyattrrepeatoid();
- if(StringUtils.isBlank(keyAttrRuleOid)){
- //鎴戜滑鏍规嵁涓婄骇鐨勫垎绫伙紝鎸夌収灞傜骇鍊掑簭鎺掑垪
- if(!CollectionUtils.isEmpty(classifyFullInfo.getParentClassifyVOs())){
- //鏈変笂绾у垎绫荤殑鎯呭喌涓嬫墠鍘绘煡璇�
- List<CodeClassifyVO> sortedClassifyVO = classifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).collect(Collectors.toList());
- for(int i = sortedClassifyVO.size() -1;i>=0;i--){
- CodeClassifyVO record = sortedClassifyVO.get(i);
- if(StringUtils.isNotBlank(record.getCodekeyattrrepeatoid())){
- keyAttrRuleOid = record.getCodekeyattrrepeatoid();
- break;
- }
- }
- }
- }
- if(StringUtils.isNotBlank(keyAttrRuleOid)){
- return getObjectByOid(keyAttrRuleOid);
- }
- //鍏抽敭灞炴�х殑瑙勫垯鍙互涓虹┖锛屼负绌虹殑鏃跺�欏氨浠ｈ〃涓嶆帶鍒讹紝
- return null;
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseAttrServiceImpl.java
deleted file mode 100644
index ce27060..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodePhaseAttrServiceImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
-import com.vci.ubcs.code.entity.CodePhaseAttrDO;
-import com.vci.ubcs.code.service.CodePhaseAttrServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtil;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodePhaseAttrDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodePhaseAttrVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-/**
- * 闃舵鐨勫睘鎬ф湇鍔�
- * @author weidy
- * @date 2022-01-24
- */
-@Service
-public class CodePhaseAttrServiceImpl implements CodePhaseAttrServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodePhaseAttrMapper codePhaseAttrMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑闃舵鐨勫睘鎬�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodePhaseAttrVO> gridCodePhaseAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodePhaseAttrDO> doList = codePhaseAttrMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodePhaseAttrVO> dataGrid=new DataGrid<CodePhaseAttrVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codePhaseAttrDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codePhaseAttrMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codePhaseAttrDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodePhaseAttrVO> codePhaseAttrDO2VOs(Collection<CodePhaseAttrDO> codePhaseAttrDOs) throws VciBaseException{
- List<CodePhaseAttrVO> voList = new ArrayList<CodePhaseAttrVO>();
- if(!CollectionUtils.isEmpty(codePhaseAttrDOs)){
- for(CodePhaseAttrDO s: codePhaseAttrDOs){
- CodePhaseAttrVO vo = codePhaseAttrDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codePhaseAttrDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodePhaseAttrVO codePhaseAttrDO2VO(CodePhaseAttrDO codePhaseAttrDO) throws VciBaseException{
- CodePhaseAttrVO vo = new CodePhaseAttrVO();
- if(codePhaseAttrDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codePhaseAttrDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- }
- return vo;
- }
-
- /**
- * 澧炲姞闃舵鐨勫睘鎬�
- * @param codePhaseAttrDTO 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodePhaseAttrVO addSave(CodePhaseAttrDTO codePhaseAttrDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codePhaseAttrDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodePhaseAttrDO codePhaseAttrDO = new CodePhaseAttrDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codePhaseAttrDTO,codePhaseAttrDO);
- codePhaseAttrMapper.insert(codePhaseAttrDO);
- return codePhaseAttrDO2VO(codePhaseAttrDO);
- }
-
- /**
- * 淇敼闃舵鐨勫睘鎬�
- * @param codePhaseAttrDTO 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodePhaseAttrVO editSave(CodePhaseAttrDTO codePhaseAttrDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codePhaseAttrDTO,"鏁版嵁瀵硅薄",codePhaseAttrDTO.getOid(),"闃舵鐨勫睘鎬т富閿�");
- //灏咲TO杞崲涓篋O
- CodePhaseAttrDO codePhaseAttrDO = selectByOid(codePhaseAttrDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codePhaseAttrDTO,codePhaseAttrDO);
- codePhaseAttrMapper.updateByPrimaryKey(codePhaseAttrDO);
- return codePhaseAttrDO2VO(codePhaseAttrDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codePhaseAttrDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codePhaseAttrDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodePhaseAttrDTO codePhaseAttrDTO, CodePhaseAttrDO codePhaseAttrDO) {
- CodePhaseAttrDO tsDO = new CodePhaseAttrDO();
- BeanUtil.convert(codePhaseAttrDTO,tsDO);
- boService.checkTs(tsDO);
- if(!checkIsLinked(codePhaseAttrDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎闃舵鐨勫睘鎬�
- * @param codePhaseAttrDTO 闃舵鐨勫睘鎬ф暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodePhaseAttr(CodePhaseAttrDTO codePhaseAttrDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codePhaseAttrDTO,"闃舵鐨勫睘鎬ф暟鎹璞�",codePhaseAttrDTO.getOid(),"闃舵鐨勫睘鎬х殑涓婚敭");
- CodePhaseAttrDO codePhaseAttrDO = selectByOid(codePhaseAttrDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codePhaseAttrDTO,codePhaseAttrDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codePhaseAttrMapper.deleteByPrimaryKey(codePhaseAttrDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇闃舵鐨勫睘鎬�
- * @param oid 涓婚敭
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodePhaseAttrVO getObjectByOid(String oid) throws VciBaseException{
- return codePhaseAttrDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodePhaseAttrDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodePhaseAttrDO codePhaseAttrDO = codePhaseAttrMapper.selectByPrimaryKey(oid.trim());
- if(codePhaseAttrDO == null || StringUtils.isBlank(codePhaseAttrDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codePhaseAttrDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇闃舵鐨勫睘鎬�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodePhaseAttrVO> listCodePhaseAttrByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodePhaseAttrDO> codePhaseAttrDOList = listCodePhaseAttrDOByOidCollections(oidCollections);
- return codePhaseAttrDO2VOs(codePhaseAttrDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodePhaseAttrDO> listCodePhaseAttrDOByOidCollections(Collection<String> oidCollections){
- List<CodePhaseAttrDO> codePhaseAttrDOList = new ArrayList<CodePhaseAttrDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodePhaseAttrDO> tempDOList = codePhaseAttrMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codePhaseAttrDOList.addAll(tempDOList);
- }
- }
- }
- return codePhaseAttrDOList;
- }
-
-
-
- /**
- * 鍙傜収闃舵鐨勫睘鎬у垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 闃舵鐨勫睘鎬ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodePhaseAttrVO> refDataGridCodePhaseAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodePhaseAttr(conditionMap,pageHelper);
- }
-
- /**
- * 浣跨敤妯℃澘涓婚敭鍜岄樁娈电紪鍙疯幏鍙栧寘鍚殑灞炴��
- *
- * @param templateOid 妯℃澘鐨勭紪鍙�
- * @param phaseId 闃舵鐨勭紪鍙�
- * @return 灞炴�х殑鑻辨枃鍚嶇О
- */
- @Override
- public List<String> listAttrByTemplateOidAndPhaseId(String templateOid, String phaseId) {
- if(StringUtils.isBlank(templateOid)|| StringUtils.isBlank(phaseId)){
- return new ArrayList<>();
- }
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codephaseoid", QueryOptionConstant.IN + "(select oid from "+
- VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_TEMPLATE_PHASE) +
- " where codeClassifyTemplateOid ='" + templateOid + "' and lower(name) ='" + phaseId.trim().toLowerCase(Locale.ROOT) + "')");
- PageHelper pageHelper = new PageHelper(-1);
- List<CodePhaseAttrDO> attrDOS = codePhaseAttrMapper.selectByCondition(conditionMap, pageHelper);
- return CollectionUtils.isEmpty(attrDOS)?new ArrayList<>():attrDOS.stream().map(CodePhaseAttrDO::getId).collect(Collectors.toList());
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java
deleted file mode 100644
index bb6ddd0..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeResembleRuleServiceImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.vci.ubcs.code.mapper.CodeResembleRuleMapper;
-import com.vci.ubcs.code.entity.CodeResembleRuleDO;
-import com.vci.ubcs.code.service.CodeResembleRuleServiceI;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeResembleRuleDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeResembleRuleVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-/**
- * 鐩镐技鏌ヨ瑙勫垯鏈嶅姟
- * @author weidy
- * @date 2022-04-10
- */
-@Service
-public class CodeResembleRuleServiceImpl implements CodeResembleRuleServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeResembleRuleMapper codeResembleRuleMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑鐩镐技鏌ヨ瑙勫垯
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeResembleRuleVO> gridCodeResembleRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodeResembleRuleDO> doList = codeResembleRuleMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeResembleRuleVO> dataGrid=new DataGrid<CodeResembleRuleVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeResembleRuleDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeResembleRuleMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeResembleRuleDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeResembleRuleVO> codeResembleRuleDO2VOs(Collection<CodeResembleRuleDO> codeResembleRuleDOs) throws VciBaseException{
- List<CodeResembleRuleVO> voList = new ArrayList<CodeResembleRuleVO>();
- if(!CollectionUtils.isEmpty(codeResembleRuleDOs)){
- for(CodeResembleRuleDO s: codeResembleRuleDOs){
- CodeResembleRuleVO vo = codeResembleRuleDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeResembleRuleDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeResembleRuleVO codeResembleRuleDO2VO(CodeResembleRuleDO codeResembleRuleDO) throws VciBaseException{
- CodeResembleRuleVO vo = new CodeResembleRuleVO();
- if(codeResembleRuleDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeResembleRuleDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setLcStatusText(FrameworkDataLCStatus.getTextByValue(vo.getLcStatus()));
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeResembleRuleVO addSave(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeResembleRuleDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeResembleRuleDO codeResembleRuleDO = new CodeResembleRuleDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeResembleRuleDTO,codeResembleRuleDO);
- codeResembleRuleMapper.insert(codeResembleRuleDO);
- return codeResembleRuleDO2VO(codeResembleRuleDO);
- }
-
- /**
- * 淇敼鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeResembleRuleVO editSave(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeResembleRuleDTO,"鏁版嵁瀵硅薄",codeResembleRuleDTO.getOid(),"鐩镐技鏌ヨ瑙勫垯涓婚敭");
- //灏咲TO杞崲涓篋O
- CodeResembleRuleDO codeResembleRuleDO = selectByOid(codeResembleRuleDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeResembleRuleDTO,codeResembleRuleDO);
- codeResembleRuleMapper.updateByPrimaryKey(codeResembleRuleDO);
- return codeResembleRuleDO2VO(codeResembleRuleDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeResembleRuleDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeResembleRuleDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeResembleRuleDTO codeResembleRuleDTO, CodeResembleRuleDO codeResembleRuleDO) {
- CodeResembleRuleDO tsDO = new CodeResembleRuleDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeResembleRuleDTO,tsDO);
- boService.checkTs(tsDO);
- if(!checkIsLinked(codeResembleRuleDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎鐩镐技鏌ヨ瑙勫垯
- * @param codeResembleRuleDTO 鐩镐技鏌ヨ瑙勫垯鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeResembleRule(CodeResembleRuleDTO codeResembleRuleDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeResembleRuleDTO,"鐩镐技鏌ヨ瑙勫垯鏁版嵁瀵硅薄",codeResembleRuleDTO.getOid(),"鐩镐技鏌ヨ瑙勫垯鐨勪富閿�");
- CodeResembleRuleDO codeResembleRuleDO = selectByOid(codeResembleRuleDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeResembleRuleDTO,codeResembleRuleDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeResembleRuleMapper.deleteByPrimaryKey(codeResembleRuleDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇鐩镐技鏌ヨ瑙勫垯
- * @param oid 涓婚敭
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeResembleRuleVO getObjectByOid(String oid) throws VciBaseException{
- return codeResembleRuleDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeResembleRuleDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeResembleRuleDO codeResembleRuleDO = codeResembleRuleMapper.selectByPrimaryKey(oid.trim());
- if(codeResembleRuleDO == null || StringUtils.isBlank(codeResembleRuleDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeResembleRuleDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鐩镐技鏌ヨ瑙勫垯
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeResembleRuleVO> listCodeResembleRuleByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeResembleRuleDO> codeResembleRuleDOList = listCodeResembleRuleDOByOidCollections(oidCollections);
- return codeResembleRuleDO2VOs(codeResembleRuleDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeResembleRuleDO> listCodeResembleRuleDOByOidCollections(Collection<String> oidCollections){
- List<CodeResembleRuleDO> codeResembleRuleDOList = new ArrayList<CodeResembleRuleDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeResembleRuleDO> tempDOList = codeResembleRuleMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeResembleRuleDOList.addAll(tempDOList);
- }
- }
- }
- return codeResembleRuleDOList;
- }
-
-
-
- /**
- * 鍙傜収鐩镐技鏌ヨ瑙勫垯鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鐩镐技鏌ヨ瑙勫垯鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeResembleRuleVO> refDataGridCodeResembleRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeResembleRule(conditionMap,pageHelper);
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 0a10361..90c590b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -1,686 +1,242 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
package com.vci.ubcs.code.service.impl;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.mapper.CodeBasicSecMapper;
-import com.vci.ubcs.code.mapper.CodeRuleMapper;
-import com.vci.ubcs.code.lifecycle.CodeRuleLC;
-import com.vci.ubcs.code.entity.CodeAllCodeDO;
-import com.vci.ubcs.code.entity.CodeBasicSecDO;
-import com.vci.ubcs.code.entity.CodeClassifyDO;
-import com.vci.ubcs.code.entity.CodeRuleDO;
-import com.vci.ubcs.code.service.CodeBasicSecServiceI;
-import com.vci.ubcs.code.service.CodeClassifyServiceI;
-import com.vci.ubcs.code.service.CodeRuleServiceI;
-import com.vci.corba.common.VCIError;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.KeyValue;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeBasicSecDTO;
+import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.dto.CodeRuleDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
+import com.vci.ubcs.code.entity.CodeAllcode;
+import com.vci.ubcs.code.entity.CodeClassify;
+import com.vci.ubcs.code.entity.CodeRule;
+import com.vci.ubcs.code.lifecycle.CodeRuleLC;
+import com.vci.ubcs.code.mapper.CodeRuleMapper;
+import com.vci.ubcs.code.service.ICodeAllcodeService;
+import com.vci.ubcs.code.service.ICodeBasicSecService;
+import com.vci.ubcs.code.service.ICodeClassifyService;
+import com.vci.ubcs.code.service.ICodeRuleService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
+import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
+import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
+import com.vci.ubcs.com.vci.starter.exception.VciBaseException;
+import com.vci.ubcs.com.vci.starter.revision.service.RevisionModelUtil;
+import com.vci.ubcs.com.vci.starter.web.util.VciBaseUtil;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientBusinessObjectOperation;
import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.*;
+import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.FRAMEWORK_RELEASE_EDITING;
+import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.DATA_OID_NOT_EXIST;
+import static com.vci.ubcs.code.constant.MdmLifeCycleConstant.CODE_RULE_LC;
/**
- * 涓绘暟鎹紪鐮佽鍒欐湇鍔�
+ * 缂栫爜瑙勫垯 鏈嶅姟瀹炵幇绫�
*
- * @author weidy
- * @date 2022-01-24
+ * @author ludc
+ * @since 2023-04-03
*/
@Service
-public class CodeRuleServiceImpl implements CodeRuleServiceI {
+public class CodeRuleServiceImpl extends ServiceImpl<CodeRuleMapper, CodeRule> implements ICodeRuleService {
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
+ /**
+ * 鏁版嵁鎿嶄綔灞�
+ */
+ @Resource
+ private CodeRuleMapper codeRuleMapper;
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeRuleMapper codeRuleMapper;
+ @Resource
+ private ICodeClassifyService codeClassifyServcie;
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
+ @Resource
+ private ICodeAllcodeService codeAllcodeService;
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
+ @Resource
+ private ICodeBasicSecService codeBasicSecService;
- /**
- * 涓婚搴撳垎绫绘暟鎹搷浣滃眰
- */
- @Autowired
- private CodeClassifyServiceI codeClassifyService;
+ /**
+ * 瀵硅薄鐨勬搷浣�
+ */
+ @Resource
+ private RevisionModelUtil revisionModelUtil;
- /**
- * 鐮佹鍩虹淇℃伅鏈嶅姟
- */
- @Autowired
- private CodeBasicSecServiceI codeBasicSecService;
+ @Override
+ public IPage<CodeRuleVO> selectPlCodeRulePage(IPage<CodeRuleVO> page, CodeRuleVO codeRule) {
+ //瀵圭敓鍛藉懆鏈熺殑鏋氫妇杩涜杞崲
+ if(!StringUtils.isEmpty(codeRule.getLcStatusText())){
+ codeRule.setLcStatus(CodeRuleLC.getValueByText(codeRule.getLcStatusText()));
+ }
+ List<CodeRule> codeRulePage = codeRuleMapper.selectCodeRulePage(page, codeRule);
+ //do杞瑅o鍚屾椂setLcStatusText鐢熷懡鍛ㄦ湡鍊硷紝骞跺寘瑁呮垚鍒嗛〉瀵硅薄杩斿洖
+ return page.setRecords(CodeRuleWrapper.build().listVO(codeRulePage));
+ }
- /**
- * 鐮佹鍩虹淇℃伅鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeBasicSecMapper codeBasicSecMapper;
+ /**
+ * 澧炲姞涓绘暟鎹紪鐮佽鍒�
+ *
+ * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉
+ * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
+ */
+ @Override
+ public Boolean addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException{
+ VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
+ //灏咲TO杞崲涓篋O
+ CodeRule codeRule = Objects.requireNonNull(BeanUtil.copy(codeRuleDTO, CodeRule.class));
+ String userId = AuthUtil.getUserId().toString();
+ codeRule.setOid(VciBaseUtil.getPk());
+ codeRule.setRevisionOid(VciBaseUtil.getPk());
+ codeRule.setNameOid(VciBaseUtil.getPk());
+ codeRule.setBtmname("coderule");
+ codeRule.setLastR("1");
+ codeRule.setLastV("1");
+ codeRule.setFirstR("1");
+ codeRule.setFirstV("1");
+ codeRule.setCreator(userId);
+ codeRule.setCreateTime(new Date());
+ codeRule.setLastModifier("1");
+ codeRule.setLastModifyTime(new Date());
+ codeRule.setVersionRule("0");
+ codeRule.setVersionSeq(1);
+ codeRule.setLctid(CODE_RULE_LC);
+ codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
+ codeRule.setOwner("1");
+ codeRule.setCreator(userId);
+ codeRule.setLastModifier(userId);
+ return codeRuleMapper.insert(codeRule)>0;
+ }
+ /**
+ * 鏍￠獙缂栫爜瑙勫垯鐨勭姸鎬佹槸鍚﹀彲浠ョ紪杈戞垨鍒犻櫎
+ *
+ * @param lcStatus 缂栫爜瑙勫垯
+ * @return true琛ㄧず鍙互缂栬緫鎴栧垹闄わ紝false琛ㄧず涓嶅彲浠�
+ */
+ @Override
+ public boolean checkEditDelStatus(String lcStatus) {
+ if (CodeRuleLC.RELEASED.getValue().equals(lcStatus) || CodeRuleLC.DISABLED.getValue().equals(lcStatus)) {
+ return false;
+ }
+ return true;
+ }
- /**
- * 鏌ヨ鎵�鏈夌殑涓绘暟鎹紪鐮佽鍒�
- *
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeRuleVO> gridCodeRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodeRuleDO> doList = codeRuleMapper.selectByCondition(conditionMap, pageHelper);
- DataGrid<CodeRuleVO> dataGrid = new DataGrid<CodeRuleVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeRuleDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeRuleMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
+ /**
+ * 淇敼涓绘暟鎹紪鐮佽鍒�
+ *
+ * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
+ * @return 鎵ц缁撴灉
+ * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
+ */
+ @Override
+ public Boolean editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException{
+ VciBaseUtil.alertNotNull(codeRuleDTO, "鏁版嵁瀵硅薄", codeRuleDTO.getOid(), "涓绘暟鎹紪鐮佽鍒欎富閿�");
+ if (!checkEditDelStatus(codeRuleDTO.getLcStatus())) {
+ throw new VciBaseException("缂栫爜瑙勫垯宸插彂甯冿紝涓嶅厑璁哥紪杈戞垨鍒犻櫎");
+ }
+ //灏咲TO杞崲涓篋O
+ CodeRule codeRule = selectByOid(codeRuleDTO.getOid());
+ revisionModelUtil.copyFromDTOIgnore(codeRuleDTO, codeRule);
+ return codeRuleMapper.updateById(codeRule)>0;
+ }
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- *
- * @param codeRuleDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeRuleVO> codeRuleDO2VOs(Collection<CodeRuleDO> codeRuleDOs) throws VciBaseException {
- return codeRuleDO2VOs(codeRuleDOs, false);
- }
+ /**
+ * 鍒犻櫎涓绘暟鎹紪鐮佽鍒�
+ *
+ * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
+ * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
+ * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R deleteCodeRule(CodeRuleDTO codeRuleDTO) throws VciBaseException {
+ VciBaseUtil.alertNotNull(codeRuleDTO, "涓绘暟鎹紪鐮佽鍒欐暟鎹璞�", codeRuleDTO.getOid(), "涓绘暟鎹紪鐮佽鍒欑殑涓婚敭");
+ CodeRule codeRule = selectByOid(codeRuleDTO.getOid());
+ if (!checkEditDelStatus(codeRule.getLcStatus())) {
+ return R.fail("缂栫爜瑙勫垯宸插彂甯冿紝涓嶅厑璁哥紪杈戞垨鍒犻櫎");
+ } else {
+ if (isAlreadyInUse(codeRule.getOid())) {
+ return R.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄わ紒");
+ }
+ }
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- *
- * @param codeRuleDOs 鏁版嵁瀵硅薄鍒楄〃
- * @param hasSec 鏄惁鍖呭惈鐮佹
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeRuleVO> codeRuleDO2VOs(Collection<CodeRuleDO> codeRuleDOs, boolean hasSec) throws VciBaseException {
- List<CodeRuleVO> voList = new ArrayList<CodeRuleVO>();
- if (!CollectionUtils.isEmpty(codeRuleDOs)) {
- for (CodeRuleDO s : codeRuleDOs) {
- CodeRuleVO vo = codeRuleDO2VO(s);
- if (vo != null) {
- voList.add(vo);
- }
- }
- if (hasSec) {
- List<CodeBasicSecVO> secVOList = codeBasicSecService.listCodeBasicSecByRuleOids(voList.stream().map(CodeRuleVO::getOid).collect(Collectors.toList()));
- if (!CollectionUtils.isEmpty(secVOList)) {
- Map<String, List<CodeBasicSecVO>> secVOMap = secVOList.stream().collect(Collectors.groupingBy(CodeBasicSecVO::getPkCodeRule));
- voList.stream().forEach(vo -> {
- vo.setSecVOList(secVOMap.getOrDefault(vo.getOid(), new ArrayList<>()));
- });
- }
- }
- }
- return voList;
- }
+ List<CodeAllcode> codeDOList = codeAllcodeService.selectByWrapper(Wrappers.<CodeAllcode>query().eq("codeRuleOid", codeRuleDTO.getOid()));
+ if (!CollectionUtils.isEmpty(codeDOList)) {
+ return R.fail("缂栫爜瑙勫垯宸茬敓鎴愮紪鐮侊紝涓嶅厑璁稿垹闄�");
+ }
+ //鎵ц鍒犻櫎鎿嶄綔
+ //WebUtil.setPersistence(false);
+ boolean resBoolean = codeBasicSecService.batchDeleteSecByCodeRuleOid(codeRule.getOid());
+ resBoolean = codeRuleMapper.deleteById(codeRule.getOid())>0;
+ //WebUtil.setPersistence(true);
+ return R.status(resBoolean);
+ }
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- *
- * @param codeRuleDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeRuleVO codeRuleDO2VO(CodeRuleDO codeRuleDO) throws VciBaseException {
- CodeRuleVO vo = new CodeRuleVO();
- if (codeRuleDO != null) {
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDO, vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setLcStatusText(CodeRuleLC.getTextByValue(vo.getLcStatus()));
+ /**
+ * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
+ *
+ * @param oid 涓婚敭
+ * @return 鏁版嵁瀵硅薄
+ * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
+ */
+ private CodeRule selectByOid(String oid) throws VciBaseException {
+ VciBaseUtil.alertNotNull(oid, "涓婚敭");
+ CodeRule codeRuleDO = codeRuleMapper.selectById(oid.trim());
+ if (codeRuleDO == null || StringUtils.isBlank(codeRuleDO.getOid())) {
+ throw new VciBaseException(DATA_OID_NOT_EXIST);
+ }
+ return codeRuleDO;
+ }
- }
- return vo;
- }
+ /**
+ * 妫�楠岀紪鐮佽鍒欐槸鍚﹀凡缁忚浣跨敤
+ *
+ * @param oid 缂栫爜瑙勫垯涓婚敭
+ * @return true琛ㄧず宸茬粡浣跨敤锛宖alse琛ㄧず鏈浣跨敤
+ */
+ @Override
+ public boolean isAlreadyInUse(String oid) {
+ Collection<CodeClassifyVO> codeClassifyVOS = listUseRangeInCodeClassify(oid);
+ if (codeClassifyVOS.size() > 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- *
- * @param codeRuleDO 瑙勫垯鐨勬暟鎹璞�
- * @param hasSec 鏄惁鏌ヨ鐮佹
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- public CodeRuleVO codeRuleDO2VO(CodeRuleDO codeRuleDO, boolean hasSec) throws VciBaseException {
- CodeRuleVO vo = new CodeRuleVO();
- if (codeRuleDO != null) {
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDO, vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setLcStatusText(CodeRuleLC.getTextByValue(vo.getLcStatus()));
- if (hasSec) {
- //鏌ヨ鐮佹
- vo.setSecVOList(codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid()));
- }
- }
- return vo;
- }
+ /**
+ * 鏌ョ湅涓绘暟鎹紪鐮佽鍒欑殑浣跨敤鑼冨洿
+ *
+ * @param oid 缂栫爜瑙勫垯涓婚敭
+ * @return 涓婚搴撳垎绫讳娇鐢ㄥ埌璇ョ紪鐮佽鍒欑殑鎵�鏈夐泦鍚�
+ */
+ @Override
+ public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) {
+ List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().eq("codeRuleOid", oid));
+ return CodeClassifyWrapper.build().listVO(codeClassifies);
+ }
- /**
- * 澧炲姞涓绘暟鎹紪鐮佽鍒�
- *
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeRuleVO addSave(CodeRuleDTO codeRuleDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeRuleDO codeRuleDO = new CodeRuleDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDTO, codeRuleDO);
- codeRuleMapper.insert(codeRuleDO);
- return codeRuleDO2VO(codeRuleDO);
- }
-
- /**
- * 淇敼涓绘暟鎹紪鐮佽鍒�
- *
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeRuleVO editSave(CodeRuleDTO codeRuleDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(codeRuleDTO, "鏁版嵁瀵硅薄", codeRuleDTO.getOid(), "涓绘暟鎹紪鐮佽鍒欎富閿�");
- if (!checkEditDelStatus(codeRuleDTO.getLcStatus())) {
- throw new VciBaseException("缂栫爜瑙勫垯宸插彂甯冿紝涓嶅厑璁哥紪杈戞垨鍒犻櫎");
- }
- //灏咲TO杞崲涓篋O
- CodeRuleDO codeRuleDO = selectByOid(codeRuleDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeRuleDTO, codeRuleDO);
- codeRuleMapper.updateByPrimaryKey(codeRuleDO);
- return codeRuleDO2VO(codeRuleDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- *
- * @param codeRuleDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeRuleDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeRuleDTO codeRuleDTO, CodeRuleDO codeRuleDO) {
- boService.checkTs(codeRuleDTO);
- if (!checkIsLinked(codeRuleDO.getOid())) {
- return BaseResult.success();
- } else {
- return BaseResult.fail(DATA_LINKED_NOT_DELETE, new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- *
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException {
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎涓绘暟鎹紪鐮佽鍒�
- *
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeRule(CodeRuleDTO codeRuleDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(codeRuleDTO, "涓绘暟鎹紪鐮佽鍒欐暟鎹璞�", codeRuleDTO.getOid(), "涓绘暟鎹紪鐮佽鍒欑殑涓婚敭");
- CodeRuleDO codeRuleDO = selectByOid(codeRuleDTO.getOid());
- //BaseResult baseResult = checkIsCanDeleteForDO(codeRuleDTO,codeRuleDO);
- // if(baseResult.isSuccess()) {
- // }else{
- // return baseResult;
- // }
- if (!checkEditDelStatus(codeRuleDO.getLcStatus())) {
- return BaseResult.fail("缂栫爜瑙勫垯宸插彂甯冿紝涓嶅厑璁哥紪杈戞垨鍒犻櫎");
- } else {
- if (isAlreadyInUse(codeRuleDO.getOid())) {
- return BaseResult.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄わ紒");
- }
- }
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("codeRuleOid", codeRuleDTO.getOid());
- List<CodeAllCodeDO> codeDOList = boService.queryObject(CodeAllCodeDO.class, conditionMap);
- if (!CollectionUtils.isEmpty(codeDOList)) {
- return BaseResult.fail("缂栫爜瑙勫垯宸茬敓鎴愮紪鐮侊紝涓嶅厑璁稿垹闄�");
- }
- //鎵ц鍒犻櫎鎿嶄綔
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = codeBasicSecService.batchDeleteSecByCodeRuleOid(codeRuleDO.getOid());
- BatchCBO mainCBO = codeRuleMapper.deleteByPrimaryKey(codeRuleDO.getOid());
- WebUtil.setPersistence(true);
- Set<ClientBusinessObject> deleteSet = new HashSet<>();
- deleteSet.addAll(batchCBO.getDeleteCbos());
- deleteSet.addAll(mainCBO.getDeleteCbos());
- batchCBO.setDeleteCbos(deleteSet);
- boService.persistenceBatch(batchCBO);
- return (batchCBO != null && batchCBO.getDeleteCbos() != null && batchCBO.getDeleteCbos().size() > 0) ? BaseResult.successMsg(DELETE_SUCCESS) : BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 鏍￠獙缂栫爜瑙勫垯鐨勭姸鎬佹槸鍚﹀彲浠ョ紪杈戞垨鍒犻櫎
- *
- * @param lcStatus 缂栫爜瑙勫垯
- * @return true琛ㄧず鍙互缂栬緫鎴栧垹闄わ紝false琛ㄧず涓嶅彲浠�
- */
- @Override
- public boolean checkEditDelStatus(String lcStatus) {
- if (CodeRuleLC.RELEASED.getValue().equals(lcStatus) || CodeRuleLC.DISABLED.getValue().equals(lcStatus)) {
- return false;
- }
- return true;
- }
-
-
- /**
- * 涓婚敭鑾峰彇涓绘暟鎹紪鐮佽鍒�
- *
- * @param oid 涓婚敭
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeRuleVO getObjectByOid(String oid) throws VciBaseException {
- return codeRuleDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- *
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeRuleDO selectByOid(String oid) throws VciBaseException {
- VciBaseUtil.alertNotNull(oid, "涓婚敭");
- CodeRuleDO codeRuleDO = codeRuleMapper.selectByPrimaryKey(oid.trim());
- if (codeRuleDO == null || StringUtils.isBlank(codeRuleDO.getOid())) {
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeRuleDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹紪鐮佽鍒�
- *
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeRuleVO> listCodeRuleByOids(Collection<String> oidCollections) throws VciBaseException {
- VciBaseUtil.alertNotNull(oidCollections, "鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeRuleDO> codeRuleDOList = listCodeRuleDOByOidCollections(oidCollections);
- return codeRuleDO2VOs(codeRuleDOList);
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇涓绘暟鎹紪鐮佽鍒�
- *
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @param hasSec 鏄惁鍖呭惈鐮佹
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeRuleVO> listCodeRuleByOids(Collection<String> oidCollections, boolean hasSec) throws VciBaseException {
- VciBaseUtil.alertNotNull(oidCollections, "鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeRuleDO> codeRuleDOList = listCodeRuleDOByOidCollections(oidCollections);
- return codeRuleDO2VOs(codeRuleDOList, true);
- }
-
- /**
- * 浣跨敤缂栧彿鐨勯泦鍚堣幏鍙栬鍒欑殑鍐呭
- *
- * @param idCollection 缂栧彿鐨勯泦鍚�
- * @return 瑙勫垯鐨勫唴瀹�
- */
- @Override
- public List<CodeRuleVO> listCodeRuleByIds(Collection<String> idCollection) {
- return codeRuleDO2VOs(listCodeRuleDOByIdCollections(idCollection));
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- *
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeRuleDO> listCodeRuleDOByOidCollections(Collection<String> oidCollections) {
- List<CodeRuleDO> codeRuleDOList = new ArrayList<CodeRuleDO>();
- if (!CollectionUtils.isEmpty(oidCollections)) {
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for (Collection<String> oids : oidCollectionsList) {
- List<CodeRuleDO> tempDOList = codeRuleMapper.selectByPrimaryKeyCollection(oids);
- if (!CollectionUtils.isEmpty(tempDOList)) {
- codeRuleDOList.addAll(tempDOList);
- }
- }
- }
- return codeRuleDOList;
- }
-
- /**
- * 浣跨敤缂栧彿闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- *
- * @param idCollections 缂栧彿鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeRuleDO> listCodeRuleDOByIdCollections(Collection<String> idCollections) {
- List<CodeRuleDO> codeRuleDOList = new ArrayList<CodeRuleDO>();
- if (!CollectionUtils.isEmpty(idCollections)) {
- Collection<Collection<String>> idCollectionsList = VciBaseUtil.switchCollectionForOracleIn(idCollections);
- for (Collection<String> ids : idCollectionsList) {
- List<CodeRuleDO> tempDOList = codeRuleMapper.selectByIdCollection(ids);
- if (!CollectionUtils.isEmpty(tempDOList)) {
- codeRuleDOList.addAll(tempDOList);
- }
- }
- }
- return codeRuleDOList;
- }
-
-
- /**
- * 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
- *
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeRuleVO> refDataGridCodeRule(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- if (conditionMap == null) {
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeRule(conditionMap, pageHelper);
- }
-
- /**
- * 鏌ョ湅涓绘暟鎹紪鐮佽鍒欑殑浣跨敤鑼冨洿
- *
- * @param oid 缂栫爜瑙勫垯涓婚敭
- * @return 涓婚搴撳垎绫讳娇鐢ㄥ埌璇ョ紪鐮佽鍒欑殑鎵�鏈夐泦鍚�
- */
- @Override
- public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) {
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("codeRuleOid", oid);
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(conditionMap, CodeClassifyDO.class);
- List<CodeClassifyDO> dos = codeClassifyService.selectByWrapper(queryWrapper);
- return codeClassifyService.codeClassifyDO2VOs(dos);
- }
-
- /**
- * 妫�楠岀紪鐮佽鍒欐槸鍚﹀凡缁忚浣跨敤
- *
- * @param oid 缂栫爜瑙勫垯涓婚敭
- * @return true琛ㄧず宸茬粡浣跨敤锛宖alse琛ㄧず鏈浣跨敤
- */
- @Override
- public boolean isAlreadyInUse(String oid) {
- Collection<CodeClassifyVO> codeClassifyVOS = listUseRangeInCodeClassify(oid);
- if (codeClassifyVOS.size() > 0) {
- return true;
- } else {
- return false;
- }
- }
-
- /**
- * 鍋滅敤涓庡惎鐢ㄧ紪鐮佽鍒�
- *
- * @param oid 缂栫爜瑙勫垯涓婚敭
- * @param update enable:鍚敤 disable:鍋滅敤 release:鍙戝竷
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult updateStatus(String oid, String update) {
- int count = 0;
- CodeRuleDO codeRuleDO = selectByOid(oid);
- if ("enable".equalsIgnoreCase(update)) {
- if (!CodeRuleLC.DISABLED.getValue().equals(codeRuleDO.getLcStatus())) {
- return BaseResult.fail("闈炲仠鐢ㄧ姸鎬佺殑缂栫爜瑙勫垯鏃犻渶鐐瑰嚮鍚敤");
- }
- count = codeRuleMapper.updateLcStatus(oid, CodeRuleLC.RELEASED.getValue());
- } else if ("disable".equalsIgnoreCase(update)) {
- if (!CodeRuleLC.RELEASED.getValue().equals(codeRuleDO.getLcStatus())) {
- return BaseResult.fail("闈炲彂甯冪姸鎬佺殑缂栫爜瑙勫垯鏃犳硶鍋滅敤");
- }
- count = codeRuleMapper.updateLcStatus(oid, CodeRuleLC.DISABLED.getValue());
- } else if ("release".equalsIgnoreCase(update)) {
- if (!CodeRuleLC.EDITING.getValue().equals(codeRuleDO.getLcStatus())) {
- return BaseResult.fail("闈炵紪杈戠姸鎬佺殑缂栫爜瑙勫垯鏃犳硶鍙戝竷");
- }
- count = codeRuleMapper.updateLcStatus(oid, CodeRuleLC.RELEASED.getValue());
- } else {
- return BaseResult.fail("鏆備笉鏀寔鐨勬搷浣滅被鍨�");
- }
- if (count > 0) {
- return BaseResult.success();
- } else {
- return BaseResult.fail("鏇存柊鐘舵�佸け璐�");
- }
- }
-
- /**
- * 鍏嬮殕缂栫爜瑙勫垯
- *
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- */
- public BaseResult cloneCodeRule_v1(CodeRuleDTO codeRuleDTO) {
- VciBaseUtil.alertNotNull(codeRuleDTO.getOid(), "缂栫爜瑙勫垯涓婚敭");
- ClientBusinessObjectOperation operation = new ClientBusinessObjectOperation();
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("pkCodeRule", codeRuleDTO.getOid());
- List<CodeBasicSecDO> basicSecDOS = boService.queryObject(CodeBasicSecDO.class, conditionMap);
- List<String> secOidList = new ArrayList<>();
- for (CodeBasicSecDO secDO : basicSecDOS) {
- secOidList.add(secDO.getOid());
- }
- List<ClientBusinessObject> cboList = new ArrayList<>();
- try {
- ClientBusinessObject templateCbo = operation.readBusinessObjectById(codeRuleDTO.getOid(), MdmBtmTypeConstant.CODE_RULE);
- ClientBusinessObject codeRuleCbo = operation.initBusinessObject(templateCbo.getBtmName());
- String curOid = codeRuleCbo.getOid();
- String curRevisionId = codeRuleCbo.getRevisionid();
- String curNameOid = codeRuleCbo.getNameoid();
- BeanUtilForVCI.copyPropertiesIgnoreCase(templateCbo, codeRuleCbo);
- codeRuleCbo.setOid(curOid);
- codeRuleCbo.setRevisionid(curRevisionId);
- codeRuleCbo.setNameoid(curNameOid);
- codeRuleCbo.setId(templateCbo.getId() + "_copy");
- codeRuleCbo.setName(templateCbo.getName() + "_copy");
- if (!CollectionUtils.isEmpty(secOidList)) {
- ClientBusinessObject[] secCboArr = operation.readBusinessObjectById(secOidList.toArray(new String[0]), MdmBtmTypeConstant.CODE_BASIC_SEC);
- for (ClientBusinessObject cbo : secCboArr) {
- ClientBusinessObject newSecCbo = operation.initBusinessObject(cbo.getBtmName());
- String newSecCboOid = newSecCbo.getOid();
- String newSecCboRevisionId = newSecCbo.getRevisionid();
- String newSecCboNameOid = newSecCbo.getNameoid();
- BeanUtilForVCI.copyPropertiesIgnoreCase(cbo, newSecCbo);
- newSecCbo.setOid(newSecCboOid);
- newSecCbo.setRevisionid(newSecCboRevisionId);
- newSecCbo.setNameoid(newSecCboNameOid);
- newSecCbo.setId(newSecCbo.getId() + "_copy");
- newSecCbo.setName(newSecCbo.getName() + "_copy");
- newSecCbo.setAttributeValue("pkCodeRule", codeRuleCbo.getOid());
- cboList.add(newSecCbo);
- }
- }
- cboList.add(codeRuleCbo);
- ClientBusinessObject[] saveList = operation.batchSaveCreateBuinessObject(cboList.toArray(new ClientBusinessObject[0]));
- if (saveList.length == 0) {
- return BaseResult.fail("鍏嬮殕鍑洪敊浜嗏�︹��");
- }
- } catch (VCIError vciError) {
- vciError.printStackTrace();
- }
- return BaseResult.success();
- }
-
- /**
- * 鍏嬮殕缂栫爜瑙勫垯
- *
- * @param codeRuleDTO 涓绘暟鎹紪鐮佽鍒欐暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞�
- */
- @Override
- public BaseResult cloneCodeRule(CodeRuleDTO codeRuleDTO) {
- VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- CodeRuleDO codeRuleDO = new CodeRuleDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDTO, codeRuleDO);
- WebUtil.setPersistence(false);
- BatchCBO batchInsertCBO = codeRuleMapper.insert(codeRuleDO);
- List<CodeBasicSecDTO> secList = codeRuleDTO.getElements();
- secList.forEach(codeBasicSecDTO -> {
- codeBasicSecDTO.setPkCodeRule(codeRuleDO.getOid());
- KeyValue attrKv = codeBasicSecService.checkAttrNullableBySecType(codeBasicSecDTO);
- if (!"success".equals(attrKv.getKey())) {
- throw new VciBaseException(attrKv.getValue() + "涓嶈兘涓虹┖");
- }
- CodeBasicSecDO codeBasicSecDO = new CodeBasicSecDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDTO, codeBasicSecDO);
- codeBasicSecDO.setOid("");
- codeBasicSecDO.setRevisionOid("");
- codeBasicSecDO.setNameOid("");
- //codeBasicSecMapper涓殑璇彞鍏ㄩ儴杩佺Щ鍒拌繖閲�
- VciBaseUtil.alertNotNull(codeBasicSecDO,"瑕佹坊鍔犵殑鏁版嵁");
- BatchCBO cbo = boService.addSave(codeBasicSecDO);
- batchInsertCBO.addCreateCbo(cbo.getCreateCboArray()[0]);
- });
- boService.persistenceBatch(batchInsertCBO);
- return BaseResult.success();
- }
-
- /**
- * 浣跨敤涓婚敭鑾峰彇缂栫爜瑙勫垯鐨勫唴瀹�
- *
- * @param oid 涓婚敭
- * @return 瑙勫垯鐨勬樉绀哄璞�
- */
- @Override
- public CodeRuleVO getObjectHasSecByOid(String oid) {
- CodeRuleDO ruleDO = selectByOid(oid);
- return codeRuleDO2VO(ruleDO, true);
- }
-
- /**
- * 缂栫爜瑙勫垯娓呯┖鎵�鏈夊凡鐢熸垚鐨勭紪鐮�
- *
- * @param oid 缂栫爜瑙勫垯涓婚敭
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult clearAllCode(String oid) {
- WebUtil.alertNotNull(oid, "缂栫爜瑙勫垯涓婚敭");
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("codeRuleOid", oid);
- List<CodeAllCodeDO> codeDOList = boService.queryObject(CodeAllCodeDO.class, conditionMap);
- if (CollectionUtils.isEmpty(codeDOList)) {
- return BaseResult.fail("褰撳墠缂栫爜瑙勫垯娌℃湁鐢熸垚缂栫爜,鏃犻渶娓呯┖");
- }
- //鏄惁闇�瑕佽繘琛宐tm涓嶇粺涓�鐨勫垽鏂�?
- String btmType = codeDOList.get(0).getCreateCodeBtm();
- /*boolean flag = codeDOList.stream().anyMatch(s -> !StringUtils.equalsIgnoreCase(btmType, s.getCreateCodeBtm()));
- if (flag) {
- return BaseResult.fail("褰撳墠缂栫爜瑙勫垯鐢熸垚缂栫爜鍦ㄤ笉鍚岀被鍨嬩笅浣跨敤杩�");
- }*/
- //澶氱绫诲瀷涓嬬殑鏌ヨ
- Set<String> btmTypeSet = codeDOList.stream().filter(s -> {
- return !StringUtils.equalsIgnoreCase(btmType, s.getCreateCodeBtm());
- }).map(s -> s.getCreateCodeBtm()).collect(Collectors.toSet());
- List<ClientBusinessObject> businessDataList = new ArrayList<>();
- if (btmTypeSet.size() > 1) {
- for (String btm : btmTypeSet) {
- String sql = "select COUNT(w.OID) from PLATFORMBTM_" + btm + " w\n" +
- "join PLATFORMBTM_" + MdmBtmTypeConstant.CODE_ALL_CODE + " c on w.OID = c.CREATECODEOID\n" +
- "where c.CREATECODEBTM = '" + btm + "' and c.CODERULEOID = '" + oid + "'" +
- "and w.ISLASTR = '1' and w.ISLASTV = '1'";
- List<ClientBusinessObject> businessData = boService.queryByOnlySql(sql);
- businessDataList.addAll(businessData);
- }
- }else {
- String sql = "select COUNT(w.OID) from PLATFORMBTM_" + btmType + " w\n" +
- "join PLATFORMBTM_" + MdmBtmTypeConstant.CODE_ALL_CODE + " c on w.OID = c.CREATECODEOID\n" +
- "where c.CREATECODEBTM = '" + btmType + "' and c.CODERULEOID = '" + oid + "'" +
- "and w.ISLASTR = '1' and w.ISLASTV = '1'";
- List<ClientBusinessObject> businessData = boService.queryByOnlySql(sql);
- businessDataList.addAll(businessData);
- }
- if (CollectionUtils.isEmpty(businessDataList) || StringUtils.isBlank(businessDataList.get(0).getAttributeValue("COUNT(w.OID)"))) {
- //鏃犳晥鏌ヨ
- return BaseResult.fail("鏌ヨ澶辫触");
- } else if (!StringUtils.equalsIgnoreCase("0", businessDataList.get(0).getAttributeValue("COUNT(w.OID)"))) {
- return BaseResult.fail("缂栫爜瑙勫垯鐢熸垚鐨勭紪鐮佸凡鍦ㄤ笟鍔℃暟鎹腑搴旂敤锛屼笉鍏佽娓呯┖");
- }
- //娌℃湁鏁版嵁锛屽彲浠ュ畨鍏ㄥ垹闄�
- WebUtil.setPersistence(false);
- //鍒犻櫎鐮佸�艰〃涓殑鏁版嵁锛屼絾涓嶅锛屽鏋滄湁娴佹按鐨勭爜娈碉紝闇�瑕侀噸鏂拌绠楁祦姘�
- conditionMap.clear();
- conditionMap.put("codeRuleOid", oid);
- List<ClientBusinessObject> serialValueList = boService.queryCBO("codeserialvalue", conditionMap);
- BatchCBO batchCBO = boService.batchDelete(codeDOList);
- batchCBO.getDeleteCbos().addAll(serialValueList);
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- return BaseResult.success();
- }
}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java
deleted file mode 100644
index e389694..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSerialAlgorithmServiceImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.vci.ubcs.code.annotation.MdmSerialAlgorithm;
-import com.vci.ubcs.code.service.CodeSerialAlgorithmServiceI;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.util.ApplicationContextProvider;
-import org.apache.commons.lang3.StringUtils;
-import com.vci.ubcs.code.vo.pagemodel.CodeSerialAlgorithmVO;
-import org.springframework.aop.framework.Advised;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 娴佹按绠楁硶鐨勬湇鍔�
- * @author weidy
- * @date 2022-2-17
- */
-@Service
-public class CodeSerialAlgorithmServiceImpl implements CodeSerialAlgorithmServiceI {
- /**
- * 鑾峰彇娴佹按绠楁硶鐨勫垪琛�
- *
- * @return 娴佹按绠楁硶鐨勪俊鎭�
- */
- @Override
- public DataGrid<CodeSerialAlgorithmVO> gridSerialAlgorithm() {
- //浣跨敤涓婚敭鍘绘壂鎻�
- String[] beanNames = ApplicationContextProvider.getApplicationContext().getBeanNamesForAnnotation(MdmSerialAlgorithm.class);
- List<CodeSerialAlgorithmVO> voList = new ArrayList<>();
- if(beanNames!=null && beanNames.length>0){
- for(String beanName : beanNames){
- Object bean = ApplicationContextProvider.getApplicationContext().getBean(beanName);
- if(bean!=null){
- CodeSerialAlgorithmVO algorithmVO = new CodeSerialAlgorithmVO();
- Advised advised = (Advised)bean;
- Class<?> targetClass = advised.getTargetSource().getTargetClass();
- algorithmVO.setClassFullName(targetClass.getName());
- MdmSerialAlgorithm serialAlgorithm = targetClass.getDeclaredAnnotation(MdmSerialAlgorithm.class);
- if(serialAlgorithm==null){
- serialAlgorithm = targetClass.getAnnotation(MdmSerialAlgorithm.class);
- }
- if(serialAlgorithm !=null) {
- algorithmVO.setName(serialAlgorithm.text());
- algorithmVO.setDescription(serialAlgorithm.description());
- algorithmVO.setId(serialAlgorithm.value());
- if(StringUtils.isBlank(algorithmVO.getId())){
- algorithmVO.setId(beanName);
- }
- voList.add(algorithmVO);
- }
- }
- }
- }
- DataGrid<CodeSerialAlgorithmVO> dataGrid = new DataGrid<>();
- dataGrid.setData(voList);
- dataGrid.setTotal(voList.size());
- return dataGrid;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSynonymServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSynonymServiceImpl.java
deleted file mode 100644
index 6b75347..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSynonymServiceImpl.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.vci.ubcs.code.mapper.CodeSynonymMapper;
-import com.vci.ubcs.code.entity.CodeSynonymDO;
-import com.vci.ubcs.code.service.CodeSynonymServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeSynonymDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeSynonymVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.*;
-
-/**
- * 鍚屼箟璇嶉厤缃湇鍔�
- * @author weidy
- * @date 2022-02-17
- */
-@Service
-public class CodeSynonymServiceImpl implements CodeSynonymServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeSynonymMapper codeSynonymMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑鍚屼箟璇嶉厤缃�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeSynonymVO> gridCodeSynonym(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodeSynonymDO> doList = codeSynonymMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeSynonymVO> dataGrid=new DataGrid<CodeSynonymVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeSynonymDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeSynonymMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeSynonymDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeSynonymVO> codeSynonymDO2VOs(Collection<CodeSynonymDO> codeSynonymDOs) throws VciBaseException{
- List<CodeSynonymVO> voList = new ArrayList<CodeSynonymVO>();
- if(!CollectionUtils.isEmpty(codeSynonymDOs)){
- for(CodeSynonymDO s: codeSynonymDOs){
- CodeSynonymVO vo = codeSynonymDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeSynonymDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeSynonymVO codeSynonymDO2VO(CodeSynonymDO codeSynonymDO) throws VciBaseException{
- CodeSynonymVO vo = new CodeSynonymVO();
- if(codeSynonymDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeSynonymDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeSynonymVO addSave(CodeSynonymDTO codeSynonymDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeSynonymDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- CodeSynonymDO codeSynonymDO = new CodeSynonymDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeSynonymDTO,codeSynonymDO);
- codeSynonymMapper.insert(codeSynonymDO);
- return codeSynonymDO2VO(codeSynonymDO);
- }
-
- /**
- * 淇敼鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeSynonymVO editSave(CodeSynonymDTO codeSynonymDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeSynonymDTO,"鏁版嵁瀵硅薄",codeSynonymDTO.getOid(),"鍚屼箟璇嶉厤缃富閿�");
- //灏咲TO杞崲涓篋O
- CodeSynonymDO codeSynonymDO = selectByOid(codeSynonymDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeSynonymDTO,codeSynonymDO);
- codeSynonymMapper.updateByPrimaryKey(codeSynonymDO);
- return codeSynonymDO2VO(codeSynonymDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeSynonymDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeSynonymDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeSynonymDTO codeSynonymDTO, CodeSynonymDO codeSynonymDO) {
- CodeSynonymDO tsDO = new CodeSynonymDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeSynonymDTO,tsDO);
- boService.checkTs(tsDO);
- if(!checkIsLinked(codeSynonymDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎鍚屼箟璇嶉厤缃�
- * @param codeSynonymDTO 鍚屼箟璇嶉厤缃暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeSynonym(CodeSynonymDTO codeSynonymDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeSynonymDTO,"鍚屼箟璇嶉厤缃暟鎹璞�",codeSynonymDTO.getOid(),"鍚屼箟璇嶉厤缃殑涓婚敭");
- CodeSynonymDO codeSynonymDO = selectByOid(codeSynonymDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeSynonymDTO,codeSynonymDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = codeSynonymMapper.deleteByPrimaryKey(codeSynonymDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇鍚屼箟璇嶉厤缃�
- * @param oid 涓婚敭
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeSynonymVO getObjectByOid(String oid) throws VciBaseException{
- return codeSynonymDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeSynonymDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeSynonymDO codeSynonymDO = codeSynonymMapper.selectByPrimaryKey(oid.trim());
- if(codeSynonymDO == null || StringUtils.isBlank(codeSynonymDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeSynonymDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇鍚屼箟璇嶉厤缃�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeSynonymVO> listCodeSynonymByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeSynonymDO> codeSynonymDOList = listCodeSynonymDOByOidCollections(oidCollections);
- return codeSynonymDO2VOs(codeSynonymDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeSynonymDO> listCodeSynonymDOByOidCollections(Collection<String> oidCollections){
- List<CodeSynonymDO> codeSynonymDOList = new ArrayList<CodeSynonymDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeSynonymDO> tempDOList = codeSynonymMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeSynonymDOList.addAll(tempDOList);
- }
- }
- }
- return codeSynonymDOList;
- }
-
-
-
- /**
- * 鍙傜収鍚屼箟璇嶉厤缃垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鍚屼箟璇嶉厤缃樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeSynonymVO> refDataGridCodeSynonym(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeSynonym(conditionMap,pageHelper);
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTemplatePhaseServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTemplatePhaseServiceImpl.java
deleted file mode 100644
index b72dad8..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeTemplatePhaseServiceImpl.java
+++ /dev/null
@@ -1,510 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.mapper.CodePhaseAttrMapper;
-import com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateAttrDO;
-import com.vci.ubcs.code.entity.CodePhaseAttrDO;
-import com.vci.ubcs.code.entity.CodeTemplatePhaseDO;
-import com.vci.ubcs.code.service.CodeClassifyTemplateAttrServiceI;
-import com.vci.ubcs.code.service.CodePhaseAttrServiceI;
-import com.vci.ubcs.code.service.CodeTemplatePhaseServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtil;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeTemplatePhaseDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeTemplatePhaseVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-/**
- * 妯℃澘闃舵鏈嶅姟
- * @author weidy
- * @date 2022-01-24
- */
-@Service
-public class CodeTemplatePhaseServiceImpl implements CodeTemplatePhaseServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodeTemplatePhaseMapper codeTemplatePhaseMapper;
-
- /**
- * 妯℃澘灞炴�х殑鏈嶅姟
- */
- @Autowired
- @Lazy
- private CodeClassifyTemplateAttrServiceI tempAttrService;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 闃舵鐨勫睘鎬�
- */
- @Autowired
- private CodePhaseAttrServiceI phaseAttrService;
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private CodePhaseAttrMapper codePhaseAttrMapper;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑妯℃澘闃舵
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeTemplatePhaseVO> gridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<CodeTemplatePhaseDO> doList = codeTemplatePhaseMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<CodeTemplatePhaseVO> dataGrid=new DataGrid<CodeTemplatePhaseVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(codeTemplatePhaseDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(codeTemplatePhaseMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeTemplatePhaseDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<CodeTemplatePhaseVO> codeTemplatePhaseDO2VOs(Collection<CodeTemplatePhaseDO> codeTemplatePhaseDOs) throws VciBaseException{
- List<CodeTemplatePhaseVO> voList = new ArrayList<CodeTemplatePhaseVO>();
- if(!CollectionUtils.isEmpty(codeTemplatePhaseDOs)){
- for(CodeTemplatePhaseDO s: codeTemplatePhaseDOs){
- CodeTemplatePhaseVO vo = codeTemplatePhaseDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param codeTemplatePhaseDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public CodeTemplatePhaseVO codeTemplatePhaseDO2VO(CodeTemplatePhaseDO codeTemplatePhaseDO) throws VciBaseException{
- CodeTemplatePhaseVO vo = new CodeTemplatePhaseVO();
- if(codeTemplatePhaseDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- }
- return vo;
- }
-
- /**
- * 澧炲姞妯℃澘闃舵
- * @param codeTemplatePhaseDTO 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeTemplatePhaseVO addSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeTemplatePhaseDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄",codeTemplatePhaseDTO.getAttributes(),"鍖呭惈鐨勫睘鎬�");
- //灏咲TO杞崲涓篋O
- CodeTemplatePhaseDO codeTemplatePhaseDO = new CodeTemplatePhaseDO();
- codeTemplatePhaseDO.setOid(VciBaseUtil.getPk());
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeTemplatePhaseDTO,codeTemplatePhaseDO);
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = codeTemplatePhaseMapper.insert(codeTemplatePhaseDO);
- List<CodePhaseAttrDO> attrDOList = new ArrayList<>();
- codeTemplatePhaseDTO.getAttributes().stream().forEach(attrDTO->{
- CodePhaseAttrDO attrDO = new CodePhaseAttrDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(attrDTO,attrDO);
- attrDO.setOid(VciBaseUtil.getPk());
- attrDO.setCodePhaseOid(codeTemplatePhaseDO.getOid());
- attrDOList.add(attrDO);
- });
- BatchCBO attrCBO = codePhaseAttrMapper.batchInsert(attrDOList);
- batchCBO.copyFromOther(attrCBO);
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- return codeTemplatePhaseDO2VO(codeTemplatePhaseDO);
- }
-
- /**
- * 淇敼妯℃澘闃舵
- * @param codeTemplatePhaseDTO 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeTemplatePhaseVO editSave(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeTemplatePhaseDTO,"鏁版嵁瀵硅薄",codeTemplatePhaseDTO.getOid(),"妯℃澘闃舵涓婚敭",codeTemplatePhaseDTO.getAttributes(),"鍖呭惈鐨勫睘鎬�");
- //灏咲TO杞崲涓篋O
- CodeTemplatePhaseDO codeTemplatePhaseDO = selectByOid(codeTemplatePhaseDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(codeTemplatePhaseDTO,codeTemplatePhaseDO);
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = codeTemplatePhaseMapper.updateByPrimaryKey(codeTemplatePhaseDO);
- //鎶婁互鍓嶇殑鍒犻櫎
- List<CodePhaseAttrDO> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseDO.getOid());
- if(!CollectionUtils.isEmpty(phaseAttrDOS)){
- BatchCBO delCBO = codePhaseAttrMapper.batchDeleteByOids(phaseAttrDOS.stream().map(CodePhaseAttrDO::getOid).collect(Collectors.toList()));
- batchCBO.copyFromOther(delCBO);
- }
- List<CodePhaseAttrDO> attrDOList = new ArrayList<>();
- codeTemplatePhaseDTO.getAttributes().stream().forEach(attrDTO->{
- CodePhaseAttrDO attrDO = new CodePhaseAttrDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(attrDTO,attrDO);
- attrDO.setOid(VciBaseUtil.getPk());
- attrDO.setCodePhaseOid(codeTemplatePhaseDO.getOid());
- attrDOList.add(attrDO);
- });
- BatchCBO attrCBO = codePhaseAttrMapper.batchInsert(attrDOList);
- batchCBO.copyFromOther(attrCBO);
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- return codeTemplatePhaseDO2VO(codeTemplatePhaseDO);
- }
-
- /**
- * 浣跨敤闃舵涓婚敭鑾峰彇鍖呭惈鐨勫睘鎬�
- * @param codePhaseOid 闃舵鐨勪富閿�
- * @return 鍖呭惈灞炴�х殑鏁版嵁瀵硅薄
- */
- private List<CodePhaseAttrDO> listPhaseAttrDOByPhaseOid(String codePhaseOid){
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codePhaseOid",codePhaseOid);
- List<CodePhaseAttrDO> phaseAttrDOS = codePhaseAttrMapper.selectByCondition(conditionMap, new PageHelper(-1));
- return phaseAttrDOS;
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param codeTemplatePhaseDTO 鏁版嵁浼犺緭瀵硅薄
- * @param codeTemplatePhaseDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(CodeTemplatePhaseDTO codeTemplatePhaseDTO, CodeTemplatePhaseDO codeTemplatePhaseDO) {
- CodeTemplatePhaseDO tsDO = new CodeTemplatePhaseDO();
- BeanUtil.convert(codeTemplatePhaseDTO,tsDO);
- boService.checkTs(tsDO);
- if(!checkIsLinked(codeTemplatePhaseDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎妯℃澘闃舵
- * @param codeTemplatePhaseDTO 妯℃澘闃舵鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteCodeTemplatePhase(CodeTemplatePhaseDTO codeTemplatePhaseDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(codeTemplatePhaseDTO,"妯℃澘闃舵鏁版嵁瀵硅薄",codeTemplatePhaseDTO.getOid(),"妯℃澘闃舵鐨勪富閿�");
- CodeTemplatePhaseDO codeTemplatePhaseDO = selectByOid(codeTemplatePhaseDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(codeTemplatePhaseDTO,codeTemplatePhaseDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = codeTemplatePhaseMapper.deleteByPrimaryKey(codeTemplatePhaseDO.getOid());
- //闇�瑕佸垹闄ゅ睘鎬�
- List<CodePhaseAttrDO> phaseAttrDOS = listPhaseAttrDOByPhaseOid(codeTemplatePhaseDO.getOid());
- if(!CollectionUtils.isEmpty(phaseAttrDOS)) {
- BatchCBO deleteCBO = codePhaseAttrMapper.batchDeleteByOids(phaseAttrDOS.stream().map(CodePhaseAttrDO::getOid).collect(Collectors.toList()));
- batchCBO.copyFromOther(deleteCBO);
- }
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 妯℃澘淇敼瑙﹀彂鍔熻兘
- * @param attrDOList 灞炴�х殑鏁版嵁瀵硅薄
- * @return 鍙楀奖鍝嶇殑鏁版嵁
- */
- @Override
- public BatchCBO codeTemplateAttrModifyTrigger(List<CodeClassifyTemplateAttrDO> attrDOList){
- //灞炴�т慨鏀圭殑鏃跺�欙紝闇�瑕佸悓姝ヤ慨鏀瑰搴斿睘鎬х殑鍚嶇О
- BatchCBO batchCBO = new BatchCBO();
- List<CodePhaseAttrDO> phaseAttrDOS =listLinkAttrDOByTemplateAttrDOS(attrDOList);
- if(!CollectionUtils.isEmpty(phaseAttrDOS)){
- //璇存槑鏈夊睘鎬�,鎴戜滑鍘绘浛鎹竴涓�
- Map<String, CodeClassifyTemplateAttrDO> attrDOMap = attrDOList.stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
- phaseAttrDOS.stream().forEach(phaseAttrDO->{
- if(attrDOMap.containsKey(phaseAttrDO.getId())){
- CodeClassifyTemplateAttrDO attrDO = attrDOMap.get(phaseAttrDO.getId());
- phaseAttrDO.setId(attrDO.getId());
- phaseAttrDO.setName(attrDO.getName());
- phaseAttrDO.setAttributeGroup(attrDO.getAttributeGroup());
- }
- });
- BatchCBO updateCBO = codePhaseAttrMapper.batchUpdate(phaseAttrDOS);
- batchCBO.copyFromOther(updateCBO);
- }
- return batchCBO;
- }
-
- /**
- * 浣跨敤妯℃澘鐨勫睘鎬ц幏鍙栭樁娈典腑鍖呭惈鐨勫睘鎬у唴瀹�
- * @param attrDOList 灞炴�х殑鏁版嵁瀵硅薄
- * @return 闃舵閲岀殑灞炴�ф暟鎹璞�
- */
- private List<CodePhaseAttrDO> listLinkAttrDOByTemplateAttrDOS(List<CodeClassifyTemplateAttrDO> attrDOList){
- if(!CollectionUtils.isEmpty(attrDOList)) {
- //鏌ヨ杩欎釜妯℃澘閲屽寘鍚殑鎵�鏈夐樁娈电殑杩欎簺灞炴��
- //鍥犱负oracle閲岃〃鐨勫瓧娈典笉鑳借秴杩�1000涓紝鎵�浠ユ垜浠繖閲岄粯璁ゅ睘鎬т釜鏁版槸灏忎簬1000鐨勶紱
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("codePhaseOid", QueryOptionConstant.IN + "(select oid from " + getPhaseTable() + " where codeClassifyTemplateOid='" + attrDOList.get(0).getClassifyTemplateOid() + "')");
- conditionMap.put("id", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(attrDOList.stream().map(CodeClassifyTemplateAttrDO::getId).collect(Collectors.toList()).toArray(new String[0])) + ")");
- return codePhaseAttrMapper.selectByCondition(conditionMap, new PageHelper(-1));
- }else{
- return new ArrayList<>();
- }
- }
-
- /**
- * 闃舵鐨勮〃鍚�
- * @return 琛ㄥ悕
- */
- private String getPhaseTable(){
- return VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_TEMPLATE_PHASE);
- }
-
- /**
- * 闃舵灞炴�х殑琛ㄥ悕
- * @return 琛ㄥ悕
- */
- private String getPhaseAttrTable(){
- return VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_PHASE_ATTR);
- }
-
- /**
- * 妯℃澘灞炴�у垹闄ょ殑鏃跺�欒Е鍙�
- * @param attrDOList 灞炴�х殑鏁版嵁瀵硅薄
- * @return 鍙楀奖鍝嶇殑鏁版嵁
- */
- @Override
- public BatchCBO codeTemplateAttrDeleteTrigger(List<CodeClassifyTemplateAttrDO> attrDOList){
- BatchCBO batchCBO = new BatchCBO();
- List<CodePhaseAttrDO> phaseAttrDOS =listLinkAttrDOByTemplateAttrDOS(attrDOList);
- if(!CollectionUtils.isEmpty(phaseAttrDOS)){
- //灞炴�ц鍒犻櫎鐨勬椂鍊欙紝闃舵閲岄潰涔熶竴鏍疯琚垹闄�
- batchCBO.copyFromOther(codePhaseAttrMapper.batchDeleteByOids(phaseAttrDOS.stream().map(CodePhaseAttrDO::getOid).collect(Collectors.toList())));
- }
- return batchCBO;
- }
-
- /**
- * 妯℃澘鍒犻櫎鐨勬椂鍊欒Е鍙�
- *
- * @param classifyTemplateOid 妯℃澘鐨勪富閿�
- * @return 鍙楀奖鍝嶇殑鏁版嵁
- */
- @Override
- public BatchCBO codeTemplateDeleteTrigger(String classifyTemplateOid) {
- BatchCBO batchCBO = new BatchCBO();
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("codeClassifyTemplateOid",classifyTemplateOid);
- List<CodeTemplatePhaseDO> templatePhaseDOS = codeTemplatePhaseMapper.selectByCondition(conditionMap, new PageHelper(-1));
- conditionMap.clear();
- if(!CollectionUtils.isEmpty(templatePhaseDOS)) {
- batchCBO.copyFromOther(codeTemplatePhaseMapper.batchDeleteByOids(templatePhaseDOS.stream().map(CodeTemplatePhaseDO::getOid).collect(Collectors.toList())));
- conditionMap.put("codePhaseOid", QueryOptionConstant.IN + "(select oid from " + getPhaseTable() + " where codeClassifyTemplateOid='" + classifyTemplateOid + "')");
- List<CodePhaseAttrDO> phaseAttrDOS = codePhaseAttrMapper.selectByCondition(conditionMap, new PageHelper(-1));
- if(!CollectionUtils.isEmpty(phaseAttrDOS)){
- batchCBO.copyFromOther(codePhaseAttrMapper.batchDeleteByOids(phaseAttrDOS.stream().map(CodePhaseAttrDO::getOid).collect(Collectors.toList())));
- }
- }
- return batchCBO;
- }
-
- /**
- * 涓婚敭鑾峰彇妯℃澘闃舵
- * @param oid 涓婚敭
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public CodeTemplatePhaseVO getObjectByOid(String oid) throws VciBaseException{
- return codeTemplatePhaseDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private CodeTemplatePhaseDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- CodeTemplatePhaseDO codeTemplatePhaseDO = codeTemplatePhaseMapper.selectByPrimaryKey(oid.trim());
- if(codeTemplatePhaseDO == null || StringUtils.isBlank(codeTemplatePhaseDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return codeTemplatePhaseDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇妯℃澘闃舵
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<CodeTemplatePhaseVO> listCodeTemplatePhaseByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeTemplatePhaseDO> codeTemplatePhaseDOList = listCodeTemplatePhaseDOByOidCollections(oidCollections);
- return codeTemplatePhaseDO2VOs(codeTemplatePhaseDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<CodeTemplatePhaseDO> listCodeTemplatePhaseDOByOidCollections(Collection<String> oidCollections){
- List<CodeTemplatePhaseDO> codeTemplatePhaseDOList = new ArrayList<CodeTemplatePhaseDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<CodeTemplatePhaseDO> tempDOList = codeTemplatePhaseMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- codeTemplatePhaseDOList.addAll(tempDOList);
- }
- }
- }
- return codeTemplatePhaseDOList;
- }
-
-
-
- /**
- * 鍙傜収妯℃澘闃舵鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 妯℃澘闃舵鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<CodeTemplatePhaseVO> refDataGridCodeTemplatePhase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridCodeTemplatePhase(conditionMap,pageHelper);
- }
-
- /**
- * 闃舵涓嶅寘鍚殑灞炴��
- *
- * @param conditionMap 鏌ヨ瀵硅薄锛屽繀椤昏鏈夋ā鏉跨殑涓婚敭锛坈lassifyTemplateOid锛夛紝鍚﹀垯涓嶈兘纭畾灞炴��
- * @param pageHelper 鍒嗛〉瀵硅薄
- * @return 灞炴�х殑淇℃伅
- */
- @Override
- public DataGrid<CodeClassifyTemplateAttrVO> gridUnUsedAttribute(Map<String, String> conditionMap, PageHelper pageHelper) {
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- if(!conditionMap.containsKey("classifyTemplateOid")){
- return new DataGrid<>("娌℃湁妯℃澘鐨勪富閿�");
- }
- //闇�瑕佸垽鏂樁娈电殑涓婚敭鏄惁瀛樺湪
- String codePhaseOid = conditionMap.getOrDefault("codePhaseOid", null);
- if(StringUtils.isNotBlank(codePhaseOid)){
- //鎺掗櫎闃舵涓婁娇鐢ㄧ殑
- conditionMap.remove("codePhaseOid");
- conditionMap.put("id", QueryOptionConstant.NOTIN + "(select id from " + getPhaseAttrTable() + " where codePhaseOid ='" +codePhaseOid + "')");
- }
- return tempAttrService.gridCodeClassifyTemplateAttr(conditionMap,pageHelper);
- }
-
- /**
- * 闃舵鍖呭惈鐨勫睘鎬�
- *
- * @param conditionMap 鏌ヨ瀵硅薄锛屽繀椤昏闃舵鐨勪富閿�(codePhaseOid)
- * @param pageHelper 鍒嗛〉瀵硅薄
- * @return 灞炴�х殑淇℃伅
- */
- @Override
- public DataGrid<CodeClassifyTemplateAttrVO> gridUsedAttribute(Map<String, String> conditionMap, PageHelper pageHelper) {
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- String codePhaseOid = conditionMap.getOrDefault("codePhaseOid", null);
- if(StringUtils.isBlank(codePhaseOid)){
- return new DataGrid<>();
- }
- conditionMap.remove("codePhaseOid");
- CodeTemplatePhaseDO phaseDO = selectByOid(codePhaseOid);
- conditionMap.put("id",QueryOptionConstant.IN + "(select id from " + getPhaseAttrTable() + " where codePhaseOid ='" +codePhaseOid + "')");
- conditionMap.put("classifyTemplateOid",phaseDO.getCodeClassifyTemplateOid());
- return tempAttrService.gridCodeClassifyTemplateAttr(conditionMap,pageHelper);
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreApplyDataInfoServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreApplyDataInfoServiceImpl.java
deleted file mode 100644
index f58855b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreApplyDataInfoServiceImpl.java
+++ /dev/null
@@ -1,277 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.vci.ubcs.code.mapper.DockingPreApplyDataInfoMapper;
-import com.vci.ubcs.code.entity.DockingPreApplyDataInfoDO;
-import com.vci.ubcs.code.service.DockingPreApplyDataInfoServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.DockingPreApplyDataInfoDTO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyDataInfoVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-/**
- * 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏈嶅姟
- * @author weidy
- * @date 2022-04-05
- */
-@Service
-public class DockingPreApplyDataInfoServiceImpl implements DockingPreApplyDataInfoServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private DockingPreApplyDataInfoMapper dockingPreApplyDataInfoMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<DockingPreApplyDataInfoVO> gridDockingPreApplyDataInfo(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<DockingPreApplyDataInfoDO> doList = dockingPreApplyDataInfoMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<DockingPreApplyDataInfoVO> dataGrid=new DataGrid<DockingPreApplyDataInfoVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(dockingPreApplyDataInfoDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(dockingPreApplyDataInfoMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param dockingPreApplyDataInfoDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<DockingPreApplyDataInfoVO> dockingPreApplyDataInfoDO2VOs(Collection<DockingPreApplyDataInfoDO> dockingPreApplyDataInfoDOs) throws VciBaseException{
- List<DockingPreApplyDataInfoVO> voList = new ArrayList<DockingPreApplyDataInfoVO>();
- if(!CollectionUtils.isEmpty(dockingPreApplyDataInfoDOs)){
- for(DockingPreApplyDataInfoDO s: dockingPreApplyDataInfoDOs){
- DockingPreApplyDataInfoVO vo = dockingPreApplyDataInfoDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param dockingPreApplyDataInfoDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DockingPreApplyDataInfoVO dockingPreApplyDataInfoDO2VO(DockingPreApplyDataInfoDO dockingPreApplyDataInfoDO) throws VciBaseException{
- DockingPreApplyDataInfoVO vo = new DockingPreApplyDataInfoVO();
- if(dockingPreApplyDataInfoDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreApplyDataInfoDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataInfoDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public DockingPreApplyDataInfoVO addSave(DockingPreApplyDataInfoDTO dockingPreApplyDataInfoDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(dockingPreApplyDataInfoDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- DockingPreApplyDataInfoDO dockingPreApplyDataInfoDO = new DockingPreApplyDataInfoDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreApplyDataInfoDTO,dockingPreApplyDataInfoDO);
- dockingPreApplyDataInfoMapper.insert(dockingPreApplyDataInfoDO);
- return dockingPreApplyDataInfoDO2VO(dockingPreApplyDataInfoDO);
- }
-
- /**
- * 淇敼璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataInfoDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public DockingPreApplyDataInfoVO editSave(DockingPreApplyDataInfoDTO dockingPreApplyDataInfoDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(dockingPreApplyDataInfoDTO,"鏁版嵁瀵硅薄",dockingPreApplyDataInfoDTO.getOid(),"璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅涓婚敭");
- //灏咲TO杞崲涓篋O
- DockingPreApplyDataInfoDO dockingPreApplyDataInfoDO = selectByOid(dockingPreApplyDataInfoDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(dockingPreApplyDataInfoDTO,dockingPreApplyDataInfoDO);
- dockingPreApplyDataInfoMapper.updateByPrimaryKey(dockingPreApplyDataInfoDO);
- return dockingPreApplyDataInfoDO2VO(dockingPreApplyDataInfoDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param dockingPreApplyDataInfoDTO 鏁版嵁浼犺緭瀵硅薄
- * @param dockingPreApplyDataInfoDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(DockingPreApplyDataInfoDTO dockingPreApplyDataInfoDTO, DockingPreApplyDataInfoDO dockingPreApplyDataInfoDO) {
- DockingPreApplyDataInfoDO tsDO = new DockingPreApplyDataInfoDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreApplyDataInfoDTO,tsDO);
- boService.checkTs(tsDO);
- if(!checkIsLinked(dockingPreApplyDataInfoDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataInfoDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteDockingPreApplyDataInfo(DockingPreApplyDataInfoDTO dockingPreApplyDataInfoDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(dockingPreApplyDataInfoDTO,"璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄",dockingPreApplyDataInfoDTO.getOid(),"璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鐨勪富閿�");
- DockingPreApplyDataInfoDO dockingPreApplyDataInfoDO = selectByOid(dockingPreApplyDataInfoDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(dockingPreApplyDataInfoDTO,dockingPreApplyDataInfoDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = dockingPreApplyDataInfoMapper.deleteByPrimaryKey(dockingPreApplyDataInfoDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param oid 涓婚敭
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public DockingPreApplyDataInfoVO getObjectByOid(String oid) throws VciBaseException{
- return dockingPreApplyDataInfoDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private DockingPreApplyDataInfoDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- DockingPreApplyDataInfoDO dockingPreApplyDataInfoDO = dockingPreApplyDataInfoMapper.selectByPrimaryKey(oid.trim());
- if(dockingPreApplyDataInfoDO == null || StringUtils.isBlank(dockingPreApplyDataInfoDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return dockingPreApplyDataInfoDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<DockingPreApplyDataInfoVO> listDockingPreApplyDataInfoByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<DockingPreApplyDataInfoDO> dockingPreApplyDataInfoDOList = listDockingPreApplyDataInfoDOByOidCollections(oidCollections);
- return dockingPreApplyDataInfoDO2VOs(dockingPreApplyDataInfoDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<DockingPreApplyDataInfoDO> listDockingPreApplyDataInfoDOByOidCollections(Collection<String> oidCollections){
- List<DockingPreApplyDataInfoDO> dockingPreApplyDataInfoDOList = new ArrayList<DockingPreApplyDataInfoDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<DockingPreApplyDataInfoDO> tempDOList = dockingPreApplyDataInfoMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- dockingPreApplyDataInfoDOList.addAll(tempDOList);
- }
- }
- }
- return dockingPreApplyDataInfoDOList;
- }
-
-
-
- /**
- * 鍙傜収璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<DockingPreApplyDataInfoVO> refDataGridDockingPreApplyDataInfo(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridDockingPreApplyDataInfo(conditionMap,pageHelper);
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreApplyDataServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreApplyDataServiceImpl.java
deleted file mode 100644
index b2f4220..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreApplyDataServiceImpl.java
+++ /dev/null
@@ -1,1116 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.alibaba.cloud.commons.io.FileUtils;
-import com.vci.ubcs.code.constant.MdmDuckingConstant;
-import com.vci.ubcs.code.constant.MdmEngineConstant;
-import com.vci.ubcs.code.mapper.DockingPreApplyDataMapper;
-import com.vci.ubcs.code.mapper.DockingPreApplyDataInfoMapper;
-import com.vci.ubcs.code.lifecycle.CodeDefaultLC;
-import com.vci.ubcs.code.entity.DockingPreApplyDataDO;
-import com.vci.ubcs.code.entity.DockingPreApplyDataInfoDO;
-import com.vci.ubcs.code.utils.AttributeMapConfig;
-import com.vci.ubcs.code.utils.EnumVO;
-import com.vci.starter.poi.bo.SheetDataSet;
-import com.vci.starter.poi.bo.SheetRowData;
-import com.vci.starter.poi.bo.WriteExcelData;
-import com.vci.starter.poi.bo.WriteExcelOption;
-import com.vci.starter.poi.util.ExcelUtil;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.enumpck.ResultCodeEnum;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.*;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.service.*;
-import com.vci.ubcs.code.vo.pagemodel.*;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.UITableFieldVO;
-import com.vci.web.redis.RedisService;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.lang.StringUtils;
-import org.dom4j.Attribute;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.CodeOrderDTO;
-import com.vci.ubcs.code.dto.DockingPreApplyDataDTO;
-import com.vci.ubcs.code.dto.DockingPreApplyDataInfoDTO;
-import com.vci.ubcs.code.dto.PreApplyCodeOrderDTO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.*;
-
-/**
- * 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏈嶅姟
- * @author weidy
- * @date 2022-04-05
- */
-@Service
-public class DockingPreApplyDataServiceImpl implements DockingPreApplyDataServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private DockingPreApplyDataMapper dockingPreApplyDataMapper;
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private DockingPreApplyDataInfoMapper dockingPreApplyDataInfoMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private DockingPreApplyDataInfoServiceI dockingPreApplyDataInfoServiceI;
-
- /**
- * 妯℃澘鐨勬湇鍔�
- */
- @Autowired
- private CodeClassifyTemplateServiceI templateService;
- /**
- * 鍒嗙被鎿嶄綔鏈嶅姟
- */
- @Autowired
- private CodeClassifyServiceImpl codeClassifyService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private CodeClassifyServiceI codeClassifyServiceI;
-
- /**
- * 棰勭敵璇锋暟鎹紝灞炴�ф槧灏勬ā鏉垮瓨鏀捐矾寰�
- */
- @Value("${docking.templateDir:D:\\desktop}")
- public String preApplyTemplate;
-
- @Value("${docking.tuhao:tuhao}")
- public String tuhao;
- /**
- * 涓绘暟鎹紩鎿庢湇鍔�
- */
- @Autowired(required = false)
- @Lazy
- private MdmEngineServiceI engineService;
-
- /**
- * 涓绘暟鎹紩鎿庢湇鍔�
- */
- @Autowired(required = false)
- @Lazy
- private MdmIOServiceI mdmIOService;
-
- @Autowired
- private RedisService redisService;
-
- @Autowired
- private DockingPreAttrMappingSeviceI dockingPreAttrMappingSeviceI;
-
- /***
- * 鑾峰彇MAP鏋氫妇鍊�
- */
-
- @Autowired
- private AttributeMapConfig attributeMapConfig;
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param dockingPreApplyDataDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- public List<DockingPreApplyDataVO> dockingPreApplyDataDO2VOs(Collection<DockingPreApplyDataDO> dockingPreApplyDataDOs, boolean iscontainAttr) throws VciBaseException {
- List<DockingPreApplyDataVO> voList = new ArrayList<DockingPreApplyDataVO>();
- if(!CollectionUtils.isEmpty(dockingPreApplyDataDOs)){
- for(DockingPreApplyDataDO s: dockingPreApplyDataDOs){
- DockingPreApplyDataVO vo = dockingPreApplyDataDO2VO(s,iscontainAttr);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- private DockingPreApplyDataVO dockingPreApplyDataDO2VO(DockingPreApplyDataDO dockingPreApplyDataDO,boolean iscontainAttr) throws VciBaseException{
- DockingPreApplyDataVO vo = new DockingPreApplyDataVO();
- if(dockingPreApplyDataDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreApplyDataDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- if(iscontainAttr) {
- List<DockingPreApplyDataInfoDO> dockingPreApplyDataInfoDOS = redisService.getCacheList(vo.getOid() + "_attr");
- if (CollectionUtils.isEmpty(dockingPreApplyDataInfoDOS)) {
- //鏌ヨ鏁版嵁鐨勫睘鎬у搴斿�间俊鎭�
- VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(DockingPreApplyDataInfoDO.class);
- queryWrapperForDO.addQueryMap("dataoid",dockingPreApplyDataDO.getOid());
- dockingPreApplyDataInfoDOS= boService.selectByQueryWrapper(queryWrapperForDO,DockingPreApplyDataInfoDO.class);
- }
- List<DockingPreApplyDataInfoVO> dockingPreApplyDataInfoVOS = dockingPreApplyDataInfoServiceI.dockingPreApplyDataInfoDO2VOs(dockingPreApplyDataInfoDOS);
- vo.setDockingPreApplyDataInfoVOs(dockingPreApplyDataInfoVOS);
- }
- }
- return vo;
- }
-
-
- @Override
- public List<DockingPreApplyDataVO> batchSetDataClassId(DockingPreApplyDataDTO dockingPreApplyDataDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(dockingPreApplyDataDTO,"鏁版嵁瀵硅薄",dockingPreApplyDataDTO.getOid(),"璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅涓婚敭");
- List<String> oidList= VciBaseUtil.str2List(dockingPreApplyDataDTO.getOid());
- String classOid=dockingPreApplyDataDTO.getClassifyoid();
- List<DockingPreApplyDataDO> dockingPreApplyDataDOS=dockingPreApplyDataMapper.selectByPrimaryKeyCollection(oidList);
- dockingPreApplyDataDOS.stream().forEach(dockingPreApplyDataDO -> {
- dockingPreApplyDataDO.setClassifyoid(classOid);
- });
- dockingPreApplyDataMapper.batchUpdate(dockingPreApplyDataDOS);
- List<DockingPreApplyDataVO> dockingPreApplyDataVOS= dockingPreApplyDataDO2VOs(dockingPreApplyDataDOS);
- return dockingPreApplyDataVOS;
- }
-
- /***
- * 杩斿洖淇℃伅
- * @param codeClassifyOid
- * @param templateOid
- * @param btmType
- * @param dataOids
- * @return
- * @throws VciBaseException
- */
- @Override
- public DataGrid<Map<String, String>> gridApplyData(String codeClassifyOid, String templateOid, String btmType, String dataOids) throws VciBaseException {
- VciBaseUtil.alertNotNull(codeClassifyOid,"鏁版嵁瀵硅薄",codeClassifyOid,"鍒嗙被涓婚敭");
- VciBaseUtil.alertNotNull(templateOid,"鏁版嵁瀵硅薄",templateOid,"鍒嗙被妯℃澘");
- VciBaseUtil.alertNotNull(dataOids,"鏁版嵁瀵硅薄",dataOids,"鏁版嵁涓婚敭");
- CodeClassifyVO topClassifyVO = codeClassifyService.getTopClassifyVO(codeClassifyOid);
- String btmTypeId = topClassifyVO.getBtmtypeid();
- if (StringUtils.isBlank(btmTypeId)) {
- return new DataGrid<>("杩欎釜鍒嗙被鎵�灞為《灞傚垎绫绘病鏈夋坊鍔犱笟鍔＄被鍨�");
- }
- boolean iccheckHasChild=codeClassifyService.checkHasChild(codeClassifyOid);
- if(iccheckHasChild){
- throw new VciBaseException("璇烽�夋嫨鍙跺瓙鍒嗙被鑺傜偣鐢宠鏁版嵁锛�");
- }
- CodeClassifyTemplateVO templateVO= engineService.getUsedTemplateByClassifyOid(codeClassifyOid);
- Map<String, String> classifyDevlevMap= engineService.previewClassify(codeClassifyOid,templateOid);
- List<CodeClassifyTemplateAttrVO> templateAttrVOS=templateVO.getAttributes();
- Map<String,CodeClassifyTemplateAttrVO> attrTemplateAttrMap=templateAttrVOS.stream().collect(Collectors.toMap(s -> s.getId(), t -> t, (o1, o2) -> o2));
- Map<String,String> condtionMappingMap=new HashMap<>();
- condtionMappingMap.put("jviewModeId", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(VciBaseUtil.str2List(templateOid).toArray(new String[]{})) + ")");
- //condtionMappingMap.put("jSourceClsfId",codeClassifyOid);
- //鑾峰彇灞炴�ф槧灏勫叧绯�
- List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=dockingPreAttrMappingSeviceI.selectAttrMappings(condtionMappingMap);
- if(CollectionUtils.isEmpty(dockingPreAttrMappingVOList)){
- return new DataGrid<>("鏈幏鍙栧埌鐩稿叧灞炴�ф槧灏勯厤缃�");
- }
- List<DockingPreApplyDataDO> dockingPreApplyDataDOS=this.dockingPreApplyDataMapper.selectByPrimaryKeyCollection(VciBaseUtil.str2List(dataOids));
- List<DockingPreApplyDataVO> dockingPreApplyDataVOS= dockingPreApplyDataDO2VOs(dockingPreApplyDataDOS,true);
- List<Map> maps=new ArrayList<>();
-
- dockingPreApplyDataVOS.stream().forEach(dockingPreApplyDataVO -> {
- List<DockingPreApplyDataInfoVO> dockingPreApplyDataInfoVOS= dockingPreApplyDataVO.getDockingPreApplyDataInfoVOs();
- Map<String/**oid**/, DockingPreApplyDataInfoVO/**瀵硅薄**/> attrMappingMap=new HashMap<>();
- if(!CollectionUtils.isEmpty(dockingPreApplyDataInfoVOS)) {
- attrMappingMap = dockingPreApplyDataInfoVOS.stream().collect(Collectors.toMap(s -> s.getKey(), t -> t, (o1, o2) -> o2));
- }
- Map<String,String> attributMap=new HashMap<>();
- Map<String, DockingPreApplyDataInfoVO> finalAttrMappingMap = attrMappingMap;
- dockingPreAttrMappingVOList.stream().forEach(dockingPreAttrMappingVO -> {
- String innerName=dockingPreAttrMappingVO.getJsourceAttrKey();
- String jtargetAttrKey=dockingPreAttrMappingVO.getJtargetAttrKey().toLowerCase(Locale.ROOT);
- final String[] defaulValue = {dockingPreAttrMappingVO.getJdefaultValue()};
- CodeClassifyTemplateAttrVO templateAttr= attrTemplateAttrMap.get(innerName);
-
- if(innerName.equalsIgnoreCase(tuhao.toLowerCase(Locale.ROOT))){//灞炴�ф槧灏勪腑鏄浘鍙风殑搴斿綋鍗曠嫭鍔�
- attributMap.put(tuhao,dockingPreApplyDataVO.getUniquecode());
- }else{
- if (StringUtils.isNotBlank(jtargetAttrKey) && finalAttrMappingMap.containsKey(jtargetAttrKey)) {
- DockingPreApplyDataInfoVO dataInfoVO = finalAttrMappingMap.get(jtargetAttrKey);
- String value = dataInfoVO.getValue();
- List<DockingPreAttrRangeVO> dockingPreAttrRangeVOList = dockingPreAttrMappingVO.getDockingPreAttrRangeVOS();
- //Map<String/**闆嗘垚灞炴�у彇鍊艰寖鍥寸殑鍐呴儴鍊�**/, String/**涓绘暟鎹睘鎬у彇鍊艰寖鍥村唴閮ㄥ��**/> attrNameIdMap=new HashMap<>();
- if (StringUtils.isNotBlank(value)) {
- defaulValue[0] = value;
- }
- if (!CollectionUtils.isEmpty(dockingPreAttrRangeVOList)) {
- // attrNameIdMap = dockingPreAttrRangeVOList.stream().collect(Collectors.toMap(s -> s.getJtargeNumTextValue(), t -> t.getJnumTextValue().toLowerCase(Locale.ROOT),(o1, o2)->o2));
- dockingPreAttrRangeVOList.stream().forEach(dockingPreAttrRangeVO -> {
- String jtargeNumTextValue = dockingPreAttrRangeVO.getJtargeNumTextValue();
- List<String> valueList = VciBaseUtil.str2List(jtargeNumTextValue);
- if (valueList.contains(value)) {
- defaulValue[0] = dockingPreAttrRangeVO.getJnumTextValue();
- }
- });
- }
- }
- //鍒ゆ柇妯℃澘灞炴�ц缃鍒欓粯璁ゅ��
- if (StringUtils.isBlank(defaulValue[0]) && templateAttr != null && StringUtils.isNotBlank(templateAttr.getClassifyinvokelevel())) {
- defaulValue[0] = classifyDevlevMap.get(innerName);
- }
-
- //鍒ゆ柇妯℃澘灞炴�ч粯璁ゅ��
- if (StringUtils.isBlank(defaulValue[0]) && templateAttr != null && StringUtils.isNotBlank(templateAttr.getDefaultvalue())) {
- defaulValue[0] = templateAttr.getDefaultvalue();
- }
- if (((StringUtils.isNotBlank(templateAttr.getEnumString())
- && !"[]".equalsIgnoreCase(templateAttr.getEnumString())) ||
- StringUtils.isNotBlank(templateAttr.getEnumid()))) {
- UITableFieldVO fieldVO = engineService.templateAttr2TableField(templateAttr, false);
- List<KeyValue> keyValueList = fieldVO.getData();
- String text = "";
- if (!CollectionUtils.isEmpty(keyValueList)) {
- Map<String, String> enumMap = keyValueList.stream().collect(Collectors.toMap(s -> s.getKey(), t -> t.getValue().toLowerCase(Locale.ROOT), (o1, o2) -> o2));
- if (enumMap.containsKey(defaulValue[0])) {
- text = enumMap.get(defaulValue[0]);
- }
- }
- attributMap.put(fieldVO.getField(), text);
- }
- attributMap.put(innerName, defaulValue[0]);
- }
- });
- maps.add(attributMap);
- });
- DataGrid<Map<String, String>> dataGrid = new DataGrid<>();
- List<Map<String, String>> dataList = new ArrayList<>();
- if (!CollectionUtils.isEmpty(maps)) {
- maps.stream().forEach(map -> {
- Map<String, String> data = new HashMap<>();
- map.forEach((key, value) -> {
- data.put((String) key, (String) value);
- });
- dataList.add(data);
- });
- }
- dataGrid.setData(dataList);
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param dockingPreApplyDataDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<DockingPreApplyDataVO> dockingPreApplyDataDO2VOs(Collection<DockingPreApplyDataDO> dockingPreApplyDataDOs) throws VciBaseException{
- List<DockingPreApplyDataVO> voList = new ArrayList<DockingPreApplyDataVO>();
- if(!CollectionUtils.isEmpty(dockingPreApplyDataDOs)){
- for(DockingPreApplyDataDO s: dockingPreApplyDataDOs){
- DockingPreApplyDataVO vo = dockingPreApplyDataDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param dockingPreApplyDataDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DockingPreApplyDataVO dockingPreApplyDataDO2VO(DockingPreApplyDataDO dockingPreApplyDataDO) throws VciBaseException{
- DockingPreApplyDataVO vo = new DockingPreApplyDataVO();
- if(dockingPreApplyDataDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreApplyDataDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public DockingPreApplyDataVO addSave(DockingPreApplyDataDTO dockingPreApplyDataDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(dockingPreApplyDataDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- DockingPreApplyDataDO dockingPreApplyDataDO = new DockingPreApplyDataDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreApplyDataDTO,dockingPreApplyDataDO);
- dockingPreApplyDataMapper.insert(dockingPreApplyDataDO);
- return dockingPreApplyDataDO2VO(dockingPreApplyDataDO);
- }
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param dockingPreApplyDataDTO 鏁版嵁浼犺緭瀵硅薄
- * @param dockingPreApplyDataDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(DockingPreApplyDataDTO dockingPreApplyDataDTO, DockingPreApplyDataDO dockingPreApplyDataDO) {
- DockingPreApplyDataDO tsDO = new DockingPreApplyDataDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreApplyDataDTO,tsDO);
- boService.checkTs(tsDO);
- if(!checkIsLinked(dockingPreApplyDataDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteDockingPreApplyData(DockingPreApplyDataDTO dockingPreApplyDataDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(dockingPreApplyDataDTO,"璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁瀵硅薄",dockingPreApplyDataDTO.getOid(),"璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鐨勪富閿�");
- DockingPreApplyDataDO dockingPreApplyDataDO = selectByOid(dockingPreApplyDataDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(dockingPreApplyDataDTO,dockingPreApplyDataDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = dockingPreApplyDataMapper.deleteByPrimaryKey(dockingPreApplyDataDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param oid 涓婚敭
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public DockingPreApplyDataVO getObjectByOid(String oid) throws VciBaseException{
- return dockingPreApplyDataDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private DockingPreApplyDataDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- DockingPreApplyDataDO dockingPreApplyDataDO = dockingPreApplyDataMapper.selectByPrimaryKey(oid.trim());
- if(dockingPreApplyDataDO == null || StringUtils.isBlank(dockingPreApplyDataDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return dockingPreApplyDataDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<DockingPreApplyDataVO> listDockingPreApplyDataByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<DockingPreApplyDataDO> dockingPreApplyDataDOList = listDockingPreApplyDataDOByOidCollections(oidCollections);
- return dockingPreApplyDataDO2VOs(dockingPreApplyDataDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<DockingPreApplyDataDO> listDockingPreApplyDataDOByOidCollections(Collection<String> oidCollections){
- List<DockingPreApplyDataDO> dockingPreApplyDataDOList = new ArrayList<DockingPreApplyDataDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<DockingPreApplyDataDO> tempDOList = dockingPreApplyDataMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- dockingPreApplyDataDOList.addAll(tempDOList);
- }
- }
- }
- return dockingPreApplyDataDOList;
- }
-
-
-
- /**
- * 鍙傜収璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<DockingPreApplyDataVO> refDataGridDockingPreApplyData(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridDockingPreApplyData(conditionMap,pageHelper);
- }
-
- //==================
-
- /**
- * 鏌ヨ鎵�鏈夌殑璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<DockingPreApplyDataVO> gridDockingPreApplyData(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
-
- //鍙煡璇㈠惎鐢ㄧ殑data锛岃繖鏍峰氨涓嶇敤鍘绘壘鏈�澶х増鏈彿浜嗗啀鏌ヨ
- conditionMap.put("useddflag","true");
- List<DockingPreApplyDataDO> doList = dockingPreApplyDataMapper.selectByCondition(conditionMap,pageHelper);
- Map<String,List<EnumVO>> mpmEnumMap= this.attributeMapConfig.getMpmEnumMap();
- Map<String,List<String>> typeCodemap =new HashedMap();
- doList.stream().forEach(dockingPreApplyDataDO -> {
- String enumValue= dockingPreApplyDataDO.getParttype();
- String type=dockingPreApplyDataDO.getType();
- String code=dockingPreApplyDataDO.getNum();
- if(!CollectionUtils.isEmpty(mpmEnumMap)){
- if(mpmEnumMap.containsKey("partType")){
- List<EnumVO> partTypeEnumMapList= mpmEnumMap.get("partType");
- Map<String, String> enumFieldValueMap = partTypeEnumMapList.stream().collect(Collectors.toMap(EnumVO::getEnumValue, EnumVO::getEnumText, (key1, key2) -> key2));
- if(enumFieldValueMap.containsKey(enumValue)){
- String enumText= enumFieldValueMap.get(enumValue);
- dockingPreApplyDataDO.setParttype(enumText);
- }
- }
- }
- if(StringUtils.isNotBlank(code)) {
- List<String> codeList = new ArrayList<>();
- codeList.add(code);
- if (typeCodemap.containsKey(type)) {
- List<String> oldCodeList = typeCodemap.get(type);
- codeList.addAll(oldCodeList);
- }
- typeCodemap.put(type, codeList);
- }
- });
- List<ClientBusinessObject> cbos=new ArrayList<>();
- if(!CollectionUtils.isEmpty(typeCodemap)) {
- typeCodemap.forEach((type,codes)->{
- Map<String,String> contionMap=new HashedMap();
- contionMap.put("id", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(codes.toArray(new String[]{})) + ")");
- List<ClientBusinessObject> newcbos=boService.queryCBO(type,contionMap);
- cbos.addAll(newcbos);
- });
- }
- Map<String, ClientBusinessObject> codeCbosMap = cbos.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
- doList.stream().forEach(s->{
- String code =s.getNum();
- if(codeCbosMap.containsKey(code)){
- ClientBusinessObject cbo= codeCbosMap.get(code);
- if(!cbo.getLcStatus().equals(CodeDefaultLC.RELEASED.getValue())){//濡傛灉涓嶆槸鍙戝竷鐘舵�佸垯闅愯棌缂栫爜
- s.setNum("******");
- s.setId("******");
- s.setPreapplyoid("******");
- }
- }else{
-
- }
- });
-
- DataGrid<DockingPreApplyDataVO> dataGrid=new DataGrid<DockingPreApplyDataVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(dockingPreApplyDataDO2VOs(doList,false));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(dockingPreApplyDataMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎻掑叆data鍜宒atainfo,浼氳嚜鍔ㄦ妸data閲岀殑oid,unique璧嬪�煎埌datainfo閲岃竟鍘�
- * @param dockingPreApplyDataDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public void addSaveDataAndInfo(DockingPreApplyDataDTO dockingPreApplyDataDTO, List<DockingPreApplyDataInfoDTO> dockingPreApplyDataInfoDTOList) throws VciBaseException{
- String unique = "";
- //灏咲TO杞崲涓篋O
- DockingPreApplyDataDO dockingPreApplyDataDO = new DockingPreApplyDataDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreApplyDataDTO,dockingPreApplyDataDO);
-
- String dataoid = dockingPreApplyDataDO.getOid();
- if(StringUtils.isEmpty(dockingPreApplyDataDO.getOid())) {
- dataoid = redisService.getUUIDEveryDay();
- dockingPreApplyDataDO.setOid(dataoid);
- }
-
- //鏌ヨ浠ュ墠鐨勬暟鎹紝鍑嗗淇敼usedflasg
- VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(DockingPreApplyDataDO.class);
- queryWrapperForDO.addQueryMap("uniquecode",dockingPreApplyDataDO.getUniquecode());
- List<DockingPreApplyDataDO> dockingPreApplyDataDOList = boService.selectByQueryWrapper(queryWrapperForDO,DockingPreApplyDataDO.class);
-
- //鎵ц鏁版嵁淇濆瓨鎿嶄綔
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
-
- BatchCBO batchUpdateData = new BatchCBO();
- //淇敼浠ュ墠鐨勬暟鎹畊seddflag=false
- if (dockingPreApplyDataDOList.size() != 0) {
- for (DockingPreApplyDataDO dockingPreApplyDataDOi : dockingPreApplyDataDOList) {
- dockingPreApplyDataDOi.setUseddflag(MdmDuckingConstant.PRE_APPLY_DATA_USER_FALSE);
- }
- batchUpdateData = dockingPreApplyDataMapper.batchUpdate(dockingPreApplyDataDOList);
- }
-
- //鏂板鐜板湪鐨刣ata
- dockingPreApplyDataDO.setUseddflag(MdmDuckingConstant.PRE_APPLY_DATA_USER_TRUE);//鏄渶鏂扮殑
- BatchCBO batchInsertData = dockingPreApplyDataMapper.insert(dockingPreApplyDataDO);
- batchUpdateData.copyFromOther(batchInsertData);
-
- //鏂板dataInfo
- List<DockingPreApplyDataInfoDO> dockingPreApplyDataInfoDOList = new ArrayList<DockingPreApplyDataInfoDO>();
- for (DockingPreApplyDataInfoDTO dockingPreApplyDataInfoDTO : dockingPreApplyDataInfoDTOList) {
- DockingPreApplyDataInfoDO dockingPreApplyDataInfoDO = new DockingPreApplyDataInfoDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreApplyDataInfoDTO, dockingPreApplyDataInfoDO);
- dockingPreApplyDataInfoDO.setDataoid(dataoid);
-
- if (StringUtils.isNotEmpty(dockingPreApplyDataDO.getUniquecode())) {
- dockingPreApplyDataInfoDO.setUniquecode(dockingPreApplyDataDO.getUniquecode());
- }
- if (StringUtils.isEmpty(dockingPreApplyDataInfoDO.getOid())) {
- String datainfooid = redisService.getUUIDEveryDay();
- dockingPreApplyDataInfoDO.setOid(datainfooid);
- }
-
- dockingPreApplyDataInfoDOList.add(dockingPreApplyDataInfoDO);
- }
-
- if(dockingPreApplyDataInfoDOList.size()!=0) {
- BatchCBO batchInsertDataInfo = dockingPreApplyDataInfoMapper.batchInsert(dockingPreApplyDataInfoDOList);
- batchUpdateData.copyFromOther(batchInsertDataInfo);
- redisService.setCacheList(dockingPreApplyDataDO.getOid(),dockingPreApplyDataInfoDOList);
- }
- WebUtil.setPersistence(true);//鎵ц淇濆瓨
- boService.persistenceBatch(batchUpdateData);//涓�璧锋墽琛屼繚瀛�
- }
-
- /**
- * 淇敼璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅
- * @param dockingPreApplyDataDTO 璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public BaseResult editSave(DockingPreApplyDataDTO dockingPreApplyDataDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(dockingPreApplyDataDTO,"鏁版嵁瀵硅薄",dockingPreApplyDataDTO.getOid(),"璁板綍宸ヨ壓鎺ㄩ�佽繃鏉ョ殑鏁版嵁淇℃伅涓婚敭");
- //灏咲TO杞崲涓篋O
- DockingPreApplyDataDO dockingPreApplyDataDO = selectByOid(dockingPreApplyDataDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(dockingPreApplyDataDTO,dockingPreApplyDataDO);
- dockingPreApplyDataMapper.updateByPrimaryKey(dockingPreApplyDataDO);
- return BaseResult.success(dockingPreApplyDataDO2VO(dockingPreApplyDataDO));
- }
-
- /**
- * 鏍规嵁data鐨刼id鏌ヨdata淇℃伅鍜宒atainfo淇℃伅锛屽苟涓旀嫾鎺atainfo涓簃ap
- * @param dockingPreApplyDataDTO
- * @return
- * @throws VciBaseException
- */
- @Override
- public BaseResult<Map<String,String>> getDataInfoMap(DockingPreApplyDataDTO dockingPreApplyDataDTO) throws VciBaseException{
-
- String dataoid = dockingPreApplyDataDTO.getOid();
-
- //鏌ヨdata鐨則ype
- DockingPreApplyDataDO dockingPreApplyDataDO = dockingPreApplyDataMapper.selectByPrimaryKey(dataoid);
-
- if(dockingPreApplyDataDO == null){
- String msg = "棰勭敵璇风紪鐮侊紝閫氳繃oid鏌ヨDockingPreApplyDataDO鏈壘鍒版暟鎹�!";
- logger.error(msg);
- return BaseResult.fail(msg,null);
- }
-
- String type = dockingPreApplyDataDO.getType();
-
- //鏌ヨdatainfo涓簃ap
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingPreApplyDataInfoDO.class);
- queryWrapper.addQueryMap("dataoid",dataoid);
- List<DockingPreApplyDataInfoDO> dockingPreApplyDataInfoDOList = dockingPreApplyDataInfoMapper.selectByWrapper(queryWrapper);
- Map<String,String> dataInfoMap = new HashMap<String,String>();//鎵�鏈夌殑鍊�
- for (DockingPreApplyDataInfoDO dockingPreApplyDataInfoDO :dockingPreApplyDataInfoDOList){
- dataInfoMap.put(dockingPreApplyDataInfoDO.getKey(),dockingPreApplyDataInfoDO.getValue());
- }
-//鎶奷atainfomap鏍规嵁閰嶇疆鐨勬ā鏉縳ml杞寲涓烘渶缁堝瓨鍏ョ殑鏁版嵁map
-// String systemid = dockingPreApplyDataDO.getSystemid();//绯荤粺缂栧彿
-//
-// PreApplyDataTrans preApplyDataTrans = getPreApplyDataTransBySystemIdAndType(systemid,type);
-// if(preApplyDataTrans == null){
-// String msg = "璇诲彇棰勭敵璇锋暟鎹厤缃ā鏉挎垚鍔�,浣嗘槸娌℃湁鍖归厤鐨勬ā鏉垮睘鎬�,systemid: "+systemid+",type: "+type;
-// logger.error(msg);
-// preApplyDataTrans = new PreApplyDataTrans(systemid,type,new HashMap<String,String>());
-// }
-//
-// Map<String, String> attrMap = preApplyDataTrans.getAttrMap();
-//
-// Map<String, String> outMap = getShowMap(attrMap,dataInfoMap);
-
- return BaseResult.success(dataInfoMap,"鏌ヨ鎴愬姛");
- }
-
- /**
- * 鏍规嵁systemid鏌ヨ閰嶇疆鐨勫睘鎬фā鏉�
- * @param systemid 绯荤粺id
- * @param type 鍒嗙被
- * @return
- */
- public PreApplyDataTrans getPreApplyDataTransBySystemIdAndType(String systemid,String type){
- String templateXml = null;
- String fileUrl = "";
- try {
- String templatename = systemid;
- fileUrl = preApplyTemplate+ File.separator+templatename+".xml";
- templateXml = FileUtils.readFileToString(new File(fileUrl),"utf-8");
- }catch (Exception e){
- e.printStackTrace();
- logger.error("璇诲彇棰勭敵璇峰睘鎬ф槧灏勬ā鏉垮け璐�,fileUrl: "+fileUrl);
- return null;
- }
-
- /**
- * 閫氳繃閰嶇疆鐨勬ā鏉挎枃浠讹紝杞崲涓哄墠绔鎳傚拰mdmEngineController/getDataByOid鎺ュ彛绫讳技鐨勬暟鎹�
- */
- List<PreApplyDataTrans> preApplyDataTransList = null;
- try {
- preApplyDataTransList = readAttrTransfTemplate(templateXml);
- }catch (Exception e){
- logger.error("璇诲彇棰勭敵璇锋暟鎹厤缃ā鏉垮け璐�,");
- return null;
- }
-
- PreApplyDataTrans preApplyDataTrans = null;
- for(PreApplyDataTrans preApplyDataTransi:preApplyDataTransList){
- String preApplyDataTrans_type = preApplyDataTransi.getType();
- if(type.equals(preApplyDataTrans_type)){
- preApplyDataTrans = preApplyDataTransi;
- break;
- }
- }
- return preApplyDataTrans;
- }
-
- /**
- * 鎶婇鐢宠鐨勫睘鎬ф牴鎹ā鏉縳ml杞寲涓烘渶缁堢殑灞炴�ap
- * @param attrMap
- * @param dataInfoMap
- * @return
- */
- public Map<String, String> getShowMap(Map<String, String> attrMap,Map<String, String> dataInfoMap){
- Map<String, String> outMap = new HashMap<String, String>();//杞崲鐨刱ey鍚庣殑map
- for (String systemkey:attrMap.keySet()){
- String mdmKey = attrMap.getOrDefault(systemkey,"");
- String value = dataInfoMap.getOrDefault(mdmKey,"");
- if(StringUtils.isNotEmpty(value)){
- outMap.put(systemkey,value);
- }
- }
- return outMap;
- }
- /**
- * 鎵归噺澶勭悊棰勭敵璇风紪鐮�
- * 蹇呴』瑕佹湁鍒嗙被oid鍜宒ata
- */
- @Override
- public BaseResult applyData(List<PreApplyCodeOrderDTO> preApplyCodeOrderDTOList) {
-
- List<Map> retMapList = new ArrayList<Map>();//淇濆瓨杩斿洖鐨勯敊璇痮id鍜屼俊鎭�
- for (PreApplyCodeOrderDTO preApplyCodeOrderDTO : preApplyCodeOrderDTOList) {
-
- CodeOrderDTO codeOrderDTO = new CodeOrderDTO();
- try {
- //鏍规嵁鍒嗙被oid鏌ヨ妯℃澘oid锛岀紪鐮佽鍒檕id
- String codeClassfyOid = preApplyCodeOrderDTO.getCodeClassifyOid();
-
- //鏌ヨdata鐨則ype
- String dataoid = preApplyCodeOrderDTO.getDataoid();
- DockingPreApplyDataDO dockingPreApplyDataDO = dockingPreApplyDataMapper.selectByPrimaryKey(dataoid);
-
- //鏌ヨ缂栫爜瑙勫垯oid
- String ruleOid = null;
- try {
- CodeRuleVO codeRuleVO = engineService.getCodeRuleByClassifyOid(codeClassfyOid);
- ruleOid = codeRuleVO.getOid();
- }catch (Exception e){
- Map retMap = new HashMap<String,String>();
- retMap.put("oid",codeOrderDTO.getOid());
- retMap.put("msg","閫夋嫨鐨勫垎绫讳互鍙婁笂绾у垎绫绘病鏈夐厤缃紪鐮佽鍒�");
- retMapList.add(retMap);
- logger.error("鎵归噺澶勭悊棰勭敵璇锋暟鎹け璐�,鏁版嵁: "+preApplyCodeOrderDTO.toString()+",msg: 鏍规嵁鍒嗙被oid鏌ヨ缂栫爜瑙勫垯澶辫触,鍒嗙被oid: "+codeClassfyOid);
- continue;
- }
-
- //鏌ヨ浣跨敤鐨勬ā鏉縪id
- String templateOid = null;
- try {
- CodeClassifyTemplateVO codeClassifyTemplateVO = engineService.getUsedTemplateByClassifyOid(codeClassfyOid);
- templateOid = codeClassifyTemplateVO.getOid();
- }catch (Exception e){
- Map retMap = new HashMap<String,String>();
- retMap.put("oid",codeOrderDTO.getOid());
- retMap.put("msg","閫夋嫨鐨勫垎绫讳互鍙婁笂绾у垎绫绘病鏈夐厤缃厤缃ā鏉�");
- retMapList.add(retMap);
- logger.error("鎵归噺澶勭悊棰勭敵璇锋暟鎹け璐�,鏁版嵁: "+preApplyCodeOrderDTO.toString()+",msg: 鏍规嵁鍒嗙被oid鏌ヨ浣跨敤鐨勬ā鏉垮け璐�,鍒嗙被oid: "+codeClassfyOid);
- continue;
- }
-
- //鏍规嵁dataoid鏌ヨdataInfoMap
- Map dataInfoMap = null;
-
- DockingPreApplyDataDTO dockingPreApplyDataDTO = new DockingPreApplyDataDTO();
- dockingPreApplyDataDTO.setOid(preApplyCodeOrderDTO.getDataoid());
- BaseResult baseResult_dataMap = getDataInfoMap(dockingPreApplyDataDTO);
- if(ResultCodeEnum.SUCCESS.code==baseResult_dataMap.getCode()){
- Object datao = baseResult_dataMap.getObj();
- if(datao!=null){
- dataInfoMap = (Map<String, String>)datao;
- }
- }
- if(dataInfoMap==null){
- Map retMap = new HashMap<String,String>();
- retMap.put("oid",codeOrderDTO.getOid());
- retMap.put("msg","鏌ヨ鍒版帴鏀剁殑棰勭敵璇锋暟鎹负绌�");
- retMapList.add(retMap);
- logger.error("鎵归噺澶勭悊棰勭敵璇锋暟鎹け璐�,鏁版嵁: "+preApplyCodeOrderDTO.toString()+",msg: 鏍规嵁DockingPreApplyData_oid鏌ヨ鏁版嵁鎺ユ敹鐨勯鐢宠鏁版嵁澶辫触,DockingPreApplyData_oid: "+preApplyCodeOrderDTO.getDataoid());
- continue;
- }
-
- //鎶奷atainfomap鏍规嵁閰嶇疆鐨勬ā鏉縳ml杞寲涓烘渶缁堝瓨鍏ョ殑鏁版嵁map
- String systemid = dockingPreApplyDataDO.getSystemid();//绯荤粺缂栧彿
- String type = dockingPreApplyDataDO.getType();//type
-
- PreApplyDataTrans preApplyDataTrans = getPreApplyDataTransBySystemIdAndType(systemid,type);
- if(preApplyDataTrans == null){
- String msg = "璇诲彇棰勭敵璇锋暟鎹厤缃ā鏉挎垚鍔�,浣嗘槸娌℃湁鍖归厤鐨勬ā鏉垮睘鎬�,systemid: "+systemid+",type: "+type;
- logger.error(msg);
- preApplyDataTrans = new PreApplyDataTrans(systemid,type,new HashMap<String,String>());
- }
-
- Map<String, String> attrMap = preApplyDataTrans.getAttrMap();
-
- Map<String, String> data = getShowMap(attrMap,dataInfoMap);
- if(data.size()==0){
- Map retMap = new HashMap<String,String>();
- retMap.put("oid",codeOrderDTO.getOid());
- retMap.put("msg","鎺ユ敹鐨勯鐢宠鏁版嵁鏍规嵁閰嶇疆鐨勬ā鏉縳ml杞寲灞炴�уけ璐�");
- retMapList.add(retMap);
- logger.error("鎵归噺澶勭悊棰勭敵璇锋暟鎹け璐�,鏁版嵁: "+preApplyCodeOrderDTO.toString()+",msg: 鎺ユ敹鐨勯鐢宠鏁版嵁鏍规嵁閰嶇疆鐨勬ā鏉縳ml杞寲灞炴�уけ璐�!");
- continue;
- }
-
- String name = data.getOrDefault("name","");
-
- //鎵ц鏁版嵁淇濆瓨
- codeOrderDTO.setCodeClassifyOid(codeClassfyOid);
- codeOrderDTO.setTemplateOid(templateOid);
- codeOrderDTO.setCodeRuleOid(ruleOid);
- codeOrderDTO.setSecDTOList(preApplyCodeOrderDTO.getSecDTOList());//鐮佹
- codeOrderDTO.setEditInProcess(preApplyCodeOrderDTO.isEditInProcess());
- codeOrderDTO.setUpVersion(preApplyCodeOrderDTO.isUpVersion());
- codeOrderDTO.setName(name);
- codeOrderDTO.setData(data);
- engineService.addSaveCode(codeOrderDTO);
-
- //鍐嶄慨鏀筪ata閲岃竟鐨刢lassifyoid鍜宑lassifuname
- String classifyoid = preApplyCodeOrderDTO.getCodeClassifyOid();
- //鏌ヨ鍒嗙被
- CodeClassifyVO codeClassifyVO = codeClassifyServiceI.getObjectByOid(classifyoid);
- //璁剧疆鍒嗙被oid,name,flag
- dockingPreApplyDataDO.setClassifyoid(codeClassifyVO.getOid());
- dockingPreApplyDataDO.setClassifyname(codeClassifyVO.getName());
- dockingPreApplyDataMapper.updateByPrimaryKey(dockingPreApplyDataDO);
- } catch (Exception e) {
- Map retMap = new HashMap<String,String>();
- retMap.put("oid",preApplyCodeOrderDTO.getDataoid());
- retMap.put("msg","澶勭悊澶辫触!");
- retMapList.add(retMap);
- logger.error("鎵归噺澶勭悊棰勭敵璇锋暟鎹け璐�,鏁版嵁: "+preApplyCodeOrderDTO.toString()+",msg: "+e.getMessage());
- }
- }
- BaseResult result = BaseResult.success(retMapList);
- return result;
- }
-
- @Override
- public BaseResult batchApplyDatas(List<CodeOrderDTO> codeOrderDTOs) {
- if(!CollectionUtils.isEmpty(codeOrderDTOs)){
- CodeOrderDTO orderDTO=codeOrderDTOs.get(0);
- Map<String,String> rowsOidMap=new HashMap<>();
- SheetDataSet dataSet=new SheetDataSet();
- List<SheetRowData> sheetRowDatas=new ArrayList<>();
- CodeClassifyTemplateVO codeClassifyTemplateVO = engineService.getUsedTemplateByClassifyOid(orderDTO.getCodeClassifyOid());
- List<String> colName=new ArrayList<>();
- List<CodeClassifyTemplateAttrVO> templateAttrVOS=codeClassifyTemplateVO.getAttributes();
- List<CodeClassifyTemplateAttrVO> attrVOS = templateAttrVOS.stream().filter(s -> !MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
- Map<String/**鑻辨枃鍚嶇О**/, String/**涓枃鍚嶇О**/> attrNameIdMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t.getName(),(o1, o2)->o2));
- for (int i=0;i<codeOrderDTOs.size();i++) {
- CodeOrderDTO codeOrderDTO=codeOrderDTOs.get(i);
- String dataoid = codeOrderDTO.getOid();
- rowsOidMap.put(i+"",dataoid);//瀛樺偍鏁版嵁oid锛屼竴閬嶈缃�
-
- SheetRowData sheetRowData=new SheetRowData();
- Map<String, String> dataMap= codeOrderDTO.getData();
- sheetRowData.setRowIndex(i+"");
- Map<Integer,String> indexValueMap=new HashMap<>();
- int index=0;
- colName=new ArrayList<>();
- for (String field: attrNameIdMap.keySet()) {
- String outAttrName=attrNameIdMap.get(field);
- colName.add(outAttrName);
- String value="";
- if(dataMap.containsKey(field)){
- value=StringUtils.isBlank(dataMap.get(field))?"":dataMap.get(field);
- }else{
- value="";
- }
- indexValueMap.put(index++,value);
- }
- sheetRowData.setData(indexValueMap);
- sheetRowDatas.add(sheetRowData);
- }
- dataSet.setRowData(sheetRowDatas);
- dataSet.setColName(colName);
- Map<String,String> errorMap=new HashMap<>();
- List<String> codeList=mdmIOService.batchImportCode(orderDTO,codeClassifyTemplateVO,dataSet,errorMap,false);
- List<SheetRowData> needSaveCboList = dataSet.getRowData().stream().filter(cbo -> {
- String rowIndex =cbo.getRowIndex();
- return !errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
- LinkedList<String> needOIdList=new LinkedList<>();
- Map<String,String> codeIdMap=new HashMap<>();
- for(int i=0;i<needSaveCboList.size();i++) {
- SheetRowData cbo = needSaveCboList.get(i);
- String rouIndex = cbo.getRowIndex();
- if (rowsOidMap.containsKey(rouIndex)) {
- String dataOid = rowsOidMap.get(rouIndex);
- needOIdList.add(dataOid);
- codeIdMap.put(dataOid,codeList.get(i));
- }
- }
- if(!CollectionUtils.isEmpty(needOIdList)) {
- CodeClassifyVO codeClassifyVO = codeClassifyServiceI.getObjectByOid(orderDTO.getCodeClassifyOid());
- List<DockingPreApplyDataDO> dockingPreApplyDataDOS = dockingPreApplyDataMapper.selectByPrimaryKeys(VciBaseUtil.array2String(needOIdList.toArray(new String[]{})));
- dockingPreApplyDataDOS.stream().forEach(dockingPreApplyDataDO -> {
- //璁剧疆鍒嗙被oid,name,flag
- String dataOid=dockingPreApplyDataDO.getOid();
- dockingPreApplyDataDO.setClassifyoid(codeClassifyVO.getOid());
- dockingPreApplyDataDO.setClassifyname(codeClassifyVO.getName());
- if(codeIdMap.containsKey(dataOid)) {//瀛樺叆鏁版嵁缂栫爜
- String code= codeIdMap.get(dataOid);
- dockingPreApplyDataDO.setId(code);
- dockingPreApplyDataDO.setPreapplyoid(code);
- dockingPreApplyDataDO.setNum(code);
- }
-
- dockingPreApplyDataDO.setDatamsg("璧嬬爜鎴愬姛");
- dockingPreApplyDataDO.setUseddflag("true");
- });
- dockingPreApplyDataMapper.batchUpdate(dockingPreApplyDataDOS);
- }
- //濡傛灉鏈夐敊璇垯瀵煎嚭execl
- if(errorMap.size()>0){
- List<String> needRowIndexList = new ArrayList<>();
- String errorFile=returnErrorToExcel(dataSet.getRowData(),errorMap, needRowIndexList,dataSet.getColName());
- if(StringUtils.isNotBlank(errorFile)){
- //鏀惧埌map閲�
- BaseResult result = BaseResult.fail("鏈夐儴鍒嗘暟鎹敵璇峰け璐ワ紝璇锋牳瀵�");
- result.setObj(ControllerUtil.putErrorFile(errorFile));
- return result;
- }else {
- return BaseResult.success("鐢宠鎴愬姛!");
- }
-
- }
-
- }
-
- return BaseResult.success("鐢宠鎴愬姛!");
- }
-
- /**
- * 閿欒淇℃伅杩斿洖excel
- * @param rowDataList 鎵�鏈夌殑瀵煎叆鏁版嵁
- * @param errorMap 閿欒鐨勪俊鎭�
- * @param needRowIndexList 闇�瑕佸啓鍏ョ殑鏁版嵁鐨勮鍙�
- * @param titleRowData 鏍囬琛�
- *
- * @return 閿欒鐨別xcel鏂囦欢锛屾病鏈夐敊璇細杩斿洖绌�
- */
- private String returnErrorToExcel(Collection<SheetRowData> rowDataList,
- Map<String,String> errorMap,
- List<String> needRowIndexList,List<String> titleRowData){
- if(CollectionUtils.isEmpty(errorMap)){
- return "";
- }
- Map<String, SheetRowData> rowIndexDataMap = rowDataList.stream().filter(s -> !needRowIndexList.contains(s.getRowIndex())).collect(Collectors.toMap(s -> s.getRowIndex(), t -> t));
- LinkedList<WriteExcelData> errorDataList = new LinkedList<>();
- errorDataList.add(new WriteExcelData(0,0,"閿欒淇℃伅"));
- for (int i = 0; i < titleRowData.size(); i++) {
- //閿欒淇℃伅鍦ㄦ渶鍚�
- errorDataList.add(new WriteExcelData(0,i+1,titleRowData.get(i)));
- }
- Integer[] newRowIndex = new Integer[]{1};
- errorMap.forEach((index,error)->{
- //閿欒淇℃伅鍏ㄩ儴缁勫悎鍒颁竴璧�
- SheetRowData rowData = rowIndexDataMap.getOrDefault(index, null);
- if(rowData!=null){
- errorDataList.add(new WriteExcelData(newRowIndex[0],0,error));
- rowData.getData().forEach((colIndex,value)->{
- errorDataList.add(new WriteExcelData(newRowIndex[0],colIndex+1,value));
- });
- newRowIndex[0]++;
- }
- });
- String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒淇℃伅.xls";
- WriteExcelOption eo = new WriteExcelOption(errorDataList);
- try {
- new File(excelFileName).createNewFile();
- } catch (IOException e) {
- throw new VciBaseException(LangBaseUtil.getErrorMsg(e));
- }
- ExcelUtil.writeDataToFile(excelFileName,eo);
- return excelFileName;
- }
-
- /**
- * 瑙ｆ瀽棰勭敵璇锋暟鎹拰鍒嗙被鐨勫睘鎬ц浆鎹㈡ā鏉縮s
- */
- public List<PreApplyDataTrans> readAttrTransfTemplate(String templateXml) throws Exception{
- templateXml = StringUtils.isEmpty(templateXml)?"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<datas systemid=\"oa0001\">\n" +
- "\t<data type=\"wupin\">\n" +
- "\t\t<attr systemkey=\"code01\" mdmkey=\"key01\"/>\n" +
- "\t\t<attr systemkey=\"code02\" mdmkey=\"key02\"/>\n" +
- "\t</data>\n" +
- "</datas>":templateXml;
-
- List<PreApplyDataTrans> preApplyDataTransList = new ArrayList<PreApplyDataTrans>();
- Document document = DocumentHelper.parseText(templateXml);
- Element datas_element = document.getRootElement();
- List<Element> data_elements = datas_element.elements(MdmDuckingConstant.XML_DATA);
- for (Element data_element:data_elements){
- Attribute systemid_attr = data_element.attribute(MdmDuckingConstant.XML_SYSTEMID);
- String systemid = systemid_attr==null?"":systemid_attr.getValue();//systemid
-
- Attribute type_attr = data_element.attribute(MdmDuckingConstant.XML_TYPE);
- String type = type_attr==null?"":type_attr.getValue();//type
-
- List<Element> attr_elements = data_element.elements(MdmDuckingConstant.XML_ATTR);
- Map<String,String> attrMap = new HashMap<String,String>();
- for (Element attr_element:attr_elements){
- Map<String,Object> dataMap = new HashMap<String,Object>();
-
- Attribute systemkey_attr = attr_element.attribute(MdmDuckingConstant.XML_SYSTEMKEY);
- String systemkey = systemkey_attr==null?"":systemkey_attr.getValue();//systemkey
-
- Attribute mdmkey_attr = attr_element.attribute(MdmDuckingConstant.XML_MDMKEY);
- String mdmkey = mdmkey_attr==null?"":mdmkey_attr.getValue();//mdmkey
-
- attrMap.put(systemkey,mdmkey);
- PreApplyDataTrans p = new PreApplyDataTrans(systemid,type,attrMap);
- preApplyDataTransList.add(p);
- }
- }
- return preApplyDataTransList;
- }
-
-
- class PreApplyDataTrans{
- private String systemid;
- private String type;
- private Map<String,String> attrMap;
-
- public PreApplyDataTrans(String systemid, String type, Map<String, String> attrMap) {
- this.systemid = systemid;
- this.type = type;
- this.attrMap = attrMap;
- }
-
- public String getSystemid() {
- return systemid;
- }
-
- public void setSystemid(String systemid) {
- this.systemid = systemid;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public Map<String, String> getAttrMap() {
- return attrMap;
- }
-
- public void setAttrMap(Map<String, String> attrMap) {
- this.attrMap = attrMap;
- }
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingSeviceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingSeviceImpl.java
deleted file mode 100644
index 0ac671a..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingSeviceImpl.java
+++ /dev/null
@@ -1,531 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.mapper.DockingPreAttrMappingMapper;
-import com.vci.ubcs.code.mapper.DockingPreAttrRangeMapper;
-import com.vci.ubcs.code.entity.DockingPreAttrMappingDO;
-import com.vci.ubcs.code.entity.DockingPreAttrRangeDO;
-import com.vci.ubcs.code.service.CodeClassifyTemplateAttrServiceI;
-import com.vci.ubcs.code.service.DockingPreAttrMappingSeviceI;
-import com.vci.ubcs.code.service.MdmEngineServiceI;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.pageModel.OsEnumItemVO;
-import com.vci.web.redis.RedisService;
-import com.vci.web.service.OsEnumServiceI;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.DockingPreAttrMappingDTO;
-import com.vci.ubcs.code.dto.DockingPreAttrRangeDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Service
-public class DockingPreAttrMappingSeviceImpl implements DockingPreAttrMappingSeviceI {
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 闆嗘垚灞炴�ф槧灏勯厤缃湇鍔�
- */
- @Resource
- private DockingPreAttrMappingMapper dockingPreAttrMappingDaoI;
- /**
- * 闆嗘垚灞炴�у彇鍊艰寖鍥撮厤缃湇鍔�
- */
- @Resource
- private DockingPreAttrRangeMapper dockingPreAttrRangeDODaoI;
- /**
- * 鍒嗙被鎿嶄綔鏈嶅姟
- */
- @Autowired
- private CodeClassifyServiceImpl codeClassifyService;
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 缂撳瓨鏈嶅姟
- */
- @Autowired
- private RedisService redisService;
-
- /**
- * 涓绘暟鎹紩鎿庣殑鏈嶅姟
- */
- @Autowired
- private MdmEngineServiceI engineService;
- /**
- *鏋氫妇鏈嶅姟
- */
- @Autowired
- private OsEnumServiceI osEnumService;
- @Autowired
- private CodeClassifyTemplateAttrServiceI codeClassifyTemplateAttrServiceI;
-
- /***
- * 灞炴�ф槧灏勫垪琛�
- * @param conditionMap
- * @param pageHelper
- * @param type
- * @return
- * @throws VciBaseException
- */
- @Override
- public DataGrid<DockingPreAttrMappingVO> gridAttrMappings(String clsfId, int type, Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
-
- }
- VciBaseUtil.alertNotNull(clsfId,"鍒嗙被涓婚敭");
- VciBaseUtil.alertNotNull(type,"鎿嶄綔绫诲瀷");
- //VciBaseUtil.alertNotNull(templateOid,"妯℃澘涓婚敭");
- if(conditionMap==null){
- conditionMap=new HashMap<>();
- }
-
- /***
- * 1.棣栧厛鍘绘ā鏉块噷鏌ヨ鏄惁鏈夊鍒犲睘鎬�
- * 2.濡傛灉鏈夌殑璇濋渶瑕佹牎楠屽睘鎬х殑鍚嶇О鏄惁鏈夊彉鏇�
- */
- List<ClientBusinessObject> tempCBO=new ArrayList<>();
- ClientBusinessObject clssCBO=new ClientBusinessObject();
- // List<String> templateIds = VciBaseUtil.str2List(templateOid);
- Map<String,String> cboOidMap=new HashMap<>();
- String btmName= MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR;
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(clsfId);
-
- if(StringUtils.isBlank(templateVO.getOid())){
- return new DataGrid<>();
- }
- String templateOid=templateVO.getOid();
- String clsfBtmName=MdmBtmTypeConstant.CODE_CLASSIFY;
- String orderbyFiled="";
- if(type==1) {//浠ｈ〃鐨勬槸wrj
- orderbyFiled="ordernum";
- cboOidMap.put("classifytemplateoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(templateVO.getOid()) + ")");
- btmName=MdmBtmTypeConstant.CODE_CLASSIFY_TEMPLATE_ATTR;
- clsfBtmName=MdmBtmTypeConstant.CODE_CLASSIFY;
- }else{
- orderbyFiled="codeattrseq";
- cboOidMap.put("classifytemplateoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(templateOid) + ")");
- btmName=MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR;
- clsfBtmName=MdmBtmTypeConstant.DOCKING_PRE_JCLASS;
- }
- //鎸夋ā鏉块『搴忓睍绀哄睘鎬�
- PageHelper tempPageHelper=new PageHelper();
- tempPageHelper = new PageHelper(-1);
- tempPageHelper.addDefaultAsc(orderbyFiled);
- tempCBO = boService.queryCBO(btmName,cboOidMap,tempPageHelper);
- if(CollectionUtils.isEmpty(tempCBO)){
- throw new VciBaseException("鏍规嵁妯℃澘涓婚敭鏈煡璇㈠埌鐩稿簲鐨勫睘鎬т俊鎭�");
- }
- clssCBO= boService.selectCBOByOid(clsfId,clsfBtmName);
- if(clssCBO==null||StringUtils.isBlank(clssCBO.getOid())){
- throw new VciBaseException("鏍规嵁鍒嗙被涓婚敭鏈煡璇㈠埌鍒嗙被淇℃伅");
- }
- pageHelper.addDefaultDesc("createTime");
- //鏍规嵁婧愬垎绫籭d鍜屾ā鏉縤d鏌ヨ妯℃澘鏄犲皠鏁版嵁
- // conditionMap.put("jsourceClsfId",clsfId);
- conditionMap.put("jviewModeId", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(templateOid) + ")");
-
- List<DockingPreAttrMappingDO> doList = dockingPreAttrMappingDaoI.selectByCondition(conditionMap,pageHelper);
- Map<String/**涓枃鍚嶇О**/, DockingPreAttrMappingDO/**鏁版嵁瀵硅薄**/> dockingAttrmappingOidToMap = doList.stream().collect(Collectors.toMap(s -> s.getJmetaListId(), t -> t,(o1, o2)->o2));
- List<DockingPreAttrMappingDO> newDockingPreAttrMappingDOS=new ArrayList<>();
- ClientBusinessObject finalClssCBO = clssCBO;
- tempCBO.stream().forEach(cbo ->{
- DockingPreAttrMappingDO dockingPreAttrMappingDO=new DockingPreAttrMappingDO();
- String oid=cbo.getOid();//灞炴�id
- if(dockingAttrmappingOidToMap.containsKey(oid)){
- dockingPreAttrMappingDO=dockingAttrmappingOidToMap.get(oid);
- }else{
- dockingPreAttrMappingDO.setOid(redisService.getUUIDEveryDay());
- dockingPreAttrMappingDO.setJmetaListId(oid);//婧愮郴缁熺殑灞炴�id
- dockingPreAttrMappingDO.setJdefaultValue("");//榛樿鍊�
- dockingPreAttrMappingDO.setJsourceAttrKey(cbo.getId());//婧愮郴缁熷睘鎬у唴閮ㄥ悕绉�
- dockingPreAttrMappingDO.setJsourceAttrName(cbo.getName());//婧愮郴缁熷睘鎬у悕绉�
- dockingPreAttrMappingDO.setJsourceClsfId(clsfId);//婧愮郴缁熺殑鍒嗙被oid
- dockingPreAttrMappingDO.setJsourceClsfName(finalClssCBO.getName());//婧愮郴缁熺殑鍒嗙被鍚嶇О
- dockingPreAttrMappingDO.setJviewModeId(templateOid);//鏆傛椂涓嶅瓨,妯℃澘瑙嗗浘鐨刼id
- dockingPreAttrMappingDO.setJviewModeName(templateVO.getName());//鏆傛椂涓嶅瓨锛屾ā鏉垮悕绉�
- dockingPreAttrMappingDO.setJtargetAttrId("");//鐩爣绯荤粺灞炴�х郴id
- dockingPreAttrMappingDO.setJtargetAttrName("");//鐩爣绯荤粺灞炴�у悕绉�
- dockingPreAttrMappingDO.setJtargetAttrKey("");//鐩爣绯荤粺灞炴�у唴閮ㄥ��
- dockingPreAttrMappingDO.setJtargetClsfId("");//鐩爣绯荤粺鍒嗙被oid
- }
- newDockingPreAttrMappingDOS.add(dockingPreAttrMappingDO);
- } );
-
- DataGrid<DockingPreAttrMappingVO> dataGrid=new DataGrid<DockingPreAttrMappingVO>();
- if (!CollectionUtils.isEmpty(newDockingPreAttrMappingDOS)) {
- dataGrid.setData(dockingPreAttrMappingDO2VOs(newDockingPreAttrMappingDOS));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(dockingPreAttrMappingDaoI.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /***
- * 鑾峰彇灞炴�ф灇涓�
- * @param conditionMap
- * @param pageHelper
- * @return
- * @throws VciBaseException
- */
- @Override
- public DataGrid<DockingPreAttrRangeVO> gridAttrRanges(String attrOid, int type, Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException {
- VciBaseUtil.alertNotNull(attrOid,"灞炴�т富閿�");
- VciBaseUtil.alertNotNull(type,"鎿嶄綔绫诲瀷");
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- if(conditionMap==null){
- conditionMap=new HashMap<>();
- }
- pageHelper.addDefaultDesc("createTime");
- conditionMap.put("jmetaListId",attrOid);
- List<DockingPreAttrRangeDO> doList =dockingPreAttrRangeDODaoI.selectByCondition(conditionMap,pageHelper);
- Map<String/**鏋氫妇鍐呴儴鍚嶇О**/, DockingPreAttrRangeDO/**鏁版嵁瀵硅薄**/> dockingPreAttrRangeValueMap = doList.stream().collect(Collectors.toMap(s -> s.getJnumTextValue(), t -> t,(o1, o2)->o2));
- CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO= codeClassifyTemplateAttrServiceI.getObjectByOid(attrOid);
- String attrkey= codeClassifyTemplateAttrVO.getId();
- Map<String,String> cboOidMap=new HashMap<>();
- List<DockingPreAttrRangeDO> newDockingPreAttrRangeDO=new ArrayList<>();
- if(type==1){
- List<OsEnumItemVO> osEnumItemVOList= osEnumService.listEnumByAttriteKey(attrkey);
- if(!CollectionUtils.isEmpty(osEnumItemVOList)) {
- osEnumItemVOList.stream().forEach(osEnumItemVO -> {
- DockingPreAttrRangeDO dockingPreAttrRangeDO = dockingPreAttrRangeValueMap.get(osEnumItemVO.getId());
- if (!dockingPreAttrRangeValueMap.containsKey(osEnumItemVO.getId())) {
- dockingPreAttrRangeDO = new DockingPreAttrRangeDO();
- dockingPreAttrRangeDO.setOid(redisService.getUUIDEveryDay());
- dockingPreAttrRangeDO.setJmetaListId(attrOid);//灞炴�id
- dockingPreAttrRangeDO.setJnumText(osEnumItemVO.getName());//灞炴�ф灇涓炬樉绀哄��
- dockingPreAttrRangeDO.setJnumTextValue(osEnumItemVO.getId());//鏋氫妇鍐呴儴鍊�
- dockingPreAttrRangeDO.setJtargeNumText("");//閰嶇疆鐨勬樉绀哄��
- dockingPreAttrRangeDO.setJtargeNumTextValue("");//閰嶇疆鐨勫唴閮ㄥ��
- }
- newDockingPreAttrRangeDO.add(dockingPreAttrRangeDO);
- });
- }
- }
- DataGrid<DockingPreAttrRangeVO> dataGrid=new DataGrid<>();
- if (!CollectionUtils.isEmpty(newDockingPreAttrRangeDO)) {
- dataGrid.setData(dockingPreAttrRangeDO2VOs(newDockingPreAttrRangeDO));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(dockingPreAttrRangeDODaoI.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /***
- *淇濆瓨灞炴�ф槧灏勯厤缃粍浠�
- * @param dockingPreAttrMappingDTOS 灞炴�ф槧灏勯厤缃暟鎹紶杈撳璞�
- * @return
- * @throws VciBaseException
- */
- @Override
- public List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingDTO> dockingPreAttrMappingDTOS) throws VciBaseException {
- List<DockingPreAttrMappingVO> dockingPreAttrMappingVOS=new ArrayList<>();
- if(CollectionUtils.isEmpty(dockingPreAttrMappingDTOS)){
- return new ArrayList<>();
- }
- /**
- * 1.浼犻�掕繃鏉ョ殑鏈夊彲鑳戒富鏁版嵁妯℃澘鏂板灞炴�э紝杩欐牱鐨勯渶瑕佹坊鍔狅紝涔熸湁鍙兘鍒犻櫎鐨勫睘鎬э紝杩欐牱鐨勬槧灏勯渶瑕佸垹闄�
- * 涔熸湁鏇存柊鐨勮繖鏍峰垯鏇存柊
- */
- List<DockingPreAttrMappingDO> newDockingPreAttrMappingDOS=new ArrayList<>();
- List<String>oidList=new ArrayList<>();
- List<String>attrIdList=new ArrayList<>();
- List<String> attributeOidList=new ArrayList<>();
- List<DockingPreAttrRangeDO> newDockingPreAttrRangeDTOList=new ArrayList<>();
- dockingPreAttrMappingDTOS.stream().forEach(dockingPreAttrMappingDTO -> {
- List<DockingPreAttrRangeDTO>dockingPreAttrRangeDTOList=dockingPreAttrMappingDTO.getDockingPreAttrRangeDTOS();
- DockingPreAttrMappingDO dockingPreAttrMappingDO=new DockingPreAttrMappingDO();
- oidList.add(dockingPreAttrMappingDTO.getOid());
- if(!CollectionUtils.isEmpty(dockingPreAttrRangeDTOList)) {
- attrIdList.add(dockingPreAttrMappingDTO.getJmetaListId());
- List<DockingPreAttrRangeDO> dockingPreAttrRangeDOList = dockingPreAttrRangeDTO2DOs(dockingPreAttrRangeDTOList);
- newDockingPreAttrRangeDTOList.addAll(dockingPreAttrRangeDOList);
- }
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreAttrMappingDTO, dockingPreAttrMappingDO);
- newDockingPreAttrMappingDOS.add(dockingPreAttrMappingDO);
- });
- List<DockingPreAttrRangeDO> dockingPreAttrRangeDOList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(attrIdList)) {
- //鑾峰彇瀛樺湪鐨勫睘鎬у彇鍊艰寖鍥�.
- dockingPreAttrRangeDOList = dockingPreAttrRangeDODaoI.selectByAttrOid(StringUtils.join(attrIdList, ","));
- }
- //鑾峰彇瀛樺湪鐨勫睘鎬ф槧灏�.
- List<DockingPreAttrMappingDO> dataAttrMapping = dockingPreAttrMappingDaoI.selectByOid(StringUtils.join(oidList, ","));
- Map<String/**oid**/,DockingPreAttrMappingDO/**灞炴�у璞�**/> allSaveAttrMappingMap = newDockingPreAttrMappingDOS.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
- Map<String/**oid**/,DockingPreAttrMappingDO/**瀵硅薄**/> oldAttrMappingMap =dataAttrMapping.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
-
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
- BatchCBO batchCbos = new BatchCBO();
- //闇�瑕佹柊澧炵殑灞炴�ф槧灏�
- List<DockingPreAttrMappingDO> needSaveCboList = newDockingPreAttrMappingDOS.stream().filter(cbo -> {
- String oid =cbo.getOid();
- return !oldAttrMappingMap.containsKey(oid);
- }).collect(Collectors.toList());
- if(needSaveCboList.size()>0) {
- BatchCBO addCOB = dockingPreAttrMappingDaoI.batchInsert(needSaveCboList);
- batchCbos.copyFromOther(addCOB);
- }
- Map<String/**oid**/,DockingPreAttrMappingDO/**瀵硅薄**/> saveAttrMappingMap = needSaveCboList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
- //瑕佹妸浠ヤ笂鐨勯敊璇殑閮芥姏鍑哄悗锛岄渶瑕佹洿鏂扮殑灞炴�ф槧灏�
- List<DockingPreAttrMappingDO> needEditCboList = newDockingPreAttrMappingDOS.stream().filter(cbo -> {
- String oid =cbo.getOid();
- return !saveAttrMappingMap.containsKey(oid);
- }).collect(Collectors.toList());
- if(needEditCboList.size()>0) {
- List<DockingPreAttrMappingDO> editCboList=new ArrayList<>();
- needEditCboList.stream().forEach(cbo->{
- String oid=cbo.getOid();
- if(oldAttrMappingMap.containsKey(oid)){
- DockingPreAttrMappingDO dockingPreAttrMappingDO= oldAttrMappingMap.get(oid);
- dockingPreAttrMappingDO.setJtargetAttrKey(cbo.getJtargetAttrKey());
- dockingPreAttrMappingDO.setJtargetAttrName(cbo.getJtargetAttrName());
- dockingPreAttrMappingDO.setJtargetAttrId(cbo.getJtargetAttrId());
- dockingPreAttrMappingDO.setJtargetClsfId(cbo.getJtargetClsfId());
- dockingPreAttrMappingDO.setJdefaultValue(cbo.getJdefaultValue());
- editCboList.add(dockingPreAttrMappingDO);
- }
- });
- BatchCBO editCOB = dockingPreAttrMappingDaoI.batchUpdate(editCboList);
- batchCbos.copyFromOther(editCOB);
- }
- //闇�瑕佸垹闄ょ殑灞炴�ф槧灏�
- List<String> deleteIdList=new ArrayList<>();
- dataAttrMapping.stream().forEach(cbo -> {
- String oid =cbo.getOid();
- if(!allSaveAttrMappingMap.containsKey(oid)){
- deleteIdList.add(oid);
- }
- });
- if(deleteIdList.size()>0) {
- BatchCBO deleteCBO = dockingPreAttrMappingDaoI.batchDeleteByOids(deleteIdList);
- batchCbos.copyFromOther(deleteCBO);
- }
- //鍙栧�艰寖鍥村鐞�
- if(!CollectionUtils.isEmpty(newDockingPreAttrRangeDTOList)) {
- Map<String/**oid**/, DockingPreAttrRangeDO/**灞炴�у璞�**/> allSaveAttrAttrRangeDOMap =newDockingPreAttrRangeDTOList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t, (o1, o2) -> o2));
- Map<String/**oid**/, DockingPreAttrRangeDO/**瀵硅薄**/> oldSaveAttrAttrRangeDOMap = dockingPreAttrRangeDOList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t, (o1, o2) -> o2));
- //闇�瑕佹柊澧炵殑灞炴�у彇鍊艰寖鍥�
- List<DockingPreAttrRangeDO> needSaveRangeCboList = newDockingPreAttrRangeDTOList.stream().filter(cbo -> {
- String oid = cbo.getOid();
- return !oldSaveAttrAttrRangeDOMap.containsKey(oid);
- }).collect(Collectors.toList());
- if(needSaveRangeCboList.size()>0) {
- BatchCBO addRangeCOB = dockingPreAttrRangeDODaoI.batchInsert(needSaveRangeCboList);
- batchCbos.copyFromOther(addRangeCOB);
- }
- //闇�瑕佹洿鏂扮殑灞炴�у彇鍊艰寖鍥�
- Map<String/**oid**/, DockingPreAttrRangeDO/**瀵硅薄**/> saveRangeMap = needSaveRangeCboList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t, (o1, o2) -> o2));
- List<DockingPreAttrRangeDO> needEditRangeCboList = newDockingPreAttrRangeDTOList.stream().filter(cbo -> {
- String oid = cbo.getOid();
- return !saveRangeMap.containsKey(oid);
- }).collect(Collectors.toList());
-
- if(needEditRangeCboList.size()>0) {
- List<DockingPreAttrRangeDO> editCboList=new ArrayList<>();
- needEditRangeCboList.stream().forEach(cbo->{
- String oid=cbo.getOid();
- if(oldSaveAttrAttrRangeDOMap.containsKey(oid)){
- DockingPreAttrRangeDO dockingPreAttrRangeDO= oldSaveAttrAttrRangeDOMap.get(oid);
- dockingPreAttrRangeDO.setJtargeNumText(cbo.getJtargeNumText());
- dockingPreAttrRangeDO.setJtargeNumTextValue(cbo.getJtargeNumTextValue());
- editCboList.add(dockingPreAttrRangeDO);
- }
- });
- BatchCBO editRangeCOB = dockingPreAttrRangeDODaoI.batchUpdate(editCboList);
- batchCbos.copyFromOther(editRangeCOB);
- }
- //闇�瑕佸垹闄ょ殑灞炴�у彇鍊艰寖鍥�
- List<String> deleteRangeIdList = new ArrayList<>();
- dockingPreAttrRangeDOList.stream().forEach(cbo -> {
- String oid = cbo.getOid();
- if (!allSaveAttrAttrRangeDOMap.containsKey(oid)) {
- deleteRangeIdList.add(oid);
- }
- });
- if(deleteIdList.size()>0) {
- BatchCBO deleteRangeCBO = dockingPreAttrRangeDODaoI.batchDeleteByOids(deleteIdList);
- batchCbos.copyFromOther(deleteRangeCBO);
- }
- }
-
- WebUtil.setPersistence(true);
- this.boService.persistenceBatch(batchCbos);//鏇存敼鏁版嵁
- return dockingPreAttrMappingVOS;
- }
-
- /***
- * 鏍规嵁鏉′欢鏌ヨ灞炴�ф槧灏勪俊鎭�
- * @param conditionMap
- * @return
- * @throws VciBaseException
- */
- @Override
- public List<DockingPreAttrMappingVO> selectAttrMappings(Map<String, String> conditionMap) throws VciBaseException {
- List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>();
- VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(DockingPreAttrMappingDO.class);
- queryWrapperForDO.setConditionMap(conditionMap);
- List<DockingPreAttrMappingDO> dockingPreAttrMappingDOS=dockingPreAttrMappingDaoI.selectByWrapper(queryWrapperForDO);
- List<String> attributOids=new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingPreAttrMappingDOS)){
- dockingPreAttrMappingDOS.stream().forEach(dockingPreAttrMappingDO -> {
- String attrOid= dockingPreAttrMappingDO.getJmetaListId();
- attributOids.add(attrOid);
- });
- dockingPreAttrMappingVOList= dockingPreAttrMappingDO2VOs(dockingPreAttrMappingDOS);
- Map<String/**oid**/,DockingPreAttrMappingVO/**瀵硅薄**/> attrMappingMap = dockingPreAttrMappingVOList.stream().collect(Collectors.toMap(s -> s.getJmetaListId(), t -> t,(o1, o2)->o2));
-
- VciQueryWrapperForDO queryWrapperForDO2 = new VciQueryWrapperForDO(DockingPreAttrRangeDO.class);
- Map<String,String> condtionMap=new HashMap<>();
- condtionMap.put("jmetaListId", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(attributOids.toArray(new String[]{})) + ")");
- queryWrapperForDO.setConditionMap(conditionMap);
- List<DockingPreAttrRangeDO> dockingPreAttrRangeDOS=dockingPreAttrRangeDODaoI.selectByWrapper(queryWrapperForDO2);
- Map<String,List<DockingPreAttrRangeVO>> attribueOidMap=new HashMap<>();
- if(!CollectionUtils.isEmpty(dockingPreAttrRangeDOS)){
- dockingPreAttrRangeDOS.stream().forEach(dockingPreAttrRangeDO -> {
- String attributeOid= dockingPreAttrRangeDO.getJmetaListId();
- List<DockingPreAttrRangeVO> dockingPreAttrRangeVOS=new ArrayList<>();
- dockingPreAttrRangeVOS.add(dockingPreAttrRangeDO2VO(dockingPreAttrRangeDO));
- if(attribueOidMap.containsKey(attributeOid)){
- List<DockingPreAttrRangeVO> oldDockingPreAttrRangeVOS= attribueOidMap.get(attributeOid);
- dockingPreAttrRangeVOS.addAll(oldDockingPreAttrRangeVOS);
- }
- attribueOidMap.put(attributeOid,dockingPreAttrRangeVOS);
- });
- }
- if(!CollectionUtils.isEmpty(attribueOidMap)){
- attribueOidMap.keySet().forEach(attoributeOid->{
- List<DockingPreAttrRangeVO> dockingPreAttrRangeVOList= attribueOidMap.get(attoributeOid);
- if(attrMappingMap.containsKey(attoributeOid)){
- DockingPreAttrMappingVO dockingPreAttrMappingVO= attrMappingMap.get(attoributeOid);
- dockingPreAttrMappingVO.setDockingPreAttrRangeVOS(dockingPreAttrRangeVOList);
- }
- });
- }
- }
- return dockingPreAttrMappingVOList;
- }
-
- /***
- * 灞炴�ф灇涓惧璞¤浆鎹�
- * @param doList
- * @return
- */
- private List<DockingPreAttrRangeDO> dockingPreAttrRangeDTO2DOs(List<DockingPreAttrRangeDTO> doList) {
- List<DockingPreAttrRangeDO> voList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(doList)){
- for(DockingPreAttrRangeDTO s: doList){
- DockingPreAttrRangeDO doBO = dockingPreAttrRangeDTO2DO(s);
- if(doBO != null){
- voList.add(doBO);
- }
- }
- }
- return voList;
- }
-
- /***
- * 灞炴�ф灇涓炬槧灏�
- * @param dockingPreAttrRangeDTO
- * @return
- */
- private DockingPreAttrRangeDO dockingPreAttrRangeDTO2DO(DockingPreAttrRangeDTO dockingPreAttrRangeDTO) {
- DockingPreAttrRangeDO dockingPreAttrRangeDO = new DockingPreAttrRangeDO();
- if(dockingPreAttrRangeDTO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreAttrRangeDTO,dockingPreAttrRangeDO);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- }
- return dockingPreAttrRangeDO;
- }
-
- /***
- * 灞炴�ф灇涓惧璞¤浆鎹�
- * @param doList
- * @return
- */
- private List<DockingPreAttrRangeVO> dockingPreAttrRangeDO2VOs(List<DockingPreAttrRangeDO> doList) {
- List<DockingPreAttrRangeVO> voList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(doList)){
- for(DockingPreAttrRangeDO s: doList){
- DockingPreAttrRangeVO vo = dockingPreAttrRangeDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /***
- * 灞炴�ф灇涓炬槧灏�
- * @param dockingPreAttrRangeDO
- * @return
- */
- private DockingPreAttrRangeVO dockingPreAttrRangeDO2VO(DockingPreAttrRangeDO dockingPreAttrRangeDO) {
- DockingPreAttrRangeVO vo = new DockingPreAttrRangeVO();
- if(dockingPreAttrRangeDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreAttrRangeDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- }
- return vo;
- }
-
- /***
- * 灞炴�ф槧灏勫璞¤浆鎹�
- * @param doList
- * @return
- */
- private List<DockingPreAttrMappingVO> dockingPreAttrMappingDO2VOs(List<DockingPreAttrMappingDO> doList) {
- List<DockingPreAttrMappingVO> voList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(doList)){
- for(DockingPreAttrMappingDO s: doList){
- DockingPreAttrMappingVO vo = dockingPreAttrMappingDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- private DockingPreAttrMappingVO dockingPreAttrMappingDO2VO(DockingPreAttrMappingDO dockingPreAttrMappingDO) {
- DockingPreAttrMappingVO vo = new DockingPreAttrMappingVO();
- if(dockingPreAttrMappingDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingPreAttrMappingDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- }
- return vo;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/ICodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/ICodeClassifyServiceImpl.java
new file mode 100644
index 0000000..bd39008
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/ICodeClassifyServiceImpl.java
@@ -0,0 +1,30 @@
+package com.vci.ubcs.code.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.CodeClassify;
+import com.vci.ubcs.code.mapper.CodeClassifyMapper;
+import com.vci.ubcs.code.service.ICodeClassifyService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class ICodeClassifyServiceImpl extends ServiceImpl<CodeClassifyMapper, CodeClassify> implements ICodeClassifyService {
+
+ @Resource
+ private CodeClassifyMapper codeClassifyMapper;
+
+ /**
+ * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
+ * @param wrapper 鏌ヨ灏佽鍣�
+ * @return 鏁版嵁瀵硅薄
+ */
+ @Override
+ public List<CodeClassify> selectByWrapper(Wrapper wrapper) {
+ return codeClassifyMapper.selectList(wrapper);
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
deleted file mode 100644
index e6d4281..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ /dev/null
@@ -1,2755 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmEngineConstant;
-import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
-import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
-import com.vci.ubcs.code.enumpack.CodeUseButtonPositionTypeEnum;
-import com.vci.ubcs.code.lifecycle.CodeDefaultLC;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateAttrDO;
-import com.vci.ubcs.code.entity.CodeClassifyTemplateDO;
-import com.vci.ubcs.code.utils.DateUtils;
-import com.vci.corba.common.VCIError;
-import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
-import com.vci.frameworkcore.lcstatuspck.FrameworkDataLCStatus;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.starter.revision.bo.TreeWrapperOptions;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.constant.RegExpConstant;
-import com.vci.starter.web.enumpck.BooleanEnum;
-import com.vci.starter.web.enumpck.UserSecretEnum;
-import com.vci.starter.web.enumpck.VciFieldTypeEnum;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.*;
-import com.vci.starter.web.toolmodel.DateConverter;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.util.VciDateUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.service.*;
-import com.vci.ubcs.code.vo.pagemodel.*;
-import com.vci.web.dto.BaseModelDTO;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.*;
-import com.vci.web.service.*;
-import com.vci.web.service.impl.FormulaServiceImpl;
-import com.vci.web.service.impl.OsEnumServiceImpl;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
-import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
-import com.vci.ubcs.code.dto.CodeOrderDTO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientBusinessObjectOperation;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
-import static com.vci.web.constant.EnumIdConstant.LC_STATUS_SUBFIX;
-
-/**
- * 涓绘暟鎹紩鎿庢湇鍔�
- *
- * @author weidy
- * @date 2022-2-22
- */
-@Service
-public class MdmEngineServiceImpl implements MdmEngineServiceI {
-
- /**
- * 蹇呰緭
- */
- public static final String REQUIRED_CHAR = "*";
- /**
- * 鏇挎崲瀛楃
- */
- public static final String SPECIAL_CHAR = "VCI";
- /**
- * 妯℃澘鐨勬湇鍔�
- */
- @Autowired
- private CodeClassifyTemplateServiceI templateService;
-
- /**
- * 妯℃澘鎸夐挳鏈嶅姟
- */
- @Autowired
- private CodeClassifyTemplateButtonServiceI templateButtonService;
-
- /**
- * 鍒嗙被鐨勬湇鍔�
- */
- @Autowired
- private CodeClassifyServiceI classifyService;
-
- /**
- * 涓氬姟鏁版嵁鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 鍏紡鐨勬湇鍔�
- */
- @Autowired
- private FormulaServiceImpl formulaService;
-
- /**
- * 鏋氫妇鐨勬湇鍔�
- */
- @Autowired
- private OsEnumServiceI enumService;
-
- /**
- * 鐢熷懡鍛ㄦ湡鐨勬湇鍔�
- */
- @Autowired
- private OsLifeCycleServiceI lifeCycleService;
-
- /**
- * 缂栫爜瑙勫垯鐨勬湇鍔�
- */
- @Autowired
- private CodeRuleServiceI ruleService;
-
- /**
- * 鍒嗙被鐮佸�肩殑鏈嶅姟
- */
- @Autowired
- private CodeClassifyValueServiceI classifyValueService;
-
- /**
- * 鍏抽敭灞炴�х殑閰嶇疆
- */
- @Autowired
- private CodeKeyAttrRepeatRuleServiceI keyRuleService;
-
-
- /**
- * 鍔熻兘鎸夐挳鐨勬湇鍔�
- */
- @Autowired
- private SmOperationServiceI operationService;
-
- /**
- * 鐢熸垚缂栫爜鐨勬湇鍔�
- */
- @Autowired
- private MdmProductCodeServiceI productCodeService;
-
- /**
- * 闃舵鐨勬湇鍔�
- */
- @Autowired
- private CodePhaseAttrServiceI phaseAttrService;
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 瀵嗙骇鐨勬湇鍔�
- */
- @Autowired
- private WebSecretServiceI secretService;
-
- /**
- * 鍙緭鍙��
- */
- @Autowired
- private BdSelectInputCharServiceI charService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 鐩镐技椤规煡璇㈣鍒�
- */
- @Autowired
- private CodeResembleRuleServiceI resembleRuleService;
-
- /**
- * 灞炴�х殑鏈嶅姟
- */
- @Autowired
- private OsAttributeServiceI attributeService;
-
- /**
- * 鐢ㄦ埛鏌ヨ鐨勬湇鍔�
- */
- @Autowired(required = false)
- private SmUserQueryServiceI userQueryService;
-
- /**
- * 妯℃澘灞炴�х殑鏈嶅姟
- */
- @Autowired
- private CodeClassifyTemplateAttrServiceI templateAttrService;
-
- /**
- * 鎷疯礉鐨勭増鏈�
- */
- public static final String COPY_FROM_VERSION = "copyfromversion";
-
-
- /**
- * 浣跨敤鍒嗙被涓婚敭鑾峰彇椤甸潰鐨勫唴瀹癸紝鍖呭惈鎸夐挳
- *
- * @param codeClassifyOid 涓婚搴撳垎绫讳富閿�
- * @param functionId 鍔熻兘鐨勭紪鍙�
- * @return UI鐩稿叧鐨勫唴瀹�
- */
- @Override
- public MdmUIInfoVO getUIInfoByClassifyOid(String codeClassifyOid, String functionId) {
- VciBaseUtil.alertNotNull(codeClassifyOid, "涓婚搴撳垎绫讳富閿�");
- MdmUIInfoVO uiInfoVO = getTableDefineByTemplateVO(getUsedTemplateByClassifyOid(codeClassifyOid));
- uiInfoVO.setLeaf(classifyService.countChildrenByClassifyOid(codeClassifyOid) == 0);
- if (StringUtils.isNotBlank(functionId) && !"~".equalsIgnoreCase(functionId)) {
- List<SmOperationVO> operationVOS = operationService.listButtonByFunctionId(functionId);
- if (operationVOS == null) {
- operationVOS = new ArrayList<>();
- }
- //鏌ヨ鎵╁睍鎸夐挳
- List<CodeButtonVO> buttonVOS = listButtonInToolbarByClassifyOid(codeClassifyOid);
- if (!CollectionUtils.isEmpty(buttonVOS)) {
- for (int i = 0; i < buttonVOS.size(); i++) {
- CodeButtonVO buttonVO = buttonVOS.get(i);
- SmOperationVO operationVO = new SmOperationVO();
- operationVO.setModuleNo(functionId);
- operationVO.setUniqueFlag(buttonVO.getId());
- operationVO.setName(buttonVO.getName());
- operationVO.setAlias(operationVO.getName());
- operationVO.setExecuteJs(buttonVO.getExecutejs());
- operationVO.setIconCls(buttonVO.getIconcls());
- operationVOS.add(operationVO);
- }
- }
- uiInfoVO.setButtons(operationVOS);
- }
- return uiInfoVO;
- }
-
-
- /**
- * 浣跨敤涓婚搴撳垎绫昏幏鍙杣i鐩稿叧鐨勫唴瀹癸紙涓嶅寘鍚寜閽級
- *
- * @param codeClassifyOid 涓婚搴撶殑鍒嗙被鐨勪富閿�
- * @return UI鐩稿叧鐨勫唴瀹�
- */
- @Override
- public MdmUIInfoVO getTableDefineByClassifyOid(String codeClassifyOid) {
- VciBaseUtil.alertNotNull(codeClassifyOid, "涓婚搴撳垎绫讳富閿�");
- return getTableDefineByTemplateVO(getUsedTemplateByClassifyOid(codeClassifyOid));
- }
-
- /**
- * 浣跨敤妯℃澘鏄剧ず瀵硅薄杞崲涓鸿〃鏍肩殑淇℃伅锛堝寘鍚墿灞曠殑鎸夐挳锛�
- *
- * @param templateVO 妯℃澘鐨勪俊鎭�
- * @return UI鐩稿叧鐨勫唴瀹癸紙浠呭寘鍚〃鏍间俊鎭級
- */
- private MdmUIInfoVO getTableDefineByTemplateVO(CodeClassifyTemplateVO templateVO) {
- //鍏堢湅杩欎釜鍒嗙被鏈韩鏄惁鏈夋ā鏉�
- MdmUIInfoVO uiInfoVO = new MdmUIInfoVO();
- uiInfoVO.setTemplateVO(templateVO);
- //鎴戜滑闇�瑕佸皢妯℃澘杞崲涓鸿〃鏍肩浉鍏崇殑鏄剧ず淇℃伅
- uiInfoVO.setTableDefineVO(wrapperTableDefineByTemplate(uiInfoVO.getTemplateVO(),false));
- //闇�瑕佸幓鐪嬫墿灞曠殑鎸夐挳,鍙湁鍒楄〃閲岄潰鏈韩鎵嶆坊鍔犺繘鍘伙紝宸ュ叿鏍忎笂鐨勫崟鐙幏鍙�
- List<CodeClassifyTemplateButtonVO> buttonVOS = templateButtonService.listButtonByTemplateOid(templateVO.getOid(), true);
- if (!CollectionUtils.isEmpty(buttonVOS)) {
- //鎴戜滑瑕佸垎寮�涓烘寜閽紝杩樻槸鍦ㄦ搷浣滃垪閲岄潰
- List<CodeClassifyTemplateButtonVO> tableButtonVOs = buttonVOS.stream().filter(s -> CodeUseButtonPositionTypeEnum.TABLE.getValue().equalsIgnoreCase(s.getButtonuse())).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(tableButtonVOs)) {
- UITableFieldVO optionFieldVO = new UITableFieldVO();
- optionFieldVO.setField("options");
- optionFieldVO.setTitle("鎿嶄綔");
- optionFieldVO.setFieldType("text");
- optionFieldVO.setOptionField(true);
- List<KeyValue> buttons = new ArrayList<>();
- Map<String, String> optionJsMap = new HashMap<>();
- tableButtonVOs.stream().forEach(buttonVO -> {
- KeyValue kv = new KeyValue();
- kv.setKey(buttonVO.getId());
- kv.setValue(buttonVO.getClassifybuttonoidName());
- kv.setAttributes(VciBaseUtil.objectToMap(buttonVO));
- buttons.add(kv);
- optionJsMap.put(buttonVO.getId(), buttonVO.getButtonVO().getExecutejs());
- });
- optionFieldVO.setOptionJsMap(optionJsMap);
- uiInfoVO.getTableDefineVO().getCols().get(0).add(optionFieldVO);
- }
- }
- return uiInfoVO;
- }
-
- /**
- * 浣跨敤鍒嗙被鐨勪富閿幏鍙栧彲浠ヤ娇鐢ㄧ殑妯℃澘瀵硅薄
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 妯℃澘鐨勬樉绀哄璞�
- */
- @Override
- public CodeClassifyTemplateVO getUsedTemplateByClassifyOid(String codeClassifyOid) {
- return getUsedTemplateByClassifyOid(codeClassifyOid, true);
- }
-
- /**
- * 浣跨敤鍒嗙被鐨勪富閿幏鍙栧彲浠ヤ娇鐢ㄧ殑妯℃澘瀵硅薄
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param hasAttr 鍖呭惈灞炴��
- * @return 妯℃澘鐨勬樉绀哄璞�
- */
- @Override
- public CodeClassifyTemplateVO getUsedTemplateByClassifyOid(String codeClassifyOid, boolean hasAttr) {
- List<CodeClassifyTemplateVO> templateVOs = templateService.listReleaseTemplateByClassifyOid(codeClassifyOid, hasAttr);
- return templateVOs.get(templateVOs.size() - 1);
- }
-
- /**
- * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅
- *
- * @param codeClassifyTemplateOid 妯℃澘鐨勪富閿�
- * @return ui鐩稿叧鐨勫唴瀹�
- */
- @Override
- public MdmUIInfoVO getFormDefineByTemplateOid(String codeClassifyTemplateOid) {
- return getFormDefineByTemplateOid(codeClassifyTemplateOid, null);
- }
-
- /**
- * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅
- *
- * @param codeClassifyTemplateOid 妯℃澘鐨勪富閿�
- * @param codeClassifyOid 浣跨敤妯℃澘鐨勫垎绫讳富閿�
- * @return ui鐩稿叧鐨勫唴瀹�
- */
- @Override
- public MdmUIInfoVO getFormDefineByTemplateOid(String codeClassifyTemplateOid, String codeClassifyOid) {
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(codeClassifyTemplateOid);
- MdmUIInfoVO uiInfoVO = new MdmUIInfoVO();
- uiInfoVO.setTemplateVO(templateVO);
- uiInfoVO.setFormDefineVO(wrapperFormDefineByTemplate(templateVO, codeClassifyOid));
- wrapperResemble(templateVO, uiInfoVO);
- return uiInfoVO;
- }
-
- /**
- * 灏佽鐩镐技椤规煡璇㈢殑鍒楄〃
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param uiInfoVO 椤甸潰鐨勪俊鎭�
- */
- private void wrapperResemble(CodeClassifyTemplateVO templateVO, MdmUIInfoVO uiInfoVO) {
- List<CodeClassifyTemplateAttrVO> resembleAttrList = templateVO.getAttributes().stream().filter(s -> VciBaseUtil.getBoolean(s.getSamerepeatattrflag())
- || VciQueryWrapperForDO.ID_FIELD.equalsIgnoreCase(s.getId())).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(resembleAttrList) && resembleAttrList.size() > 1) {
- UITableDefineVO resembleTable = new UITableDefineVO();
- resembleTable.setOid(templateVO.getOid());
- resembleTable.setBtmType(templateVO.getBtmTypeId());
- resembleTable.setDisplayQueryArea(false);
- resembleTable.setPageVO(new UITablePageVO());
- //澶勭悊鎵�鏈夌殑鍒楋紝杩欎釜妯℃澘娌℃湁鍚堝苟鐨勮〃澶寸殑鎯呭喌
- List<UITableFieldVO> fieldVOList = new ArrayList<>();
- resembleAttrList.forEach(attrVO -> {
- UITableFieldVO tableFieldVO = templateAttr2TableField(attrVO,false);
- tableFieldVO.setHidden(false);
- fieldVOList.add(tableFieldVO);
- });
- List<List<UITableFieldVO>> cols = new ArrayList<>();
- cols.add(fieldVOList);
- resembleTable.setCols(cols);
- uiInfoVO.setResembleTableVO(resembleTable);
- }
- }
-
- /**
- * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑淇℃伅
- *
- * @param templateOid 妯℃澘鐨勪富閿�
- * @param executionId 娴佺▼鎵цid
- * @param processUse 娴佺▼妯℃澘鐨勭敤閫�
- * @return ui鐩稿叧鐨勫唴瀹�
- */
- @Override
- public List<String> getFieldByProcessTemplate(String templateOid, String executionId, String processUse) {
- VciBaseUtil.alertNotNull(templateOid, "妯℃澘涓婚敭", executionId, "娴佺▼鐨勬墽琛孖d", processUse, "娴佺▼妯℃澘鐢ㄩ��");
- while (StringUtils.countMatches(executionId, ".") > 1) {
- executionId = executionId.substring(0, executionId.lastIndexOf("."));
- }
- String sql = "select distinct (t.codetempattrOidArr)\n" +
- "from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY_PROCESS_TEMPLATE) + " t\n" +
- "join PLFLOWINSTANCE plfi on t.ID = plfi.PLTEMPLATEPUID\n" +
- "where plfi.PLEXECUTIONID = '" + executionId + "' and t.CLASSIFYTEMPLATEOID = '" + templateOid + "' and t.CODEPROCESSUSE = '" + processUse + "'";
- List<ClientBusinessObject> tempAttrOidArr = boService.queryByOnlySql(sql);
- if (CollectionUtils.isEmpty(tempAttrOidArr) || StringUtils.isBlank(tempAttrOidArr.get(0).getAttributeValue("codetempattroidarr"))) {
- return new ArrayList<>();
- }
- return VciBaseUtil.str2List(tempAttrOidArr.get(0).getAttributeValue("codetempattroidarr"));
- }
-
- /**
- * 浣跨敤涓婚搴撳垎绫荤殑涓婚敭鑾峰彇琛ㄥ崟鐨勪俊鎭�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return ui鐩稿叧鐨勫唴瀹�
- */
- @Override
- public MdmUIInfoVO getFormDefineByClassifyOid(String codeClassifyOid) {
- MdmUIInfoVO uiInfoVO = new MdmUIInfoVO();
- CodeClassifyTemplateVO templateVO = getUsedTemplateByClassifyOid(codeClassifyOid);
- uiInfoVO.setTemplateVO(templateVO);
- uiInfoVO.setFormDefineVO(wrapperFormDefineByTemplate(templateVO, codeClassifyOid));
- wrapperResemble(templateVO, uiInfoVO);
- return uiInfoVO;
- }
-
- /**
- * 浣跨敤鍒嗙被鐨勪富閿幏鍙栬〃鏍肩殑瀹氫箟
- *
- * @param codeClassifyOid 鍒嗙被涓婚敭
- * @param phase 闃舵鐨勫悕绉�
- * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗�)
- */
- @Override
- public MdmUIInfoVO getTableDefineByClassifyOid_v2(String codeClassifyOid, String phase) {
- MdmUIInfoVO uiInfoVO = new MdmUIInfoVO();
- CodeClassifyTemplateVO templateVO = getUsedTemplateByClassifyOid(codeClassifyOid);
- uiInfoVO.setTemplateVO(templateVO);
- UITableDefineVO uiTableDefineVO = wrapperTableDefineByTemplate(templateVO,true);
- List<String> phaseAttrIdList = listPhaseAttrByClassifyOid(codeClassifyOid, phase);
- uiTableDefineVO.getCols().stream().forEach(list -> {
- List<UITableFieldVO> visiableTableField=new ArrayList<>();
- if(StringUtils.isNotBlank(phase)) {
- visiableTableField = list.stream().filter(col ->
- phaseAttrIdList.stream().anyMatch(s -> StringUtils.equalsIgnoreCase(col.getField(), s) ||
- (StringUtils.equalsIgnoreCase(col.getFieldType(), "combox") && StringUtils.equalsIgnoreCase(col.getSortField(), s))
- || (StringUtils.equalsIgnoreCase(col.getFieldType(), "refer") && StringUtils.equalsIgnoreCase(col.getQueryField(), s))
- )).collect(Collectors.toList());
- }else{
- visiableTableField= list.stream().filter(col ->
- templateVO.getAttributes().stream().anyMatch(s ->
- (!s.getReadonlyflag().equalsIgnoreCase("true")&& StringUtils.equalsIgnoreCase(col.getField(), s.getId())) ||
- (StringUtils.equalsIgnoreCase(col.getFieldType(), "combox") && StringUtils.equalsIgnoreCase(col.getSortField(), s.getId()))
- || (StringUtils.equalsIgnoreCase(col.getFieldType(), "refer") && StringUtils.equalsIgnoreCase(col.getQueryField(), s.getId()))
- )).collect(Collectors.toList());
- }
-
- visiableTableField.stream().forEach(vo -> {
- uiTableDefineVO.setHasEditor(true);
- if ("refer".equalsIgnoreCase(vo.getFieldType())) {
- setReferConfig2EditConfig(vo);
- } else if ("combox".equalsIgnoreCase(vo.getFieldType())) {
- setComboxConfig2EditConfig(vo);
- } else if (StringUtils.isNotBlank(vo.getDateFormate())){
- vo.setEdit("date");
- }else {
- vo.setEdit(vo.getFieldType());
- }
- });
- });
- uiInfoVO.setTableDefineVO(uiTableDefineVO);
- wrapperResemble(templateVO, uiInfoVO);
- return uiInfoVO;
- }
-
- /**
- * 鍔犺浇鎴愬弬鐓х殑淇敼閰嶇疆
- * @param vo 琛ㄦ牸瀛楁鏄剧ず瀵硅薄
- */
- private void setReferConfig2EditConfig(UITableFieldVO vo) {
- if (!CollectionUtils.isEmpty(vo.getReferConfig().getWhere())){
- vo.getReferConfig().getWhere().keySet().forEach(key -> {
- vo.getReferConfig().getWhere().put(key, "'" + vo.getReferConfig().getWhere().get(key) + "'");
- });
- }
- if (StringUtils.isNotBlank(vo.getReferConfig().getParentValue())){
- String parentValue = vo.getReferConfig().getParentValue();
- parentValue ="\\" + parentValue.replaceAll("'","{vci-quote}").replaceAll("=","{vci-equals}");
- vo.getReferConfig().setParentValue(parentValue);
- }
- String referConfig = vo.getReferConfig().toString()
- .replaceAll("=",":")
- .replaceAll("UITableCustomDefineVO","")
- .replaceAll("UIFieldSortVO","")
- .replaceAll("UITablePageVO","")
- .replaceAll("UITableFieldVO","")
- .replaceAll("UIFormReferVO","")
- .replaceAll("\\{vci-equals}","=")
- .replaceAll("\\{vci-quote}","\\\\'")
- .replaceAll("'null'","null");
- referConfig = referConfig + ",fieldMap:{" + vo.getQueryField() + ":'" + vo.getReferConfig().getValueField() + "'}";
- vo.setEditConfig("{referConfig:" + referConfig + "}");
- vo.setEdit(vo.getFieldType());
- }
-
- /**
- * 鍔犺浇鎴愪笅鎷夋鐨勪慨鏀归厤缃�
- * @param vo 琛ㄦ牸瀛楁鏄剧ず瀵硅薄
- */
- private void setComboxConfig2EditConfig(UITableFieldVO vo) {
- vo.setEditConfig("{editable:true,comboxKey:'" + vo.getComboxKey() + "'");
- if (!CollectionUtils.isEmpty(vo.getData())){
- vo.setEditConfig(vo.getEditConfig()+", comboxConfig:");
- for (int i = 0; i < vo.getData().size(); i++) {
- KeyValue data = vo.getData().get(i);
- if (i == vo.getData().size() -1){
- vo.setEditConfig(vo.getEditConfig() + "{attributes:"+data.getAttributes()+",key:'"+data.getKey()+"',value:'"+data.getValue()+"'}]}");
- }else if (i == 0){
- vo.setEditConfig(vo.getEditConfig() + "{data:[{attributes:"+data.getAttributes()+",key:'"+data.getKey()+"',value:'"+data.getValue()+"'},");
- }else{
- vo.setEditConfig(vo.getEditConfig() + "{attributes:"+data.getAttributes()+",key:'"+data.getKey()+"',value:'"+data.getValue()+"'},");
- }
- }
- vo.setEditConfig(vo.getEditConfig() + ",valueField:'" + vo.getQueryField() + "'");
- }
- vo.setEditConfig(vo.getEditConfig() + "}");
- vo.setEdit(vo.getFieldType());
- }
-
- /**
- * 浣跨敤妯℃澘涓婚敭鑾峰彇ui鐩稿叧鐨勫唴瀹�
- *
- * @param templateOid 妯℃澘鐨勪富閿�
- * @return ui鐩稿叧鐨勫唴瀹�
- */
- @Override
- public MdmUIInfoVO getTableDefineByTemplateOid(String templateOid) {
- return getTableDefineByTemplateVO(templateService.getObjectHasAttrByOid(templateOid));
- }
-
- /**
- * 浣跨敤鍒嗙被涓婚敭鑾峰彇宸ュ叿鏍忎腑鐨勬寜閽俊鎭�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 鎸夐挳鐨勪俊鎭紝浼氭寜鐓ф帓搴忓彿杩涜鎺掑簭
- */
- @Override
- public List<CodeButtonVO> listButtonInToolbarByClassifyOid(String codeClassifyOid) {
- CodeClassifyTemplateVO templateVO = getUsedTemplateByClassifyOid(codeClassifyOid);
- return listButtonInToolbarByTemplateOid(templateVO.getOid());
- }
-
- /**
- * 浣跨敤妯℃澘涓婚敭鑾峰彇宸ュ叿鏍忎腑鐨勬寜閽俊鎭�
- *
- * @param templateOid 妯℃澘鐨勪富閿�
- * @return 鎸夐挳鐨勪俊鎭紝浼氭寜鐓ф帓搴忓彿杩涜鎺掑簭
- */
- @Override
- public List<CodeButtonVO> listButtonInToolbarByTemplateOid(String templateOid) {
- List<CodeClassifyTemplateButtonVO> buttonVOS = templateButtonService.listButtonByTemplateOid(templateOid, true);
- if (CollectionUtils.isEmpty(buttonVOS)) {
- return new ArrayList<>();
- }
- List<CodeClassifyTemplateButtonVO> toolbarButtons = buttonVOS.stream().filter(s -> CodeUseButtonPositionTypeEnum.TOOLBAR.getValue().equalsIgnoreCase(s.getButtonuse())).collect(Collectors.toList());
- if (CollectionUtils.isEmpty(toolbarButtons)) {
- return new ArrayList<>();
- }
- List<CodeButtonVO> buttonVOList = new ArrayList<>();
- for (int i = 0; i < toolbarButtons.size(); i++) {
- buttonVOList.add(toolbarButtons.get(i).getButtonVO());
- }
- return buttonVOList;
- }
-
- /**
- * 浣跨敤鍒嗙被鑾峰彇瀵瑰簲鐨勬暟鎹�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param templateOid 妯℃澘鐨勪富閿�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鐨勫璞�
- * @return 鏁版嵁锛堝寘鍚笅绾у垎绫伙級
- */
- @Override
- public DataGrid<Map<String, String>> gridTableDataByClassifyOid(String codeClassifyOid, String templateOid, Map<String, String> conditionMap, PageHelper pageHelper) {
- //1. 浣跨敤鍒嗙被鑾峰彇鎵�鏈夌殑涓嬬骇鍒嗙被锛岀劧鍚庢牴鎹垎绫绘煡璇㈠搴旂殑鏁版嵁
- //2. 鍏ㄩ儴浣跨敤褰撳墠鍒嗙被鐨勫綋鍓嶆ā鏉挎潵灞曠ず鍐呭
- //3. 濡傛灉妯℃澘涓婃湁鏋氫妇娉ㄥ叆锛岀粍鍚堣鍒欙紝鍜屽弬鐓х殑锛岄渶瑕佹墽琛岃浆鎹�
- //4. 鏌ヨ鐨勬椂鍊欙紝鐩存帴浣跨敤codeclsfpath鏉ユ煡璇�
- CodeClassifyVO topClassifyVO = classifyService.getTopClassifyVO(codeClassifyOid);
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(templateOid);
- if (topClassifyVO == null || StringUtils.isBlank(topClassifyVO.getBtmtypeid())) {
- throw new VciBaseException("褰撳墠涓婚搴撳垎绫绘病鏈夐《灞傚垎绫伙紝鎴栬�呴《灞傚垎绫绘病鏈夎缃笟鍔＄被鍨�");
- }
- String btmTypeId = topClassifyVO.getBtmtypeid();
- if (StringUtils.isBlank(btmTypeId)) {
- return new DataGrid<>("杩欎釜鍒嗙被鎵�灞為《灞傚垎绫绘病鏈夋坊鍔犱笟鍔＄被鍨�");
- }
- if (conditionMap == null) {
- conditionMap = new HashMap<>();
- }
- //pageHelper.addDefaultDesc("createTime");
- pageHelper.addDefaultDesc("id");
- if (!classifyService.checkHasChild(codeClassifyOid)) {
- conditionMap.put(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD, codeClassifyOid);
- } else {
- conditionMap.put(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY)
- + " where lcstatus='" + FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED +
- "' start with parentCodeClassifyOid = '" + codeClassifyOid + "' CONNECT BY PRIOR OID = parentCodeClassifyOid )");
- }
- conditionMap.put("islastr", "1");
- conditionMap.put("islastv", "1");
- return queryGrid(btmTypeId, templateVO, conditionMap, pageHelper);
-// List<String> selectFieldList = templateVO.getAttributes().stream().map(CodeClassifyTemplateAttrVO::getId).collect(Collectors.toList());
-// //鍙傜収璁╁钩鍙扮洿鎺ユ煡璇㈠氨琛�
-// List<String> finalSelectFieldList = selectFieldList;
-// List<CodeClassifyTemplateAttrVO> referAttrVOs = templateVO.getAttributes().stream().filter(
-// s -> StringUtils.isNotBlank(s.getReferbtmid())
-// &&
-// (finalSelectFieldList.size() ==0 || finalSelectFieldList.contains(s.getId().toLowerCase(Locale.ROOT)))
-// ).collect(Collectors.toList());
-// if(!CollectionUtils.isEmpty(referAttrVOs)){
-// for (int i = 0; i < referAttrVOs.size(); i++) {
-// selectFieldList.add(referAttrVOs.get(i).getId() + ".name");
-// }
-// }
-// //鎴戜滑浣跨敤鍜屼笟鍔＄被鍨嬬殑鏉ユ煡璇�
-// DataGrid<Map<String,String>> dataGrid = boService.queryGridByBo(btmTypeId, conditionMap, pageHelper, selectFieldList);
-// //鎴戜滑闇�瑕佷娇鐢ㄦā鏉挎潵杞崲
-// if(!CollectionUtils.isEmpty(dataGrid.getData())){
-// wrapperData(dataGrid.getData(),templateVO,finalSelectFieldList,false);
-// }
-// return dataGrid;
- }
-
- /**
- * 鏌ヨ缂栫爜鏁版嵁鐨勫垪琛�
- *
- * @param btmType 涓氬姟绫诲瀷
- * @param templateVO 妯℃澘鐨勫璞★紝闇�瑕佸寘鍚ā鏉跨殑灞炴��
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉瀵硅薄
- * @return 鏁版嵁鍒楄〃
- */
- @Override
- public DataGrid<Map<String, String>> queryGrid(String btmType, CodeClassifyTemplateVO templateVO, Map<String, String> conditionMap, PageHelper pageHelper) {
- CodeTemplateAttrSqlBO sqlBO = getSqlByTemplateVO(btmType, templateVO, conditionMap, pageHelper);
- List<Map> maps = boService.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
- DataGrid<Map<String, String>> dataGrid = new DataGrid<>();
- List<Map<String, String>> dataList = new ArrayList<>();
- if (!CollectionUtils.isEmpty(maps)) {
- maps.stream().forEach(map -> {
- Map<String, String> data = new HashMap<>();
- map.forEach((key, value) -> {
- data.put(((String) key).toLowerCase(Locale.ROOT), (String) value);
- });
- dataList.add(data);
- });
- }
- dataGrid.setData(dataList);
- if (!CollectionUtils.isEmpty(dataList)) {
- wrapperData(dataGrid.getData(), templateVO, sqlBO.getSelectFieldList(), false);
- dataGrid.setTotal(boService.queryCountBySql(sqlBO.getSqlCount(), new HashMap<>()));
- }
- return dataGrid;
- }
-
- /**
- * 鏍规嵁妯℃澘灞炴�х敓鎴愮浉搴旂殑sql淇℃伅
- *
- * @param btmType 涓氬姟绫诲瀷
- * @param templateVO 妯℃澘鏄剧ず瀵硅薄锛屽繀椤诲寘鍚睘鎬�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴忓璞�
- * @return sql鐨勭浉鍏充俊鎭�
- */
- @Override
- public CodeTemplateAttrSqlBO getSqlByTemplateVO(String btmType, CodeClassifyTemplateVO templateVO, Map<String, String> conditionMap, PageHelper pageHelper) {
- //鍥犱负鍙傜収涓嶄竴瀹氭槸鍦ㄥ钩鍙扮殑灞炴�ф睜閲岄潰璁剧疆锛屾墍浠ユ垜浠緱闇�瑕佽嚜琛屽鐞�
- //鍙傝�僔ciQueryWrapper鏉ュ鐞�
- //1. 鎵惧埌鎵�鏈夌殑瀛楁锛�
- Map<String, CodeClassifyTemplateAttrVO> attrVOMap = templateVO.getAttributes().stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- List<String> selectFieldList = attrVOMap.keySet().stream().collect(Collectors.toList());
-
- //鎵�鏈夌殑鍙傜収鐨勫瓧娈�
- Map<String/**灞炴�у瓧娈�**/, String> joinTableList = new ConcurrentHashMap<>();
- List<CodeClassifyTemplateAttrVO> referAttrVOs = templateVO.getAttributes().stream().filter(
- s -> StringUtils.isNotBlank(s.getReferbtmid()) || StringUtils.isNotBlank(s.getReferConfig())
- ).collect(Collectors.toList());
- Map<String/**鍙傜収鐨勫睘鎬�**/, String/**瀹為檯鐨勫瓧娈�**/> referFieldMap = new HashMap<>();
- if (!CollectionUtils.isEmpty(referAttrVOs)) {
- referAttrVOs.parallelStream().forEach(attrVO -> {
- UIFormReferVO referVO = null;
- if (StringUtils.isNotBlank(attrVO.getReferConfig())) {
- referVO = JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class);
- } else {
- referVO = new UIFormReferVO();
- referVO.setReferType(attrVO.getReferbtmid());
- referVO.setValueField(VciQueryWrapperForDO.OID_FIELD);
- referVO.setTextField("name");
- }
-
- String referTable = VciBaseUtil.getTableName(referVO.getReferType());
- String referTableNick = attrVO.getId() + "0";
- String left = " left join " + referTable + " " + referTableNick + " on " + referTableNick + "." + referVO.getValueField() + " = t." + attrVO.getId();
- joinTableList.put(attrVO.getId(), left);
- String referShowField = attrVO.getId() + "Name";
- List<String> textFields = VciBaseUtil.str2List(referVO.getTextField());
- String showFieldInSource = "";
- if (textFields.contains("name")) {
- showFieldInSource = "name";
- } else {
- showFieldInSource = textFields.get(0);
- }
- referFieldMap.put(attrVO.getId(), referTableNick + "." + showFieldInSource);
- selectFieldList.add(referTableNick + "." + showFieldInSource + " as " + referShowField);
- });
- }
- Optional.ofNullable(attributeService.getDefaultAttributeVOMap()).orElseGet(() -> new HashMap<>()).keySet().stream().forEach(attrId -> {
- if (!selectFieldList.contains(attrId) && !"secretgrade".equalsIgnoreCase(attrId)) {
- selectFieldList.add(attrId);
- }
- });
- if (!selectFieldList.contains(MdmEngineConstant.CODE_FIELD)) {
- selectFieldList.add(MdmEngineConstant.CODE_FIELD);
- }
- if (!selectFieldList.contains(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD)) {
- selectFieldList.add(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD);
- }
- if (!selectFieldList.contains(MdmEngineConstant.CODE_TEMPLATE_OID_FIELD)) {
- selectFieldList.add(MdmEngineConstant.CODE_TEMPLATE_OID_FIELD);
- }
- if (!selectFieldList.contains(MdmEngineConstant.CODE_FULL_PATH_FILED)) {
- selectFieldList.add(MdmEngineConstant.CODE_FULL_PATH_FILED);
- }
-
- //澶勭悊鏌ヨ鏉′欢
- //TODO 楠岃瘉sql娉ㄥ叆
- List<String> andSql = new ArrayList<>();
- List<String> orSql = new ArrayList<>();
- if (!CollectionUtils.isEmpty(conditionMap)) {
- Map<String, String> orConditionMap = new HashMap<>();
- Map<String, String> andCondtionMap = new HashMap<>();
- //鍏堝垎绂籵r鐨勬煡璇㈡潯浠讹紝鍙﹀褰撴煡璇㈡潯浠舵槸绌虹殑鏃跺�欎篃涓嶆煡璇�
- conditionMap.forEach((k, v) -> {
- if (StringUtils.isNotBlank(v)) {
- if (v.startsWith(QueryOptionConstant.OR)) {
- orConditionMap.put(k, v.substring(QueryOptionConstant.OR.length()));
- } else {
- andCondtionMap.put(k, v);
- }
- }
- });
-
- andCondtionMap.forEach((k, v) -> {
- andSql.add(getConditionSql(k.toLowerCase(), v, referFieldMap, attrVOMap));
- });
- orConditionMap.forEach((k, v) -> {
- orSql.add(getConditionSql(k.toLowerCase(), v, referFieldMap, attrVOMap));
- });
- }
- //缁勫悎璧锋潵
- StringBuilder andSb = new StringBuilder();
- andSql.stream().forEach(s -> {
- andSb.append(s).append(SPACE).append(QueryOptionConstant.AND).append(SPACE);
- });
-
- String andString = andSb.toString().trim();
- String endWithSql = QueryOptionConstant.AND;
- if (andString.endsWith(endWithSql)) {
- andString = andString.substring(0, andString.length() - endWithSql.length());
- }
-
- String orString = orSql.stream().collect(Collectors.joining(" or "));
- String whereSql = "";
- if (StringUtils.isNotBlank(orString)) {
- if (StringUtils.isBlank(andString)) {
- andString = " 1 = 1 ";
- }
- whereSql = SPACE + "(" + SPACE + andString + SPACE + ") and (" + SPACE + orString + SPACE + ")" + SPACE;
- } else {
- whereSql = andString + SPACE;
- }
- if (attrVOMap.keySet().contains("secretgrade")) {
- Integer userSecret = VciBaseUtil.getCurrentUserSecret();
- if (userSecret == null || userSecret == 0) {
- userSecret = secretService.getMinUserSecret();
- }
- whereSql += " and ( t.secretGrade <= " + userSecret + ") ";
- }
- String tableName = VciBaseUtil.getTableName(btmType);
- String sql = "select " + selectFieldList.stream().map(s -> (s.contains(".") ? s : ("t." + s))).collect(Collectors.joining(","))
- + " from " + tableName + SPACE + "t" + SPACE
- + joinTableList.values().stream().collect(Collectors.joining(SPACE))
- + (StringUtils.isBlank(whereSql) ? "" : " where ") + whereSql;
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- //鐪嬬湅鎺掑簭
- String orderSql = pageHelper.getOrderSql("t");
- sql += (orderSql == null ? "" : orderSql);
- String whereSubfixForPage = " ) A where rownum < " + (pageHelper.getLimit() * pageHelper.getPage() + 1) + ") where RN >= "
- + (pageHelper.getLimit() * (pageHelper.getPage() - 1) + 1);
- String sqlHasPage = pageHelper.getLimit() > 0 ? ("select * from (select A.*,rownum RN from (" + sql + whereSubfixForPage) : sql;
- String sqlCount = "select count(1) from " + tableName + SPACE + "t" + SPACE + joinTableList.values().stream().collect(Collectors.joining(SPACE))
- + (StringUtils.isBlank(whereSql) ? "" : " where ") + whereSql;
- CodeTemplateAttrSqlBO sqlBO = new CodeTemplateAttrSqlBO();
- sqlBO.setTableName(tableName);
- sqlBO.setJoinTable(joinTableList);
- sqlBO.setNickName("t");
- sqlBO.setPageHelper(pageHelper);
- sqlBO.setSqlHasPage(sqlHasPage);
- sqlBO.setSqlCount(sqlCount);
- sqlBO.setSqlUnPage(sql);
- return sqlBO;
- }
-
-
- /**
- * 绌烘牸
- */
- public static final String SPACE = " ";
-
- /**
- * 缁勫悎鏌ヨ鏉′欢鐨剆ql
- *
- * @param key 瀛楁
- * @param value 鍚嶅瓧
- * @param referFieldMap 鍙傜収鐨勫瓧娈�
- * @param attrVOMap 灞炴�х殑鏄犲皠
- * @return Sql璇彞
- */
- private String getConditionSql(String key, String value, Map<String/**鍙傜収鐨勫睘鎬�**/, String/**瀹為檯鐨勫睘鎬�**/> referFieldMap, Map<String, CodeClassifyTemplateAttrVO> attrVOMap) {
- if (key.endsWith("_begin")) {
- //璇存槑鏄�>=鐨勩�傛垜浠渶瑕佸厛鑾峰彇涓�涓�
- String field = (key.substring(0, key.length() - 6).toLowerCase().trim());
- if (referFieldMap.containsKey(field)) {
- //璇存槑杩樻槸鍙傜収閲岄潰鐨勶紝鎴戜滑榛樿杩欑鎯呭喌涓嬮兘鏄瓧绗︿覆鍚э紝鍥犱负鍙傜収鐨勫睘鎬т笉涓�瀹氱敤鐨勫钩鍙扮殑灞炴�ф睜閲岀殑锛屾墍浠ュぇ閮ㄥ垎鎯呭喌涓嬶紝鏄剧ず鐨勫睘鎬ч兘鏄瓧绗︿覆鍚�
- return referFieldMap.get(field) + SPACE + " >= '" + value + "'" + SPACE;
- } else {
- return (field.contains(".") ? "" : "t.") + field + SPACE + " >= " + getStringValueInWhere(value, field, attrVOMap);
- }
- } else if (key.endsWith("_end")) {
- //璇存槑鏄�<=鐨勩�傛垜浠渶瑕佸厛鑾峰彇涓�涓�
- String field = (key.substring(0, key.length() - 6).toLowerCase().trim());
- if (referFieldMap.containsKey(field)) {
- //璇存槑杩樻槸鍙傜収閲岄潰鐨勶紝鎴戜滑榛樿杩欑鎯呭喌涓嬮兘鏄瓧绗︿覆鍚э紝鍥犱负鍙傜収鐨勫睘鎬т笉涓�瀹氱敤鐨勫钩鍙扮殑灞炴�ф睜閲岀殑锛屾墍浠ュぇ閮ㄥ垎鎯呭喌涓嬶紝鏄剧ず鐨勫睘鎬ч兘鏄瓧绗︿覆鍚�
- return referFieldMap.get(field) + SPACE + " <= '" + value + "'" + SPACE;
- } else {
- return (field.contains(".") ? "" : "t.") + field + SPACE + " <= " + getStringValueInWhere(field, value, attrVOMap);
- }
- } else {
- if (referFieldMap.containsKey(key)) {
- //璇存槑鏄弬鐓х殑锛屾垜浠弬鐓х殑鏌ヨ閮借涓烘槸瀛楃涓诧紝濡傛灉鏄椂闂存牸寮忕殑鏌ヨ鑲畾鏈夐棶棰橈紝
- String selectKey = referFieldMap.get(key);
- return getSqlByValue(selectKey, value, null);
- } else {
- return getSqlByValue(key, value, attrVOMap);
- }
- }
-
- }
-
- /**
- * 灏佽鏈�缁堢殑sql璇彞涓殑鍊奸儴鍒�
- *
- * @param selectKey 鏌ヨ鐨勫瓧娈�
- * @param value 鍊�
- * @param attrVOMap 灞炴�х殑鏄剧ず瀵硅薄鏄犲皠
- * @return sql閲岀殑鍊�
- */
- private String getSqlByValue(String selectKey, String value, Map<String, CodeClassifyTemplateAttrVO> attrVOMap) {
- StringBuilder sql = new StringBuilder();
- if (!selectKey.contains(".") && (attrVOMap.containsKey(selectKey.toLowerCase(Locale.ROOT)) || attributeService.isDefaultAttr(selectKey) || selectKey.matches(RegExpConstant.LETTER))) {
- sql.append("t.");
- }
- if (value.startsWith(QueryOptionConstant.IN)) {
- sql.append(selectKey)
- .append(SPACE)
- .append("in")
- .append(SPACE)
- .append("(")
- .append(value.replace(QueryOptionConstant.IN, ""))
- .append(")");
- } else if (value.startsWith(QueryOptionConstant.NOTIN)) {
- sql.append(selectKey)
- .append(SPACE)
- .append("not in")
- .append(SPACE)
- .append("(")
- .append(value.replace(QueryOptionConstant.NOTIN, ""))
- .append(")");
- } else if (value.startsWith(QueryOptionConstant.NOTEQUAL)) {
- value = value.replace(QueryOptionConstant.NOTEQUAL, "");
- value = getStringValueInWhere(selectKey, value, attrVOMap);
- sql.append(selectKey)
- .append(SPACE)
- .append(QueryOptionConstant.NOTEQUAL)
- .append(SPACE)
- .append(value);
- } else if (value.startsWith(QueryOptionConstant.MORETHAN)) {
- value = value.replace(QueryOptionConstant.MORETHAN, "");
- value = getStringValueInWhere(selectKey, value, attrVOMap);
- sql.append(selectKey)
- .append(SPACE)
- .append(QueryOptionConstant.MORETHAN)
- .append(SPACE)
- .append(value);
- } else if (value.startsWith(QueryOptionConstant.MORE)) {
- value = value.replace(QueryOptionConstant.MORE, "");
- value = getStringValueInWhere(selectKey, value, attrVOMap);
- sql.append(selectKey)
- .append(SPACE)
- .append(QueryOptionConstant.MORE)
- .append(SPACE)
- .append(value);
- } else if (value.startsWith(QueryOptionConstant.LESSTHAN)) {
- value = value.replace(QueryOptionConstant.LESSTHAN, "");
- value = getStringValueInWhere(selectKey, value, attrVOMap);
-
- sql.append(selectKey)
- .append(SPACE)
- .append(QueryOptionConstant.LESSTHAN)
- .append(SPACE)
- .append(value);
- } else if (value.startsWith(QueryOptionConstant.LESS)) {
- value = value.replace(QueryOptionConstant.LESS, "");
- value = getStringValueInWhere(selectKey, value, attrVOMap);
-
- sql.append(selectKey)
- .append(SPACE)
- .append(QueryOptionConstant.LESS)
- .append(SPACE)
- .append(value);
- } else if (value.startsWith(QueryOptionConstant.ISNOTNULL)) {
- sql.append(selectKey)
- .append(SPACE)
- .append(" is not null");
- } else if (value.startsWith(QueryOptionConstant.ISNULL)) {
- sql.append(selectKey)
- .append(SPACE)
- .append(" is null");
- } else if (value.contains("*")) {
- //璇存槑鏄痩ike锛屾垨鑰卨efe like ,right like
- value = getStringValueInWhere(selectKey, value, attrVOMap);
- sql.append(selectKey)
- .append(SPACE)
- .append("like")
- .append(SPACE)
- // .append("'")
- .append(value.replace("*", "%"))
- // .append("'")
- .append(SPACE);
- } else {
- value= value.replace(SPECIAL_CHAR,REQUIRED_CHAR);
- value = getStringValueInWhere(selectKey, value, attrVOMap);
-
- sql.append(selectKey)
- .append(SPACE)
- .append(QueryOptionConstant.EQUAL)
- .append(SPACE)
- .append(value);
- }
- sql.append(SPACE);
- return sql.toString();
- }
-
- /**
- * 榛樿鐨勬椂闂存牸寮�
- */
- private static final String DATETIME_FORMAT = "yyyy-mm-dd hh24:mi:ss";
-
- /**
- * 鏃ユ湡鏍煎紡
- */
- private static final String DATE_FORMAT = "yyyy-mm-dd";
- /**
- * 鍙槸sql
- */
- public static final String ONLY = "${vcionly}";
-
- /**
- * 鑾峰彇鏌ヨ鏉′欢涓殑鍊肩殑锛屽鐞嗕笉鍚岀殑绫诲瀷
- *
- * @param value 鍊�
- * @param field 瀛楁鍚嶇О
- * @return 鏃ユ湡鎴栬�呮椂闂存牸寮忎細鍖呮嫭to_date锛屽瓧绗︿覆浼氬姞'
- */
- private String getStringValueInWhere(String field, String value, Map<String, CodeClassifyTemplateAttrVO> attrVOMap) {
- if ((field.contains(".") && !field.toLowerCase(Locale.ROOT).startsWith("t.")) || attrVOMap == null
- || !field.replace("t.", "").matches(RegExpConstant.LETTER) || value.startsWith(ONLY)) {
- //璇存槑鍙兘鏄寚瀹氱殑鏌愪釜鏉′欢锛岀洿鎺ヨ繑鍥�
- if (value.startsWith(ONLY)) {
- value = value.replace(ONLY, "");
- }
- if ((value.startsWith("(") && value.endsWith(")")) || (value.startsWith("'") && value.endsWith("'"))) {
- return value;
- }
- if (field.contains(".") && attrVOMap != null && attrVOMap.containsKey(field.split("\\.")[0].toLowerCase(Locale.ROOT))) {
- //鏄弬鐓�
- return "'" + value + "'";
- } else {
- return value;
- }
- } else {
- //鐪嬬湅鏄笉鏄繖涓璞￠噷鐨勫睘鎬�
- if (attrVOMap.containsKey(field)) {
- VciFieldTypeEnum fieldTypeEnum = VciFieldTypeEnum.valueOf(attrVOMap.get(field).getAttributedatatype());
- if ("ts".equalsIgnoreCase(field)) {
- return "to_timestamp('" + value + "', '" + DATETIME_FORMAT + ".ff')";
- }
- DateConverter dateConverter = new DateConverter();
- if (VciFieldTypeEnum.VTDateTime.equals(fieldTypeEnum)) {
- //瀹為檯涓婏紝鏁版嵁搴撻兘鏄痶imestamp鐨勭被鍨�.
- dateConverter.setAsText(value);
- return "to_date('" + dateConverter.getAsText(VciDateUtil.DateTimeFormat) + "','" + DATETIME_FORMAT + "')";
- } else if (VciFieldTypeEnum.VTDate.equals(fieldTypeEnum)) {
- dateConverter.setAsText(value);
- return "to_date('" + dateConverter.getAsText(VciDateUtil.DateFormat) + "','" + DATE_FORMAT + "')";
- } else if (VciFieldTypeEnum.VTDouble.equals(fieldTypeEnum)
- || VciFieldTypeEnum.VTLong.equals(fieldTypeEnum)
- || VciFieldTypeEnum.VTInteger.equals(fieldTypeEnum)) {
- return value;
- } else {
- return "'" + value + "'";
- }
- } else {
- if ((value.startsWith("(") && value.endsWith(")")) || (value.startsWith("'") && value.endsWith("'"))) {
- return value;
- }
- return "'" + value + "'";
- }
- }
-
- }
-
- /**
- * 灏佽寮�鍏崇殑鍐呭锛屽父鐢ㄤ簬瀵煎嚭
- * @param dataMap 鏁版嵁鐨勫唴瀹�
- * @param templateVO 妯℃澘鐨勬樉绀�
- */
- @Override
- public void wrapperBoolean(List<Map<String, String>> dataMap, CodeClassifyTemplateVO templateVO){
- List<String> booleanAttributes = templateVO.getAttributes().stream().filter(s -> VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(s.getAttributedatatype())).map(s -> s.getId().toLowerCase(Locale.ROOT)).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(booleanAttributes)){
- dataMap.stream().forEach(data -> {
- booleanAttributes.stream().forEach(attrId->{
- if(data.containsKey(attrId)){
- String value = data.get(attrId);
- data.put(attrId, BooleanEnum.TRUE.getValue().equalsIgnoreCase(value)?"鏄�":"鍚�");
- }
- });
- });
- }
- }
-
- /**
- * 灏佽鏌ヨ鍑烘潵鐨勬暟鎹�
- *
- * @param dataMap 鏁版嵁鐨勬槧灏�
- * @param templateVO 妯℃澘鐨勫睘鎬�
- * @param onlySelectAttrIdList 浠呬粎鏌ヨ鐨勫睘鎬у瓧娈�
- * @param form 琛ㄥ崟閲屼娇鐢�
- */
- @Override
- public void wrapperData(List<Map<String, String>> dataMap, CodeClassifyTemplateVO templateVO,
- Collection<String> onlySelectAttrIdList, boolean form) {
- if (onlySelectAttrIdList == null) {
- onlySelectAttrIdList = new ArrayList<>();
- }
- //鍏堣浆鎹竴涓嬫椂闂存牸寮�
- List<String> finalOnlySelectAttrIdList = onlySelectAttrIdList.stream().collect(Collectors.toList());
- List<CodeClassifyTemplateAttrVO> dateFormatAttrVOs = templateVO.getAttributes().stream().filter(
- s -> StringUtils.isNotBlank(s.getCodedateformat()) &&
- (finalOnlySelectAttrIdList.size() == 0 || finalOnlySelectAttrIdList.contains(s.getId().toLowerCase(Locale.ROOT)))
- ).collect(Collectors.toList());
- //鏋氫妇鐨勫唴瀹�
- List<CodeClassifyTemplateAttrVO> enumAttrVOs = templateVO.getAttributes().stream().filter(
- s -> (StringUtils.isNotBlank(s.getEnumid()) || StringUtils.isNotBlank(s.getEnumString()))
- &&
- (finalOnlySelectAttrIdList.size() == 0 || finalOnlySelectAttrIdList.contains(s.getId().toLowerCase(Locale.ROOT)))
- ).collect(Collectors.toList());
-
- List<String> userIds = new ArrayList<>();
- dataMap.stream().forEach(data -> {
- //澶勭悊鏃堕棿
- if (!form) {
- //琛ㄥ崟鐨勬椂鍊欏彧鑳界敤缁熶竴鐨勬椂闂存牸寮�
- wrapperDateFormat(dateFormatAttrVOs, data);
- }
- //澶勭悊鏋氫妇
- wrapperEnum(enumAttrVOs, data);
- String lcstatus = data.get(VciQueryWrapperForDO.LC_STATUS_FIELD);
- String copyFromVersion = data.getOrDefault(COPY_FROM_VERSION,"");
- if ((CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(lcstatus) || CodeDefaultLC.AUDITING.getValue().equalsIgnoreCase(lcstatus))
- && StringUtils.isBlank(copyFromVersion)
- ) {
- data.put(VciQueryWrapperForDO.ID_FIELD, "******");
- }
- data.put(VciQueryWrapperForDO.LC_STATUS_FIELD_TEXT.toLowerCase(Locale.ROOT), CodeDefaultLC.getTextByValue(lcstatus));
- if(CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(lcstatus)
- && StringUtils.isNotBlank(copyFromVersion)){
- data.put(VciQueryWrapperForDO.LC_STATUS_FIELD_TEXT.toLowerCase(Locale.ROOT), "淇敼涓�");
- }
- if (data.containsKey("creator")) {
- userIds.add(data.get("creator"));
- }
- if (data.containsKey("lastmodifier")) {
- userIds.add(data.get("lastmodifier"));
- }
- });
- if (!CollectionUtils.isEmpty(userIds)) {
- Map<String, SmUserVO> userVOMap = Optional.ofNullable(userQueryService.listUserByUserIds(userIds)).orElseGet(() -> new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- dataMap.stream().forEach(data -> {
- String creator = data.getOrDefault("creator", null);
- if (StringUtils.isNotBlank(creator) && userVOMap.containsKey(creator.toLowerCase(Locale.ROOT))) {
- data.put("creator", creator + "(" + userVOMap.get(creator.toLowerCase(Locale.ROOT)).getName() + ")");
- }
- String lastmodifier = data.getOrDefault("lastmodifier", null);
- if (StringUtils.isNotBlank(lastmodifier) && userVOMap.containsKey(lastmodifier.toLowerCase(Locale.ROOT))) {
- data.put("lastmodifier", lastmodifier + "(" + userVOMap.get(lastmodifier.toLowerCase(Locale.ROOT)).getName() + ")");
- }
- });
- }
- }
-
- /**
- * 澶勭悊鏃堕棿鏍煎紡
- *
- * @param dateFormatAttrVOs 鏃堕棿鏍煎紡鐨勫睘鎬�
- * @param data 褰撳墠琛屾暟鎹�
- */
- private void wrapperDateFormat(Collection<CodeClassifyTemplateAttrVO> dateFormatAttrVOs, Map<String, String> data) {
- if (!CollectionUtils.isEmpty(dateFormatAttrVOs)) {
- dateFormatAttrVOs.stream().forEach(dateFormatAttrVO -> {
- String attrId = dateFormatAttrVO.getId().toLowerCase(Locale.ROOT);
- String oldValue = data.getOrDefault(attrId, null);
- if (StringUtils.isNotBlank(oldValue)) {
- DateConverter dateConverter = new DateConverter();
- try {
- dateConverter.setAsText(oldValue);
- Date value = dateConverter.getValue();
- if (value != null) {
- data.put(attrId, VciDateUtil.date2Str(value, dateFormatAttrVO.getCodedateformat()));
- }
- } catch (Throwable e) {
- //杞崲鍙兘鏈夐棶棰橈紝杩欏氨浣跨敤鍘熸湰瀛樺偍鐨勫��
- }
- }
- });
- }
- }
-
- /**
- * 澶勭悊鏋氫妇鐨勫唴瀹癸紝濡傛灉涓嶅湪鏋氫妇涓紝浼氳繑鍥炲師鏈殑鍊�
- *
- * @param enumAttrVOs 鏋氫妇灞炴��
- * @param data 褰撳墠琛屾暟鎹�
- */
- private void wrapperEnum(Collection<CodeClassifyTemplateAttrVO> enumAttrVOs, Map<String, String> data) {
- //澶勭悊鏋氫妇鐨勫唴瀹癸紝涓轰簡鍏煎浠ュ墠鐨勬暟鎹�,濡傛灉鏁版嵁涓嶈兘浣跨敤鏋氫妇杞崲鐨勮瘽锛岄偅杩樻槸鏄剧ず浠ュ墠鐨勫��
- if (!CollectionUtils.isEmpty(enumAttrVOs)) {
- enumAttrVOs.stream().forEach(enumAttrVO -> {
- String attrId = enumAttrVO.getId().toLowerCase(Locale.ROOT);
- String oldValue = data.getOrDefault(attrId, null);
- if (StringUtils.isNotBlank(oldValue)) {
- List<KeyValue> comboxKVs = listComboboxItems(enumAttrVO);
- String newValue = oldValue;
- KeyValue keyValue = Optional.ofNullable(comboxKVs).orElseGet(() -> new ArrayList<>()).stream().filter(s -> s.getKey().equalsIgnoreCase(oldValue)).findFirst().orElseGet(() -> null);
- if (keyValue != null) {
- newValue = keyValue.getValue();
- }
- data.put(attrId + "Text", newValue);
- }
- });
- }
- }
-
- /**
- * 鑾峰彇鏋氫妇鐨勪笅鎷夐�夐」
- *
- * @param attrVO 妯℃澘灞炴�х殑瀵硅薄
- * @return 涓嬫媺閫夐」
- */
- @Override
- public List<KeyValue> listComboboxItems(CodeClassifyTemplateAttrVO attrVO) {
- List<KeyValue> comboboxKVs;
- if (StringUtils.isNotBlank(attrVO.getEnumString())) {
- comboboxKVs = JSONObject.parseArray(attrVO.getEnumString(), KeyValue.class);
- } else {
- comboboxKVs = enumService.getEnum(attrVO.getEnumid());
- }
- return comboboxKVs;
- }
-
- /**
- * 澶勭悊缁勫悎瑙勫垯鐨勫唴瀹癸紝濡傛灉涓嶅湪鏋氫妇涓紝浼氳繑鍥炲師鏈殑鍊�
- *
- * @param compAttrVOs 缁勫悎瑙勫垯灞炴��
- * @param data 褰撳墠琛屾暟鎹�
- */
- private void wrapperComponentRule(Collection<CodeClassifyTemplateAttrVO> compAttrVOs, Map<String, String> data) {
- if (!CollectionUtils.isEmpty(compAttrVOs)) {
- compAttrVOs.stream().forEach(attrVO -> {
- String attrId = attrVO.getId().toLowerCase(Locale.ROOT);
- //鐢ㄥ叕寮忓幓璁＄畻
- //鍏堢敤褰撳墠鏁版嵁鏇挎崲涓�涓�
- String calculatedValue = formulaService.getValueByFormula(data, attrVO.getComponentrule());
- data.put(attrId, calculatedValue);
- });
- }
- }
-
-
- /**
- * 浣跨敤鏁版嵁涓婚敭鑾峰彇鏁版嵁鐨勫叏閮ㄤ俊鎭�
- *
- * @param oid 涓婚敭
- * @param templateOid 妯℃澘鐨勪富閿�
- * @return 鏁版嵁鐨勫唴瀹�
- */
- @Override
- public BaseResult<Map<String, String>> getDataByOid(String oid, String templateOid) {
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(templateOid);
- //涓轰簡闃叉妯℃澘涓婄殑涓氬姟绫诲瀷涓庡垎绫讳笂涓嶅搴�
- CodeClassifyVO topClassifyVO = classifyService.getTopClassifyVO(templateVO.getCodeclassifyoid());
- String btmId = topClassifyVO.getBtmtypeid();
- //鏌ヨ鏁版嵁
- Map<String, String> conditionMap = WebUtil.getOidQuery(oid);
- CodeTemplateAttrSqlBO sqlBO = getSqlByTemplateVO(btmId, templateVO, conditionMap, new PageHelper(-1));
- //鎴戜滑浣跨敤鍜屼笟鍔＄被鍨嬬殑鏉ユ煡璇�
- List<ClientBusinessObject> cbos = boService.queryByOnlySql(sqlBO.getSqlUnPage());
- if (CollectionUtils.isEmpty(cbos)) {
- throw new VciBaseException("鏁版嵁鍦ㄧ郴缁熶腑涓嶅瓨鍦紝鏄惁鍥犱负淇敼杩囦笟鍔＄被鍨嬶紵");
- }
- Map<String, String> data = new HashMap<>();
- ClientBusinessObject cbo = cbos.get(0);
- WebUtil.copyValueToMapFromCbos(cbo, data);
- List<Map<String, String>> dataList = new ArrayList<>();
- dataList.add(data);
- wrapperData(dataList, templateVO, sqlBO.getSelectFieldList(), true);
- BaseResult<Map<String, String>> result = BaseResult.success(data);
- //鎴戜滑瑕佺湅鏄惁涓嶆槸鍗囩増鐨勶紝鍗囩増鐨勮瘽锛岄渶瑕佸姣斾笉鐩哥瓑鐨勫睘鎬�
- String copy = cbo.getCopyFromVersion();
- if (StringUtils.isBlank(copy)) {
- copy = cbo.getAttributeValue("copyfromversion");
- }
- if (StringUtils.isNotBlank(copy)) {
- //璇存槑鏈夊彉鏇寸殑鍐呭
-
- CodeTemplateAttrSqlBO oldSqlBO = getSqlByTemplateVO(btmId, templateVO, WebUtil.getOidQuery(copy), new PageHelper(-1));
- //鎴戜滑浣跨敤鍜屼笟鍔＄被鍨嬬殑鏉ユ煡璇�
- List<ClientBusinessObject> oldCbos = boService.queryByOnlySql(oldSqlBO.getSqlUnPage());
- if (!CollectionUtils.isEmpty(oldCbos)) {
- Map<String, String> newData = new HashMap<>();
- WebUtil.copyValueToMapFromCbos(cbo, newData);
- Map<String, String> oldData = new HashMap<>();
- WebUtil.copyValueToMapFromCbos(oldCbos.get(0), oldData);
- Map<String, String> difFieldMap = new HashMap<>();
- newData.forEach((key, value) -> {
- String oldValue = oldData.getOrDefault(key, "");
- if (value == null) {
- value = "";
- }
- if (oldValue == null) {
- oldValue = "";
- }
- if (!value.equalsIgnoreCase(oldValue)) {
- difFieldMap.put(key, oldValue);
- }
- });
- List<Map<String, String>> difFieldList = new ArrayList<>();
- difFieldList.add(difFieldMap);
- result.setData(difFieldList);
- }
- }
- return result;
- }
-
- /**
- * 浣跨敤涓婚搴撳垎绫昏幏鍙栫紪鐮佽鍒�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 缂栫爜瑙勫垯鐨勫唴瀹�
- */
- @Override
- public CodeRuleVO getCodeRuleByClassifyOid(String codeClassifyOid) {
- VciBaseUtil.alertNotNull(codeClassifyOid, "鍒嗙被鐨勪富閿�");
- CodeClassifyVO classifyVO = classifyService.getObjectByOid(codeClassifyOid);
- String codeRuleOid = classifyVO.getCoderuleoid();
- if (StringUtils.isBlank(codeRuleOid)) {
- //寰�涓婃壘
- CodeClassifyFullInfoBO fullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
- return getCodeRuleByClassifyFullInfo(fullInfo);
- }
- //鎴戜滑鏌ヨ缂栫爜瑙勫垯
- return ruleService.getObjectHasSecByOid(codeRuleOid);
- }
-
- /**
- * 浣跨敤鍒嗙被鐨勫叏閮ㄤ俊鎭幏鍙栫紪鐮佽鍒�
- *
- * @param fullInfoBO 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @return 瑙勫垯鐨勫唴瀹�
- */
- @Override
- public CodeRuleVO getCodeRuleByClassifyFullInfo(CodeClassifyFullInfoBO fullInfoBO) {
- //寰�涓婃壘
- String codeRuleOid = "";
- if (StringUtils.isNotBlank(fullInfoBO.getCurrentClassifyVO().getCoderuleoid())) {
- codeRuleOid = fullInfoBO.getCurrentClassifyVO().getCoderuleoid();
- } else {
- if (CollectionUtils.isEmpty(fullInfoBO.getParentClassifyVOs())) {
- //璇存槑宸茬粡鏄渶楂樺眰绾�,
- throw new VciBaseException("褰撳墠涓婚搴撳垎绫伙紝浠ュ強瀹冪殑鎵�鏈夌殑涓婄骇鍒嗙被閮芥病鏈夎缃紪鐮佽鍒�");
- }
- List<CodeClassifyVO> parentClassifyVOList = fullInfoBO.getParentClassifyVOs().stream().sorted((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel())).collect(Collectors.toList());
- //浠庢渶楂樼殑level寮�濮嬭幏鍙�
- for (int i = 0; i < parentClassifyVOList.size(); i++) {
- CodeClassifyVO record = parentClassifyVOList.get(i);
- if (StringUtils.isNotBlank(record.getCoderuleoid())) {
- codeRuleOid = record.getCoderuleoid();
- break;
- }
- }
- if (StringUtils.isBlank(codeRuleOid)) {
- throw new VciBaseException("褰撳墠涓婚搴撳垎绫伙紝浠ュ強瀹冪殑鎵�鏈夌殑涓婄骇鍒嗙被閮芥病鏈夎缃紪鐮佽鍒�");
- }
- }
- return ruleService.getObjectHasSecByOid(codeRuleOid);
- }
-
- /**
- * 浣跨敤鐮佹鐨勪富閿幏鍙栧垎绫荤殑鐮佸�煎唴瀹�
- *
- * @param classifySecOid 鐮佹鐨勪富閿�
- * @param parentClassifyValueOid 涓婄骇鍒嗙被鐨勪富閿�
- * @return 鍒嗙被鐮佸�肩殑鍐呭
- */
- @Override
- public List<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid) {
- return classifyValueService.listCodeClassifyValueBySecOid(classifySecOid, parentClassifyValueOid);
- }
-
- /**
- * 鐢宠鍗曚竴缂栫爜
- *
- * @param orderDTO 鐢宠鐨勪俊鎭紝闇�瑕佸寘鍚睘鎬х殑鍐呭鍜岀爜娈电浉鍏崇殑鍐呭
- * @return 杩斿洖缂栫爜鐨勫唴瀹�
- */
- @Override
- public String addSaveCode(CodeOrderDTO orderDTO) {
- VciBaseUtil.alertNotNull(orderDTO, "缂栫爜鐢宠鐩稿叧鐨勫睘鎬у拰鐮佹鐨勫唴瀹归兘涓虹┖", orderDTO.getCodeClassifyOid(), "涓婚搴撳垎绫荤殑涓婚敭",
- orderDTO.getTemplateOid(), "妯℃澘鐨勪富閿�", orderDTO.getCodeRuleOid(), "缂栫爜瑙勫垯鐨勪富閿�");
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
- CodeRuleVO ruleVO = ruleService.getObjectHasSecByOid(orderDTO.getCodeRuleOid());
- //1.鍒ゆ柇瑙勫垯涓櫎浜嗘祦姘寸爜娈碉紝鏄惁鏈夊叾浠栫爜娈�
- checkSecValueOnOrder(ruleVO, orderDTO);
- //2.鍒ゆ柇蹇呰緭椤�
- checkRequiredAttrOnOrder(templateVO, orderDTO);
- //3.鍏堟敞鍏ワ紝鍐嶇粍鍚堬紝鏈�鍚庢牎楠�
- switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO);
- //4.澶勭悊缁勫悎瑙勫垯銆傜粍鍚堣鍒欎笉鑳戒娇鐢ㄧ紪鐮佺殑灞炴�э紝鍥犱负缂栫爜鐨勭敓鎴愬彲鑳芥槸闇�瑕佸睘鎬х殑
- switchComponentAttrOnOrder(templateVO, orderDTO);
- //5.鏍￠獙瑙勫垯
- checkVerifyOnOrder(templateVO, orderDTO);
- //6.鍏抽敭灞炴��
- checkKeyAttrOnOrder(classifyFullInfo, templateVO, orderDTO);
- //7.鏋氫妇杞崲
- checkEnumOnOrder(templateVO, orderDTO);
- //8.澶勭悊鏃堕棿鏍煎紡锛屽湪鏁版嵁搴撻噷闈笉璁烘槸瀛楃涓茶繕鏄棩鏈熸牸寮忥紝閮戒娇鐢ㄧ浉鍚岀殑鏍煎紡瀛樺偍
- switchDateAttrOnOrder(templateVO, orderDTO);
- //9.鐢熸垚缂栫爜鐨勪俊鎭�
- ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
- //榛樿鐨勫睘鎬ч兘涓嶇敤浠庡墠绔嫹璐�
- //璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
- copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
- //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
- cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
- //end -- modify by lihang @20220407
- List<ClientBusinessObject> cboList = new ArrayList<>();
-
- //澶囨敞
- cbo.setDescription(orderDTO.getDescription()==null?"":orderDTO.getDescription());
-
- cboList.add(cbo);
- List<String> codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), cboList);
- batchSaveSelectChar(templateVO, cboList);
- return codeList.size() > 0 ? codeList.get(0) : "";
- }
-
- /**
- * 淇敼涓婚搴撴暟鎹�
- *
- * @param orderDTO 鏁版嵁鐨勫唴瀹癸紝涓嶇敤鍖呭惈鐮佹鐨勫唴瀹逛簡
- */
- @Override
- public void editSaveCode(CodeOrderDTO orderDTO) {
- VciBaseUtil.alertNotNull(orderDTO, "缂栫爜鐢宠鐩稿叧鐨勫睘鎬х殑鍐呭閮戒负绌�", orderDTO.getOid(), "鏁版嵁涓婚敭",
- orderDTO.getCodeClassifyOid(), "涓婚搴撳垎绫荤殑涓婚敭");
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
- //鎵句笟鍔＄被鍨嬶紝鐒跺悗浣跨敤涓婚敭鍘昏幏鍙栨暟鎹簱閲岀殑鏁版嵁
- List<ClientBusinessObject> cbos = boService.queryCBO(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), WebUtil.getOidQuery(orderDTO.getOid()));
- if (CollectionUtils.isEmpty(cbos)) {
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- ClientBusinessObject cbo = cbos.get(0);
- if (!cbo.getTs().contains(VciDateUtil.date2Str(orderDTO.getTs(), VciDateUtil.DateTimeFormat))) {
- throw new VciBaseException("鏁版嵁涓嶆槸鏈�鏂扮殑锛屽彲鑳戒粬浜哄凡缁忎慨鏀癸紝璇峰埛鏂板悗鍐嶈瘯");
- }
- if (!CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(cbo.getLcStatus()) && !orderDTO.isEditInProcess()) {
- throw new VciBaseException("鏁版嵁涓嶆槸{0}鐨勭姸鎬侊紝涓嶅厑璁镐慨鏀�", new String[]{CodeDefaultLC.EDITING.getText()});
- }
-
- //娉ㄦ剰妯℃澘涓嶈兘浣跨敤鏁版嵁瀛樺偍鐨勬椂鍊欑殑妯℃澘锛屽洜涓哄彲鑳戒細鍙樺寲
-
- //1. 鍒ゆ柇蹇呰緭椤�
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
- checkRequiredAttrOnOrder(templateVO, orderDTO);
- //2.鍏堟敞鍏ワ紝鍐嶇粍鍚堬紝鏈�鍚庢牎楠�
- switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO);
- //3.澶勭悊缁勫悎瑙勫垯銆傜粍鍚堣鍒欎笉鑳戒娇鐢ㄧ紪鐮佺殑灞炴�э紝鍥犱负缂栫爜鐨勭敓鎴愬彲鑳芥槸闇�瑕佸睘鎬х殑
- switchComponentAttrOnOrder(templateVO, orderDTO);
- //4.鏍￠獙瑙勫垯
- checkVerifyOnOrder(templateVO, orderDTO);
- //5.鍒ゆ柇鍏抽敭灞炴��
- checkKeyAttrOnOrder(classifyFullInfo, templateVO, orderDTO);
- //6.鏍￠獙鏋氫妇鐨勫唴瀹规槸鍚︽纭�
- checkEnumOnOrder(templateVO, orderDTO);
- //7.澶勭悊鏃堕棿鏍煎紡锛屽湪鏁版嵁搴撻噷闈笉璁烘槸瀛楃涓茶繕鏄棩鏈熸牸寮忥紝閮戒娇鐢ㄧ浉鍚岀殑鏍煎紡瀛樺偍
- switchDateAttrOnOrder(templateVO, orderDTO);
- //榛樿鐨勫唴瀹逛笉鑳藉彉锛屾墍浠ュ彧闇�瑕佹嫹璐濊嚜瀹氫箟鐨勭浉鍏冲睘鎬у嵆鍙�
- copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, true);
- //浼佷笟鐮佸拰闆嗗洟鐮佺殑涓嶄慨鏀�
- cbo.setDescription(orderDTO.getDescription()==null?"":orderDTO.getDescription());
- cbo.setName(orderDTO.getName()==null?"":orderDTO.getName());
- try {
- cbo.setAttributeValueWithNoCheck("description", orderDTO.getDescription());
- cbo.setAttributeValue("name", orderDTO.getName());
- } catch (VCIError e) {
- e.printStackTrace();
- }
- //淇敼鐨勬椂鍊欙紝缂栫爜鏄笉鍙樼殑
- BatchCBO batchCBO = new BatchCBO();
- batchCBO.getUpdateCbos().add(cbo);
- List<ClientBusinessObject> cboList = new ArrayList<>();
- cboList.add(cbo);
- boService.persistenceBatch(batchCBO);
- batchSaveSelectChar(templateVO, cboList);
- }
-
- /**
- * 鍗囩増鐨勪富棰樺簱鏁版嵁
- *
- * @param orderDTO 鏁版嵁鐨勫唴瀹癸紝涓嶉渶瑕佸寘鍚爜娈电殑鍐呭
- */
- @Override
- public void upSaveCode(CodeOrderDTO orderDTO) {
- VciBaseUtil.alertNotNull(orderDTO, "缂栫爜鐢宠鐩稿叧鐨勫睘鎬х殑鍐呭涓虹┖", orderDTO.getCopyFromVersion(), "鍘熷鏁版嵁鐨勪富閿�",
- orderDTO.getCodeClassifyOid(), "涓婚搴撳垎绫荤殑涓婚敭");
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
- //鎵句笟鍔＄被鍨嬶紝鐒跺悗浣跨敤涓婚敭鍘昏幏鍙栨暟鎹簱閲岀殑鏁版嵁
- List<ClientBusinessObject> cbos = boService.queryCBO(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), WebUtil.getOidQuery(orderDTO.getCopyFromVersion()));
- if (CollectionUtils.isEmpty(cbos)) {
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- ClientBusinessObject oldCbo = cbos.get(0);
- if (!CodeDefaultLC.RELEASED.getValue().equalsIgnoreCase(oldCbo.getLcStatus())) {
- throw new VciBaseException("鏁版嵁涓嶆槸{0}鐨勭姸鎬侊紝涓嶅厑璁告暟鎹洿鏀�", new String[]{CodeDefaultLC.RELEASED.getText()});
- }
- //闇�瑕佸崌鐗�
- ClientBusinessObjectOperation cboOperation = new ClientBusinessObjectOperation();
- ClientBusinessObject cbo = null;
- try {
- //cbo = cboOperation.createBusinessObjectVersion(oldCbo,VciBaseUtil.getCurrentUserId());
- cbo = cboOperation.reviseBusinessObject(oldCbo, "");
- } catch (VCIError e) {
- throw new VciBaseException("鍒濆鍖栫浉鍏崇殑鍐呭鍑虹幇浜嗛敊璇�", new String[0], e);
- }
- //1. 鍒ゆ柇蹇呰緭椤�
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
- checkRequiredAttrOnOrder(templateVO, orderDTO);
- //2.鍏堟敞鍏ワ紝鍐嶇粍鍚堬紝鏈�鍚庢牎楠�
- switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO);
- //3.澶勭悊缁勫悎瑙勫垯銆傜粍鍚堣鍒欎笉鑳戒娇鐢ㄧ紪鐮佺殑灞炴�э紝鍥犱负缂栫爜鐨勭敓鎴愬彲鑳芥槸闇�瑕佸睘鎬х殑
- switchComponentAttrOnOrder(templateVO, orderDTO);
- //4.鏍￠獙瑙勫垯
- checkVerifyOnOrder(templateVO, orderDTO);
- //5.鍒ゆ柇鍏抽敭灞炴��
- checkKeyAttrOnOrder(classifyFullInfo, templateVO, orderDTO);
- //6.鏍￠獙鏋氫妇鐨勫唴瀹规槸鍚︽纭�
- checkEnumOnOrder(templateVO, orderDTO);
- //7.澶勭悊鏃堕棿鏍煎紡锛屽湪鏁版嵁搴撻噷闈笉璁烘槸瀛楃涓茶繕鏄棩鏈熸牸寮忥紝閮戒娇鐢ㄧ浉鍚岀殑鏍煎紡瀛樺偍
- switchDateAttrOnOrder(templateVO, orderDTO);
- //榛樿鐨勫唴瀹逛笉鑳藉彉锛屾墍浠ュ彧闇�瑕佹嫹璐濊嚜瀹氫箟鐨勭浉鍏冲睘鎬у嵆鍙�
- copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, true);
- //浼佷笟鐮佸拰闆嗗洟鐮佺殑涓嶄慨鏀�
-// cbo.setDescription(orderDTO.getDescription());
-// cbo.setName(orderDTO.getName());
- cbo.setDescription(orderDTO.getDescription()==null?"":orderDTO.getDescription());
- cbo.setName(orderDTO.getName()==null?"":orderDTO.getName());
- try {
- cbo.setAttributeValueWithNoCheck("description", orderDTO.getDescription());
- cbo.setAttributeValue("name", orderDTO.getName());
- } catch (VCIError e) {
- e.printStackTrace();
- }
- //鏁版嵁鐨勬椂鍊欙紝缂栫爜鏄笉鍙樼殑
- cbo.setCreateTime(DateUtils.convert2String(new Date(Long.parseLong(cbo.getCreateTime())), "yyyy-MM-dd HH:mm:ss"));
- cbo.setLastModifyTime(DateUtils.convert2String(new Date(Long.parseLong(cbo.getLastModifyTime())), "yyyy-MM-dd HH:mm:ss"));
- List<ClientBusinessObject> cboList = new ArrayList<>();
- cboList.add(cbo);
- try {
- cboOperation.saveRevisionBuinessObject(cbo);
- } catch (VCIError vciError) {
- throw new VciBaseException("鏁版嵁鏇存敼淇濆瓨鍑洪敊浜�", new String[0], vciError);
- }
- batchSaveSelectChar(templateVO, cboList);
- }
-
- /**
- * 淇濆瓨鍙緭鍙�夌殑淇℃伅
- *
- * @param templateVO 妯℃澘鐨勫璞�
- * @param cboList 鏁版嵁鐨勫唴瀹�
- */
- @Override
- public void batchSaveSelectChar(CodeClassifyTemplateVO templateVO, List<ClientBusinessObject> cboList) {
- if (templateVO != null && !CollectionUtils.isEmpty(cboList)) {
- //鏄紓姝ョ殑锛屾墍浠ョ洿鎺ュ惊鐜�
- List<CodeClassifyTemplateAttrVO> selectAttrVOs = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getLibraryIdentification())).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(selectAttrVOs)) {
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- selectAttrVOs.parallelStream().forEach(attrVO -> {
- List<String> valuesList = new CopyOnWriteArrayList<>();
- cboList.parallelStream().forEach(cbo -> {
- String value = cbo.getAttributeValue(attrVO.getId());
- if (StringUtils.isNotBlank(value)) {
- valuesList.add(value);
- }
- });
- if (!CollectionUtils.isEmpty(valuesList)) {
- charService.saveBySameNamespaceAndFlag(templateVO.getBtmTypeId(), attrVO.getLibraryIdentification(), valuesList, sessionInfo);
- }
- });
- }
- }
- }
-
- /**
- * 鍒犻櫎涓婚搴撴暟鎹�
- *
- * @param deleteBatchDTO 鏁版嵁鐨勫唴瀹癸紝蹇呴』瑕佹湁涓婚敭鍜屽垎绫讳富閿�
- */
- @Override
- public void deleteCode(CodeDeleteBatchDTO deleteBatchDTO) {
- VciBaseUtil.alertNotNull(deleteBatchDTO, "缂栫爜鐢宠鐩稿叧鐨勫睘鎬у拰鐮佹鐨勫唴瀹归兘涓虹┖", deleteBatchDTO.getOidList(), "鏁版嵁涓婚敭",
- deleteBatchDTO.getCodeClassifyOid(), "涓婚搴撳垎绫荤殑涓婚敭");
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(deleteBatchDTO.getCodeClassifyOid());
- //鎵句笟鍔＄被鍨嬶紝鐒跺悗浣跨敤涓婚敭鍘昏幏鍙栨暟鎹簱閲岀殑鏁版嵁
- Collection<Collection<String>> oidCollection = VciBaseUtil.switchCollectionForOracleIn(deleteBatchDTO.getOidList());
- List<ClientBusinessObject> cboList = new ArrayList<>();
- oidCollection.stream().forEach(oids -> {
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("oid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oids.toArray(new String[0])) + ")");
- List<ClientBusinessObject> cbos = boService.queryCBO(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), conditionMap);
- cboList.addAll(cbos);
- });
- if (CollectionUtils.isEmpty(cboList)) {
- throw new VciBaseException("鏁版嵁鍏ㄩ儴鍦ㄧ郴缁熶腑涓嶅瓨鍦�");
- }
- List<ClientBusinessObject> editCBOs = cboList.stream().filter(s -> !CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(editCBOs)) {
- ClientBusinessObject cbo = editCBOs.get(0);
- throw new VciBaseException("缂栫爜涓簕0}绛夊叡{1}鏉℃暟鎹殑鐘舵�佷笉鏄痆{2}]锛屼笉鍏佽鍒犻櫎", new String[]{cbo.getId(), String.valueOf(editCBOs.size()), CodeDefaultLC.EDITING.getText()});
- }
-
- //鍙兘鍒犻櫎鑷繁鍒涘缓鐨勬暟鎹�
- String userId = WebUtil.getCurrentUserId();
- for (ClientBusinessObject clientBusinessObject:cboList){
- String creator = clientBusinessObject.getCreator();
- if(!userId.equalsIgnoreCase(creator)){
- throw new VciBaseException("缂栫爜涓�"+clientBusinessObject.getId()+"鐨勬暟鎹笉鏄綋鍓嶇敤鎴峰垱寤猴紝涓嶈兘鍒犻櫎锛�");
- }
-
- }
- BatchCBO batchCBO = new BatchCBO();
- batchCBO.getDeleteCbos().addAll(cboList);
- WebUtil.setPersistence(false);
- batchCBO.copyFromOther(productCodeService.recycleCode(classifyFullInfo.getCurrentClassifyVO().getBtmtypeid(), deleteBatchDTO.getOidList()));
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- }
-
- /**
- * 鎷疯礉鏁版嵁鍒癱bo瀵硅薄涓�
- *
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param cbo 涓氬姟鏁版嵁
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param edit 鏄惁涓轰慨鏀�
- */
- private void copyValueToCBO(CodeClassifyFullInfoBO classifyFullInfo, ClientBusinessObject cbo,
- CodeOrderDTO orderDTO, CodeClassifyTemplateVO templateVO,
- boolean edit) {
- String fullPath = "";
- if (!CollectionUtils.isEmpty(classifyFullInfo.getParentClassifyVOs())) {
- fullPath = classifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel())))
- .map(CodeClassifyVO::getOid).collect(Collectors.joining("##"));
- } else {
- fullPath = classifyFullInfo.getCurrentClassifyVO().getOid();
- }
- orderDTO.getData().forEach((key, value) -> {
- if (!edit || (!boService.checkUnAttrUnEdit(key) &&
- !VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(key))) {
- try {
- cbo.setAttributeValue(key, value);
- } catch (VCIError e) {
- logger.error("璁剧疆灞炴�х殑鍊奸敊璇�", e);
- }
- }
- });
- try {
- cbo.setAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD, classifyFullInfo.getCurrentClassifyVO().getOid());
- cbo.setAttributeValue(MdmEngineConstant.CODE_TEMPLATE_OID_FIELD, templateVO.getOid());
- cbo.setAttributeValue(MdmEngineConstant.CODE_FULL_PATH_FILED, fullPath);
- if (!edit && StringUtils.isBlank(orderDTO.getLcStatus())) {
- //鎵剧敓鍛藉懆鏈熺殑璧峰鐘舵�侊紝
- if (StringUtils.isNotBlank(cbo.getLctId())) {
- OsLifeCycleVO lifeCycleVO = lifeCycleService.getLifeCycleById(cbo.getLctId());
- if (lifeCycleVO != null) {
- cbo.setLcStatus(lifeCycleVO.getStartStatus());
- } else {
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
- }
- } else {
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
- }
-
- }
- int secret = VciBaseUtil.getInt(cbo.getAttributeValue(MdmEngineConstant.SECRET_FIELD));
- if (secret == 0 || !secretService.checkDataSecret(secret)) {
- Integer userSecret = VciBaseUtil.getCurrentUserSecret();
- cbo.setAttributeValue(MdmEngineConstant.SECRET_FIELD, String.valueOf((userSecret == null || userSecret == 0) ? UserSecretEnum.NONE.getValue() : userSecret));
- }
- } catch (Throwable e) {
- logger.error("璁剧疆榛樿鐨勫睘鎬х殑鍊奸敊璇�", e);
- }
- }
-
-
- /**
- * 杞崲缁勫悎瑙勫垯鐨勫��
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝闇�瑕佸寘鍚ā鏉垮睘鎬�
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void switchComponentAttrOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO) {
- Map<String, CodeClassifyTemplateAttrVO> compAttrVOMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getComponentrule())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(compAttrVOMap)) {
- Map<String, String> dataMap = WebUtil.objectToMapString(orderDTO);
-
- Map<String, String> dataLowMap = new HashMap<>();
- if (!CollectionUtils.isEmpty(dataMap)) {
- dataMap.forEach((key, value) -> {
- dataLowMap.put(key.toLowerCase(Locale.ROOT), value);
- });
- }
- dataLowMap.putAll(orderDTO.getData());
- compAttrVOMap.forEach((attrId, attrVO) -> {
- dataLowMap.put(attrId, formulaService.getValueByFormula(dataLowMap, attrVO.getComponentrule()));
- });
- dataLowMap.forEach((key, value) -> {
- setValueToOrderDTO(orderDTO, key, value);
- });
- }
- }
-
- /**
- * 澶勭悊鍒嗙被娉ㄥ叆鐨勪俊鎭�
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝蹇呴』瑕佸悗妯℃澘鐨勫睘鎬�
- * @param classifyFullInfoBO 鍒嗙被鐨勫叏璺緞
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void switchClassifyLevelOnOrder(CodeClassifyTemplateVO templateVO, CodeClassifyFullInfoBO classifyFullInfoBO, CodeOrderDTO orderDTO) {
- Map<String, CodeClassifyTemplateAttrVO> classifyAttrVOMap = templateVO.getAttributes().stream().filter(
- s -> StringUtils.isNotBlank(s.getClassifyinvokeattr()) && StringUtils.isNotBlank(s.getClassifyinvokelevel())
- ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (classifyFullInfoBO.getTopClassifyVO() == null) {
- //闇�瑕侀噸鏂版煡璇竴涓嬶紝鍥犱负杩欎釜鏄寚瀹氱殑鍒嗙被杩涙潵鐨�
-
- }
- if (!CollectionUtils.isEmpty(classifyAttrVOMap)) {
- classifyAttrVOMap.forEach((attrId, attrVO) -> {
- //鍒嗙被娉ㄥ叆鐨勭紪鍙锋垨鑰呭悕绉帮紝
- //灞傜骇鍖呭惈鎸囧畾灞傚拰鏈�灏忓眰
- CodeClassifyVO classifyVO = null;
- if (!CodeLevelTypeEnum.MIN.getValue().equalsIgnoreCase(attrVO.getClassifyinvokelevel()) && !"min".equalsIgnoreCase(attrVO.getClassifyinvokelevel())) {
- //鎸囧畾浜嗗眰绾х殑
- //娉ㄦ剰锛屽洜涓烘煡璇笂绾у垎绫诲嚭鏉ョ殑灞傜骇鏄�掑簭鐨勶紝鍗抽《灞傝妭鐐规槸鏈�澶х殑鍊�
- List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
- int level = VciBaseUtil.getInt(attrVO.getClassifyinvokelevel());
- if (classifyVOS.size() >= level && level > 0) {
- classifyVO = classifyVOS.get(level - 1);
- }
- } else {
- //褰撳墠鐨勫垎绫�
- classifyVO = classifyFullInfoBO.getCurrentClassifyVO();
- }
- if (classifyVO == null) {
- //璇存槑灞傜骇鏈夎
- orderDTO.getData().put(attrId, "鍒嗙被鏍戜笂娌℃湁灞傜骇[" + attrVO.getClassifyinvokelevel() + "]");
- // classifyVO = classifyFullInfoBO.getCurrentClassifyVO();
- } else {
- Map<String, String> classifyDataMap = VciBaseUtil.objectToMapString(classifyVO);
- String value = classifyDataMap.getOrDefault(attrVO.getClassifyinvokeattr(), "");
- orderDTO.getData().put(attrId, value);
- }
- });
- }
- }
-
- /**
- * 杞崲鏃堕棿鐨勬牸寮�
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝闇�瑕佸寘鍚睘鎬�
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void switchDateAttrOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO) {
- Map<String, CodeClassifyTemplateAttrVO> dateAttrVOMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getCodedateformat())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(dateAttrVOMap)) {
- dateAttrVOMap.forEach((attrId, attrVO) -> {
- String value = getValueFromOrderDTO(orderDTO, attrId);
- if (StringUtils.isNotBlank(value)) {
- DateConverter dateConverter = new DateConverter();
- dateConverter.setAsText(value);
- value = VciDateUtil.date2Str(dateConverter.getValue(), VciDateUtil.DateTimeMillFormat);
- setValueToOrderDTO(orderDTO, attrId, value);
- }
- });
- }
- }
-
- /**
- * 鏍￠獙鏋氫妇鐨勫唴瀹�
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝闇�瑕佸寘鍚睘鎬�
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void checkEnumOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO) {
- //濡傛灉鏋氫妇鍙互淇敼锛屽垯涓嶉渶瑕佹牎楠屾槸鍚︾鍚堟灇涓剧殑閫夐」
- Map<String, CodeClassifyTemplateAttrVO> enumAttrVOMap = templateVO.getAttributes().stream().filter(s -> (StringUtils.isNotBlank(s.getEnumString()) || StringUtils.isNotBlank(s.getEnumid())) && !VciBaseUtil.getBoolean(s.getEnumeditflag())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(enumAttrVOMap)) {
- enumAttrVOMap.forEach((attrId, attrVO) -> {
- String value = getValueFromOrderDTO(orderDTO, attrId);
- if (StringUtils.isNotBlank(value)) {
- //鏈夊�兼墠鑳芥牎楠�
- List<KeyValue> comboboxKVs = listComboboxItems(attrVO);
- if (!comboboxKVs.stream().anyMatch(s -> value.equalsIgnoreCase(s.getKey()))) {
- throw new VciBaseException("灞炴�с�恵0}銆戠殑鍊间笉绗﹀悎鏋氫妇鐨勮姹�", new String[]{attrVO.getName()});
- }
- }
- });
- }
- }
-
- /**
- * 鏍￠獙姝ｅ垯琛ㄨ揪寮忔槸鍚︽纭�
- *
- * @param templateVO 妯℃澘鐨勪俊鎭紝蹇呴』鍖呭惈灞炴�х殑鍐呭
- * @param orderDTO 缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅
- */
- private void checkVerifyOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO) {
- Map<String, CodeClassifyTemplateAttrVO> verifyAttrVOMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getVerifyrule())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(verifyAttrVOMap)) {
- verifyAttrVOMap.forEach((attrId, attrVO) -> {
- String value = getValueFromOrderDTO(orderDTO, attrId);
- if (StringUtils.isNotBlank(value) && !value.matches(attrVO.getVerifyrule())) {
- //鏍￠獙姝ｅ垯琛ㄨ揪寮�
- throw new VciBaseException("灞炴�{0}]鐨勫�间笉绗﹀悎鏍￠獙瑙勫垯鐨勮姹�", new String[]{attrVO.getName()});
- }
- });
- }
- }
-
- /**
- * 鏍￠獙鍏抽敭灞炴��
- *
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param templateVO 妯℃澘鐨勫唴瀹癸紝蹇呴』鍖呭惈妯℃澘灞炴��
- * @param orderDTO 缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅
- */
- private void checkKeyAttrOnOrder(CodeClassifyFullInfoBO classifyFullInfo, CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO) {
- //鍏堣幏鍙栧叧閿睘鎬х殑瑙勫垯锛屼篃鍒╃敤缁ф壙鐨勬柟寮�
- CodeKeyAttrRepeatRuleVO keyRuleVO = keyRuleService.getRuleByClassifyFullInfo(classifyFullInfo);
- //娉ㄦ剰鐨勬槸keyRuleVO鍙兘涓虹┖锛岃〃绀轰笉浣跨敤瑙勫垯鎺у埗
- //鑾峰彇鎵�鏈夌殑鍏抽敭灞炴��
- Map<String, CodeClassifyTemplateAttrVO> ketAttrMap = templateVO.getAttributes().stream().filter(s -> VciBaseUtil.getBoolean(s.getKeyattrflag())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- Map<String, String> conditionMap = new HashMap<>();
- boolean trimAll = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnoreallspaceflag());
- //鍏ㄩ儴鍘荤┖鐨勪紭鍏堢骇澶т簬鍘荤┖
- boolean trim = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorespaceflag());
- boolean ignoreCase = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorecaseflag());
- boolean ignoreWidth = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorewidthflag());
- ketAttrMap.forEach((attrId, attrVO) -> {
- String value = getValueFromOrderDTO(orderDTO, attrId);
- if (value == null) {
- value = "";
- }
- wrapperKeyAttrConditionMap(value, keyRuleVO, attrId, trim, ignoreCase, ignoreWidth, trimAll, conditionMap);
- });
-
- //娌℃湁闄愬埗鍒嗙被锛屼絾鏄竴涓ā鏉垮彧鍙兘鍦ㄤ竴涓笟鍔＄被鍨嬮噷闈紝鎵�浠ョ洿鎺ユ煡璇㈣繖涓笟鍔＄被鍨嬪嵆鍙�
-
- if (!CollectionUtils.isEmpty(conditionMap)) {
- final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " t where 1 = 1 "};
- conditionMap.forEach((key, value) -> {
- sql[0] += " and " + key + " = " + value;
- });
- if (StringUtils.isNotBlank(orderDTO.getOid())) {
- //淇敼鐨勬椂鍊欙紝闇�瑕佹帓闄よ嚜宸�
- sql[0] += " and oid != '" + orderDTO.getOid() + "'";
- } else if (StringUtils.isNotBlank(orderDTO.getCopyFromVersion())) {
- sql[0] += " and oid != '" + orderDTO.getCopyFromVersion() + "'";
- }
- sql[0] += " and islastR = '1' and islastV = '1' ";
- if (boService.queryCountBySql(sql[0], new HashMap<>()) > 0) {
- String ruleInfoMsg = keyRuleVO == null ? "" : "鏌ヨ瑙勫垯锛氬幓闄ょ┖鏍�--{0},蹇界暐澶у皬鍐�--{1},蹇界暐鍏ㄥ崐瑙�--{2},蹇界暐鍏ㄩ儴绌烘牸--{3}";
- String[] objs = new String[]{trim ? "鏄�" : "鍚�", ignoreCase ? "鏄�" : "鍚�", ignoreWidth ? "鏄�" : "鍚�", trimAll ? "鏄�" : "鍚�"};
- throw new VciBaseException("鏍规嵁鎮ㄥ～鍐欑殑鍏抽敭灞炴�х殑鍐呭锛岀粨鍚堝叧閿睘鎬ф煡璇㈣鍒欙紝鍙戠幇杩欎釜鏁版嵁宸茬粡鍦ㄧ郴缁熶腑瀛樺湪浜嗐�傝淇!銆�" + ruleInfoMsg, objs);
- }
- }
- }
-
- /**
- * 灏佽鍏抽敭灞炴�х殑鏌ヨ璇彞
- *
- * @param value 褰撳墠鐨勫��
- * @param keyRuleVO 鍏抽敭灞炴�х殑鎺у埗瑙勫垯锛屽彲浠ヤ负绌�
- * @param attrId 灞炴�х殑缂栧彿
- * @param trim 鏄惁鍘婚櫎绌烘牸
- * @param ignoreCase 鏄惁涓嶅尯鍒嗗ぇ灏忓啓
- * @param ignoreWidth 鏄惁蹇界暐鍏ㄥ崐瑙�
- * @param trimAll 鏄惁蹇界暐鍏ㄩ儴绌烘牸
- * @param conditionMap 鏌ヨ鏉′欢
- */
- @Override
- public void wrapperKeyAttrConditionMap(String value, CodeKeyAttrRepeatRuleVO keyRuleVO, String attrId,
- boolean trim, boolean ignoreCase, boolean ignoreWidth,
- boolean trimAll, Map<String, String> conditionMap) {
- boolean ignoreSpace = trim || trimAll;
- if (StringUtils.isBlank(value)) {
- //涓虹┖鐨勬椂鍊欙紝涓嶈兘鐢≦ueryOperation.ISNULL锛屽钩鍙颁笉鐭ラ亾鍟ユ椂鍊欎笉澶勭悊杩欑浜�
- conditionMap.put("t."+attrId, "null");
- } else {
- if (keyRuleVO != null) {
- String queryKey = "";
- String queryValue = "";
-
- String temp = "";
- if (ignoreCase && ignoreSpace && ignoreWidth) {
- //蹇界暐澶у皬鍐欙紝涓斿幓绌猴紝蹇界暐鍏ㄥ崐瑙�
- temp = (trimAll ? "REPLACE" : "TRIM") + "(UPPER(to_single_byte(%s)) " + (trimAll ? ",' ','')" : ")");
- } else if (ignoreCase && ignoreSpace && !ignoreWidth) {
- //蹇界暐澶у皬鍐欍�佸幓绌恒�佷笉蹇界暐鍏ㄥ崐瑙�
- temp = (trimAll ? "REPLACE" : "TRIM") + "(UPPER(%s) " + (trimAll ? ",' ','')" : ")");
- } else if (ignoreCase && !ignoreSpace && ignoreWidth) {
- //蹇界暐澶у皬鍐欍�佷笉鍘荤┖銆佸拷鐣ュ叏鍗婅
- temp = "UPPER(to_single_byte(%s))";
- } else if (!ignoreCase && ignoreSpace && ignoreWidth) {
- //涓嶅拷鐣ュぇ灏忓啓銆佸幓绌恒�佸拷鐣ュ叏鍗婅
- temp = (trimAll ? "REPLACE" : "TRIM") + "(to_single_byte(%s) " + (trimAll ? ",' ','')" : ")");
- } else if (ignoreCase && !ignoreSpace && !ignoreWidth) {
- //蹇界暐澶у皬鍐欍�佷笉鍘荤┖銆佷笉蹇界暐鍏ㄥ崐瑙�
- temp = "UPPER(%s)";
- } else if (!ignoreCase && !ignoreCase && ignoreWidth) {
- //涓嶅拷鐣ュぇ灏忓啓銆佷笉鍘荤┖銆佸拷鐣ュ叏鍗婅
- temp = "to_single_byte(%s)";
- } else if (!ignoreCase && ignoreSpace && !ignoreWidth) {
- //涓嶅拷鐣ュぇ灏忓啓銆佸幓绌恒�佷笉蹇界暐鍏ㄥ崐瑙�
- temp = (trimAll ? "REPLACE" : "TRIM") + "(%s " + (trimAll ? ",' ','')" : ")");
- } else if (!ignoreCase && !ignoreSpace && !ignoreWidth) {
- //涓嶅拷鐣ュぇ灏忓啓銆佷笉鍘荤┖銆佷笉蹇界暐鍏ㄥ崐瑙�
- temp = "%s";
- }
- queryKey = String.format(temp, "t."+attrId);
- queryValue = String.format(temp, "'" + (trim ? value.trim() : value) + "'");
- conditionMap.put(queryKey, queryValue);
- } else {
- //涓虹┖鐨勬椂鍊欎笉浠ｈ〃涓嶆牎楠岋紝鍙槸涓嶅幓闄ょ浉鍏崇殑淇℃伅
- conditionMap.put("t."+attrId, value);
- }
- }
- }
-
-
- /**
- * 浠庣紪鐮佺敵璇蜂俊鎭璞′笂鑾峰彇鏌愪釜灞炴�х殑鍊�
- *
- * @param orderDTO 缂栫爜鐢宠瀵硅薄
- * @param attrId 灞炴�х殑缂栧彿
- * @return 鍊�
- */
- private String getValueFromOrderDTO(CodeOrderDTO orderDTO, String attrId) {
- attrId = attrId.toLowerCase(Locale.ROOT);
- String value = null;
- if (VciQueryWrapperForDO.BASIC_FIELD_MAP.containsKey(attrId)
- || VciQueryWrapperForDO.SECRET_MANAGE_FIELD_MAP.containsKey(attrId)
- || VciQueryWrapperForDO.REVISION_MANAGE_FIELD_MAP.containsKey(attrId)
- || VciQueryWrapperForDO.LIFECYCLE_MANAGE_FIELD_MAP.containsKey(attrId)
- || VciQueryWrapperForDO.BASE_MODEL_COMPATIBILITY_MAP.containsValue(attrId)
- ) {
- value = WebUtil.getStringValueFromObject(WebUtil.getValueFromField(WebUtil.getFieldForObject(attrId, orderDTO.getClass()).getName(), orderDTO));
- } else {
- //璇存槑鏄嚜琛岄厤缃殑
- //鍓嶇蹇呴』瑕佷紶閫掑皬鍐欑殑灞炴��
- value = orderDTO.getData().getOrDefault(attrId, "");
- }
- return value;
- }
-
- /**
- * 璁剧疆鏂扮殑鍊煎埌鐢宠瀵硅薄涓�
- *
- * @param orderDTO 缂栫爜鐢宠瀵硅薄
- * @param attrId 灞炴�х殑缂栧彿
- * @param value 鍊�
- */
- private void setValueToOrderDTO(CodeOrderDTO orderDTO, String attrId, String value) {
- attrId = attrId.toLowerCase(Locale.ROOT);
- if (VciQueryWrapperForDO.BASIC_FIELD_MAP.containsKey(attrId)) {
- WebUtil.setValueToField(WebUtil.getFieldForObject(attrId, orderDTO.getClass()).getName(), orderDTO, value);
- } else {
- orderDTO.getData().put(attrId, value);
- }
- }
-
-
- /**
- * 鏍￠獙灞炴�ф槸鍚︿负蹇呰緭
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝闇�瑕佸寘鍚ā鏉垮睘鎬�
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void checkRequiredAttrOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO) {
- Map<String, CodeClassifyTemplateAttrVO> requiredAttrMap = templateVO.getAttributes().stream().filter(
- s -> VciBaseUtil.getBoolean(s.getRequireflag()) && StringUtils.isBlank(s.getComponentrule())
- && StringUtils.isBlank(s.getClassifyinvokeattr()))
- .collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(requiredAttrMap)) {
- requiredAttrMap.forEach((attrId, attrVO) -> {
- //鍙湁浼佷笟缂栫爜锛岀姸鎬侊紝澶囨敞锛屾ā鏉夸富閿紝鍒嗙被涓婚敭杩欏嚑涓槸鍥哄畾鐨勶紝鍏朵綑閮芥槸鑷閰嶇疆鐨�
- if (StringUtils.isBlank(getValueFromOrderDTO(orderDTO, attrId))) {
- throw new VciBaseException("灞炴�с�恵0}銆戝繀椤昏杈撳叆(閫夋嫨)鍐呭", new String[]{attrVO.getName()});
- }
- });
- }
- }
-
-
- /**
- * 鍒ゆ柇缂栫爜鐨勭爜娈垫槸鍚﹁緭鍏ユ垨鑰呴�夋嫨浜嗙爜鍊�
- *
- * @param ruleVO 瑙勫垯鐨勬樉绀哄璞�
- * @param orderDTO 缂栫爜鐢宠鐨勫唴瀹�
- */
- @Override
- public void checkSecValueOnOrder(CodeRuleVO ruleVO, CodeOrderDTO orderDTO) {
- List<String> unSerialSecOidList = ruleVO.getSecVOList().stream().filter(
- s -> !(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue().equalsIgnoreCase(s.getSectype())
- || CodeSecTypeEnum.CODE_ATTR_SEC.getValue().equalsIgnoreCase(s.getSectype())
- || CodeSecTypeEnum.CODE_DATE_SEC.getValue().equalsIgnoreCase(s.getSectype())
- || CodeSecTypeEnum.CODE_LEVEL_SEC.getValue().equalsIgnoreCase(s.getSectype())
- || VciBaseUtil.getBoolean(s.getNullableFlag()))
- ).map(CodeBasicSecVO::getOid).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(unSerialSecOidList)) {
- if (CollectionUtils.isEmpty(orderDTO.getSecDTOList())) {
- throw new VciBaseException("闈炴祦姘寸爜娈�(鎴栬�呭繀杈撶爜娈碉級蹇呴』瑕佽緭鍏�(鎴栭�夋嫨)鐮佸��");
- }
- if (orderDTO.getSecDTOList().stream().anyMatch(s -> !unSerialSecOidList.contains(s.getSecOid())
- && StringUtils.isBlank(s.getSecValue()))) {
- throw new VciBaseException("闈炴祦姘寸爜娈�(鎴栬�呭繀杈撶爜娈碉級蹇呴』瑕佽緭鍏�(鎴栭�夋嫨)鐮佸��");
- }
- }
- }
-
- /**
- * 浣跨敤鍒嗙被鍜岄樁娈电殑缂栧彿锛岃幏鍙栧寘鍚殑灞炴��
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param phase 闃舵鐨勫悕绉�
- * @return 灞炴�х殑鑻辨枃鍚嶇О
- */
- @Override
- public List<String> listPhaseAttrByClassifyOid(String codeClassifyOid, String phase) {
- CodeClassifyTemplateVO templateVO = getUsedTemplateByClassifyOid(codeClassifyOid, false);
- //鎵鹃樁娈�
- return phaseAttrService.listAttrByTemplateOidAndPhaseId(templateVO.getOid(), phase);
- }
-
- /**
- * 璺緞涓婂寘鍚綋鍓嶅垎绫荤殑鎵�鏈夊垎绫讳俊鎭�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return 鍒嗙被鏍�
- */
- @Override
- public List<Tree> hasSelfClassifyTree(String codeClassifyOid) {
- if (StringUtils.isBlank(codeClassifyOid)) {
- return new ArrayList<>();
- }
- CodeClassifyFullInfoBO fullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
- //鏌ヨ瀛�
- List<CodeClassifyVO> childrenClassifys = classifyService.listChildrenClassify(codeClassifyOid, true, "id", true);
- Map<String, CodeClassifyVO> classifyVOMap = new HashMap<>();
- classifyVOMap.putAll(Optional.ofNullable(fullInfo.getParentClassifyVOs()).orElseGet(() -> new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t)));
- classifyVOMap.putAll(Optional.ofNullable(childrenClassifys).orElseGet(() -> new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t)));
- TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(CodeClassifyServiceImpl.PARENT_FIELD_NAME.toLowerCase(Locale.ROOT));
- return revisionModelUtil.doList2Trees(classifyVOMap.values().stream().collect(Collectors.toList()), treeWrapperOptions, (CodeClassifyVO s) -> {
- return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
- .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
- });
- }
-
- /**
- * 鍒嗙被娉ㄥ叆鐨勫唴瀹归瑙�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param codeTemplateOid 妯℃澘鐨勪富閿�
- * @return key鏄垎绫绘敞鍏ョ殑灞炴�э紝value鏄敞鍏ュ悗鐨勫��
- */
- @Override
- public Map<String, String> previewClassify(String codeClassifyOid, String codeTemplateOid) {
- if (StringUtils.isBlank(codeClassifyOid) || StringUtils.isBlank(codeTemplateOid)) {
- return new HashMap<>();
- }
- //鏌ヨ鍒嗙被鐨勪俊鎭紝鏌ヨ妯℃澘鐨勪俊鎭�
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(codeTemplateOid);
- //
-
- CodeOrderDTO orderDTO = new CodeOrderDTO();
- orderDTO.setData(new HashMap<>());
- switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO);
- return orderDTO.getData();
- }
-
- /**
- * 棰勮缁勫悎瑙勫垯
- *
- * @param orderDTO 棰勮鐨勪俊鎭紝鍖呭惈妯℃澘鐨勪富閿�
- * @return key鏄粍鍚堣鍒欑殑灞炴�с�倂alue鏄粍鍚堝悗鐨勫�硷紝銆傚鏋滅己灏戞煇涓睘鎬х殑鍊硷紝浼氫綔涓簐alue杩斿洖
- */
- @Override
- public Map<String, String> previewCompRule(CodeOrderDTO orderDTO) {
- VciBaseUtil.alertNotNull(orderDTO, "缂栫爜鐢宠鐩稿叧淇℃伅", orderDTO.getTemplateOid(), "妯℃澘鐨勪富閿�");
- //鏌ヨ鍒嗙被鐨勪俊鎭紝鏌ヨ妯℃澘鐨勪俊鎭�
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
- switchComponentAttrOnOrder(templateVO, orderDTO);
- return orderDTO.getData();
- }
-
- /**
- * 淇敼鐘舵��
- *
- * @param baseModelDTO 鏁版嵁浼犺緭瀵硅薄
- */
- @Override
- public void changeStatus(BaseModelDTO baseModelDTO) {
- VciBaseUtil.alertNotNull(baseModelDTO, "鏁版嵁淇℃伅", baseModelDTO.getOid(), "涓婚敭", baseModelDTO.getBtmname(), "涓氬姟绫诲瀷", baseModelDTO.getLcStatus(), "鐩爣鐘舵��");
- List<String> oids = VciBaseUtil.str2List(baseModelDTO.getOid());
- List<ClientBusinessObject> cboList = boService.selectCBOByOidCollection(oids, baseModelDTO.getBtmname());
- //杩橀渶瑕佷慨鏀筧llCode鐨勭敓鍛藉懆鏈�
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("createcodeoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oids.toArray(new String[0])) + ")");
- conditionMap.put("createcodebtm", baseModelDTO.getBtmname());
- List<ClientBusinessObject> codeCbos = boService.queryCBO(MdmBtmTypeConstant.CODE_ALL_CODE, conditionMap);
- // 鍥炴敹闇�瑕佷笟鍔℃暟鎹垹闄�
- if (CodeDefaultLC.TASK_BACK.getValue().equals(baseModelDTO.getLcStatus())) {
- BatchCBO batchCBO = new BatchCBO();
- batchCBO.getDeleteCbos().addAll(cboList);
- boService.persistenceBatch(batchCBO);
- } else {
- lifeCycleService.transCboStatus(cboList, baseModelDTO.getLcStatus());
- }
- lifeCycleService.transCboStatus(codeCbos, baseModelDTO.getLcStatus());
- }
-
- /**
- * 鐩镐技椤规煡璇�
- *
- * @param orderDTO 缂栫爜鐨勭浉鍏充俊鎭�
- * @return 鏁版嵁鍒楄〃
- */
- @Override
- public DataGrid<Map<String, String>> resembleQuery(CodeOrderDTO orderDTO) {
- VciBaseUtil.alertNotNull(orderDTO, "鐢宠鐨勪俊鎭�", orderDTO.getCodeClassifyOid(), "鍒嗙被涓婚敭", orderDTO.getTemplateOid(), "妯℃澘涓婚敭");
- CodeClassifyFullInfoBO fullInfoBO = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
- switchClassifyLevelOnOrder(templateVO, fullInfoBO, orderDTO);
- switchDateAttrOnOrder(templateVO, orderDTO);
- switchComponentAttrOnOrder(templateVO, orderDTO);
- //闇�瑕佽幏鍙栨槸鍚︽湁鐩镐技鏌ヨ灞炴��
- Map<String, CodeClassifyTemplateAttrVO> attrVOs = templateVO.getAttributes().stream().filter(s -> VciBaseUtil.getBoolean(s.getSamerepeatattrflag())).collect(Collectors.toMap(s -> s.getId(), t -> t));
- if (CollectionUtils.isEmpty(attrVOs)) {
- //閮芥病鏈夊睘鎬э紝鑲畾涓嶈兘鏌ヨ浜�
- return new DataGrid<>();
- }
- Map<String, String> conditionMap = new HashMap<>();
- //鎴戜滑棣栧厛鑾峰彇鏈夋病鏈夋煡璇㈣鍒�
- CodeResembleRuleVO resembleRuleVO = Optional.ofNullable(getUseResembleRule(fullInfoBO, fullInfoBO.getCurrentClassifyVO())).orElseGet(() -> new CodeResembleRuleVO());
- attrVOs.forEach((attrId, attrVO) -> {
- String value = getValueFromOrderDTO(orderDTO, attrId);
- if (value == null) {
- value = "";
- }
- wrapperResembleConditionMap(value, resembleRuleVO, attrId, conditionMap);
- });
-
- //娌℃湁闄愬埗鍒嗙被锛屼絾鏄竴涓ā鏉垮彧鍙兘鍦ㄤ竴涓笟鍔＄被鍨嬮噷闈紝鎵�浠ョ洿鎺ユ煡璇㈣繖涓笟鍔＄被鍨嬪嵆鍙�
- if (!CollectionUtils.isEmpty(conditionMap)) {
- Map<String, String> andConditionMap = new HashMap<>();
- andConditionMap.put("islastr", "1");
- andConditionMap.put("islastv", "1");
- if (StringUtils.isNotBlank(orderDTO.getOid())) {
- andConditionMap.put("oid", QueryOptionConstant.NOTEQUAL + orderDTO.getOid());
- }
- conditionMap.putAll(andConditionMap);
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultDesc("id");
- return queryGrid(fullInfoBO.getTopClassifyVO().getBtmtypeid(), templateVO, conditionMap, pageHelper);
- }
- return new DataGrid<>();
- }
-
- /**
- * 灏佽鐩镐技椤规煡璇㈢殑鏌ヨ鏉′欢鐨勬槧灏�
- *
- * @param value 鍊�
- * @param resembleRuleVO 鐩镐技椤硅鍒�
- * @param attrId 灞炴�х殑缂栧彿
- * @param conditionMap 鏌ヨ鏉′欢
- */
- @Override
- public void wrapperResembleConditionMap(String value, CodeResembleRuleVO resembleRuleVO, String attrId, Map<String, String> conditionMap) {
- boolean ignoreSpace = VciBaseUtil.getBoolean(resembleRuleVO.getIgnorespaceflag()) || VciBaseUtil.getBoolean(resembleRuleVO.getIgnoreallspaceflag());
- if (StringUtils.isBlank(value)) {
- //涓虹┖鐨勬椂鍊欏氨涓嶆煡璇㈠畠灏辨槸
- } else {
- String queryKey = "";
- String queryValue = "";
- boolean ignoreCase = VciBaseUtil.getBoolean(resembleRuleVO.getIgnorecaseflag());
- boolean ignoreWidth = VciBaseUtil.getBoolean(resembleRuleVO.getIgnorewidthflag());
- boolean trimAll = VciBaseUtil.getBoolean(resembleRuleVO.getIgnoreallspaceflag());
- boolean trim = VciBaseUtil.getBoolean(resembleRuleVO.getIgnoreallspaceflag());
- String temp = "";
- if (ignoreCase && ignoreSpace && ignoreWidth) {
- //蹇界暐澶у皬鍐欙紝涓斿幓绌猴紝蹇界暐鍏ㄥ崐瑙�
- temp = (trimAll ? "REPLACE" : "TRIM") + "(UPPER(to_single_byte('%s')) " + (trimAll ? ",' ','')" : ")");
- } else if (ignoreCase && ignoreSpace && !ignoreWidth) {
- //蹇界暐澶у皬鍐欍�佸幓绌恒�佷笉蹇界暐鍏ㄥ崐瑙�
- temp = (trimAll ? "REPLACE" : "TRIM") + "(UPPER(%s) " + (trimAll ? ",' ','')" : ")");
- } else if (ignoreCase && !ignoreSpace && ignoreWidth) {
- //蹇界暐澶у皬鍐欍�佷笉鍘荤┖銆佸拷鐣ュ叏鍗婅
- temp = "UPPER(to_single_byte('%s'))";
- } else if (!ignoreCase && ignoreSpace && ignoreWidth) {
- //涓嶅拷鐣ュぇ灏忓啓銆佸幓绌恒�佸拷鐣ュ叏鍗婅
- temp = (trimAll ? "REPLACE" : "TRIM") + "(to_single_byte('%s') " + (trimAll ? ",' ','')" : ")");
- } else if (ignoreCase && !ignoreSpace && !ignoreWidth) {
- //蹇界暐澶у皬鍐欍�佷笉鍘荤┖銆佷笉蹇界暐鍏ㄥ崐瑙�
- temp = "UPPER(%s)";
- } else if (!ignoreCase && !ignoreCase && ignoreWidth) {
- //涓嶅拷鐣ュぇ灏忓啓銆佷笉鍘荤┖銆佸拷鐣ュ叏鍗婅
- temp = "to_single_byte('%s')";
- } else if (!ignoreCase && ignoreSpace && !ignoreWidth) {
- //涓嶅拷鐣ュぇ灏忓啓銆佸幓绌恒�佷笉蹇界暐鍏ㄥ崐瑙�
- temp = (trimAll ? "REPLACE" : "TRIM") + "(%s " + (trimAll ? ",' ','')" : ")");
- } else if (!ignoreCase && !ignoreSpace && !ignoreWidth) {
- //涓嶅拷鐣ュぇ灏忓啓銆佷笉鍘荤┖銆佷笉蹇界暐鍏ㄥ崐瑙�
- temp = "%s";
- }
- if (StringUtils.isNotBlank(resembleRuleVO.getLinkCharacter())) {
- List<String> chars = VciBaseUtil.str2List(resembleRuleVO.getLinkCharacter());
- for (int i = 0; i < chars.size(); i++) {
- String s = chars.get(i);
- temp = "replace(" + temp + ",'" + s + "','')";
- }
- }
- queryValue = String.format(temp, (trim ? value.trim() : value));
- temp = temp.replace("to_single_byte('%s')","to_single_byte(%s)");
- queryKey = String.format(temp, "t."+attrId);
- conditionMap.put(queryKey, QueryOptionConstant.OR + queryValue);
- }
- }
-
- /**
- * 浣跨敤鍒嗙被涓婚敭鑾峰彇鐩镐技鏌ヨ瑙勫垯
- *
- * @param codeClassifyOid 鍒嗙被涓婚敭
- * @return 瑙勫垯锛屽鏋滀笉瀛樺湪浼氳繑鍥瀗ull
- */
- @Override
- public CodeResembleRuleVO getUseResembleRuleByClassifyOid(String codeClassifyOid) {
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
- return getUseResembleRule(classifyFullInfo, classifyFullInfo.getCurrentClassifyVO());
- }
-
- /**
- * 鑾峰彇浣跨敤鐨勭浉浼兼煡璇㈣鍒�
- *
- * @param fullInfoBO 绫诲叏閮ㄤ俊鎭�
- * @param currentClassifyVO 褰撳墠鐨勫垎绫�
- * @return 瑙勫垯锛屽鏋滀笉瀛樺湪浼氳繑鍥濶ull
- */
- @Override
- public CodeResembleRuleVO getUseResembleRule(CodeClassifyFullInfoBO fullInfoBO, CodeClassifyVO currentClassifyVO) {
- if (currentClassifyVO == null) {
- return null;
- }
- if (currentClassifyVO != null && StringUtils.isNotBlank(currentClassifyVO.getCodeResembleRuleOid())) {
- //璇存槑宸茬粡瀛樺湪
- return resembleRuleService.getObjectByOid(currentClassifyVO.getCodeResembleRuleOid());
- }
- if (StringUtils.isBlank(currentClassifyVO.getParentcodeclassifyoid())) {
- return null;
- }
- Map<String, CodeClassifyVO> classifyVOMap = fullInfoBO.getParentClassifyVOs().stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
- return getUseResembleRule(fullInfoBO, classifyVOMap.getOrDefault(currentClassifyVO.getParentcodeclassifyoid(), null));
- }
-
-
- /**
- * 妯℃澘灞炴�ц浆鎹负琛ㄥ崟瀹氫箟鐨勪俊鎭�
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿紝涓虹┖鐨勬椂鍊欙紝鑾峰彇妯℃澘鎵�灞炵殑鍒嗙被涓婚敭.鐢ㄤ簬浜х敓鍒嗙被娉ㄥ叆
- * @return 琛ㄦ牸鐨勪俊鎭�
- */
- private UIFormDefineVO wrapperFormDefineByTemplate(CodeClassifyTemplateVO templateVO, String codeClassifyOid) {
- UIFormDefineVO formDefineVO = new UIFormDefineVO();
- formDefineVO.setOid(templateVO.getOid());
- formDefineVO.setBtmType(templateVO.getBtmTypeId());
- if (StringUtils.isBlank(codeClassifyOid)) {
- codeClassifyOid = templateVO.getCodeclassifyoid();
- }
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
-
- List<UIFormItemVO> itemVOS = new ArrayList<>();
- Map<String, List<CodeClassifyTemplateAttrVO>> attrGroupMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getAttributegroup())).collect(Collectors.groupingBy(s -> s.getAttributegroup()));
- templateVO.getAttributes().forEach(attrVO -> {
- UIFormItemVO formItemVO = templateAttr2FormField(attrVO, templateVO.getBtmTypeId());
- itemVOS.add(formItemVO);
- });
- //澶勭悊灞炴�у垎缁�
- if (!CollectionUtils.isEmpty(attrGroupMap)) {
- //鎸夌収鍒嗙粍鐨勫睘鎬ф帓鍒楋紝鎵惧埌姣忎竴涓垎缁勭殑绗竴涓睘鎬�
- for (String key : attrGroupMap.keySet()) {
- List<CodeClassifyTemplateAttrVO> value = attrGroupMap.get(key);
- //鎵惧埌杩欎釜鍒嗙粍鐨勫睘鎬х殑绗竴涓�
- CodeClassifyTemplateAttrVO attrVO = value.stream().sorted(((o1, o2) -> o1.getOrdernum().compareTo(o2.getOrdernum()))).findFirst().get();
- //鎴戜滑鎵惧埌杩欎釜灞炴�у湪鏈�缁堢殑itemVOs閲岀殑浣嶇疆
- UIFormItemVO lineVO = new UIFormItemVO();
- lineVO.setField(attrVO.getId() + "_line");
- lineVO.setType("line");
- lineVO.setText(key);
- //鎵句綅缃�
- for (int i = 0; i < itemVOS.size(); i++) {
- UIFormItemVO record = itemVOS.get(i);
- if (record.getField().equalsIgnoreCase(attrVO.getId())) {
- itemVOS.add(i, lineVO);
- break;
- }
- }
- }
- }
-
- CodeOrderDTO orderDTO = new CodeOrderDTO();
- switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO);
- if (!CollectionUtils.isEmpty(orderDTO.getData())) {
- orderDTO.getData().forEach((key, value) -> {
- for (int i = 0; i < itemVOS.size(); i++) {
- UIFormItemVO itemVO = itemVOS.get(i);
- if (itemVO.getField().equalsIgnoreCase(key)) {
- itemVO.setDefaultValue(value);
- break;
- }
- }
- });
- }
- formDefineVO.setItems(itemVOS);
- //鏌ヨ鏄惁鏈夊垎绫绘敞鍏ョ殑
- return formDefineVO;
- }
-
-
- /**
- * 妯℃澘灞炴�ц浆鎹负琛ㄦ牸瀹氫箟鐨勪俊鎭�
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param forEdit 鏄惁鏄紪杈戞墍闇�
- * @return 琛ㄦ牸鐨勪俊鎭�
- */
- private UITableDefineVO wrapperTableDefineByTemplate(CodeClassifyTemplateVO templateVO,boolean forEdit) {
- //灏佽淇℃伅
- UITableDefineVO tableDefineVO = new UITableDefineVO();
- tableDefineVO.setOid(templateVO.getOid());
- tableDefineVO.setBtmType(templateVO.getBtmTypeId());
- tableDefineVO.setDisplayQueryArea(true);
- //鍓嶇浼氶粯璁ゅ垎椤电殑淇℃伅
-
- //澶勭悊鎵�鏈夌殑鍒楋紝杩欎釜妯℃澘娌℃湁鍚堝苟鐨勮〃澶寸殑鎯呭喌
- List<UITableFieldVO> fieldVOList = new ArrayList<>();
- Map<String, String> comboxOrReferFieldMap = new HashMap<>();
-
- templateVO.getAttributes().forEach(attrVO -> {
- UITableFieldVO tableFieldVO = templateAttr2TableField(attrVO,forEdit);
- if ("combox".equalsIgnoreCase(tableFieldVO.getFieldType())) {
- comboxOrReferFieldMap.put(tableFieldVO.getSortField(), tableFieldVO.getField());
- }
- if ("refer".equalsIgnoreCase(tableFieldVO.getFieldType())) {
- comboxOrReferFieldMap.put(tableFieldVO.getSortField(), tableFieldVO.getField());
- }
- if(StringUtils.isNotBlank(tableFieldVO.getEdit())){
- tableDefineVO.setHasEditor(true);
- }
- fieldVOList.add(tableFieldVO);
- });
- List<List<UITableFieldVO>> cols = new ArrayList<>();
- cols.add(fieldVOList);
- tableDefineVO.setCols(cols);
- Map<String, UITableFieldVO> fieldVOMap = fieldVOList.stream().collect(Collectors.toMap(s -> s.getField().toLowerCase(Locale.ROOT), t -> t));
- //鏌ヨ灞炴��
- List<CodeClassifyTemplateAttrVO> queryAttrVOs = templateVO.getAttributes().stream().filter(s -> BooleanEnum.TRUE.getValue().equalsIgnoreCase(s.getQueryattrflag())).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(queryAttrVOs)) {
- List<UITableFieldVO> queryFieldVOs = new ArrayList<>();
- queryAttrVOs.stream().forEach(attrVO -> {
- String attrId = attrVO.getId().toLowerCase(Locale.ROOT);
- attrId = comboxOrReferFieldMap.getOrDefault(attrId, attrVO.getId()).toLowerCase(Locale.ROOT);
- if (fieldVOMap.containsKey(attrId)) {
- queryFieldVOs.add(fieldVOMap.get(attrId));
- }
- });
- tableDefineVO.setQueryColumns(queryFieldVOs);
- }
- //楂樼骇灞炴��
- List<CodeClassifyTemplateAttrVO> seniorQueryAttrVOs = templateVO.getAttributes().stream().filter(s -> BooleanEnum.TRUE.getValue().equalsIgnoreCase(s.getSeniorqueryattrflag())).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(seniorQueryAttrVOs)) {
- List<UITableFieldVO> queryFieldVOs = new ArrayList<>();
- seniorQueryAttrVOs.stream().forEach(attrVO -> {
- String attrId = attrVO.getId().toLowerCase(Locale.ROOT);
- attrId = comboxOrReferFieldMap.getOrDefault(attrId, attrId).toLowerCase(Locale.ROOT);
- if (fieldVOMap.containsKey(attrId)) {
- queryFieldVOs.add(fieldVOMap.get(attrId));
- }
- });
- tableDefineVO.setSeniorQueryColumns(queryFieldVOs);
- }
- return tableDefineVO;
- }
-
- /**
- * 妯℃澘灞炴�ц浆鎹负琛ㄦ牸鏄剧ず鐨勯厤缃�
- *
- * @param attrVO 妯℃澘灞炴��
- * @param forEdit 鏄惁鏄紪杈戞墍闇�
- * @return 琛ㄦ牸鐨勫瓧娈�
- */
- @Override
- public UITableFieldVO templateAttr2TableField(CodeClassifyTemplateAttrVO attrVO,boolean forEdit) {
- UITableFieldVO fieldVO = new UITableFieldVO();
- if (SECRET_FILED.equalsIgnoreCase(attrVO.getId())) {
- attrVO.setEnumid(OsEnumServiceImpl.MY_DATA_SECRET);
- }
- fieldVO.setField(attrVO.getId());
- fieldVO.setTitle(attrVO.getName());
- fieldVO.setFieldType(vciFieldTypeMap.getOrDefault(attrVO.getAttributedatatype(), "text"));
- fieldVO.setSort(true);
- fieldVO.setSortField(fieldVO.getField());
- fieldVO.setQueryField(fieldVO.getField());
- if (forEdit){
- fieldVO.setHidden(!VciBaseUtil.getBoolean(attrVO.getFormdisplayflag()));
- }else {
- fieldVO.setHidden(!VciBaseUtil.getBoolean(attrVO.getTabledisplayflag()));
- }
- if (attrVO.getAttrTableWidth() != null && attrVO.getAttrTableWidth() > 0) {
- fieldVO.setMinWidth(attrVO.getAttrTableWidth());
- fieldVO.setWidth(attrVO.getAttrTableWidth());
- }
- //鐪嬬湅鏄惁鏈夋灇涓�
- if ((StringUtils.isNotBlank(attrVO.getEnumString())
- && !"[]".equalsIgnoreCase(attrVO.getEnumString())) ||
- StringUtils.isNotBlank(attrVO.getEnumid())) {
- fieldVO.setFieldType("combox");
- fieldVO.setField(fieldVO.getField() + "Text");
- fieldVO.setComboxKey(attrVO.getEnumid());
- if (StringUtils.isNotBlank(attrVO.getEnumString())) {
- //鎸囧畾鐨勪笅鎷夋鍐呭
- fieldVO.setData(JSONObject.parseArray(attrVO.getEnumString(), KeyValue.class));
- if (StringUtils.isBlank(attrVO.getEnumid())) {
- fieldVO.setComboxKey(fieldVO.getField() + "_data");
- }
- }else {
- List<KeyValue> osEnumItemVOList= enumService.getEnum(attrVO.getEnumid());
- fieldVO.setData(osEnumItemVOList);
- }
- }
- //鐪嬫槸鍚︽湁鍙傜収
- if (StringUtils.isNotBlank(attrVO.getReferbtmid()) || StringUtils.isNotBlank(attrVO.getReferConfig())) {
- fieldVO.setFieldType("refer");
- fieldVO.setQueryField(fieldVO.getField());
- fieldVO.setField(fieldVO.getField() + "name");
- fieldVO.setShowField(fieldVO.getField());
- if (StringUtils.isNotBlank(attrVO.getReferConfig())) {
- //閰嶇疆鐨勫唴瀹�
- fieldVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
- } else {
- UIFormReferVO formReferVO = new UIFormReferVO();
- formReferVO.setType("default");
- formReferVO.setReferType(attrVO.getReferbtmid());
- fieldVO.setReferConfig(formReferVO);
- }
- }
- if (VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(fieldVO.getSortField())) {
- fieldVO.setField("lcstatus_text");
- }
- Map<String, String> eventJsMap = new HashMap<>();
- //瓒呴摼鎺ヤ笌妯℃澘鏄簰鏂�
- if (StringUtils.isNotBlank(attrVO.getTablehref())) {
- String event = fieldVO.getSortField() + "_href";
- eventJsMap.put(event, attrVO.getTablehref());
- fieldVO.setTemplet("function(d){ return '<a class=\"layui-btn layui-btn-intable \" lay-event=\"" + event + "\">d." + fieldVO.getField() + "</a>';}");
- }
- if (StringUtils.isNotBlank(attrVO.getTabledisplayjs())) {
- //鐩存帴鍐檉unction(d){ return xxxxx;}
- fieldVO.setTemplet(attrVO.getTabledisplayjs());
- }
- if (StringUtils.isBlank(fieldVO.getTemplet()) && VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(attrVO.getAttributedatatype())) {
- fieldVO.setTemplet("function(d){return $webUtil.formateBoolean(d." + fieldVO.getField() + ");}");
- }
- fieldVO.setOptionJsMap(eventJsMap);
- fieldVO.setStyle(attrVO.getTabledisplaystyle());
- //鍒楄〃閲屼笉鍏佽鐩存帴缂栬緫
- fieldVO.setDateFormate(attrVO.getCodedateformat());
- return fieldVO;
- }
-
- /**
- * 瀵嗙骇鐨勫瓧娈�
- */
- public static final String SECRET_FILED = "secretgrade";
-
- /**
- * 妯℃澘灞炴�ц浆鎹负琛ㄥ崟鐨勫瓧娈�
- *
- * @param attrVO 妯℃澘灞炴��
- * @param btmType 涓氬姟绫诲瀷
- * @return 琛ㄥ崟鐨勫瓧娈�
- */
- @Override
- public UIFormItemVO templateAttr2FormField(CodeClassifyTemplateAttrVO attrVO, String btmType) {
- UIFormItemVO itemVO = new UIFormItemVO();
- if (SECRET_FILED.equalsIgnoreCase(attrVO.getId())) {
- attrVO.setEnumid(OsEnumServiceImpl.MY_DATA_SECRET);
- }
- itemVO.setField(attrVO.getId());
- itemVO.setText(attrVO.getName());
- itemVO.setType(vciFieldTypeMap.getOrDefault(attrVO.getAttributedatatype(), "text"));
- if (VciBaseUtil.getBoolean(attrVO.getTextareaflag())) {
- itemVO.setType("textarea");
- }
- if (VciFieldTypeEnum.VTLong.name().equalsIgnoreCase(attrVO.getAttributedatatype())
- || VciFieldTypeEnum.VTInteger.name().equalsIgnoreCase(attrVO.getAttributedatatype())
- || VciFieldTypeEnum.VTDouble.name().equalsIgnoreCase(attrVO.getAttributedatatype())) {
- itemVO.setVerify("number");
- }
- itemVO.setReadOnly(VciBaseUtil.getBoolean(attrVO.getReadonlyflag()));
- itemVO.setKeyAttr(VciBaseUtil.getBoolean(attrVO.getKeyattrflag()));
- itemVO.setRequired(VciBaseUtil.getBoolean(attrVO.getRequireflag()));
- itemVO.setDefaultValue(attrVO.getDefaultvalue());
- itemVO.setDateFormate(attrVO.getCodedateformat());
- itemVO.setHidden(!VciBaseUtil.getBoolean(attrVO.getFormdisplayflag()));
- itemVO.setVerify(attrVO.getVerifyrule());
- itemVO.setPrefix(attrVO.getPrefixvalue());
- itemVO.setSuffix(attrVO.getSuffixvalue());
- itemVO.setTooltips(attrVO.getExplain());
- itemVO.setSelectLibFlag(attrVO.getLibraryIdentification());
- //鐪嬬湅鏄惁鏈夋灇涓�
- if ((StringUtils.isNotBlank(attrVO.getEnumString())
- && !"[]".equalsIgnoreCase(attrVO.getEnumString())) ||
- StringUtils.isNotBlank(attrVO.getEnumid())) {
- itemVO.setType("combox");
- itemVO.setComboxKey(attrVO.getEnumid());
- if (StringUtils.isNotBlank(attrVO.getEnumString())) {
- //鎸囧畾鐨勪笅鎷夋鍐呭
- itemVO.setData(JSONObject.parseArray(attrVO.getEnumString(), KeyValue.class));
- if (StringUtils.isBlank(attrVO.getEnumid())) {
- itemVO.setComboxKey(itemVO.getField() + "_data");
- }
- }
- }
- //鐪嬫槸鍚︽湁鍙傜収
- if (StringUtils.isNotBlank(attrVO.getReferbtmid()) || StringUtils.isNotBlank(attrVO.getReferConfig())) {
- itemVO.setType("refer");
- itemVO.setShowField(itemVO.getField() + "name");
- if (StringUtils.isNotBlank(attrVO.getReferConfig())) {
- //閰嶇疆鐨勫唴瀹�
- itemVO.setReferConfig(JSONObject.parseObject(attrVO.getReferConfig(), UIFormReferVO.class));
- } else {
- UIFormReferVO formReferVO = new UIFormReferVO();
- formReferVO.setType("default");
- formReferVO.setReferType(attrVO.getReferbtmid());
- itemVO.setReferConfig(formReferVO);
- }
- }
-
- //濡傛灉鏄粍鍚堣鍒欙紝鍒嗙被娉ㄥ叆鐨勶紝鏄剧ず涓哄彧璇�
- if (StringUtils.isNotBlank(attrVO.getComponentrule())) {
- itemVO.setReadOnly(true);
- itemVO.setTooltips("鏈睘鎬т负缁勫悎瑙勫垯");
- itemVO.setRequired(false);
- }
- if (StringUtils.isNotBlank(attrVO.getClassifyinvokeattr())) {
- itemVO.setReadOnly(!VciBaseUtil.getBoolean(attrVO.getClassifyinvokeeditflag()));
- itemVO.setTooltips("鏈睘鎬ф槸鍒嗙被娉ㄥ叆");
- itemVO.setRequired(false);
- }
-
- if (VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(itemVO.getField())) {
- //鏄敓鍛藉懆鏈熺姸鎬�
- itemVO.setType("combox");
- itemVO.setComboxKey(btmType + LC_STATUS_SUBFIX);
- }
- return itemVO;
- }
-
- /**
- * 灞炴�х被鍨嬩笌js涓殑瀛楁绫诲瀷鐨勬槧灏�
- */
- private static Map<String, String> vciFieldTypeMap = new HashMap<String, String>() {{
- put(VciFieldTypeEnum.VTString.name(), "text");
- put(VciFieldTypeEnum.VTInteger.name(), "text");
- put(VciFieldTypeEnum.VTLong.name(), "text");
- put(VciFieldTypeEnum.VTDouble.name(), "text");
- put(VciFieldTypeEnum.VTClob.name(), "text");
- put(VciFieldTypeEnum.VTBoolean.name(), "truefalse");
- put(VciFieldTypeEnum.VTDateTime.name(), "datetime");
- put(VciFieldTypeEnum.VTDate.name(), "datetime");
- put(VciFieldTypeEnum.VTTime.name(), "datetime");
- put(VciFieldTypeEnum.VTFilePath.name(), "file");
- }};
-
- /**
- * 鏍囪娴佺▼涓笟鍔℃暟鎹槸鍚﹂�氳繃
- *
- * @param oid 涓氬姟鏁版嵁涓婚敭
- * @param btmName 涓氬姟绫诲瀷
- * @param pass 鏄惁閫氳繃
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult markDataPassing(String oid, String btmName, Boolean pass) {
- VciBaseUtil.alertNotNull(oid, "涓氬姟鏁版嵁涓婚敭", btmName, "涓氬姟绫诲瀷", pass, "鏍囪绫诲瀷");
- boolean flag = false;
- try {
- ClientBusinessObjectOperation operation = new ClientBusinessObjectOperation();
- ClientBusinessObject data = operation.readBusinessObjectById(oid, btmName);
- if (data == null || StringUtils.isBlank(data.getOid())) {
- return BaseResult.fail(DATA_OID_NOT_EXIST);
- }
- data.setAttributeValue("passing", String.valueOf(pass));
- flag = operation.updateBuinessObject(data);
- } catch (VCIError e) {
- e.printStackTrace();
- }
- if (flag) {
- return BaseResult.success();
- } else {
- return BaseResult.fail("鏍囪澶辫触");
- }
- }
-
- /**
- * 浣跨敤鍒嗙被鐨勪富閿幏鍙栦笟鍔℃暟鎹�
- *
- * @param btmType 涓氬姟绫诲瀷
- * @param queryObject 鏌ヨ瀵硅薄
- * @return 琛ㄦ牸鐨勬樉绀哄璞″��
- */
- @Override
- public DataGrid<Map<String, String>> getTableDataByExecutionId(String btmType, BaseQueryObject queryObject) {
- VciBaseUtil.alertNotNull(btmType, "涓氬姟绫诲瀷");
- if (queryObject == null) {
- queryObject = new BaseQueryObject();
- }
- if (queryObject.getConditionMap() == null) {
- queryObject.setConditionMap(new HashMap<>());
- }
- Map<String, String> conditionMap = queryObject.getConditionMap();
- PageHelper pageHelper = queryObject.getPageHelper();
- if (!conditionMap.containsKey("oid")) {
- throw new VciBaseException("涓氬姟鏁版嵁涓婚敭涓嶈兘涓虹┖");
- }
- List<String> oidList = VciBaseUtil.str2List(conditionMap.get("oid"));
- Map<String, String> oidMap = new HashMap<>();
- if (conditionMap.get("oid").contains(",")) {
- oidMap.put("oid", QueryOptionConstant.IN +"("+ VciBaseUtil.toInSql(oidList.toArray(new String[0])) + ")");
- } else {
- oidMap.put("oid", conditionMap.get("oid"));
- }
- if (CollectionUtils.isEmpty(oidMap)) {
- throw new VciBaseException("涓氬姟鏁版嵁涓婚敭涓嶈兘涓虹┖");
- }
- List<ClientBusinessObject> cbos = boService.queryCBO(btmType, oidMap);
- if (CollectionUtils.isEmpty(cbos)) {
- throw new VciBaseException("鏈壘鍒颁笟鍔℃暟鎹�");
- }
- ClientBusinessObject cbo = cbos.get(0);
- String templateOid = cbo.getAttributeValue("CODETEMPLATEOID");
- Map<String, String> templateOidMap = new HashMap<>();
- templateOidMap.put("oid", templateOid);
- List<CodeClassifyTemplateDO> templateDOList = boService.queryObject(CodeClassifyTemplateDO.class, templateOidMap);
- templateOidMap.clear();
- templateOidMap.put("CLASSIFYTEMPLATEOID",templateOid);
- List<CodeClassifyTemplateAttrDO> attrDOList = boService.queryObject(CodeClassifyTemplateAttrDO.class, templateOidMap);
- if (CollectionUtils.isEmpty(templateDOList)) {
- logger.error("鎵句笉鍒颁笟鍔℃暟鎹叧鑱旂殑妯℃澘锛屾ā鏉夸富閿細" + templateOid);
- throw new VciBaseException("鎵句笉鍒颁笟鍔℃暟鎹叧鑱旂殑妯℃澘");
- }
- CodeClassifyTemplateVO templateVO = templateService.codeClassifyTemplateDO2VO(templateDOList.get(0));
- templateVO.setAttributes(templateAttrService.codeClassifyTemplateAttrDO2VOs(attrDOList));
- try {
- if (oidList.size() > 1){
- DataGrid<Map<String,String>> allDataGrid = new DataGrid<>();
- List<Map<String,String>> allData = new ArrayList<>();
- oidList.forEach(oid -> {
- Map<String,String> condition = new HashMap<>();
- condition.put("oid",oid);
- DataGrid<Map<String, String>> dataGrid = queryGrid(btmType, templateVO, condition, pageHelper);
- allData.addAll(dataGrid.getData());
- });
- allDataGrid.setData(allData);
- return allDataGrid;
- }else {
- return queryGrid(btmType, templateVO, conditionMap, pageHelper);
- }
- } catch (Exception e) {
- System.out.println(e.getMessage());
- return null;
- }
- }
-
- /**
- * 鎵归噺淇濆瓨娴佺▼鎵ц椤甸潰淇敼鐨勫唴瀹�
- *
- * @param orderDTOList 缂栫爜鐩稿叧鐨勪俊鎭紝涓嶉渶瑕佺爜娈电殑淇℃伅
- * @return 鎵ц缁撴灉
- */
- @Override
- public BaseResult batchUpdateCode(List<CodeOrderDTO> orderDTOList) {
- VciBaseUtil.alertNotNull(orderDTOList,"缂栫爜鐢宠鐩稿叧鐨勫睘鎬у唴瀹�");
- orderDTOList.forEach(orderDTO -> {
- VciBaseUtil.alertNotNull(orderDTO, "缂栫爜鐢宠鐩稿叧鐨勫睘鎬х殑鍐呭閮戒负绌�", orderDTO.getOid(), "鏁版嵁涓婚敭",
- orderDTO.getCodeClassifyOid(), "涓婚搴撳垎绫荤殑涓婚敭");
- });
- Map<String, CodeOrderDTO> orderDTOMap = orderDTOList.stream().filter(orderDTO -> orderDTO != null && StringUtils.isNotBlank(orderDTO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
- List<ClientBusinessObject> updateList = new ArrayList<>();
- // 搴旇閮芥槸涓�涓垎绫讳笅鐨勪笟鍔℃暟鎹紝鎵剧涓�鏉＄殑灏辫
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTOList.get(0).getCodeClassifyOid());
- Map<String,String> cboOidMap = new HashMap<>();
- if (CollectionUtils.isEmpty(orderDTOMap.keySet())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- cboOidMap.put("oid",QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(orderDTOMap.keySet().toArray(new String[0])) + ")");
- List<ClientBusinessObject> cboList = boService.queryCBO(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), cboOidMap);
- if (CollectionUtils.isEmpty(cboList)){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- BatchCBO batchCBO = new BatchCBO();
- CodeClassifyTemplateVO firstTemplateVO = templateService.getObjectHasAttrByOid(orderDTOMap.values().stream().findFirst().get().getTemplateOid());
- Map<String, ClientBusinessObject> cboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
- orderDTOMap.keySet().stream().forEach(oid -> {
- CodeOrderDTO orderDTO = orderDTOMap.get(oid);
- ClientBusinessObject cbo = cboMap.get(oid);
- if (!cbo.getTs().contains(VciDateUtil.date2Str(orderDTO.getTs(), VciDateUtil.DateTimeFormat))) {
- throw new VciBaseException("鏁版嵁涓嶆槸鏈�鏂扮殑锛屽彲鑳戒粬浜哄凡缁忎慨鏀癸紝璇峰埛鏂板悗鍐嶈瘯");
- }
- if (!CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(cbo.getLcStatus()) && !orderDTO.isEditInProcess()) {
- throw new VciBaseException("鏁版嵁涓嶆槸{0}鐨勭姸鎬侊紝涓嶅厑璁镐慨鏀�", new String[]{CodeDefaultLC.EDITING.getText()});
- }
- //1. 鍒ゆ柇蹇呰緭椤�
- CodeClassifyTemplateVO templateVO = templateService.getObjectHasAttrByOid(orderDTO.getTemplateOid());
- checkRequiredAttrOnOrder(templateVO, orderDTO);
- //2.鍏堟敞鍏ワ紝鍐嶇粍鍚堬紝鏈�鍚庢牎楠�
- switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO);
- //3.澶勭悊缁勫悎瑙勫垯銆傜粍鍚堣鍒欎笉鑳戒娇鐢ㄧ紪鐮佺殑灞炴�э紝鍥犱负缂栫爜鐨勭敓鎴愬彲鑳芥槸闇�瑕佸睘鎬х殑
- switchComponentAttrOnOrder(templateVO, orderDTO);
- //4.鏍￠獙瑙勫垯
- checkVerifyOnOrder(templateVO, orderDTO);
- //5.鍒ゆ柇鍏抽敭灞炴��
- checkKeyAttrOnOrder(classifyFullInfo, templateVO, orderDTO);
- //6.鏍￠獙鏋氫妇鐨勫唴瀹规槸鍚︽纭�
- checkEnumOnOrder(templateVO, orderDTO);
- //7.澶勭悊鏃堕棿鏍煎紡锛屽湪鏁版嵁搴撻噷闈笉璁烘槸瀛楃涓茶繕鏄棩鏈熸牸寮忥紝閮戒娇鐢ㄧ浉鍚岀殑鏍煎紡瀛樺偍
- switchDateAttrOnOrder(templateVO, orderDTO);
- //榛樿鐨勫唴瀹逛笉鑳藉彉锛屾墍浠ュ彧闇�瑕佹嫹璐濊嚜瀹氫箟鐨勭浉鍏冲睘鎬у嵆鍙�
- copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, true);
- //浼佷笟鐮佸拰闆嗗洟鐮佺殑涓嶄慨鏀�
- cbo.setDescription(orderDTO.getDescription());
- cbo.setName(orderDTO.getName());
- try {
- cbo.setAttributeValueWithNoCheck("description", orderDTO.getDescription());
- cbo.setAttributeValue("name", orderDTO.getName());
- } catch (VCIError e) {
- e.printStackTrace();
- }
- batchCBO.getUpdateCbos().add(cbo);
- updateList.add(cbo);
- });
- boService.persistenceBatch(batchCBO);
- batchSaveSelectChar(firstTemplateVO, cboList);
- return BaseResult.success();
- }
-
- /**
- * 浣跨敤鍒嗙被鐨勭紪鍙疯矾寰勶紝鑾峰彇琛ㄦ牸鐨勭浉鍏冲畾涔�
- *
- * @param codeClassifyIdPath 鍒嗙被鐨勭紪鍙疯矾寰勶紝蹇呴』鏄粠椤跺眰鑺傜偣寮�濮嬶紝xxx/yy/zz杩欐牱鐨勬牸寮�
- * @param functionId 鍔熻兘鐨勭紪鍙�
- * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鏍�)
- */
- @Override
- public MdmUIInfoVO getUIInfoByClassifyIdPath(String codeClassifyIdPath, String functionId) {
- CodeClassifyVO classifyVO = classifyService.getObjectByIdPath(codeClassifyIdPath);
- if(classifyVO !=null){
- return getUIInfoByClassifyOid(classifyVO.getOid(),functionId);
- }
- return null;
- }
-
- /**
- * 浣跨敤鍒嗙被鐨勭紪鍙疯矾寰勶紝鑾峰彇琛ㄥ崟鐨勭浉鍏冲畾涔�
- *
- * @param idPath 缂栧彿鐨勮矾寰勶紝蹇呴』浠庨《灞傝妭鐐瑰紑濮嬶紝xx/yyy/zz
- * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗�)
- */
- @Override
- public MdmUIInfoVO getFormDefineByClassifyIdPath(String idPath) {
- CodeClassifyVO classifyVO = classifyService.getObjectByIdPath(idPath);
- if(classifyVO !=null){
- return getFormDefineByClassifyOid(classifyVO.getOid());
- }
- return null;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
deleted file mode 100644
index 1214ce8..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ /dev/null
@@ -1,4013 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmEngineConstant;
-import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
-import com.vci.ubcs.code.lifecycle.CodeAllCodeLC;
-import com.vci.ubcs.code.lifecycle.CodeDefaultLC;
-import com.vci.ubcs.code.vo.pagemodel.*;
-import com.vci.ubcs.code.vo.universalInter.attrmap.DataObjectVO;
-import com.vci.ubcs.code.vo.universalInter.attrmap.RowDatas;
-import com.vci.ubcs.code.vo.universalInter.result.xml.XMLResultDataObjectDetailDO;
-import com.vci.corba.common.VCIError;
-import com.vci.file.util.VciZipUtil;
-import com.vci.starter.poi.bo.*;
-import com.vci.starter.poi.util.ExcelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.enumpck.BooleanEnum;
-import com.vci.starter.web.enumpck.UserSecretEnum;
-import com.vci.starter.web.enumpck.VciFieldTypeEnum;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.toolmodel.DateConverter;
-import com.vci.starter.web.util.*;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.service.*;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.pageModel.KeyValue;
-import com.vci.web.pageModel.OsLifeCycleVO;
-import com.vci.web.pageModel.UIFormReferVO;
-import com.vci.web.redis.RedisService;
-import com.vci.web.service.OsLifeCycleServiceI;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.service.WebSecretServiceI;
-import com.vci.web.service.impl.FormulaServiceImpl;
-import com.vci.web.util.PlatformClientUtil;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.collections.map.HashedMap;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFRichTextString;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.HSSFColor;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
-import com.vci.ubcs.code.dto.CodeExportAttrDTO;
-import com.vci.ubcs.code.dto.CodeOrderDTO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.stream.Collectors;
-
-
-/**
- * 涓绘暟鎹鍏ュ鍑烘湇鍔�
- * @author weidy
- * @date 2022-3-6
- */
-@Service
-public class MdmIOServiceImpl implements MdmIOServiceI {
-
-
- @Value("${batchadd.exportattr.type:鍩烘湰淇℃伅}")
- public String BATCHADD_EXCEPORT_ATTR_TYPE;
-
-
- /**
- * 鐢熷懡鍛ㄦ湡鐨勬湇鍔�
- */
- @Autowired
- private OsLifeCycleServiceI lifeCycleService;
-
- @Autowired
- private PlatformClientUtil platformClientUtil;
- /**
- * 鍒嗙被浣跨敤鐨勬祦绋嬫ā鏉� 鏈嶅姟
- */
- @Autowired
- private CodeClassifyProcessTempServiceI codeClassifyProcessTempService;
- /**
- * 涓婚搴撳垎绫荤殑鏈嶅姟
- */
- @Autowired
- private CodeClassifyServiceI classifyService;
-
- @Autowired
- private CodeClassifyTemplateServiceI templateServiceI;
- /**
- * 涓绘暟鎹紩鎿庣殑鏈嶅姟
- */
- @Autowired
- private MdmEngineServiceI engineService;
-
- /**
- * 瑙勫垯鐨勬湇鍔�
- */
- @Autowired
- private CodeRuleServiceI ruleService;
-
- /**
- * 鏁版嵁鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 鍏紡鐨勬湇鍔�
- */
- @Autowired
- private FormulaServiceImpl formulaService;
-
- /**
- * 缂撳瓨鏈嶅姟
- */
- @Autowired
- private RedisService redisService;
-
- /**
- * 鍏抽敭灞炴��
- */
- public static final String KEY_ATTR_CHAR = "鈽�";
-
- /**
- * 瀛楁
- */
- public static final String ROW_INDEX = "LAY_TABLE_INDEX";
- /**
- * 蹇呰緭
- */
- public static final String REQUIRED_CHAR = "*";
- /**
- * 鏇挎崲瀛楃
- */
- public static final String SPECIAL_CHAR = "VCI";
- /**
- * 寮哄埗鍒嗛〉鐨勬暟閲�
- */
- public static final int LIMIT = 10000;
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鍏抽敭灞炴�х殑閰嶇疆
- */
- @Autowired
- private CodeKeyAttrRepeatRuleServiceI keyRuleService;
-
- /**
- * 缂栫爜鐢熸垚鏈嶅姟绫�
- */
- @Autowired
- private MdmProductCodeServiceI productCodeService;
-
- /**
- * 妯℃澘鐨勬湇鍔�
- */
- @Autowired
- private CodeClassifyTemplateServiceI templateService;
-
- /**
- * 瀵嗙骇鐨勬湇鍔�
- */
- @Autowired
- private WebSecretServiceI secretService;
-
- /**
- * 瀵煎嚭涓婚搴撶殑鏁版嵁
- *
- * @param exportAttrDTO 瀵煎嚭鐩稿叧鐨勯厤缃紝蹇呴』瑕佹湁涓婚搴撳垎绫荤殑涓婚敭
- * @return 瀵煎嚭鐨別xcel鐨勬枃浠�
- */
- @Override
- public String exportCode(CodeExportAttrDTO exportAttrDTO) {
- VciBaseUtil.alertNotNull(exportAttrDTO,"瀵煎嚭鐨勯厤缃�",exportAttrDTO.getCodeClassifyOid(),"涓婚搴撳垎绫荤殑涓婚敭");
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(exportAttrDTO.getCodeClassifyOid());
- //鑾峰彇鏈�鏂扮殑妯℃澘
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(exportAttrDTO.getCodeClassifyOid());
- //鍏堟煡璇㈡暟鎹�
- String btmTypeId = classifyFullInfo.getTopClassifyVO().getBtmtypeid();
- Map<String, String> conditionMap = exportAttrDTO.getConditionMap();
- if(conditionMap == null){
- conditionMap = new HashMap<>();
- }
- if(conditionMap.containsKey(VciQueryWrapperForDO.OID_FIELD)){
- conditionMap.put(VciQueryWrapperForDO.OID_FIELD,QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(conditionMap.get(VciQueryWrapperForDO.OID_FIELD)) + ")");
- }
- PageHelper pageHelper = new PageHelper(exportAttrDTO.getLimit()==null?-1:exportAttrDTO.getLimit());
- pageHelper.setPage(exportAttrDTO.getPage()==null?1:exportAttrDTO.getPage());
- pageHelper.setSort(exportAttrDTO.getSort());
- pageHelper.setOrder(exportAttrDTO.getOrder());
-
- pageHelper.addDefaultDesc("createTime");
- conditionMap.put("codeclsfpath","*" + exportAttrDTO.getCodeClassifyOid() + "*");
-
- //鍏堟煡璇㈡�绘暟
- int total = 0;
- if(exportAttrDTO.getEndPage()!=null && exportAttrDTO.getEndPage()>0
- &&exportAttrDTO.getPage() !=null && exportAttrDTO.getPage() >0
- &&exportAttrDTO.getEndPage()>exportAttrDTO.getPage()){
- //浠庡灏戦〉鍒板灏戦〉鐨勬煡璇㈡柟寮忥紝
- for(int i = exportAttrDTO.getPage() ;i <= exportAttrDTO.getEndPage();i++){
- PageHelper thisPage = new PageHelper(exportAttrDTO.getLimit()==null?-1:exportAttrDTO.getLimit());
- thisPage.setPage(exportAttrDTO.getPage()==null?1:exportAttrDTO.getPage());
- thisPage.setSort(exportAttrDTO.getSort());
- thisPage.setOrder(exportAttrDTO.getOrder());
- thisPage.addDefaultDesc("createTime");
- total += boService.queryCount(btmTypeId, conditionMap);
- }
- }else{
- total=boService.queryCount(btmTypeId, conditionMap);
- }
- List<String> selectFieldList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(exportAttrDTO.getAttrIdIndexMap())){
- selectFieldList = exportAttrDTO.getAttrIdIndexMap().values().stream().map(s->s.toLowerCase(Locale.ROOT)).collect(Collectors.toList());
- }else{
- selectFieldList = templateVO.getAttributes().stream().filter(s->VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ||VciBaseUtil.getBoolean(s.getTabledisplayflag())).map(s->s.getId().toLowerCase(Locale.ROOT)).collect(Collectors.toList());
- }
- //鍙傜収璁╁钩鍙扮洿鎺ユ煡璇㈠氨琛�
- List<String> finalSelectFieldList = selectFieldList;
- List<CodeClassifyTemplateAttrVO> referAttrVOs = templateVO.getAttributes().stream().filter(
- s -> StringUtils.isNotBlank(s.getReferbtmid())
- &&
- (finalSelectFieldList.size() ==0 || finalSelectFieldList.contains(s.getId().toLowerCase(Locale.ROOT)))
- ).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(referAttrVOs)){
- for (int i = 0; i < referAttrVOs.size(); i++) {
- selectFieldList.add(referAttrVOs.get(i).getId() + ".name");
- }
- }
- List<String> excelNameList = new CopyOnWriteArrayList<>();
- String tempFolder = LocalFileUtil.getDefaultTempFolder();
-
- if(total>LIMIT){
- //鍒嗙粍鏉ユ墽琛�
- int queryCount = (total-total%LIMIT)/LIMIT;
- if(total%LIMIT>0){
- queryCount = queryCount + 1;
- }
- List<Integer> indexList = new ArrayList<>();
- for (int i = 0; i <queryCount ; i++) {
- indexList.add(i);
- }
- Map<String, String> finalConditionMap = conditionMap;
- //骞惰鏌ヨ鐪嬬湅
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- indexList.parallelStream().forEach(index->{
- //绾跨▼鐨勬柟寮忥紝鎵�浠ラ渶瑕佽缃綋鍓嶇敤鎴�
- VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
- PageHelper thisPage = new PageHelper(LIMIT);
- thisPage.setPage(index+1);
- thisPage.setSort(exportAttrDTO.getSort());
- thisPage.setOrder(exportAttrDTO.getOrder());
- thisPage.addDefaultDesc("createTime");
- selectDataAndExportExcelName(btmTypeId, finalConditionMap,thisPage,finalSelectFieldList,
- classifyFullInfo,templateVO,exportAttrDTO,
- excelNameList,tempFolder,index);
- });
- }else{
- pageHelper.setLimit(total);
- pageHelper.setPage(1);
- selectDataAndExportExcelName(btmTypeId,conditionMap,pageHelper,finalSelectFieldList,
- classifyFullInfo,templateVO,exportAttrDTO,
- excelNameList,tempFolder,1);
- }
- if(excelNameList.size() ==0){
- throw new VciBaseException("娌℃湁鏁版嵁鍙互琚鍑�");
- }
- if(excelNameList.size() == 1){
- return excelNameList.get(0);
- }
- //鏄涓紝鎴戜滑闇�瑕佹墦鎴愬帇缂╁寘
-
- String zipFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + classifyFullInfo.getCurrentClassifyVO().getId() + "_" + classifyFullInfo.getCurrentClassifyVO().getName() + "_瀵煎嚭_" + excelNameList.size()+".zip";
- VciZipUtil zipUtil = new VciZipUtil();
- File file = new File(tempFolder);
- zipUtil.addFileToZip(file,zipFileName);
- File[] files = file.listFiles();
- for (int i = 0; i < files.length; i++) {
- LocalFileUtil.deleteTempFile(files[i],false);
- }
- LocalFileUtil.deleteTempFile(file,true);
- return zipFileName;
- }
-
- /**
- * 鎵归噺鐢宠锛氶�夊彇閫変腑鍒嗙被涓嬬殑鎵�鏈夋ā鏉垮叧閿睘鎬э紝鐩镐技灞炴�э紝蹇呭～灞炴�э紝鍐欏叆execl涓�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @return excel鐨勬枃浠跺湴鍧�
- */
- @Override
- public String downloadTopImportExcel(String codeClassifyOid){
- List<CodeClassifyTemplateVO> templateVOList=new ArrayList<>();
- VciBaseUtil.alertNotNull("瀵煎嚭妯℃澘","瀵煎嚭鐨勯厤缃�",codeClassifyOid,"涓婚搴撳垎绫荤殑涓婚敭");
- CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);
- templateVOList= templateService.childTemplates(codeClassifyOid);
- List<CodeClassifyVO> codeClassifyVOS=classifyService.getIdPathToNamePathByParentId(codeClassifyOid,true);
- WriteExcelOption eo = new WriteExcelOption();
- LinkedHashMap<String,CodeClassifyTemplateAttrVO> allFieldToOutNameMap=new LinkedHashMap<>();
- templateVOList.stream().forEach(templateVO -> {
- //缁勫悎鏍煎紡鐨勪笉瀵煎叆锛�
- // 鏋氫妇鐨勬彁渚涘簭鍒楃殑閫夋嫨
- //鏃堕棿鍏ㄩ儴缁熶竴涓簓yyy-MM-dd HH:mm:ss
- //鍙傜収鐨勮嚜琛岃緭鍏ュ悕绉�
- //鍒嗙被娉ㄥ叆鐨勪笉鐢紝閮芥槸瀵煎叆鍚庤嚜鍔ㄥ鐞嗙殑
- //缂栫爜锛岀姸鎬佺瓑瀛楁涓嶅鍏�
- List<CodeClassifyTemplateAttrVO> templateAttrVOS = templateVO.getAttributes().stream().filter(s ->
- !MdmEngineConstant.DEFAULT_ATTR_LIST.contains(s.getId())
- && StringUtils.isBlank(s.getComponentrule())
- && StringUtils.isBlank(s.getClassifyinvokeattr())
- && (VciBaseUtil.getBoolean(s.getFormdisplayflag()))
- ).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(templateAttrVOS)){
- throw new VciBaseException("妯℃澘娌℃湁閰嶇疆浠讳綍銆愯〃鍗曟樉绀恒�戜负銆愭槸銆戠殑灞炴��");
- }
- templateAttrVOS.stream().forEach(codetemplateAttr ->{
- String field=codetemplateAttr.getId();
- String name=codetemplateAttr.getName();
- CodeClassifyTemplateAttrVO codeBaseAttributeDTO=new CodeClassifyTemplateAttrVO();
- boolean res=codetemplateAttr.getAttributegroup().equals(BATCHADD_EXCEPORT_ATTR_TYPE)//鍩烘湰灞炴�у瓧娈垫樉绀�
- ||(StringUtils.isNotBlank(codetemplateAttr.getKeyattrflag())&&Boolean.parseBoolean(codetemplateAttr.getKeyattrflag()))//鍏抽敭灞炴�х殑瀛樺叆
- ||(StringUtils.isNotBlank(codetemplateAttr.getSamerepeatattrflag())&&Boolean.parseBoolean(codetemplateAttr.getSamerepeatattrflag())) //鐩镐技灞炴�х殑瀛樺叆
- ||(StringUtils.isNotBlank(codetemplateAttr.getRequireflag())&&Boolean.parseBoolean(codetemplateAttr.getRequireflag()));
- if(allFieldToOutNameMap.containsKey(name)){//濡傛灉瀛樺湪鐨勮瘽鍒欓渶瑕佹牴鎹叿浣撶殑鍘昏祴鍊�
- codeBaseAttributeDTO= allFieldToOutNameMap.get(name);
- if(StringUtils.isNotBlank(codetemplateAttr.getKeyattrflag())&&Boolean.parseBoolean(codetemplateAttr.getKeyattrflag())){
- codeBaseAttributeDTO.setKeyattrflag(codetemplateAttr.getKeyattrflag());//灞炴�у叧閿睘鎬�
- }
- if(StringUtils.isNotBlank(codetemplateAttr.getRequireflag())&&Boolean.parseBoolean(codetemplateAttr.getRequireflag())){
- codeBaseAttributeDTO.setKeyattrflag(codetemplateAttr.getRequireflag());//灞炴�у繀濉」
- }
- if(StringUtils.isNotBlank(codetemplateAttr.getSamerepeatattrflag())&&Boolean.parseBoolean(codetemplateAttr.getSamerepeatattrflag())){
- codeBaseAttributeDTO.setSamerepeatattrflag(codetemplateAttr.getSamerepeatattrflag());//灞炴�х浉浼煎睘鎬�
- }
- }else if(res){
- allFieldToOutNameMap.put(name,codetemplateAttr);
- }
- });
- });
- //鏁寸悊濂芥墍鏈夋ā鏉块渶瑕佸啓鍏xecl鐨勫睘鎬т俊鎭�
- Workbook workbook = new HSSFWorkbook();
- LinkedList<WriteExcelData> excelDataList = new LinkedList<>();
- if(!CollectionUtils.isEmpty(allFieldToOutNameMap)){
- excelDataList.add(new WriteExcelData(0,0,"鍒嗙被璺緞"));
- final int[] index = {0};
- allFieldToOutNameMap.values().stream().forEach(attrVO -> {
- Object text = attrVO.getName();
- text = exportKeyAndRequired(workbook,attrVO,text);
- int colIndex = 1 + index[0]++;
- WriteExcelData excelData = new WriteExcelData(0, colIndex, text);
- if(StringUtils.isNotBlank(attrVO.getCodedateformat())
- || VciFieldTypeEnum.VTDateTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())
- || VciFieldTypeEnum.VTDate.name().equalsIgnoreCase(attrVO.getAttributedatatype())
- ||VciFieldTypeEnum.VTTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
- excelData.setDateFormat(VciDateUtil.DateTimeFormat);
- }
- if(text instanceof RichTextString){
- excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
- }
- excelDataList.add(excelData);
- if(StringUtils.isNotBlank(attrVO.getEnumString()) || StringUtils.isNotBlank(attrVO.getEnumid())){
- //娣诲姞鏁版嵁鏈夋晥鎬�
- List<String> enumValueList = new ArrayList<>();
- enumValueList.add("");
- List<KeyValue> valueList = engineService.listComboboxItems(attrVO);
- if(!CollectionUtils.isEmpty(valueList)){
- valueList.stream().forEach(kv->{
- enumValueList.add(kv.getValue());
- });
- }
- //榛樿鍔�1涓囨潯
- WriteExcelData ed = new WriteExcelData(1,colIndex,"");
- ed.setRowTo(100);
- ed.setColTo(colIndex);
- ed.setValidation(true);
- ed.setValidationDataList(enumValueList);
- ed.setValidationErrorMsg("璇峰湪搴忓垪涓�夋嫨姝ｇ‘鐨勫��");
- excelDataList.add(ed);
- }
- if(VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
- List<String> booleanList = new ArrayList<>();
- booleanList.add("鏄�");
- booleanList.add("鍚�");
- //榛樿鍔�1涓囨潯
- WriteExcelData ed = new WriteExcelData(1,colIndex,"");
- ed.setRowTo(100);
- ed.setColTo(colIndex);
- ed.setValidation(true);
- ed.setValidationDataList(booleanList);
- ed.setValidationErrorMsg("璇峰湪搴忓垪涓�夋嫨姝ｇ‘鐨勫��");
- excelDataList.add(ed);
- }
- });
- eo.addSheetDataList(codeClassifyVO.getName()+"瀵煎叆妯℃澘",excelDataList);
- }
- LinkedList<WriteExcelData> classPathList = new LinkedList<>();
- classPathList.add(new WriteExcelData(0,0,"鍒嗙被灞傜骇"));
-
- WriteExcelData idPathWriteExcelTitle=new WriteExcelData(0,1,"鍒嗙被ID璺緞");
- idPathWriteExcelTitle.setWidth(20);
- idPathWriteExcelTitle.setCenter(false);
- classPathList.add(idPathWriteExcelTitle);
- WriteExcelData namePathWriteExcelTitle=new WriteExcelData(0,2,"鍒嗙被鍚嶇О璺緞");
- namePathWriteExcelTitle.setWidth(20);
- namePathWriteExcelTitle.setCenter(false);
- classPathList.add(namePathWriteExcelTitle);
-
-
- final int[] rowIndex = {1};
- codeClassifyVOS.stream().forEach(codeClassifyVO1 -> {
- classPathList.add(new WriteExcelData(rowIndex[0],0,codeClassifyVO1.getDataLevel()));
-
- String idPath=codeClassifyVO1.getIdPath().startsWith("#")?codeClassifyVO1.getIdPath().substring(1):codeClassifyVO1.getIdPath();
- WriteExcelData idPathWriteExcelData=new WriteExcelData(rowIndex[0],1,idPath);
- idPathWriteExcelData.setWidth(30);
- idPathWriteExcelData.setCenter(false);
- classPathList.add(idPathWriteExcelData);
-
- String namePath=codeClassifyVO1.getNamePath().startsWith("#")?codeClassifyVO1.getNamePath().substring(1):codeClassifyVO1.getNamePath();
- WriteExcelData namePathWriteExcelData= new WriteExcelData(rowIndex[0],2,namePath);
- namePathWriteExcelData.setWidth(40);
- namePathWriteExcelData.setCenter(false);
- classPathList.add(namePathWriteExcelData);
- rowIndex[0]++;
- });
-
- WriteExcelData excelData=new WriteExcelData();
- excelData.setMerged(true);
- excelData.setRow(1);
- excelData.setRowTo(2);
- excelData.setCol(4);
- excelData.setColTo(9);
- excelData.setCenter(false);
- excelData.setReadOnly(true);
- excelData.setObj("瀵煎叆鏁版嵁鏃讹紝鍒嗙被璺緞蹇呴』濉啓鍙跺瓙鑺傜偣璺緞\n(閫夋嫨鍙跺瓙鑺傜偣瀵煎叆鍒欎笉闇�瑕佸～鍐欏垎绫昏矾寰�)");
- excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
- classPathList.add(excelData);
-
- eo.addSheetDataList(codeClassifyVO.getName()+"鍒嗙被瀵圭収琛�",classPathList);
-
- String excelName = LocalFileUtil.getDefaultTempFolder() + File.separator + codeClassifyVO.getName() + "_瀵煎叆妯℃澘.xls";
- // eo.addSheetDataList(templateVOList.size()+"妯℃澘淇℃伅銆愯鍕垮垹闄ゆ垨绉诲姩銆�",tempEDList);
- ExcelUtil.writeDataToFile(excelName,eo);
- return excelName;
- }
-
- /**
- * 鐢熸垚瀵煎叆鐨勬枃浠�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param isHistory 鏄惁鍘嗗彶鏁版嵁瀵煎叆
- * @return excel鐨勬枃浠跺湴鍧�
- */
- @Override
- public String createImportExcel(String codeClassifyOid,boolean isHistory) {
- List<CodeClassifyTemplateVO> templateVOList=new ArrayList<>();
- VciBaseUtil.alertNotNull("瀵煎嚭妯℃澘","瀵煎嚭鐨勯厤缃�",codeClassifyOid,"涓婚搴撳垎绫荤殑涓婚敭");
- CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);
- if(isHistory){
- templateVOList= templateService.childTemplates(codeClassifyOid);
- }else{
- //鎵炬ā鏉�
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyOid);
- templateVOList.add(templateVO);
- }
-
- WriteExcelOption eo = new WriteExcelOption();
- eo.setAppend(true);
- //澧炲姞妯℃澘鐨勪俊鎭鍏�
- LinkedList<WriteExcelData> tempEDList = new LinkedList<>();
- tempEDList.add(new WriteExcelData(0,0,"妯℃澘涓婚敭"));
- tempEDList.add(new WriteExcelData(0,1,"妯℃澘浠ｅ彿"));
- tempEDList.add(new WriteExcelData(0,2,"妯℃澘鍚嶇О"));
- for(int j=0;j<templateVOList.size();j++){
- CodeClassifyTemplateVO templateVO=templateVOList.get(j);
-
- //缁勫悎鏍煎紡鐨勪笉瀵煎叆锛�
- // 鏋氫妇鐨勬彁渚涘簭鍒楃殑閫夋嫨
- //鏃堕棿鍏ㄩ儴缁熶竴涓簓yyy-MM-dd HH:mm:ss
- //鍙傜収鐨勮嚜琛岃緭鍏ュ悕绉�
- //鍒嗙被娉ㄥ叆鐨勪笉鐢紝閮芥槸瀵煎叆鍚庤嚜鍔ㄥ鐞嗙殑
- //缂栫爜锛岀姸鎬佺瓑瀛楁涓嶅鍏�
- List<CodeClassifyTemplateAttrVO> templateAttrVOS = templateVO.getAttributes().stream().filter(s ->
- !MdmEngineConstant.DEFAULT_ATTR_LIST.contains(s.getId())
- && StringUtils.isBlank(s.getComponentrule())
- && StringUtils.isBlank(s.getClassifyinvokeattr())
- && (isHistory || VciBaseUtil.getBoolean(s.getFormdisplayflag()))
- ).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(templateAttrVOS)){
- throw new VciBaseException("妯℃澘娌℃湁閰嶇疆浠讳綍銆愯〃鍗曟樉绀恒�戜负銆愭槸銆戠殑灞炴��");
- }
- List<CodeClassifyTemplateAttrVO> idAttrVOList = templateVO.getAttributes().stream().filter(s -> s.getId().equalsIgnoreCase(MdmEngineConstant.CODE_FIELD)).collect(Collectors.toList());
- LinkedList<WriteExcelData> excelDataList = new LinkedList<>();
- Workbook workbook = new HSSFWorkbook();
- if(isHistory){
- excelDataList.add(new WriteExcelData(0,0,"鍒嗙被璺緞"));
- excelDataList.add(new WriteExcelData(0,1,"鐮佹瀹藉害"));
- excelDataList.add(new WriteExcelData(0,2,!CollectionUtils.isEmpty(idAttrVOList)?idAttrVOList.get(0).getName():"浼佷笟缂栫爜"));
- }
- for (int i = 0; i < templateAttrVOS.size(); i++) {
- CodeClassifyTemplateAttrVO attrVO = templateAttrVOS.get(i);
- Object text = attrVO.getName();
- text = exportKeyAndRequired(workbook,attrVO,text);
- int colIndex = (isHistory?3:0) + i;
- WriteExcelData excelData = new WriteExcelData(0, colIndex, text);
- if(StringUtils.isNotBlank(attrVO.getCodedateformat())
- || VciFieldTypeEnum.VTDateTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())
- || VciFieldTypeEnum.VTDate.name().equalsIgnoreCase(attrVO.getAttributedatatype())
- ||VciFieldTypeEnum.VTTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
- excelData.setDateFormat(VciDateUtil.DateTimeFormat);
- }
- if(text instanceof RichTextString){
- excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
- }
- excelDataList.add(excelData);
- if(StringUtils.isNotBlank(attrVO.getEnumString()) || StringUtils.isNotBlank(attrVO.getEnumid())){
- //娣诲姞鏁版嵁鏈夋晥鎬�
- List<String> enumValueList = new ArrayList<>();
- enumValueList.add("");
- List<KeyValue> valueList = engineService.listComboboxItems(attrVO);
- if(!CollectionUtils.isEmpty(valueList)){
- valueList.stream().forEach(kv->{
- enumValueList.add(kv.getValue());
- });
- }
- //榛樿鍔�1涓囨潯
- WriteExcelData ed = new WriteExcelData(1,colIndex,"");
- ed.setRowTo(100);
- ed.setColTo(colIndex);
- ed.setValidation(true);
- ed.setValidationDataList(enumValueList);
- ed.setValidationErrorMsg("璇峰湪搴忓垪涓�夋嫨姝ｇ‘鐨勫��");
- excelDataList.add(ed);
- }
- if(VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
- List<String> booleanList = new ArrayList<>();
-
- booleanList.add("鏄�");
- booleanList.add("鍚�");
- //榛樿鍔�1涓囨潯
- WriteExcelData ed = new WriteExcelData(1,colIndex,"");
- ed.setRowTo(100);
- ed.setColTo(colIndex);
- ed.setValidation(true);
- ed.setValidationDataList(booleanList);
- ed.setValidationErrorMsg("璇峰湪搴忓垪涓�夋嫨姝ｇ‘鐨勫��");
- excelDataList.add(ed);
- }
- }
- eo.addSheetDataList(j+templateVO.getName(),excelDataList);
- tempEDList.add(new WriteExcelData(j+1,0,templateVO.getOid()));
- tempEDList.add(new WriteExcelData(j+1,1,templateVO.getId()));
- tempEDList.add(new WriteExcelData(j+1,2,templateVO.getName()));
- }
- String excelName = LocalFileUtil.getDefaultTempFolder() + File.separator + codeClassifyVO.getName() + (isHistory?"_鍘嗗彶鏁版嵁瀵煎叆妯℃澘.xls": "_瀵煎叆妯℃澘.xls");
- eo.addSheetDataList(templateVOList.size()+"妯℃澘淇℃伅銆愯鍕垮垹闄ゆ垨绉诲姩銆�",tempEDList);
- ExcelUtil.writeDataToFile(excelName,eo);
- return excelName;
- }
-
-
- /**
- * 鐢熸垚瀵煎叆鐨勬枃浠�
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param isHistory 鏄惁鍘嗗彶鏁版嵁瀵煎叆
- * @return excel鐨勬枃浠跺湴鍧�
- */
- /*@Override
- public String createImportExcel(String codeClassifyOid,boolean isHistory) {
- CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);
- if(isHistory && !templateService.checkChildHasSameTemplate(codeClassifyOid)){
- throw new VciBaseException("褰撳墠閫夋嫨鐨勪富棰樺簱鍒嗙被鐨勬墍鏈変笅绾ц妭鐐逛腑瀛樺湪涓嶅悓鐨勬ā鏉跨殑鎯呭喌");
- }
- //鎵炬ā鏉�
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
- //缁勫悎鏍煎紡鐨勪笉瀵煎叆锛�
- //鏋氫妇鐨勬彁渚涘簭鍒楃殑閫夋嫨
- //鏃堕棿鍏ㄩ儴缁熶竴涓簓yyy-MM-dd HH:mm:ss
- //鍙傜収鐨勮嚜琛岃緭鍏ュ悕绉�
- //鍒嗙被娉ㄥ叆鐨勪笉鐢紝閮芥槸瀵煎叆鍚庤嚜鍔ㄥ鐞嗙殑
- //缂栫爜锛岀姸鎬佺瓑瀛楁涓嶅鍏�
- List<CodeClassifyTemplateAttrVO> templateAttrVOS = templateVO.getAttributes().stream().filter(s ->
- !DEFAULT_ATTR_LIST.contains(s.getId())
- && StringUtils.isBlank(s.getComponentrule())
- && StringUtils.isBlank(s.getClassifyinvokeattr())
- && (isHistory || VciBaseUtil.getBoolean(s.getFormdisplayflag()))
- ).collect(Collectors.toList());
- if(CollectionUtils.isEmpty(templateAttrVOS)){
- throw new VciBaseException("妯℃澘娌℃湁閰嶇疆浠讳綍銆愯〃鍗曟樉绀恒�戜负銆愭槸銆戠殑灞炴��");
- }
- List<CodeClassifyTemplateAttrVO> idAttrVOList = templateVO.getAttributes().stream().filter(s -> s.getId().equalsIgnoreCase(CODE_FIELD)).collect(Collectors.toList());
- List<WriteExcelData> excelDataList = new ArrayList<>();
- Workbook workbook = new HSSFWorkbook();
- if(isHistory){
- excelDataList.add(new WriteExcelData(0,0,"鍒嗙被璺緞"));
- excelDataList.add(new WriteExcelData(0,1,"鐮佹瀹藉害"));
- excelDataList.add(new WriteExcelData(0,2,!CollectionUtils.isEmpty(idAttrVOList)?idAttrVOList.get(0).getName():"浼佷笟缂栫爜"));
- }
- for (int i = 0; i < templateAttrVOS.size(); i++) {
- CodeClassifyTemplateAttrVO attrVO = templateAttrVOS.get(i);
- Object text = attrVO.getName();
- text = exportKeyAndRequired(workbook,attrVO,text);
- int colIndex = (isHistory?3:0) + i;
- WriteExcelData excelData = new WriteExcelData(0, colIndex, text);
- if(StringUtils.isNotBlank(attrVO.getCodedateformat())
- || VciFieldTypeEnum.VTDateTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())
- || VciFieldTypeEnum.VTDate.name().equalsIgnoreCase(attrVO.getAttributedatatype())
- ||VciFieldTypeEnum.VTTime.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
- excelData.setDateFormat(VciDateUtil.DateTimeFormat);
- }
- if(text instanceof RichTextString){
- excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
- }
- excelDataList.add(excelData);
- if(StringUtils.isNotBlank(attrVO.getEnumString()) || StringUtils.isNotBlank(attrVO.getEnumid())){
- //娣诲姞鏁版嵁鏈夋晥鎬�
- List<String> enumValueList = new ArrayList<>();
- enumValueList.add("");
- List<KeyValue> valueList = engineService.listComboboxItems(attrVO);
- if(!CollectionUtils.isEmpty(valueList)){
- valueList.stream().forEach(kv->{
- enumValueList.add(kv.getValue());
- });
- }
- //榛樿鍔�1涓囨潯
- WriteExcelData ed = new WriteExcelData(1,colIndex,"");
- ed.setRowTo(100);
- ed.setColTo(colIndex);
- ed.setValidation(true);
- ed.setValidationDataList(enumValueList);
- ed.setValidationErrorMsg("璇峰湪搴忓垪涓�夋嫨姝ｇ‘鐨勫��");
- excelDataList.add(ed);
- }
- if(VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(attrVO.getAttributedatatype())){
- List<String> booleanList = new ArrayList<>();
-
- booleanList.add("鏄�");
- booleanList.add("鍚�");
- //榛樿鍔�1涓囨潯
- WriteExcelData ed = new WriteExcelData(1,colIndex,"");
- ed.setRowTo(100);
- ed.setColTo(colIndex);
- ed.setValidation(true);
- ed.setValidationDataList(booleanList);
- ed.setValidationErrorMsg("璇峰湪搴忓垪涓�夋嫨姝ｇ‘鐨勫��");
- excelDataList.add(ed);
- }
- }
- //澧炲姞妯℃澘鐨勪俊鎭鍏�
- List<WriteExcelData> tempEDList = new ArrayList<>();
- tempEDList.add(new WriteExcelData(0,0,templateVO.getOid()));
- tempEDList.add(new WriteExcelData(0,1,templateVO.getId()));
- tempEDList.add(new WriteExcelData(0,2,templateVO.getName()));
- String excelName = LocalFileUtil.getDefaultTempFolder() + File.separator + codeClassifyVO.getName() + (isHistory?"_鍘嗗彶鏁版嵁瀵煎叆妯℃澘.xls": "_瀵煎叆妯℃澘.xls");
- WriteExcelOption eo = new WriteExcelOption(excelDataList);
- eo.addSheetDataList("妯℃澘淇℃伅銆愯鍕垮垹闄ゆ垨绉诲姩銆�",tempEDList);
- ExcelUtil.writeDataToFile(excelName,eo);
- return excelName;
- }*/
-
- /**
- * 鎵归噺鐢宠缂栫爜鏁版嵁
- *
- * @param orderDTO 缂栫爜鐢宠淇℃伅锛屽繀椤诲寘鍚垎绫讳富閿拰鐮佹鐨勪俊鎭�
- * @param file excel鏂囦欢鐨勪俊鎭�
- * @return 鏈夐敊璇俊鎭殑excel鐨勬枃浠�
- */
- @Override
- public CodeImProtRusultVO batchImportCode(CodeOrderDTO orderDTO, File file) {
- VciBaseUtil.alertNotNull(orderDTO,"缂栫爜鐢宠鐩稿叧鐨勬暟鎹�",orderDTO.getCodeClassifyOid(),"涓婚搴撳垎绫讳富閿�");
- ReadExcelOption reo = new ReadExcelOption();
- reo.setReadAllSheet(true);
- List<SheetDataSet> sheetDataSetList = ExcelUtil.readDataObjectFromExcel(file,null,reo);
- if(CollectionUtils.isEmpty(sheetDataSetList) || CollectionUtils.isEmpty(sheetDataSetList.get(0).getRowData())
- ||sheetDataSetList.get(0).getRowData().size()<1){
- throw new VciBaseException("娌℃湁璇诲彇鍒颁换浣曠殑鏁版嵁");
- }
- if(sheetDataSetList.size()>LIMIT+1){
- throw new VciBaseException("涓轰簡淇濊瘉绯荤粺鐨勭ǔ瀹氭�э紝璇蜂竴娆′笉瑕佸鍏ヨ秴杩�1涓囨潯鐨勬暟鎹�");
- }
- //鍏堟壘鍒版瘡涓�琛岀殑鏍囬锛岀劧鍚庢牴鎹爣棰樻潵鑾峰彇瀵瑰簲鐨勫睘鎬�
- SheetDataSet dataSet = sheetDataSetList.get(0);
- //鎵剧涓�琛岋紝涓轰簡鎵炬爣棰�
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(orderDTO.getCodeClassifyOid());
- //鏍￠獙妯℃澘鏄笉鏄渶鏂扮殑
- checkTemplateSync(sheetDataSetList,templateVO,0);
- //鍏堜笉鐢ㄧ灞炴�ф槸鍚﹂兘瀛樺湪锛屽厛杞崲涓�涓嬫暟鎹�
- Map<String,String> errorMap = new HashMap<>();
- String redisUUid=batchImportCodes(orderDTO,templateVO,dataSet,errorMap,true);
- CodeImProtRusultVO codeImProtRusultVO = new CodeImProtRusultVO();
- List<String> needRowIndexList = new ArrayList<>();
- String filePath = returnErrorToExcel(dataSet.getRowData(), errorMap, needRowIndexList, dataSet.getColName());
- if(StringUtils.isNotBlank(filePath)) {
- codeImProtRusultVO.setFilePath(filePath);
- }
- if(StringUtils.isNotBlank(redisUUid)){
- codeImProtRusultVO.setRedisUuid(redisUUid);
- }
- return codeImProtRusultVO;
- }
-
-
- /***
- * 鎵归噺澶勭悊鐢宠鏁版嵁
- * @param orderDTO
- * @param templateVO
- * @param dataSet
- * @return
- */
- private String batchImportCodes(CodeOrderDTO orderDTO,CodeClassifyTemplateVO templateVO,SheetDataSet dataSet,Map<String,String> errorMap,boolean isEnumType){
- List<String> codeList=new ArrayList<>();
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
- //瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
- CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
- //1.鍒ゆ柇瑙勫垯涓櫎浜嗘祦姘寸爜娈碉紝鏄惁鏈夊叾浠栫爜娈�
- engineService.checkSecValueOnOrder(ruleVO,orderDTO);
- List<SheetRowData> rowDataList = dataSet.getRowData();
-
- //闄ゅ幓榛樿鐨勫睘鎬�.杩樻湁鍙湁琛ㄥ崟鏄剧ず鐨勫瓧娈垫墠瀵煎叆
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s ->
- !MdmEngineConstant.DEFAULT_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
- Map<Integer/**鍒楀彿**/,String/**瀛楁鐨勫悕绉�**/> fieldIndexMap = new HashMap<>();
- List<String> titleRowData = dataSet.getColName();
- Map<String/**涓枃鍚嶇О**/, String/**鑻辨枃鍚嶇О**/> attrNameIdMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getName(), t -> t.getId().toLowerCase(Locale.ROOT),(o1, o2)->o2));
- getFieldIndexMap(titleRowData,attrNameIdMap,fieldIndexMap);
-
- //闇�瑕佸垽鏂槸鍚︽墍鏈夌殑灞炴�ч兘鍦ㄦā鏉夸笂浜�
- List<CodeClassifyTemplateAttrVO> unExistAttrVOs = attrVOS.stream().filter(s -> !fieldIndexMap.containsValue(s.getId().toLowerCase(Locale.ROOT))
- && StringUtils.isBlank(s.getComponentrule()) && StringUtils.isBlank(s.getClassifyinvokeattr())//缁勫悎瑙勫垯鍜屽垎绫绘敞鍏ョ‘瀹炴病缁欑敤鎴峰鍑哄幓
- ).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(unExistAttrVOs)){
- throw new VciBaseException("銆�" + unExistAttrVOs.stream().map(CodeClassifyTemplateAttrVO::getName) + "銆戣繖浜涘睘鎬у湪鍒楄〃涓病鏈夋壘鍒�");
- }
- List<ClientBusinessObject> cboList = new ArrayList<>();
- String fullPath = getFullPath(classifyFullInfo);
- excelToCbo(classifyFullInfo,fieldIndexMap,rowDataList,templateVO,cboList,fullPath,true);
-
- //閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
- //濡傛灉鍑洪敊浜嗭紝鎴戜滑渚濈劧鎵ц鏈夋晥鐨勬暟鎹紝鏃犳晥鐨勬暟鎹啓鍥炲埌excel涓�
- //2.鍒ゆ柇蹇呰緭椤广�傘�傞渶瑕佸叏閮ㄧ殑灞炴�э紝濡傛灉鏄繀杈擄紝浣嗘槸琛ㄥ崟閲岄潰涓嶆樉绀虹殑锛屽彧鑳芥槸鍒嗙被娉ㄥ叆鎴栬�呯粍鍚堣鍒�
- batchCheckRequiredAttrOnOrder(templateVO,cboList,errorMap);
- //3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList);
- Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
- Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
- if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
- selfRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍦ㄥ綋鍓嶅鐞嗙殑鏁版嵁鏂囦欢涓叧閿睘鎬ч噸澶�" );
- });
- }
- if(!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)){
- keyAttrRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
- });
- }
- //鍒嗙被娉ㄥ叆
- batchSwitchClassifyAttrOnOrder(attrVOS,cboList,classifyFullInfo,false);
- //boolean
- reSwitchBooleanAttrOnOrder(attrVOS,cboList);
- //4.鏍￠獙瑙勫垯
- batchCheckVerifyOnOrder(attrVOS, cboList,errorMap);
- if(isEnumType) {//鏄惁闇�瑕佹牎楠屾灇涓�/鍙傜収
- //5.鏍￠獙鏋氫妇鏄惁姝ｇ‘
- batchSwitchEnumAttrOnOrder(attrVOS, cboList, errorMap);
- //7.澶勭悊鍙傜収鐨勬儏鍐�
- batchSwitchReferAttrOnOrder(attrVOS,cboList,errorMap);
- }
- //6.鏃堕棿鏍煎紡鐨勯獙璇�
- //6.鏃堕棿鐨勶紝蹇呴』缁熶竴涓簓yyy-MM-dd HH:mm:ss
- batchSwitchDateAttrOnOrder(attrVOS,cboList,errorMap);
- //鏈�鍚庡紕缁勫悎瑙勫垯
- batchSwitchComponentAttrOnOrder(attrVOS,cboList);
- String uuid=redisService.getUUIDEveryDay();
- Map<String, ClientBusinessObject> rowIndexCboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getAttributeValue((MdmEngineConstant.IMPORT_ROW_INDEX)), t -> t));
-
- if(errorMap.size()>0) {
- createRedisDatas(uuid + "-error",templateVO, rowIndexCboMap, dataSet, fieldIndexMap, errorMap,false);
- }
- boolean isCreateUUid=false;
- List<ClientBusinessObject> needSaveCboList = cboList.stream().filter(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
- //鐩镐技鏍￠獙
- Map<String,String>resembleMap=new HashMap<>();
- List<DataResembleVO> dataResembleVOS=new ArrayList<>();
- String btmtypeid= classifyFullInfo.getTopClassifyVO().getBtmtypeid();
- bathcResembleQuery(orderDTO.getCodeClassifyOid(),templateVO,needSaveCboList,resembleMap,btmtypeid,dataResembleVOS);
- if(resembleMap.size()>0) {
- isCreateUUid=true;
- if(!CollectionUtils.isEmpty(dataResembleVOS)) {
- redisService.setCacheList(uuid + "-resemble-data", dataResembleVOS);
- createRedisDatas(uuid + "-resemble",templateVO, rowIndexCboMap, dataSet, fieldIndexMap, resembleMap, false);
- }
- }
- //鎺掗櫎閿欒鐨勶紝鍓╀笅姝ｇ‘鐨�
- Map<String,String> newErrorMap=new HashMap<>();
- newErrorMap.putAll(resembleMap);
- newErrorMap.putAll(errorMap);
- needSaveCboList = cboList.stream().filter(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !newErrorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
- if((errorMap.size()>0&&needSaveCboList.size()>0)||resembleMap.size()>0){
- isCreateUUid=true;
- }
- createRedisByCodeClassify(uuid + "-class",templateVO,dataSet,fieldIndexMap,false);
- if(newErrorMap.size()>0) {
- createRedisDatas(uuid + "-ok",templateVO, rowIndexCboMap, dataSet, fieldIndexMap, newErrorMap,true);
- }else {
- uuid="";
- //瑕佹妸浠ヤ笂鐨勯敊璇殑閮芥姏鍑哄悗锛屽啀缁х画澶勭悊鏃堕棿鍜岀粍鍚堣鍒�
- needSaveCboList = cboList.stream().filter(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !newErrorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(needSaveCboList)) {
- //9.鎴戜滑澶勭悊涓氬姟鏁版嵁
- //鐢熸垚缂栫爜鐨勫唴瀹�
- codeList = productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), needSaveCboList);
- //濡傛灉鏄紪鐮佺敓鎴愬け璐ワ紝鍒欑洿鎺ュ氨澶辫触浜嗭紝鍏朵粬鐨勫垽鏂嚭鏉ユ湁閿欒鐨勬垜浠兘缁熶竴杩斿洖鍒癳xcel閲岄潰
- engineService.batchSaveSelectChar(templateVO, needSaveCboList);
- }
- }
- if(!isCreateUUid){
- return uuid="";
- }
- return uuid;
- }
-
- /***
- * 瀛樺偍鍒嗙被瀵硅薄鍙婂叾鍒楀悕
- * @param uuid
- * @param templateVOList
- * @param dataSet
- * @param fieldIndexMap
- * @param iscContain
- */
- private void createRedisByCodeClassify(String uuid,CodeClassifyTemplateVO templateVOList,SheetDataSet dataSet, Map<Integer/**鍒楀彿**/,String/**瀛楁鐨勫悕绉�**/> fieldIndexMap,boolean iscContain){
- List<ColumnVO> columnVOList = new ArrayList<>();
- List<String> outNameList = dataSet.getColName();
- fieldIndexMap.forEach((integer, s) -> {
- ColumnVO columnVOS = new ColumnVO();
- String field = fieldIndexMap.get(integer);
- String outName = outNameList.get(integer);
- columnVOS.setField(field);
- columnVOS.setTitle(outName);
- columnVOList.add(columnVOS);
- });
- CodeImportTemplateVO codeImportTemplateVO=new CodeImportTemplateVO();
- codeImportTemplateVO.setCodeClassifyTemplateVO(templateVOList);
- codeImportTemplateVO.setCloNamesList(columnVOList);
- List<CodeImportTemplateVO> codeImportTemplateVOs= new ArrayList<>();
- codeImportTemplateVOs.add(codeImportTemplateVO);
- redisService.setCacheList(uuid,codeImportTemplateVOs);
- redisService.expire(uuid,6000000);//redis杩囨湡鏃堕棿
- logger.info("");
- }
- private void createRedisDatas(String uuid,CodeClassifyTemplateVO templateVO,Map<String,ClientBusinessObject> rowIndexCbo, SheetDataSet dataSet, Map<Integer/**鍒楀彿**/,String/**瀛楁鐨勫悕绉�**/> fieldIndexMap,Map<String,String> errorMap,boolean isok){
- List<SheetRowData> needsheetRowDataList =new ArrayList<>();
- if(errorMap.size()>0) {
- //瑕佹妸浠ヤ笂鐨勯敊璇殑閮芥姏鍑哄悗锛屽啀缁х画澶勭悊鏃堕棿鍜岀粍鍚堣鍒�
- needsheetRowDataList = dataSet.getRowData().stream().filter(cbo -> {
- String rowIndex=cbo.getRowIndex();
- return isok? !errorMap.containsKey(rowIndex):errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
-
- }else{
- needsheetRowDataList= dataSet.getRowData();
- }
- Map<String/**涓枃鍚嶇О**/, SheetRowData/**鑻辨枃鍚嶇О**/> rowIdexDataMap = needsheetRowDataList.stream().collect(Collectors.toMap(s -> s.getRowIndex(), t -> t,(o1, o2)->o2));
- Map<String, CodeImprotDataVO> clsfDataMap=new HashMap<>();
- rowIndexCbo .forEach((rowIndex, cbo) -> {
- CodeImprotDataVO codeImprotDataVO = new CodeImprotDataVO();
- codeImprotDataVO.setTemplateOid(templateVO.getOid());
- List<Map<String, String>> dataList = new ArrayList<>();
- if(rowIdexDataMap.containsKey(rowIndex)){
- SheetRowData sheetRowData=rowIdexDataMap.get(rowIndex);
- Map<String, String> dataMap = new HashMap<>();
- Map<Integer, String> data = sheetRowData.getData();
- fieldIndexMap.forEach((integer, s) -> {
- String field = fieldIndexMap.get(integer);
- if (data.containsKey(integer)) {
- String vlues = data.get(integer);
- dataMap.put(field, vlues);
- }
- });
- dataMap.put("oid",cbo.getOid());
- dataList.add(dataMap);
- }
- if(clsfDataMap.containsKey(templateVO.getOid())){
- codeImprotDataVO=clsfDataMap.get(templateVO.getOid());
- dataList.addAll(codeImprotDataVO.getDatas());
- }
- codeImprotDataVO.setColNames(dataSet.getColName());
- codeImprotDataVO.setDatas(dataList);
- clsfDataMap.put(templateVO.getOid(),codeImprotDataVO);
- });
- if(!CollectionUtils.isEmpty(clsfDataMap)) {
- Collection codeImprotDataVOS=clsfDataMap.values();
- List<CodeImprotDataVO> codeImprotDataVOList=new ArrayList<>();
- codeImprotDataVOList.addAll(codeImprotDataVOS);
- redisService.setCacheList(uuid+"-"+templateVO.getOid(), codeImprotDataVOList);
- redisService.expire(uuid+"-"+templateVO.getOid(),6000000);//redis杩囨湡鏃堕棿
- }
- }
- /***
- * 鎵归噺澶勭悊鐢宠鏁版嵁
- * @param orderDTO
- * @param templateVO
- * @param dataSet
- * @return
- */
- @Override
- public List<String> batchImportCode(CodeOrderDTO orderDTO,CodeClassifyTemplateVO templateVO,SheetDataSet dataSet,Map<String,String> errorMap,boolean isEnumType){
- List<String> codeList=new ArrayList<>();
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
- //瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
- CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
- //1.鍒ゆ柇瑙勫垯涓櫎浜嗘祦姘寸爜娈碉紝鏄惁鏈夊叾浠栫爜娈�
- engineService.checkSecValueOnOrder(ruleVO,orderDTO);
- List<SheetRowData> rowDataList = dataSet.getRowData();
-
- //闄ゅ幓榛樿鐨勫睘鎬�.杩樻湁鍙湁琛ㄥ崟鏄剧ず鐨勫瓧娈垫墠瀵煎叆
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s ->
- !MdmEngineConstant.DEFAULT_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
- Map<Integer/**鍒楀彿**/,String/**瀛楁鐨勫悕绉�**/> fieldIndexMap = new HashMap<>();
- List<String> titleRowData = dataSet.getColName();
- Map<String/**涓枃鍚嶇О**/, String/**鑻辨枃鍚嶇О**/> attrNameIdMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getName(), t -> t.getId().toLowerCase(Locale.ROOT),(o1, o2)->o2));
- getFieldIndexMap(titleRowData,attrNameIdMap,fieldIndexMap);
-
- //闇�瑕佸垽鏂槸鍚︽墍鏈夌殑灞炴�ч兘鍦ㄦā鏉夸笂浜�
- List<CodeClassifyTemplateAttrVO> unExistAttrVOs = attrVOS.stream().filter(s -> !fieldIndexMap.containsValue(s.getId().toLowerCase(Locale.ROOT))
- && StringUtils.isBlank(s.getComponentrule()) && StringUtils.isBlank(s.getClassifyinvokeattr())//缁勫悎瑙勫垯鍜屽垎绫绘敞鍏ョ‘瀹炴病缁欑敤鎴峰鍑哄幓
- ).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(unExistAttrVOs)){
- throw new VciBaseException("銆�" + unExistAttrVOs.stream().map(CodeClassifyTemplateAttrVO::getName) + "銆戣繖浜涘睘鎬у湪鍒楄〃涓病鏈夋壘鍒�");
- }
- List<ClientBusinessObject> cboList = new ArrayList<>();
- String fullPath = getFullPath(classifyFullInfo);
- excelToCbo(classifyFullInfo,fieldIndexMap,rowDataList,templateVO,cboList,fullPath,true);
-
- //閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
- //濡傛灉鍑洪敊浜嗭紝鎴戜滑渚濈劧鎵ц鏈夋晥鐨勬暟鎹紝鏃犳晥鐨勬暟鎹啓鍥炲埌excel涓�
- //2.鍒ゆ柇蹇呰緭椤广�傘�傞渶瑕佸叏閮ㄧ殑灞炴�э紝濡傛灉鏄繀杈擄紝浣嗘槸琛ㄥ崟閲岄潰涓嶆樉绀虹殑锛屽彧鑳芥槸鍒嗙被娉ㄥ叆鎴栬�呯粍鍚堣鍒�
- batchCheckRequiredAttrOnOrder(templateVO,cboList,errorMap);
- //3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList);
- Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
- Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
- if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
- selfRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍦ㄥ綋鍓嶅鐞嗙殑鏁版嵁鏂囦欢涓叧閿睘鎬ч噸澶�" );
- });
- }
- if(!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)){
- keyAttrRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
- });
- }
- //鍒嗙被娉ㄥ叆
- batchSwitchClassifyAttrOnOrder(attrVOS,cboList,classifyFullInfo,false);
- //boolean
- reSwitchBooleanAttrOnOrder(attrVOS,cboList);
- //4.鏍￠獙瑙勫垯
- batchCheckVerifyOnOrder(attrVOS, cboList,errorMap);
- if(isEnumType) {//鏄惁闇�瑕佹牎楠屾灇涓�/鍙傜収
- //5.鏍￠獙鏋氫妇鏄惁姝ｇ‘
- batchSwitchEnumAttrOnOrder(attrVOS, cboList, errorMap);
- //7.澶勭悊鍙傜収鐨勬儏鍐�
- batchSwitchReferAttrOnOrder(attrVOS,cboList,errorMap);
- }
- //6.鏃堕棿鏍煎紡鐨勯獙璇�
- //6.鏃堕棿鐨勶紝蹇呴』缁熶竴涓簓yyy-MM-dd HH:mm:ss
- batchSwitchDateAttrOnOrder(attrVOS,cboList,errorMap);
- //鏈�鍚庡紕缁勫悎瑙勫垯
- batchSwitchComponentAttrOnOrder(attrVOS,cboList);
- //瑕佹妸浠ヤ笂鐨勯敊璇殑閮芥姏鍑哄悗锛屽啀缁х画澶勭悊鏃堕棿鍜岀粍鍚堣鍒�
- List<ClientBusinessObject> needSaveCboList = cboList.stream().filter(cbo -> {
- String rowIndex =cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
-
- if(!CollectionUtils.isEmpty(needSaveCboList)) {
- //9.鎴戜滑澶勭悊涓氬姟鏁版嵁
- //鐢熸垚缂栫爜鐨勫唴瀹�
- codeList= productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), needSaveCboList);
- //濡傛灉鏄紪鐮佺敓鎴愬け璐ワ紝鍒欑洿鎺ュ氨澶辫触浜嗭紝鍏朵粬鐨勫垽鏂嚭鏉ユ湁閿欒鐨勬垜浠兘缁熶竴杩斿洖鍒癳xcel閲岄潰
- engineService.batchSaveSelectChar(templateVO,needSaveCboList);
- }
- return codeList;
- }
- private LinkedList<CodeClassifyTemplateVO> checkSamesTemplate(List<String> titleRowData, List<SheetDataSet> sheetDataSetList,int shetNumber,Map<String/**璺緞**/, CodeClassifyVO> pathMap,Map<String,String>errorMap) throws Throwable {
- Map<String,String>pathOidMap =new HashMap<>();
- Map<String,String> templateIdRowIndex=new HashedMap();
- SheetDataSet dataSet= sheetDataSetList.get(shetNumber);
- LinkedHashMap<String,CodeClassifyTemplateVO> codeClassifyTemplateVOMap=new LinkedHashMap <String,CodeClassifyTemplateVO>();
- for (int i=0; i<titleRowData.size();i++){
- String title= titleRowData.get(i);
- if(title.equals("鍒嗙被璺緞")) {
- int finalI = i;
- dataSet.getRowData().stream().forEach(sheetRowData -> {
- String Path = sheetRowData.getData().get(finalI);
- String rowIndex=sheetRowData.getRowIndex();
- CodeClassifyTemplateVO newTemplateVO=new CodeClassifyTemplateVO();
- String templateOid="";
- if(pathOidMap.containsKey(Path)){
- templateOid= pathOidMap.get(Path) ;
- newTemplateVO=codeClassifyTemplateVOMap.get(templateOid);
- }else{
- if(pathMap.containsKey(Path)){
- CodeClassifyVO codeClassifyVO=pathMap.get(Path);
- newTemplateVO =engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
- if(newTemplateVO!=null){
- templateOid=newTemplateVO.getOid();
- }else{
- errorMap.put(rowIndex,"绗�"+rowIndex+"琛岋紝鍒嗙被璺緞鏈煡璇㈠埌鐩稿簲鐨勫垎绫绘ā鏉�");
- }
- }else{
- errorMap.put(rowIndex,"绗�"+rowIndex+"琛岋紝鍒嗙被璺緞鏈煡璇㈠埌鐩稿簲鐨勫垎绫�");
- }
- }
- pathOidMap.put(Path, templateOid);
- codeClassifyTemplateVOMap.put(templateOid, newTemplateVO);
- templateIdRowIndex.put(templateOid, templateIdRowIndex.getOrDefault(templateOid, "") + "锛�" +rowIndex );
- });
- break;
- }
- }
- LinkedList<CodeClassifyTemplateVO> codeClassifyTemplateVOList=new LinkedList<>();
- StringBuffer sb=new StringBuffer();
- codeClassifyTemplateVOMap.keySet().forEach(tempateOid->{
- String templateOidInExcel="";
- String tempateName="";
- CodeClassifyTemplateVO t= codeClassifyTemplateVOMap.get(tempateOid);
- codeClassifyTemplateVOList.add(t);
- if(!CollectionUtils.isEmpty(sheetDataSetList)
- && sheetDataSetList.size()>1 && !CollectionUtils.isEmpty(sheetDataSetList.get(sheetDataSetList.size()-1).getColName())){
- List<SheetRowData> rowData= sheetDataSetList.get(sheetDataSetList.size()-1).getRowData();
- templateOidInExcel=rowData.get(shetNumber).getData().get(0);
- tempateName=rowData.get(shetNumber).getData().get(2);
- //templateOidInExcel = sheetDataSetList.get(sheetDataSetList.size()-1).getColName().get(sheetDataSetList.size()-i);
- }
- if(StringUtils.isBlank(templateOidInExcel) || !templateOidInExcel.equalsIgnoreCase(tempateOid)){
- sb.append("妯℃澘銆�"+tempateName+"銆戜腑绗�"+templateIdRowIndex.get(tempateOid)+"琛屾暟鎹笉灞炰簬褰撳墠妯℃澘鐨勬暟鎹紝璇锋牳瀵�!");
- }
- });
- if(StringUtils.isNotBlank(sb)){
- throw new Throwable(sb.toString());
- }
- if(codeClassifyTemplateVOList.size()>1){
- String message="妯℃澘銆�"+dataSet.getSheetName()+"銆戞牴鎹垎绫昏矾寰勫垽鏂紝鍒嗙被瀛樺湪澶氫釜妯℃澘";
-
- throw new Throwable(message);
- }
- if(codeClassifyTemplateVOList.size()==0){
- String message="妯℃澘銆�"+dataSet.getSheetName()+"銆戞牴鎹暟鎹垎绫昏矾寰勫垽鏂紝鏈尮閰嶅埌瀵瑰簲妯℃澘";
- throw new Throwable(message);
- }
- return codeClassifyTemplateVOList ;
- }
- /**
- * 鏍￠獙妯℃澘鏄惁涓哄悓姝ョ殑
- * @param sheetDataSetList excel閲岀殑鍐呭
- * @param templateVO 妯℃澘鐨勪俊鎭�
- */
- private void checkTemplateSync(List<SheetDataSet> sheetDataSetList,CodeClassifyTemplateVO templateVO,int i){
- String templateOidInExcel = "";
- String templateName="";
- if(!CollectionUtils.isEmpty(sheetDataSetList)
- && sheetDataSetList.size()>1 && !CollectionUtils.isEmpty(sheetDataSetList.get(sheetDataSetList.size()-1).getColName())){
- List<SheetRowData> rowData= sheetDataSetList.get(sheetDataSetList.size()-1).getRowData();
- templateName=rowData.get(i).getData().get(2);
- templateOidInExcel=rowData.get(i).getData().get(0);
- //templateOidInExcel = sheetDataSetList.get(sheetDataSetList.size()-1).getColName().get(sheetDataSetList.size()-i);
- }
- /* if(!CollectionUtils.isEmpty(sheetDataSetList)
- && sheetDataSetList.size()>1 && !CollectionUtils.isEmpty(sheetDataSetList.get(sheetDataSetList.size()-1).getColName())){
- List<SheetRowData> rowData= sheetDataSetList.get(sheetDataSetList.size()-1).getRowData();
- templateOidInExcel=rowData.get(i).getData().get(0);
- //templateOidInExcel = sheetDataSetList.get(sheetDataSetList.size()-1).getColName().get(sheetDataSetList.size()-i);
- }*/
- if(StringUtils.isBlank(templateOidInExcel) || !templateOidInExcel.equalsIgnoreCase(templateVO.getOid())){
- throw new VciBaseException("妯℃澘銆�"+templateName+"銆戜腑鐨勬暟鎹幏鍙栫殑妯＄増淇℃伅涓庡綋鍓嶆ā鏉夸笉鍖归厤锛岃纭繚excel鏂囦欢閲屾湁銆愭ā鏉夸俊鎭�-璇峰嬁绉诲姩鎴栧垹闄ゃ�戠殑宸ヤ綔琛紝涓旂‘淇濇瘡娆″鍏ラ兘鏄厛涓嬭浇鐨勫鍏ユā鏉垮悗娣诲姞鐨勬暟鎹�");
- }
-
- }
-
- /***
- * 浠庨《灞傛壒閲忕敵璇峰鍏ユ柟娉�
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param classifyAttr 鍒嗙被璺緞浣跨敤鐨勫睘鎬�
- * @param file excel鏂囦欢鐨勪俊鎭�
- * @return
- */
- @Override
- public CodeImProtRusultVO batchTopImportCode(String codeClassifyOid, String classifyAttr, File file) {
- VciBaseUtil.alertNotNull(codeClassifyOid,"鍒嗙被鐨勪富閿�");
- ReadExcelOption reo = new ReadExcelOption();
- reo.setReadAllSheet(true);
- List<SheetDataSet> sheetDataSetList = ExcelUtil.readDataObjectFromExcel(file,null,reo);
- if(CollectionUtils.isEmpty(sheetDataSetList) || CollectionUtils.isEmpty(sheetDataSetList.get(0).getRowData())
- ||sheetDataSetList.get(0).getRowData().size()<1){
- throw new VciBaseException("娌℃湁璇诲彇鍒颁换浣曠殑鏁版嵁");
- }
- if(sheetDataSetList.size()>LIMIT+1){
- throw new VciBaseException("涓轰簡淇濊瘉绯荤粺鐨勭ǔ瀹氭�э紝璇蜂竴娆′笉瑕佸鍏ヨ秴杩�1涓囨潯鐨勬暟鎹�");
- }
- //鍏堟壘鍒版瘡涓�琛岀殑鏍囬锛岀劧鍚庢牴鎹爣棰樻潵鑾峰彇瀵瑰簲鐨勫睘鎬�
- SheetDataSet dataSet = sheetDataSetList.get(0);
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
-
- List<CodeClassifyVO> childClassifyVOs = classifyService.listChildrenClassify(codeClassifyOid, true, classifyAttr, true);
- Map<String/**璺緞**/, CodeClassifyVO> pathMap = Optional.ofNullable(childClassifyVOs).orElseGet(() -> new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getPath().startsWith("#") ? s.getPath().substring(1) : s.getPath(), t -> t));
- pathMap.put("#current#", classifyFullInfo.getCurrentClassifyVO());
- List<String> titleRowData = dataSet.getColName();
- Map<String, String> errorMap = new ConcurrentHashMap<>();
- //棣栧厛灏嗘暟鎹互妯℃澘鐨勫舰寮忓垎寮�
- LinkedHashMap<String,List<CodeImprotDataVO>> codeclassifyDataMap=new LinkedHashMap<>();
- List<CodeImprotDataVO> codeClassifyDatas=new ArrayList<>();
- createExeclClassData(dataSet,pathMap,errorMap,codeClassifyDatas);
- //鏍规嵁妯℃澘灏嗘暟鎹暣鍚堝湪涓�璧凤紝鍘绘牎楠�
- Map<String/**妯℃澘oid**/, List<CodeImprotDataVO>/**鏁版嵁瀵硅薄**/> templateDatasMap =codeClassifyDatas.stream().collect(Collectors.toMap(CodeImprotDataVO::getTemplateOid,s->{
- List<CodeImprotDataVO> l=new ArrayList<>();
- l.add(s);
- return l;
- },(List<CodeImprotDataVO> s1,List<CodeImprotDataVO> s2)->{
- s1.addAll(s2);
- return s1;
- }));
- String uuid=redisService.getUUIDEveryDay();
- List<CodeImportTemplateVO> codeImportTemplateVOS=new ArrayList<>();
- //鎸夌収妯℃澘鍘绘暣鐞嗘暟鎹�
- templateDatasMap.keySet().stream().forEach(templateVOOid->{
- List<CodeImprotDataVO> codeImprotDataVOS= templateDatasMap.get(templateVOOid);
- CodeClassifyTemplateVO templateVO= templateServiceI.getObjectHasAttrByOid(templateVOOid);
-
- //闄ゅ幓榛樿鐨勫睘鎬�.杩樻湁鍙湁琛ㄥ崟鏄剧ず鐨勫瓧娈垫墠瀵煎叆
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s ->
- !MdmEngineConstant.DEFAULT_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
-
- Map<String/**妯℃澘灞炴�у瓧娈祇id**/, String /**妯℃澘灞炴�у閮ㄥ悕绉�**/> fieldNameMap =attrVOS.stream().collect(Collectors.toMap(CodeClassifyTemplateAttrVO::getId,s->s.getName()));
-
- List<ClientBusinessObject> allCboList=new ArrayList<>();
- List<ColumnVO>columnVOList =new ArrayList();
- codeImprotDataVOS.stream().forEach(codeImprotDataVO -> {
- CodeImportTemplateVO codeImportTemplateVO=new CodeImportTemplateVO();
- codeImprotDataVO.getFields().stream().forEach(field->{
- ColumnVO columnVOS = new ColumnVO();
- String outName=fieldNameMap.get(field);
- columnVOS.setField(field);
- columnVOS.setTitle(outName);
- columnVOList.add(columnVOS);
-
- });
- codeImportTemplateVO.setCodeClassifyVO( codeImprotDataVO.getCodeClassifyVO());
- codeImportTemplateVO.setCodeClassifyTemplateVO( codeImprotDataVO.getCodeClassifyTemplateVO());
- List<String> colNames=codeImprotDataVO.getColNames();
- codeImportTemplateVO.setCloNamesList(columnVOList);
- codeImportTemplateVOS.add(codeImportTemplateVO);
- List<ClientBusinessObject> cboList=new ArrayList<>();
- excelToCbo(classifyFullInfo,codeImprotDataVO,cboList,true);
- allCboList.addAll(cboList);
-
- });
-
-
- //閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
- //濡傛灉鍑洪敊浜嗭紝鎴戜滑渚濈劧鎵ц鏈夋晥鐨勬暟鎹紝鏃犳晥鐨勬暟鎹啓鍥炲埌excel涓�
- //2.鍒ゆ柇蹇呰緭椤广�傘�傞渶瑕佸叏閮ㄧ殑灞炴�э紝濡傛灉鏄繀杈擄紝浣嗘槸琛ㄥ崟閲岄潰涓嶆樉绀虹殑锛屽彧鑳芥槸鍒嗙被娉ㄥ叆鎴栬�呯粍鍚堣鍒�
- batchCheckRequiredAttrOnOrder(templateVO,allCboList,errorMap);
- //3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, allCboList);
- Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
- Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
- if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
- selfRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍦ㄥ綋鍓嶅鐞嗙殑鏁版嵁鏂囦欢涓叧閿睘鎬ч噸澶�" );
- });
- }
- if(!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)){
- keyAttrRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
- });
- }
- //鍒嗙被娉ㄥ叆
- // batchSwitchClassifyAttrOnOrder(attrVOS,allCboList,classifyFullInfo,false);
- //boolean
- reSwitchBooleanAttrOnOrder(attrVOS,allCboList);
- //4.鏍￠獙瑙勫垯
- batchCheckVerifyOnOrder(attrVOS, allCboList,errorMap);
- //鏄惁闇�瑕佹牎楠屾灇涓�/鍙傜収
- //5.鏍￠獙鏋氫妇鏄惁姝ｇ‘
- batchSwitchEnumAttrOnOrder(attrVOS, allCboList, errorMap);
- //7.澶勭悊鍙傜収鐨勬儏鍐�
- batchSwitchReferAttrOnOrder(attrVOS,allCboList,errorMap);
-
- //6.鏃堕棿鏍煎紡鐨勯獙璇�
- //6.鏃堕棿鐨勶紝蹇呴』缁熶竴涓簓yyy-MM-dd HH:mm:ss
- batchSwitchDateAttrOnOrder(attrVOS,allCboList,errorMap);
- //鏈�鍚庡紕缁勫悎瑙勫垯
- batchSwitchComponentAttrOnOrder(attrVOS,allCboList);
-
-
- Map<String, ClientBusinessObject> rowIndexCboMap = allCboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getAttributeValue((MdmEngineConstant.IMPORT_ROW_INDEX)), t -> t));
-
- if(errorMap.size()>0) {
- createRedisDatas(uuid + "-error",templateVO,codeImprotDataVOS, errorMap,false);
- }
- List<ClientBusinessObject> needSaveCboList = allCboList.stream().filter(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
- //鐩镐技鏍￠獙
- Map<String,String>resembleMap=new HashMap<>();
- List<DataResembleVO> dataResembleVOS=new ArrayList<>();
- String btmtypeid= classifyFullInfo.getTopClassifyVO().getBtmtypeid();
- bathcResembleQuery(codeClassifyOid,templateVO,needSaveCboList,resembleMap,btmtypeid,dataResembleVOS);
- if(resembleMap.size()>0) {
- if(!CollectionUtils.isEmpty(dataResembleVOS)) {
- redisService.setCacheList(uuid + "-resemble-data", dataResembleVOS);
- createRedisDatas(uuid + "-resemble",templateVO, codeImprotDataVOS, resembleMap, false);
- }
- }
- //鎺掗櫎閿欒鐨勶紝鍓╀笅姝ｇ‘鐨�
- Map<String,String> newErrorMap=new HashMap<>();
- newErrorMap.putAll(resembleMap);
- newErrorMap.putAll(errorMap);
- needSaveCboList = allCboList.stream().filter(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !newErrorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
- createRedisDatas(uuid + "-ok",templateVO,codeImprotDataVOS, newErrorMap,true);
- });
- List<String> needRowIndexList=new ArrayList<>();
- CodeImProtRusultVO codeImProtRusultVO = new CodeImProtRusultVO();
- if(errorMap.size()>0) {
- String filePath = returnErrorToExcel(dataSet.getRowData(), errorMap, needRowIndexList, dataSet.getColName());
- if (StringUtils.isNotBlank(filePath)) {
- codeImProtRusultVO.setFilePath(filePath);
- }
- }
- if(StringUtils.isNotBlank(uuid)){
- //灏嗘墍鏈夌殑鍒嗙被瀛樺叆缂撳瓨涔嬩腑
- codeImProtRusultVO.setRedisUuid(uuid);
- redisService.setCacheList(uuid + "-class",codeImportTemplateVOS);
- // redisService.expire(uuid + "-class",6000000);
- }
- return codeImProtRusultVO;
- }
-
- /***
- * 鏍规嵁涓嶅悓妯℃澘缁勭粐execl鏁版嵁
- * @param dataSet
- * @param pathMap
- * @param errorMap
- */
- private void createExeclClassData(SheetDataSet dataSet,Map<String/**璺緞**/, CodeClassifyVO> pathMap,Map<String,String>errorMap,List<CodeImprotDataVO> codeClassifyDatas){
-
- Map<String,CodeImprotDataVO> pathDatas=new HashMap<>();
- List<String> titleRowData= dataSet.getColName();
- List<SheetRowData> rowDataList= dataSet.getRowData();
- LinkedHashMap<String,CodeClassifyTemplateVO> codeClassifyTemplateVOMap=new LinkedHashMap <String,CodeClassifyTemplateVO>();
- for (int i=0;i<titleRowData.size();i++){
- String title= titleRowData.get(i);
- if(title.equals("鍒嗙被璺緞")) {
- int finalI = i;
- rowDataList.stream().forEach(sheetRowData -> {
- CodeImprotDataVO dataVO=new CodeImprotDataVO();
- String Path = sheetRowData.getData().get(finalI);
- String rowIndex=sheetRowData.getRowIndex();
- Map<Integer, String> execlData= sheetRowData.getData();
- CodeClassifyTemplateVO newTemplateVO=new CodeClassifyTemplateVO();
-
- if(StringUtils.isEmpty(Path)){
- Path="#current#";
- }
-
- if(pathMap.containsKey(Path)){
- CodeClassifyVO codeClassifyVO=pathMap.get(Path);
- if(codeClassifyTemplateVOMap.containsKey(Path)){
- newTemplateVO= codeClassifyTemplateVOMap.get(Path);
- }else{
- newTemplateVO =engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
- if(newTemplateVO==null){
- errorMap.put(rowIndex,"绗�"+rowIndex+"琛岋紝鍒嗙被璺緞鏈煡璇㈠埌鐩稿簲鐨勫垎绫绘ā鏉�");
- }
- }
- if(pathMap.containsKey(Path)){
- dataVO=pathDatas.getOrDefault(Path,dataVO);
- }
- dataVO.setTemplateOid(newTemplateVO.getOid());
- dataVO.setCodeClassifyTemplateVO(newTemplateVO);
- dataVO.setCodeClassifyVO(codeClassifyVO);
- dataVO.setRowIndex(rowIndex);
- dataVO.setCodeClassifyOid(codeClassifyVO.getOid());//璁剧疆鍒嗙被oid
- dataVO.setCodeRuleOid(codeClassifyVO.getCoderuleoid());
- createExeclClassData(titleRowData,newTemplateVO,execlData,dataVO);
-
- pathDatas.put(Path,dataVO);
- codeClassifyTemplateVOMap.put(Path, newTemplateVO);
- }else{
- errorMap.put(rowIndex,"绗�"+rowIndex+"琛岋紝鍒嗙被璺緞鏈煡璇㈠埌鐩稿簲鐨勫垎绫�");
- }
- });
- break;
- }
- }
- List <CodeImprotDataVO> newCodeImprotDataVO= pathDatas.values().stream().collect(Collectors.toList());
- codeClassifyDatas.addAll(newCodeImprotDataVO);
- logger.info("222");
- }
-
- /**
- * 瀵煎叆鍘嗗彶鏁版嵁
- *
- * @param codeClassifyOid 鍒嗙被鐨勪富閿�
- * @param classifyAttr 鍒嗙被璺緞浣跨敤鐨勫睘鎬�
- * @param file excel鏂囦欢鐨勪俊鎭�
- * @return 鏈夐敊璇俊鎭殑excel
- */
- @Override
- public CodeImProtRusultVO batchImportHistoryData(String codeClassifyOid, String classifyAttr,File file) {
- VciBaseUtil.alertNotNull(codeClassifyOid,"鍒嗙被鐨勪富閿�");
- ReadExcelOption reo = new ReadExcelOption();
- reo.setReadAllSheet(true);
- List<SheetDataSet> sheetDataSetList = ExcelUtil.readDataObjectFromExcel(file,null,reo);
- if (sheetDataSetList.size() > LIMIT + 1) {
- throw new VciBaseException("涓轰簡淇濊瘉绯荤粺鐨勭ǔ瀹氭�э紝璇蜂竴娆′笉瑕佸鍏ヨ秴杩�1涓囨潯鐨勬暟鎹�");
- }
- Map<String,List<WriteExcelData>> shetNameMap=new HashMap<>();
- //鐩镐技椤圭洰鏌ラ噸
- String uuid = redisService.getUUIDEveryDay();
- boolean isCreateUUid=false;
- boolean isExport=false;
- for(int i=0;i<sheetDataSetList.size()-1;i++) {
- if (CollectionUtils.isEmpty(sheetDataSetList) || CollectionUtils.isEmpty(sheetDataSetList.get(i).getRowData())
- || sheetDataSetList.get(i).getRowData().size() < 1) {
- continue;
- }
- //鍘嗗彶瀵煎叆鐨勬椂鍊欎笉澶勭悊缂栫爜
- //----閫昏緫鍐呭----
- //1. 鍒嗙被鐨勮矾寰勫彲浠ュ湪椤甸潰涓婇�夋嫨鏄垎绫荤紪鍙疯繕鏄垎绫荤殑鍚嶇О
- //2. 鍒嗙被鐨勮矾寰勶紝蹇呴』鏄綋鍓嶅鍏ラ�夋嫨鐨勫垎绫荤殑鑺傜偣锛屼互鍙婂叾涓嬬骇鑺傜偣
- //3. 閫氳繃鏁版嵁瑕佸鍏ョ殑鍒嗙被鍘绘煡鎵惧搴旂殑缂栫爜瑙勫垯
- //4. 鏁版嵁瀛樺偍鍜屾壒閲忕敵璇蜂竴鏍凤紝
- //5. 闇�瑕佸崟鐙鐞嗕紒涓氱紪鐮佺殑鍐呭锛�
- // 5.1 浼佷笟缂栫爜鍦ㄥ綋鍓峞xcel閲屼笉鑳介噸澶�
- // 5.2 浼佷笟缂栫爜鍦ㄧ郴缁熶腑涓嶈兘閲嶅锛堝彲浠ユ槸宸茬粡鍥炴敹鐨勶級
- // 5.3 浼佷笟缂栫爜鐨勯暱搴︼紝鍜岀紪鐮佽鍒欑殑闀垮害瑕佸搴斾笂
- // 5.4 鑾峰彇娴佹按鐮佹鐨勫�硷紝鍘婚櫎濉厖鐨勫瓧绗︼紝鐪嬫祦姘村彿鏄灏戯紝鐒跺悗灏嗘祦姘村彿鍜岀幇鍦ㄧ殑鏈�澶ф祦姘村彿鍒ゆ柇锛屽皬浜庡氨鐩存帴褰曞叆锛屽ぇ浜庡垯淇敼鏈�澶ф祦姘村彿
- // 5.5 瀛樺偍浼佷笟缂栫爜鍒癮llcode涓�
-
- //鏌ヨ鍒嗙被鍜屾ā鏉�
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyOid);
-
- //鍏堟壘鍒版瘡涓�琛岀殑鏍囬锛岀劧鍚庢牴鎹爣棰樻潵鑾峰彇瀵瑰簲鐨勫睘鎬�
- SheetDataSet dataSet = sheetDataSetList.get(i);
- List<SheetRowData> rowDataList = dataSet.getRowData();
-
- //鎵剧涓�琛岋紝涓轰簡鎵炬爣棰�
- CodeClassifyTemplateVO templateVO = new CodeClassifyTemplateVO();
- /** if (!templateService.checkChildHasSameTemplate(classifyFullInfo.getCurrentClassifyVO().getOid())) {
- throw new VciBaseException("褰撳墠鐨勫垎绫讳互鍙婁笅绾у垎绫荤殑妯℃澘涓嶇浉鍚�");
- }***/
- //閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
- //鎵炬墍鏈夌殑鍒嗙被璺緞,闇�瑕佹牎楠岃矾寰勬槸鍚︽纭紝鏄惁閮藉湪褰撳墠鐨勫垎绫荤殑涓嬬骇
- List<CodeClassifyVO> childClassifyVOs = classifyService.listChildrenClassify(codeClassifyOid, true, classifyAttr, true);
- Map<String/**璺緞**/, CodeClassifyVO> pathMap = Optional.ofNullable(childClassifyVOs).orElseGet(() -> new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getPath().startsWith("#") ? s.getPath().substring(1) : s.getPath(), t -> t));
- List<String> titleRowData = dataSet.getColName();
- Map<String, String> errorMap = new ConcurrentHashMap<>();
- try {
- List<CodeClassifyTemplateVO> templateVOList= checkSamesTemplate(titleRowData,sheetDataSetList,i,pathMap,errorMap);
- templateVO= templateVOList.get(0);
- }catch (Throwable e){
- throw new VciBaseException(e.getMessage());
- }
-
- List<SheetRowData> needowDataList = rowDataList.stream().filter(cbo -> {
- String rowIndex = cbo.getRowIndex();
- return !errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
-
- //checkTemplateSync(sheetDataSetList, templateVO,i);
- //杩欓噷涓嶉櫎鍘婚粯璁ょ殑灞炴��
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes();
- Map<Integer/**鍒楀彿**/, String/**瀛楁鐨勫悕绉�**/> fieldIndexMap = new HashMap<>();
-
- Map<String/**涓枃鍚嶇О**/, String/**鑻辨枃鍚嶇О**/> attrNameIdMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getName(), t -> t.getId()));
- String idFieldName = attrVOS.stream().filter(s -> VciQueryWrapperForDO.ID_FIELD.equalsIgnoreCase(s.getId())).findFirst().orElseGet(() -> new CodeClassifyTemplateAttrVO()).getName();
- getFieldIndexMap(titleRowData, attrNameIdMap, fieldIndexMap);
- //鍏堜笉鐢ㄧ灞炴�ф槸鍚﹂兘瀛樺湪锛屽厛杞崲涓�涓嬫暟鎹�
- List<ClientBusinessObject> cboList = new ArrayList<>();
- String fullPath = getFullPath(classifyFullInfo);
- //鎴戜滑闇�瑕佽幏鍙栧埌鎵�鏈夌殑涓嬬骇鍒嗙被鐨刼id鐨勮矾寰勶紝鍥犱负鍚庨潰闇�瑕�
- Map<String/**涓婚敭**/, String/**璺緞**/> childOidPathMap = getChildClassifyPathMap(classifyFullInfo, fullPath);
- excelToCbo(classifyFullInfo, fieldIndexMap, needowDataList, templateVO, cboList, fullPath, false);
-
-
- Map<String/**涓婚敭**/, CodeClassifyVO> classifyVOMap = Optional.ofNullable(childClassifyVOs).orElseGet(() -> new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
- classifyVOMap.put(classifyFullInfo.getCurrentClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO());
- pathMap.put("#current#", classifyFullInfo.getCurrentClassifyVO());
-
- //鍒ゆ柇缂栧彿鍦╡xcel閲屾湰韬氨閲嶅鐨�
- Map<String, Long> idCountMap = cboList.stream().collect(Collectors.groupingBy(ClientBusinessObject::getId, Collectors.counting()));
- List<String> repeatIdList = new ArrayList<>();
- idCountMap.forEach((id, count) -> {
- if (count > 1) {
- repeatIdList.add(id);
- }
- });
- if (!CollectionUtils.isEmpty(repeatIdList)) {
- cboList.stream().filter(s -> repeatIdList.contains(s.getId())).map(s -> s.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX)).forEach(rowIndex -> {
- errorMap.put(rowIndex, "缂栧彿鍦ㄥ綋鍓峞xcel涓噸澶�;");
- });
- }
- //鎴戜滑闇�瑕佸垽鏂繖浜涘垎绫荤殑妯℃澘鏄笉鏄竴鏍风殑锛屽彧闇�瑕佹牎楠岋紝涓嶇敤鑾峰彇
- //妫�鏌ュ垎绫荤殑璺緞
- checkClassifyPathInHistory(cboList, errorMap, pathMap, childOidPathMap);
-
- //妫�鏌ヨ鍒�
- Map<String/**鍒嗙被涓婚敭**/, String/**瑙勫垯涓婚敭**/> ruleOidMap = new ConcurrentHashMap<String, String>();
- List<String> unExistRuleClassifyOidList = new CopyOnWriteArrayList<>();
- checkRuleOidInHistory(classifyVOMap, ruleOidMap, unExistRuleClassifyOidList);
- //濡傛灉鍑洪敊浜嗭紝鎴戜滑渚濈劧鎵ц鏈夋晥鐨勬暟鎹紝鏃犳晥鐨勬暟鎹啓鍥炲埌excel涓�
-
- //鎴戜滑鏍规嵁鍑洪敊鐨勫垎绫荤殑涓婚敭锛屽幓鎵捐鍙�
- if (!CollectionUtils.isEmpty(unExistRuleClassifyOidList)) {
- cboList.stream().forEach(cbo -> {
- if (unExistRuleClassifyOidList.contains(cbo.getAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD))) {
- String row_index = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- errorMap.put(row_index, errorMap.getOrDefault(row_index, "") + ";鏍规嵁鍒嗙被璺緞瀵瑰簲鐨勫垎绫伙紝娌℃湁璁剧疆缂栫爜瑙勫垯");
- }
- });
- }
-
- //鍒ゆ柇蹇呰緭椤�
- batchCheckRequiredAttrOnOrder(templateVO, cboList, errorMap);
-
- //鏈夐檺鏍￠獙缂栫爜鏄惁瀛樺湪
- batchCheckIdExistOnOrder(templateVO, cboList, errorMap);
-
- //boolean
- reSwitchBooleanAttrOnOrder(attrVOS, cboList);
-
- // 鏋氫妇鐨勫唴瀹归渶瑕佹牴鎹悕绉拌浆鎹负鏋氫妇鐨勫��
- batchSwitchEnumAttrOnOrder(attrVOS, cboList, errorMap);
-
- batchSwitchReferAttrOnOrder(attrVOS, cboList, errorMap);
- //6.澶勭悊鍒嗙被娉ㄥ叆
- batchSwitchClassifyAttrOnOrder(attrVOS, cboList, classifyFullInfo,true);
- //7.澶勭悊缁勫悎瑙勫垯
- batchSwitchComponentAttrOnOrder(attrVOS, cboList);
- //3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList);
- Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
- Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
- if (!CollectionUtils.isEmpty(selfRepeatRowIndexList)) {
- selfRepeatRowIndexList.stream().forEach(rowIndex -> {
- errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";鍦ㄥ綋鍓峞xcel鏂囦欢涓叧閿睘鎬ч噸澶�");
- });
- }
- if (!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)) {
- keyAttrRepeatRowIndexList.stream().forEach(rowIndex -> {
- errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅");
- });
- }
- //4.鏍￠獙瑙勫垯
- batchCheckVerifyOnOrder(attrVOS, cboList, errorMap);
-
- //6.鏃堕棿鐨勶紝蹇呴』缁熶竴涓簓yyy-MM-dd HH:mm:ss
- batchSwitchDateAttrOnOrder(attrVOS, cboList, errorMap);
- if (CollectionUtils.isEmpty(ruleOidMap.values())) {
- throw new VciBaseException("瀵煎叆鐨勬暟鎹墍閫夋嫨鐨勫垎绫婚兘娌℃湁璁剧疆缂栫爜瑙勫垯");
- }
- Map<String, CodeRuleVO> ruleVOMap = ruleService.listCodeRuleByOids(ruleOidMap.values(), true).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
- //鏍￠獙缂栫爜瑙勫垯鍜岀爜娈垫槸鍚︽纭�
- Map<String, List<String>> ruleRowIndexMap = new ConcurrentHashMap<>();
- checkSecLengthInHistory(cboList, classifyVOMap, ruleVOMap, ruleOidMap, errorMap, ruleRowIndexMap);
- ruleRowIndexMap.keySet().parallelStream().forEach(ruleOid -> {
- List<String> rowIndexList = ruleRowIndexMap.get(ruleOid);
- List<ClientBusinessObject> thisCbos = cboList.stream().filter(cbo -> rowIndexList.contains(cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX)) && !errorMap.containsKey(cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX))).collect(Collectors.toList());
-//鎴戜滑闇�瑕佸厛鏌ヨ涓�涓嬶紝鍐呭鏄惁宸茬粡瀛樺湪
- if(!CollectionUtils.isEmpty(thisCbos)){
- List<String> existIds = new ArrayList<>();
- VciBaseUtil.switchCollectionForOracleIn(thisCbos).stream().forEach(cbos -> {
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("coderuleoid", ruleOid);
- conditionMap.put("id", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(cbos.stream().map(s -> s.getId()).collect(Collectors.toSet()).toArray(new String[0])) + ")");
- conditionMap.put(VciQueryWrapperForDO.LC_STATUS_FIELD, QueryOptionConstant.NOTIN + "('" + CodeAllCodeLC.TASK_BACK.getValue() + "','" + CodeAllCodeLC.OBSOLETED.getValue() + "')");
- existIds.addAll(Optional.ofNullable(boService.queryCBO(MdmBtmTypeConstant.CODE_ALL_CODE, conditionMap, new PageHelper(-1), Arrays.stream(new String[]{"id"})
- .collect(Collectors.toList()))).orElseGet(() -> new ArrayList<>()).stream().map(s -> {
- String id = s.getId();
- if (StringUtils.isBlank(id)) {
- id = s.getAttributeValue("id");
- }
- return id;
- }).collect(Collectors.toList()));
- });
- List<String> existIdCbos = thisCbos.stream().filter(s -> {
- String id = s.getId();
- if (StringUtils.isBlank(id)) {
- id = s.getAttributeValue("id");
- }
- return existIds.contains(id);
- }).map(s -> s.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX)).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(existIdCbos)) {
- thisCbos = thisCbos.stream().filter(s -> {
- String id = s.getId();
- if (StringUtils.isBlank(id)) {
- id = s.getAttributeValue("id");
- }
- return !existIdCbos.contains(id);
- }).collect(Collectors.toList());
- existIdCbos.stream().forEach(rowIndex -> {
- errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";銆�" + idFieldName + "銆戝湪绯荤粺涓凡缁忚鍗犵敤");
- });
- }
- }
- });
-
- Map<String, ClientBusinessObject> rowIndexCboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getAttributeValue((MdmEngineConstant.IMPORT_ROW_INDEX)), t -> t));
- if (errorMap.size() > 0) {
- isExport=true;
- createRedisDatas(uuid + "-error", templateVO, rowIndexCboMap, dataSet, fieldIndexMap, errorMap, false);
- }
- createWriteExcelData(rowDataList, errorMap, new ArrayList<>(), titleRowData, shetNameMap, templateVO);
- List<ClientBusinessObject> needSaveCboList = cboList.stream().filter(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
- //鐩镐技鏍￠獙
- Map<String, String> resembleMap = new HashMap<>();
- List<DataResembleVO> dataResembleVOS = new ArrayList<>();
- String btmtypeid = classifyFullInfo.getTopClassifyVO().getBtmtypeid();
- bathcResembleQuery(templateVO.getCodeclassifyoid(), templateVO, needSaveCboList, resembleMap, btmtypeid, dataResembleVOS);
- if (resembleMap.size() > 0) {
- if (!CollectionUtils.isEmpty(dataResembleVOS)) {
- redisService.setCacheList(uuid + "-resemble-data", dataResembleVOS);
- createRedisDatas(uuid + "-resemble", templateVO, rowIndexCboMap, dataSet, fieldIndexMap, resembleMap, false);
- }
- }
- //鐢熸垚class缂撳瓨
- Map<String, String> rowIndexClsOidMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getAttributeValue((MdmEngineConstant.IMPORT_ROW_INDEX)), t -> t.getAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD)));
- createRedisByCodeClassify(uuid + "-class",templateVO,dataSet,fieldIndexMap,true);
- //鑾峰彇缂栫爜锛屾煡璇㈠湪绯荤粺涓槸鍚﹁鍏朵粬鐨勫紩鐢ㄤ簡
- //鎺掗櫎閿欒鐨勶紝鍓╀笅姝ｇ‘鐨�
- Map<String, String> newErrorMap = new HashMap<>();
- newErrorMap.putAll(resembleMap);
- newErrorMap.putAll(errorMap);
- //瑕佹妸浠ヤ笂鐨勯敊璇殑閮芥姏鍑哄悗锛屽啀缁х画澶勭悊鏃堕棿鍜岀粍鍚堣鍒�
- needSaveCboList = cboList.stream().filter(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !newErrorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
- if((errorMap.size()>0&&needSaveCboList.size()>0)||resembleMap.size()>0){
- isCreateUUid=true;
- }
- List<String> needRowIndexList = needSaveCboList.stream().filter(s -> errorMap.containsKey(s.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX))).map(s -> s.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX)).collect(Collectors.toList());
- if (isExport||newErrorMap.size() > 0) {
- createRedisDatas(uuid + "-ok", templateVO, rowIndexCboMap, dataSet, fieldIndexMap, newErrorMap, true);
- } else {
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- List<ClientBusinessObject> finalNeedSaveCboList = needSaveCboList;
- CodeClassifyTemplateVO finalTemplateVO = templateVO;
- ruleRowIndexMap.keySet().parallelStream().forEach(ruleOid -> {
- VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
- List<String> rowIndexList = ruleRowIndexMap.get(ruleOid);
- List<ClientBusinessObject> thisCbos = finalNeedSaveCboList.stream().filter(cbo -> rowIndexList.contains(cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX)) && !errorMap.containsKey(cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX))).collect(Collectors.toList());
- if (!CollectionUtils.isEmpty(thisCbos)) {
- try {
- productCodeService.productCodeAndSaveData(classifyFullInfo, finalTemplateVO, ruleVOMap.get(ruleOid), null, thisCbos);
- } catch (Throwable e) {
- logger.error("鎵归噺浜х敓缂栫爜鐨勬椂鍊欏嚭閿欎簡", e);
- thisCbos.stream().forEach(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";绯荤粺閿欒锛屽瓨鍌ㄦ暟鎹殑鏃跺�欏嚭閿欎簡");
- });
- }
- }
- });
- engineService.batchSaveSelectChar(templateVO, cboList);
- }
- }
- String excelFileName="";
- if(isExport&&!CollectionUtils.isEmpty(shetNameMap)) {
- excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒淇℃伅.xls";
- WriteExcelOption eo = new WriteExcelOption();
- shetNameMap.forEach((shetName, errorDataList) -> {
- eo.addSheetDataList(shetName, errorDataList);
- });
- try {
- new File(excelFileName).createNewFile();
- } catch (IOException e) {
- throw new VciBaseException(LangBaseUtil.getErrorMsg(e));
- }
- ExcelUtil.writeDataToFile(excelFileName, eo);
- }
- CodeImProtRusultVO codeImProtRusultVO=new CodeImProtRusultVO();
- if(StringUtils.isNotBlank(excelFileName)) {
- codeImProtRusultVO.setFilePath(excelFileName);
- codeImProtRusultVO.setFileOid("");
- }
- if(isCreateUUid){
- codeImProtRusultVO.setRedisUuid(uuid);
- }
-
- return codeImProtRusultVO;
- }
- private void createWriteExcelData(Collection<SheetRowData> rowDataList, Map<String,String> errorMap,
- List<String> needRowIndexList, List<String> titleRowData, Map<String,List<WriteExcelData>> shetNameMap, CodeClassifyTemplateVO templateVO){
- List<WriteExcelData> errorDataList=new ArrayList<>();
- Map<String, SheetRowData> rowIndexDataMap = rowDataList.stream().filter(s -> !needRowIndexList.contains(s.getRowIndex())).collect(Collectors.toMap(s -> s.getRowIndex(), t -> t));
- errorDataList.add(new WriteExcelData(0,0,"閿欒淇℃伅"));
- for (int i = 0; i < titleRowData.size(); i++) {
- //閿欒淇℃伅鍦ㄦ渶鍚�
- errorDataList.add(new WriteExcelData(0,i+1,titleRowData.get(i)));
- }
- Integer[] newRowIndex = new Integer[]{1};
- errorMap.forEach((index,error)->{
- //閿欒淇℃伅鍏ㄩ儴缁勫悎鍒颁竴璧�
- SheetRowData rowData = rowIndexDataMap.getOrDefault(index, null);
- if(rowData!=null){
- errorDataList.add(new WriteExcelData(newRowIndex[0],0,error));
- rowData.getData().forEach((colIndex,value)->{
- errorDataList.add(new WriteExcelData(newRowIndex[0],colIndex+1,value));
- });
- newRowIndex[0]++;
- }
- });
-
- shetNameMap.put(templateVO.getName(),errorDataList);
- }
-
- /**
- * 妫�鏌ョ爜娈电殑闀垮害鏄惁绗﹀悎瑕佹眰
- * @param cboList 鏁版嵁
- * @param classifyVOMap 鍒嗙被鏄犲皠
- * @param ruleVOMap 瑙勫垯瀵硅薄
- * @param ruleOidMap 鍒嗙被鍖呭惈瑙勫垯
- * @param errorMap 閿欒鐨勪俊鎭�
- * @param ruleRowIndexMap 瑙勫垯鍖呭惈鐨勮鍙凤紝key鏄鍒欎富閿紝value鏄寘鍚殑鍏ㄩ儴琛屽彿
- */
- private void checkSecLengthInHistory(List<ClientBusinessObject> cboList,Map<String,CodeClassifyVO> classifyVOMap,Map<String,CodeRuleVO> ruleVOMap,
- Map<String/**鍒嗙被涓婚敭**/,String/**瑙勫垯涓婚敭**/> ruleOidMap,Map<String,String> errorMap,Map<String,List<String>> ruleRowIndexMap){
-
- cboList.stream().forEach(cbo-> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- String secLength = cbo.getAttributeValue(MdmEngineConstant.CODE_SEC_LENGTH_FIELD);
- //鎵惧垎绫�
- String classifyOid = cbo.getAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD);
- CodeClassifyVO classifyVO = classifyVOMap.get(classifyOid);
- if (classifyVO != null) {
- //2#2#4#1杩欐牱鐨勬柟寮�
- CodeRuleVO ruleVO = ruleVOMap.getOrDefault(ruleOidMap.get(classifyVO.getOid()), null);
- if(ruleVO!=null){
- String[] secValues = secLength.split("#");
- //鎬婚暱搴﹀拰缂栫爜鐨勯暱搴�
- String code = cbo.getAttributeValue(MdmEngineConstant.CODE_FIELD);
- if(code.length() != Arrays.stream(secValues).mapToInt(s->VciBaseUtil.getInt(s)).sum()){
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鐮佹瀹藉害涓庣郴缁熶腑鐨勭紪鐮佽鍒欎笉鍚�" );
- }else if(secValues.length != ruleVO.getSecVOList().size()){
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鐮佹瀹藉害涓庣郴缁熶腑鐨勭紪鐮佽鍒欎笉鍚�" );
- } else {
- //姣忎竴涓暱搴﹂兘涓嶈兘瓒呰繃鐮佹鐨�
- boolean fined = false;
- for (int j = 0; j < ruleVO.getSecVOList().size(); j++) {
- CodeBasicSecVO secVO = ruleVO.getSecVOList().get(j);
- String length= secValues[j];
- if(StringUtils.isNotBlank(secVO.getCodeSecLength())&&VciBaseUtil.getInt(length)>VciBaseUtil.getInt(secVO.getCodeSecLength())){
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鐮佹瀹藉害涓庣郴缁熶腑鐨勭紪鐮佽鍒欎笉鍚�" );
- fined = true;
- break;
- }
- }
- /**for (int i = 0; i < secValues.length; i++) {
- for (int j = 0; j < ruleVO.getSecVOList().size(); j++) {
- CodeBasicSecVO secVO = ruleVO.getSecVOList().get(j);
- if (VciBaseUtil.getInt(secValues[i]) > VciBaseUtil.getInt(secVO.getCodeSecLength())) {
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鐮佹瀹藉害涓庣郴缁熶腑鐨勭紪鐮佽鍒欎笉鍚�" );
- fined = true;
- break;
- }
- }
- if(fined){
- break;
- }
- }***/
- if(!fined){
- //鏆傛椂涓嶅彇娴佹按鐨勫唴瀹癸紝鍥犱负璋冪敤produceCode鐨勬椂鍊欏幓澶勭悊
- List<String> rowIndexList = ruleRowIndexMap.getOrDefault(ruleVO.getOid(), new ArrayList<>());
- rowIndexList.add(rowIndex);
- ruleRowIndexMap.put(ruleVO.getOid(),rowIndexList);
- }
- }
- }else{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍒嗙被娌℃湁璁剧疆缂栫爜瑙勫垯" );
- }
- }
- });
- }
-
- /**
- * excel杞崲涓篶bo鐨勫璞�
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param fieldIndexMap 瀛楁鐨勪綅缃�
- * @param rowDataList excel閲岀殑琛屾暟鎹�
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param cboList 鏁版嵁鐨勫垪琛�
- * @param fullPath 鍏ㄨ矾寰�
- * @param newCode 鏄惁涓烘壒閲忕敵璇�
- */
- private void excelToCbo(CodeClassifyFullInfoBO classifyFullInfo,Map<Integer,String> fieldIndexMap,List<SheetRowData> rowDataList,
- CodeClassifyTemplateVO templateVO,List<ClientBusinessObject> cboList,
- String fullPath,boolean newCode){
- rowDataList.stream().forEach(rowData -> {
- ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
- rowData.getData().forEach((index,value)->{
- String field = fieldIndexMap.get(index);
- if(StringUtils.isBlank(field)){
- throw new VciBaseException("绗�" + (index + 1) + "鍒楃殑鏍囬鍦ㄧ郴缁熶腑涓嶅瓨鍦�");
- }
- try {
- cbo.setAttributeValueWithNoCheck(field,value);
- if(WebUtil.isDefaultField(field)){
- WebUtil.setValueToField(field, cbo, value);
- }
- } catch (VCIError e) {
- logger.error("璁剧疆灞炴�х殑鍊奸敊璇�",e);
- }
- });
- try {
- if(newCode){
- cbo.setAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD,classifyFullInfo.getCurrentClassifyVO().getOid());
- cbo.setAttributeValue(MdmEngineConstant.CODE_FULL_PATH_FILED,fullPath);
- //cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
- int secret = VciBaseUtil.getInt(cbo.getAttributeValue(MdmEngineConstant.SECRET_FIELD));
- if(secret == 0 || !secretService.checkDataSecret(secret) ){
- Integer userSecret = VciBaseUtil.getCurrentUserSecret();
- cbo.setAttributeValue(MdmEngineConstant.SECRET_FIELD,String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret));
- }
- }else{
- //姝ゆ椂杩樻病鏈夎浆鎹㈣矾寰�
- //cbo.setAttributeValue(CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(rowData.getData().getOrDefault(CODE_CLASSIFY_OID_FIELD,""),fullPath));
- cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
- }
- cbo.setAttributeValue(MdmEngineConstant.CODE_TEMPLATE_OID_FIELD,templateVO.getOid());
- cbo.setAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX,rowData.getRowIndex());
- }catch (Throwable e){
- logger.error("璁剧疆榛樿鐨勫睘鎬х殑鍊奸敊璇�",e);
- }
- cboList.add(cbo);
- });
-
- }
-
- /**
- * excel杞崲涓篶bo鐨勫璞�
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param fieldIndexMap 瀛楁鐨勪綅缃�
- * @param rowDataList excel閲岀殑琛屾暟鎹�
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param cboList 鏁版嵁鐨勫垪琛�
- * @param fullPath 鍏ㄨ矾寰�
- * @param operation 鎿嶄綔绫诲瀷
- * @param errorMap 閿欒淇℃伅璁板綍
- */
- private void excelToCbo(CodeClassifyFullInfoBO classifyFullInfo,List<String> titleRowData,Map<Integer,String> fieldIndexMap,List<RowDatas> rowDataList,
- CodeClassifyTemplateVO templateVO,List<ClientBusinessObject> cboList,
- String fullPath,boolean isProcess,String operation,Map<String,String> errorMap,Map<String,String> codeOidToSystemOidMap){
- rowDataList.stream().forEach(rowData -> {
- String oid=rowData.getOid();
- String rowNumber=rowData.getRowIndex();
- ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
- rowData.getData().forEach((index,value)->{
- String field = fieldIndexMap.get(index);
- if(StringUtils.isBlank(field)){
- errorMap.put(rowNumber,"灞炴�э細銆�" +titleRowData.get(index)+ "銆戝湪绯荤粺涓笉瀛樺湪");
- }
- try {
- cbo.setAttributeValueWithNoCheck(field,value);
- if(WebUtil.isDefaultField(field)){
- WebUtil.setValueToField(field, cbo, value);
- }
- } catch (VCIError e) {
- logger.error("璁剧疆灞炴�х殑鍊奸敊璇�",e);
- errorMap.put(rowNumber,"灞炴�э細銆�" +titleRowData.get(index)+ "銆戝湪绯荤粺涓笉瀛樺湪");
- }
- });
- try {
- if(operation.equals("create")){
- logger.info("鍒嗙被瀵硅薄锛�"+classifyFullInfo.getCurrentClassifyVO());
- logger.info("codeClassoid:"+classifyFullInfo.getCurrentClassifyVO().getOid());
- cbo.setAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD,classifyFullInfo.getCurrentClassifyVO().getOid());
- cbo.setAttributeValue(MdmEngineConstant.CODE_FULL_PATH_FILED,fullPath);
- int secret = VciBaseUtil.getInt(cbo.getAttributeValue(MdmEngineConstant.SECRET_FIELD));
- if(secret == 0 || !secretService.checkDataSecret(secret) ){
- Integer userSecret = VciBaseUtil.getCurrentUserSecret();
- cbo.setAttributeValue(MdmEngineConstant.SECRET_FIELD,String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret));
- }
- if(rowData.getStatus().equals(CodeDefaultLC.DISABLE.getValue())){//鍋滅敤
- cbo.setLcStatus(CodeDefaultLC.DISABLE.getValue());
- }else if(rowData.getStatus().equals(CodeDefaultLC.EDITING.getValue())){//缂栬緫
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
- }else if(rowData.getStatus().equals(CodeDefaultLC.AUDITING.getValue())) {//瀹℃壒涓�
- cbo.setLcStatus(CodeDefaultLC.AUDITING.getValue());
- }else if(rowData.getStatus().equals(CodeDefaultLC.TASK_BACK.getValue())){//鍥炴敹
- cbo.setLcStatus(CodeDefaultLC.TASK_BACK.getValue());
- }else{
- cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());//鍙戝竷
- }
- /** if(!isProcess){
- cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
- }else {
- if(rowData.getStatus().equals(CodeDefaultLC.DISABLE.getValue())){//鍋滅敤
- cbo.setLcStatus(CodeDefaultLC.DISABLE.getValue());
- }else if(rowData.getStatus().equals(CodeDefaultLC.EDITING.getValue())){//缂栬緫
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
- }else {//鍙戝竷
- cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
- }
- }***/
- cbo.setCreator(rowData.getCreator());
- cbo.setLastModifier(rowData.getEditor()==null?"":rowData.getEditor());
- }else if(operation.equals("update")){
- //姝ゆ椂杩樻病鏈夎浆鎹㈣矾寰�
- //cbo.setAttributeValue(CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(rowData.getData().getOrDefault(CODE_CLASSIFY_OID_FIELD,""),fullPath));
- if(rowData.getStatus().equals(CodeDefaultLC.DISABLE.getValue())){//鍋滅敤
- cbo.setLcStatus(CodeDefaultLC.DISABLE.getValue());
- }else if(rowData.getStatus().equals(CodeDefaultLC.RELEASED.getValue())){//鍙戝竷
- cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
- }else if(rowData.getStatus().equals(CodeDefaultLC.EDITING.getValue())){//缂栬緫
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
- }else if(rowData.getStatus().equals(CodeDefaultLC.AUDITING.getValue())) {//瀹℃壒涓�
- cbo.setLcStatus(CodeDefaultLC.AUDITING.getValue());
- }else if(rowData.getStatus().equals(CodeDefaultLC.TASK_BACK.getValue())){//鍥炴敹
- cbo.setLcStatus(CodeDefaultLC.TASK_BACK.getValue());
- }
- cbo.setLastModifier(rowData.getEditor() == null ? "" : rowData.getEditor());//淇敼鑰�
- }else if(operation.equals("delete")){
- if(rowData.getStatus().equals(CodeDefaultLC.TASK_BACK.getValue())){//鍥炴敹
- cbo.setLcStatus(CodeDefaultLC.TASK_BACK.getValue());
- }else{
- cbo.setLcStatus(CodeDefaultLC.DISABLE.getValue());//鍋滅敤
- }
- }
- cbo.setAttributeValue(MdmEngineConstant.CODE_TEMPLATE_OID_FIELD,templateVO.getOid());
- cbo.setAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX,rowData.getRowIndex());
- }catch (Throwable e){
- logger.error("璁剧疆榛樿鐨勫睘鎬х殑鍊奸敊璇�",e);
- errorMap.put(rowNumber,"璁剧疆榛樿鐨勫睘鎬х殑鍊奸敊璇�"+e.getMessage());
- }finally {
- codeOidToSystemOidMap.put(cbo.getOid(),oid);
- }
- cboList.add(cbo);
- });
-
- }
-
- /**
- * 妫�鏌ュ垎绫荤殑璺緞鏄惁瀛樺湪
- * @param cboList 涓氬姟鏁版嵁
- * @param errorMap 閿欒淇℃伅
- * @param pathMap 璺緞鍜屽垎绫荤殑鏄犲皠
- */
- private void checkClassifyPathInHistory(List<ClientBusinessObject> cboList,
- Map<String,String> errorMap, Map<String/**璺緞**/,CodeClassifyVO> pathMap,
- Map<String/**涓婚敭**/, String/**璺緞**/> childOidPathMap) {
- cboList.parallelStream().forEach(cbo -> {
- String classifyPath = cbo.getAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD);
- //濡傛灉path涓虹┖锛屽垯琛ㄧず鏄鍏ュ綋鍓嶅垎绫�
- if(StringUtils.isBlank(classifyPath)){
- classifyPath = "#current#";
- }
- if ( !pathMap.containsKey(classifyPath)) {
- String row_index = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- errorMap.put(row_index,errorMap.getOrDefault(row_index,"") + ";鍒嗙被璺緞涓嶅瓨鍦�");
- } else {
- //杞竴涓嬪垎绫荤殑涓婚敭
- try {
- String classifyOid = pathMap.get(classifyPath).getOid();
- cbo.setAttributeValueWithNoCheck(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD, classifyOid);
- cbo.setAttributeValue(MdmEngineConstant.CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(classifyOid,classifyPath));
- } catch (VCIError e) {
- logger.error("璁剧疆灞炴�х殑閿欒", e);
- }
- }
- });
- }
-
- /**
- * 妫�鏌ュ垎绫讳互鍙婂瓙鍒嗙被鏄惁閮芥湁缂栫爜瑙勫垯
- * @param classifyVOMap 鍒嗙被鐨勬樉绀哄璞℃槧灏�
- * @param ruleOidMap 瑙勫垯鐨勪富閿槧灏�
- * @param unExistRuleClassifyOidList 涓嶅瓨鍦ㄧ紪鐮佽鍒欑殑鍒嗙被鐨勪富閿�
- */
- private void checkRuleOidInHistory( Map<String/**涓婚敭**/,CodeClassifyVO> classifyVOMap, Map<String/**鍒嗙被涓婚敭**/,String/**瑙勫垯涓婚敭**/> ruleOidMap,
- List<String> unExistRuleClassifyOidList ){
- if(!CollectionUtils.isEmpty(classifyVOMap)){
- classifyVOMap.values().parallelStream().forEach(classifyVO->{
- if(StringUtils.isNotBlank(classifyVO.getCoderuleoid())){
- ruleOidMap.put(classifyVO.getOid(),classifyVO.getCoderuleoid());
- }else{
- //閫掑綊鎵句笂绾�
- List<String> ruleOidList = new ArrayList<>();
- recursionRule(classifyVOMap,classifyVO.getParentcodeclassifyoid(),ruleOidList);
- if(!CollectionUtils.isEmpty(ruleOidList)){
- ruleOidMap.put(classifyVO.getOid(),ruleOidList.get(0));
- }else{
- unExistRuleClassifyOidList.add(classifyVO.getOid());
- }
- }
- });
- }
- logger.info(";;;;");
- }
- /**
- * 鑾峰彇瀛愬垎绫荤殑璺緞
- * @param classifyFullInfo 鍒嗙被鍏ㄩ儴淇℃伅
- * @param fullPath 鍒嗙被鐨勫叏璺緞
- * @return 瀛愬垎绫荤殑璺緞锛宬ey鏄垎绫荤殑涓婚敭
- */
- private Map<String/**鍒嗙被鐨勪富閿�**/,String/**鍒嗙被璺緞**/> getChildClassifyPathMap(CodeClassifyFullInfoBO classifyFullInfo,String fullPath){
- List<CodeClassifyVO> childPathVOs = classifyService.listChildrenClassify(classifyFullInfo.getCurrentClassifyVO().getOid(), true, VciQueryWrapperForDO.OID_FIELD, true);
- Map<String/**鍒嗙被鐨勪富閿�**/,String/**鍒嗙被鐨勪富閿�**/> childOidPathMap = new ConcurrentHashMap<>();
- if(!CollectionUtils.isEmpty(childPathVOs)){
- childPathVOs.parallelStream().forEach(childPath->{
- // String thisClassifyPath = fullPath + "##" + childPath.getPath().replace("#" + classifyFullInfo.getCurrentClassifyVO().getOid() + "#","").replace("#","##");
- List<String> list=Arrays.asList(childPath.getPath().split("#"));
- List<String> newPahtList= list.stream().sorted(Comparator.comparing(s -> s,Comparator.reverseOrder())).collect(Collectors.toList());
- String thisClassifyPath=StringUtils.join(newPahtList,"##")+fullPath;
- childOidPathMap.put(childPath.getOid(),thisClassifyPath);
- });
- }
- return childOidPathMap;
- }
-
- /**
- * 鑾峰彇鍒嗙被鐨勫叏璺緞
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @return 鍏ㄨ矾寰�
- */
- private String getFullPath(CodeClassifyFullInfoBO classifyFullInfo){
- String fullPath = "";
- if(!CollectionUtils.isEmpty(classifyFullInfo.getParentClassifyVOs())){
- fullPath = classifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel())))
- .map(CodeClassifyVO::getOid).collect(Collectors.joining("##"));
- }else{
- fullPath = classifyFullInfo.getCurrentClassifyVO().getOid();
- }
- return fullPath;
- }
-
- /***
- * @param titleRowData
- * @param newTemplateVO
- * @param execlData
- * @param codeImprotDataVO
- */
- private void createExeclClassData(List<String> titleRowData, CodeClassifyTemplateVO newTemplateVO, Map<Integer, String> execlData, CodeImprotDataVO codeImprotDataVO){
- //闄ゅ幓榛樿鐨勫睘鎬�.杩樻湁鍙湁琛ㄥ崟鏄剧ず鐨勫瓧娈垫墠瀵煎叆
- List<CodeClassifyTemplateAttrVO> attrVOS = newTemplateVO.getAttributes().stream().filter(s ->
- !MdmEngineConstant.DEFAULT_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
- Map<String/**涓枃鍚嶇О**/, String/**鑻辨枃鍚嶇О**/> attrNameIdMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getName(), t -> t.getId()));
- List<String> fields=new ArrayList<>();
- Map<String,String> filedValueMap=new HashMap<>();
- List<String> colNames=new ArrayList<>();
- for (int i = 0; i < titleRowData.size(); i++) {
- String title = titleRowData.get(i);
- title=title.replace(KEY_ATTR_CHAR,"").replace(REQUIRED_CHAR,"");
- String id = attrNameIdMap.getOrDefault(title,"");
- if(StringUtils.isBlank(id) && "鍒嗙被璺緞".equalsIgnoreCase(title)){
- id = MdmEngineConstant.CODE_CLASSIFY_OID_FIELD;
- }
- if(StringUtils.isBlank(id) && "鐮佹瀹藉害".equalsIgnoreCase(title)){
- id = MdmEngineConstant.CODE_SEC_LENGTH_FIELD;
- }
- if(StringUtils.isBlank(id) && "浼佷笟缂栫爜".equalsIgnoreCase(title)){
- id = MdmEngineConstant.CODE_FIELD;
- }
- if(StringUtils.isNotBlank(id)){
- // fieldIndexMap.put(i,id);id
- fields.add(id);
- colNames.add(title);
- String value= StringUtils.isNotBlank(execlData.get(i))?execlData.get(i):"";
- filedValueMap.put(id,value);
-
- }
- }
- filedValueMap.put(MdmEngineConstant.IMPORT_ROW_INDEX,codeImprotDataVO.getRowIndex());
- codeImprotDataVO.setFields(fields);
- codeImprotDataVO.setColNames(colNames);
- codeImprotDataVO.getDatas().add(filedValueMap);
- }
-
- /**
- * excel鐨勬爣棰樹笂鑾峰彇瀛楁鎵�鍦ㄧ殑浣嶇疆
- * @param titleRowData 鏍囬鐨勫唴瀹�
- * @param attrNameIdMap 妯℃澘涓睘鎬у悕绉板拰鑻辨枃鐨勬槧灏�
- * @param fieldIndexMap 浣嶇疆鍜岃嫳鏂囧瓧娈电殑鏄犲皠
- */
- private void getFieldIndexMap(List<String> titleRowData,Map<String/**鍚嶇О**/,String/**瀛楁鍚�**/> attrNameIdMap,Map<Integer/**浣嶇疆**/,String/**鑻辨枃鍚嶅瓧**/> fieldIndexMap){
- for (int i = 0; i < titleRowData.size(); i++) {
- String title = titleRowData.get(i);
- String id = attrNameIdMap.getOrDefault(title.replace(KEY_ATTR_CHAR,"").replace(REQUIRED_CHAR,""),"");
- if(StringUtils.isBlank(id) && "鍒嗙被璺緞".equalsIgnoreCase(title)){
- id = MdmEngineConstant.CODE_CLASSIFY_OID_FIELD;
- }
- if(StringUtils.isBlank(id) && "鐮佹瀹藉害".equalsIgnoreCase(title)){
- id = MdmEngineConstant.CODE_SEC_LENGTH_FIELD;
- }
- if(StringUtils.isBlank(id) && "浼佷笟缂栫爜".equalsIgnoreCase(title)){
- id = MdmEngineConstant.CODE_FIELD;
- }
- if(StringUtils.isNotBlank(id)){
- fieldIndexMap.put(i,id);
- }
- }
- }
-
-
- /**
- * 閫掑綊鎵剧紪鐮佽鍒�
- * @param classifyVOMap 鍒嗙被鐨勬樉绀哄璞℃槧灏�
- * @param classifyOid 鍒嗙被鐨勪富閿�
- * @param ruleOidList 瑙勫垯鐨勪富閿甽ist
- */
- private void recursionRule(Map<String, CodeClassifyVO> classifyVOMap,String classifyOid,List<String> ruleOidList){
- if(classifyVOMap.containsKey(classifyOid)){
- CodeClassifyVO classifyVO = classifyVOMap.get(classifyOid);
- if(StringUtils.isNotBlank(classifyVO.getCoderuleoid())){
- ruleOidList.add(classifyVO.getCoderuleoid());
- return;
- }else{
- recursionRule(classifyVOMap,classifyVO.getParentcodeclassifyoid(),ruleOidList);
- }
- }else{
- Map<String, CodeClassifyVO> parentClassifyVOMap=new HashMap<>();
- CodeClassifyVO codeClassifyVO= this.classifyService.getObjectByOid(classifyOid);
- parentClassifyVOMap.put(codeClassifyVO.getOid(),codeClassifyVO);
- recursionRule(parentClassifyVOMap,codeClassifyVO.getOid(),ruleOidList);
- }
- }
-
-
- /**
- * 閿欒淇℃伅杩斿洖excel
- * @param rowDataList 鎵�鏈夌殑瀵煎叆鏁版嵁
- * @param errorMap 閿欒鐨勪俊鎭�
- * @param needRowIndexList 闇�瑕佸啓鍏ョ殑鏁版嵁鐨勮鍙�
- * @param titleRowData 鏍囬琛�
- *
- * @return 閿欒鐨別xcel鏂囦欢锛屾病鏈夐敊璇細杩斿洖绌�
- */
- private String returnErrorToExcel(Collection<SheetRowData> rowDataList,
- Map<String,String> errorMap,
- List<String> needRowIndexList,List<String> titleRowData){
- if(CollectionUtils.isEmpty(errorMap)){
- return "";
- }
- Map<String, SheetRowData> rowIndexDataMap = rowDataList.stream().filter(s -> !needRowIndexList.contains(s.getRowIndex())).collect(Collectors.toMap(s -> s.getRowIndex(), t -> t));
- List<WriteExcelData> errorDataList = new ArrayList<>();
- errorDataList.add(new WriteExcelData(0,0,"閿欒淇℃伅"));
- for (int i = 0; i < titleRowData.size(); i++) {
- //閿欒淇℃伅鍦ㄦ渶鍚�
- errorDataList.add(new WriteExcelData(0,i+1,titleRowData.get(i)));
- }
- Integer[] newRowIndex = new Integer[]{1};
- errorMap.forEach((index,error)->{
- //閿欒淇℃伅鍏ㄩ儴缁勫悎鍒颁竴璧�
- SheetRowData rowData = rowIndexDataMap.getOrDefault(index, null);
- if(rowData!=null){
- errorDataList.add(new WriteExcelData(newRowIndex[0],0,error));
- rowData.getData().forEach((colIndex,value)->{
- errorDataList.add(new WriteExcelData(newRowIndex[0],colIndex+1,value));
- });
- newRowIndex[0]++;
- }
- });
- String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒淇℃伅.xls";
- WriteExcelOption eo = new WriteExcelOption(errorDataList);
- try {
- new File(excelFileName).createNewFile();
- } catch (IOException e) {
- throw new VciBaseException(LangBaseUtil.getErrorMsg(e));
- }
- ExcelUtil.writeDataToFile(excelFileName,eo);
- return excelFileName;
- }
-
- /**
- * 鑾峰彇灞炴�у湪excel涓殑琛屾暟
- * @param fieldIndexIdMap 鍒楀彿-瀛楁鏄犲皠
- * @param attrId 灞炴�х殑缂栧彿
- * @return 鍒楀彿
- */
- private Integer getIndexInRowData(Map<Integer,String> fieldIndexIdMap,String attrId){
- return fieldIndexIdMap.keySet().stream().filter(
- index -> attrId.equalsIgnoreCase(fieldIndexIdMap.get(index))).findFirst().orElseGet(()->0);
- }
-
- /**
- * 澶勭悊鏋氫妇鐨勬樉绀哄璞�
- * @param attrVOS 妯℃澘灞炴��
- * @param dataList excel鐨勬暟鎹唴瀹�
- * @param errorMap 閿欒淇℃伅鐨勬槧灏�
- */
- private void batchSwitchEnumAttrOnOrder(Collection<CodeClassifyTemplateAttrVO> attrVOS,List<ClientBusinessObject> dataList,
- Map<String,String> errorMap ) {
- Map<String, CodeClassifyTemplateAttrVO> dateAttrVOMap = attrVOS.stream().filter(
- s -> (StringUtils.isNotBlank(s.getEnumString()) || StringUtils.isNotBlank(s.getEnumid()))
- ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(dateAttrVOMap)) {
- dateAttrVOMap.forEach((attrId, attrVO) -> {
- dataList.stream().forEach(cbo -> {
- String text = cbo.getAttributeValue(attrId);
- if(StringUtils.isNotBlank(text)){
- List<KeyValue> valueList = engineService.listComboboxItems(attrVO);
- boolean fined = false;
- for (int i = 0; i < valueList.size(); i++) {
- KeyValue keyValue = valueList.get(i);
- //if(keyValue.getValue().equalsIgnoreCase(text)){
- if(keyValue.getValue().equalsIgnoreCase(text)||keyValue.getKey().equalsIgnoreCase(text)){
- try {
- cbo.setAttributeValue(attrId, keyValue.getKey());
- }catch (Throwable e){
- logger.error("璁剧疆灞炴�у嚭閿�");
- }
- fined = true;
- break;
- }
- }
- if(!fined){
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";灞炴�" + attrVO.getName() + "]鐨勫�间笉绗﹀悎涓嬫媺鐨勮姹�");
- }
- }
- });
- });
- }
- }
-
- /**
- * 杞Щboolean鍨嬬殑灞炴��
- * @param attrVOS 灞炴�х殑瀵硅薄
- * @param dataList 鏁版嵁
- */
- private void reSwitchBooleanAttrOnOrder(Collection<CodeClassifyTemplateAttrVO> attrVOS,List<ClientBusinessObject> dataList){
- Map<String, CodeClassifyTemplateAttrVO> booleanAttrMap = attrVOS.stream().filter(
- s -> VciFieldTypeEnum.VTBoolean.name().equalsIgnoreCase(s.getAttributedatatype())
- ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(booleanAttrMap)) {
- booleanAttrMap.forEach((attrId, attrVO) -> {
- dataList.stream().forEach(cbo -> {
- String text = cbo.getAttributeValue(attrId);
- try {
- if (BooleanEnum.TRUE.getValue().equalsIgnoreCase(text) || "鏄�".equalsIgnoreCase(text)) {
- cbo.setAttributeValue(attrId, BooleanEnum.TRUE.getValue());
- } else {
- cbo.setAttributeValue(attrId, BooleanEnum.FASLE.getValue());
- }
- }catch (Throwable e){
-
- }
- });
- });
- }
- }
-
- /**
- * 杞崲鍙傜収鐨勫��
- * @param attrVOS 灞炴�х殑鏄剧ず瀵硅薄
- * @param dataList 鏁版嵁鍒楄〃
- * @param errorMap 閿欒鐨勪俊鎭�
- */
- private void batchSwitchReferAttrOnOrder(Collection<CodeClassifyTemplateAttrVO> attrVOS,List<ClientBusinessObject> dataList,Map<String,String> errorMap){
- Map<String, CodeClassifyTemplateAttrVO> referAttrVOMap = attrVOS.stream().filter(
- s -> (StringUtils.isNotBlank(s.getReferbtmid()) || StringUtils.isNotBlank(s.getReferConfig()))
- ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if(!CollectionUtils.isEmpty(referAttrVOMap)){
- Map<String/**琛ㄦ牸鍜屽�肩殑灞炴��**/,Map<String/**鏄剧ず灞炴�х殑鍊�**/,List<String>/**琛ㄦ牸閲岀殑鍊�**/>> linkValueMap = new HashMap<>();
- referAttrVOMap.forEach((attrId,attrVO)->{
- dataList.stream().forEach(cbo -> {
- String text = cbo.getAttributeValue(attrId);
- if(StringUtils.isNotBlank(text)){
- UIFormReferVO referVO = getReferVO(attrVO);
- String valueField = getValueField(referVO);
- String showText = getTextField(referVO);
- String tableAndAttr = VciBaseUtil.getTableName(referVO.getReferType()) + "#" + valueField;
- Map<String, List<String>> showTextMap = linkValueMap.getOrDefault(tableAndAttr, new HashMap<>());
- List<String> textList = showTextMap.getOrDefault(showText, new ArrayList<>());
- if(!textList.contains(text)) {
- textList.add(text);
- }
- showTextMap.put(showText,textList);
- linkValueMap.put(tableAndAttr,showTextMap);
- }
- });
- });
- if(!CollectionUtils.isEmpty(linkValueMap)){
- //闇�瑕侀�愪釜琛ㄧ殑鍊煎瓧娈碉紝閫愪釜鏌ヨ
- Map<String/**琛ㄦ牸鍜屽�煎睘鎬�**/,Map<String/**鏄剧ず灞炴��**/, Map<String/**鍊�**/,String/**鏄剧ず鐨勫��**/>>> linkCboMap = new HashMap<>();
- linkValueMap.forEach((tableAndAttr,showValueMap)->{
- String[] split = tableAndAttr.split("#");
- String table = split[0];
- String valueField = split[1].toLowerCase(Locale.ROOT);
- Map<String,Map<String,String>> dataMap = new HashMap<>();
- showValueMap.forEach((showText,valueList)->{
- Map<String,String> valueOidTextMap = new HashMap<>();
- List<List<String>> valueCollections = VciBaseUtil.switchListForOracleIn(valueList);
- String sql = "select " + valueField + "," + showText.toLowerCase(Locale.ROOT) +" from " + table + " where " + showText + " in (%s)";
- valueCollections.stream().forEach(values->{
- List<ClientBusinessObject> cbos = boService.queryByOnlySql(String.format(sql, VciBaseUtil.toInSql(values.toArray(new String[0]))));
- if(!CollectionUtils.isEmpty(cbos)){
- valueOidTextMap.putAll(cbos.stream().collect(Collectors.toMap(s->s.getAttributeValue(valueField),t->t.getAttributeValue(showText))));
- }
- });
- dataMap.put(showText,valueOidTextMap);
- });
- linkCboMap.put(tableAndAttr,dataMap);
- });
- referAttrVOMap.forEach((attrId,attrVO)->{
- dataList.stream().forEach(cbo -> {
- String text = cbo.getAttributeValue(attrId);
- if (StringUtils.isNotBlank(text)) {
- UIFormReferVO referVO = getReferVO(attrVO);
- String valueField = getValueField(referVO);
- String showText = getTextField(referVO);
- String tableAndAttr = VciBaseUtil.getTableName(referVO.getReferType()) + "#" + valueField;
- if(!linkCboMap.containsKey(tableAndAttr)){
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍙傛暟灞炴�" + attrVO.getName() + "]鐨勫�煎湪绯荤粺涓笉瀛樺湪" );
-
- }else{
- Map<String, Map<String, String>> dataMap = linkCboMap.get(tableAndAttr);
- if(!dataMap.containsKey(showText)){
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍙傛暟灞炴�" + attrVO.getName() + "]鐨勫�煎湪绯荤粺涓笉瀛樺湪" );
- }else{
- Map<String, String> data = dataMap.get(showText);
- final boolean[] fined = {false};
- data.forEach((key,value)->{
- if(value.equalsIgnoreCase(text)){
- fined[0] = true;
- try {
- cbo.setAttributeValue(attrId, key);
- }catch (Throwable e){
-
- }
- }
- });
- if(!fined[0]){
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍙傛暟灞炴�" + attrVO.getName() + "]鐨勫�煎湪绯荤粺涓笉瀛樺湪" );
- }
- }
- }
- }
- });
- });
- }
- }
-
- }
-
- /**
- * 浠庡睘鎬т笂鑾峰彇鍙傜収鐨勫唴瀹�
- * @param attrVO 灞炴�х殑淇℃伅
- * @return 鍙傜収鐨勫唴瀹�
- */
- private UIFormReferVO getReferVO(CodeClassifyTemplateAttrVO attrVO){
- UIFormReferVO referVO = null;
- if(StringUtils.isNotBlank(attrVO.getReferConfig())){
- referVO = JSONObject.parseObject(attrVO.getReferConfig(),UIFormReferVO.class);
- }else{
- referVO = new UIFormReferVO();
- referVO.setReferType(attrVO.getReferbtmid());
- referVO.setValueField(VciQueryWrapperForDO.OID_FIELD);
- referVO.setTextField("name");
- }
- return referVO;
- }
-
- /**
- * 鑾峰彇鍙傜収涓殑鍊肩殑瀛楁
- * @param referVO 鍙傜収鐨勫璞�
- * @return 榛樿涓篛id锛屾湁澶氫釜鐨勬椂鍊欙紝鑾峰彇绗竴涓�
- */
- private String getValueField(UIFormReferVO referVO){
- String showText = referVO.getValueField();
- if(StringUtils.isBlank(showText)){
- return "oid";
- }
- if(showText.contains(",")){
- //闃叉涓囦竴鏈夊涓紝鐪嬬湅鏈夋病鏈塷id
- List<String> strings = VciBaseUtil.str2List(showText);
- if(strings.contains("oid")){
- showText = "oid";
- }else{
- showText = strings.get(0);
- }
- }
- return showText;
- }
-
- /**
- * 鑾峰彇鍙傜収涓殑鏄剧ず鍐呭鐨勫瓧娈�
- * @param referVO 鍙傜収鐨勫璞�
- * @return 榛樿涓簄ame锛屾湁澶氫釜鐨勬椂鍊欙紝鑾峰彇绗竴涓�
- */
- private String getTextField(UIFormReferVO referVO){
- String showText = referVO.getTextField();
- if(StringUtils.isBlank(showText)){
- return "name";
- }
- if(showText.contains(",")){
- //闃叉涓囦竴鏈夊涓紝鐪嬬湅鏈夋病鏈塶ame
- List<String> strings = VciBaseUtil.str2List(showText);
- if(strings.contains("name")){
- showText = "name";
- }else{
- showText = strings.get(0);
- }
- }
- return showText;
- }
-
-
-
- /**
- * 澶勭悊鍒嗙被娉ㄥ叆
- * @param attrVOS 妯℃澘灞炴��
- * @param dataList excel鐨勬暟鎹唴瀹�
- * @param classifyFullInfo 鍒嗙被鐨勫叏璺緞
- */
- private void batchSwitchClassifyAttrOnOrder(Collection<CodeClassifyTemplateAttrVO> attrVOS,List<ClientBusinessObject> dataList,
- CodeClassifyFullInfoBO classifyFullInfo,boolean isImPort) {
- Map<String, CodeClassifyTemplateAttrVO> dateAttrVOMap = attrVOS.stream().filter(
- s -> StringUtils.isNotBlank(s.getClassifyinvokeattr()) && StringUtils.isNotBlank(s.getClassifyinvokelevel())
- ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- Map<String,CodeClassifyFullInfoBO> classifyFullInfoMap=new HashMap<>();
- classifyFullInfoMap.put(classifyFullInfo.getCurrentClassifyVO().getOid(),classifyFullInfo);
- if (!CollectionUtils.isEmpty(dateAttrVOMap)) {
- dataList.stream().forEach(cbo -> {
- dateAttrVOMap.forEach((attrId, attrVO) -> {
- //鍒嗙被娉ㄥ叆鐨勭紪鍙锋垨鑰呭悕绉帮紝
- //灞傜骇鍖呭惈鎸囧畾灞傚拰鏈�灏忓眰
- CodeClassifyVO classifyVO = null;
- if(!CodeLevelTypeEnum.MIN.getValue().equalsIgnoreCase(attrVO.getClassifyinvokelevel()) && !"min".equalsIgnoreCase(attrVO.getClassifyinvokelevel())) {
- //鎸囧畾浜嗗眰绾х殑
- //娉ㄦ剰锛屽洜涓烘煡璇笂绾у垎绫诲嚭鏉ョ殑灞傜骇鏄�掑簭鐨勶紝鍗抽《灞傝妭鐐规槸鏈�澶х殑鍊�
- if(isImPort){
- if(!classifyFullInfoMap.containsKey(cbo.getAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD))) {
- CodeClassifyFullInfoBO currentClassifyFullInfo = classifyService.getClassifyFullInfo(cbo.getAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD));
- classifyFullInfoMap.put(currentClassifyFullInfo.getCurrentClassifyVO().getOid(), currentClassifyFullInfo);
- }
- }
- CodeClassifyFullInfoBO newClassifyFullInfo= classifyFullInfoMap.get(cbo.getAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD));
- List<CodeClassifyVO> classifyVOS = newClassifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
- int level = VciBaseUtil.getInt(attrVO.getClassifyinvokelevel());
- if (classifyVOS.size()>=level && level > 0 ) {
- classifyVO = classifyVOS.get(level-1);
- }
- }else{
- //褰撳墠鐨勫垎绫�
- classifyVO = classifyFullInfo.getCurrentClassifyVO();
- }
- try {
- if (classifyVO == null) {
- //璇存槑灞傜骇鏈夎
- cbo.setAttributeValue(attrId, "鍒嗙被鏍戜笂娌℃湁灞傜骇[" + attrVO.getClassifyinvokelevel() + "]");
- } else {
- Map<String, String> classifyDataMap = VciBaseUtil.objectToMapString(classifyVO);
- String value = classifyDataMap.getOrDefault(attrVO.getClassifyinvokeattr(), "");
- cbo.setAttributeValue(attrId, value);
- }
- } catch (Throwable e) {
- logger.error("璁剧疆灞炴�ч敊璇�", e);
- }
- });
- });
- }
- }
-
- /**
- * 澶勭悊缁勫悎瑙勫垯
- * @param attrVOS 妯℃澘灞炴��
- * @param dataList excel鐨勬暟鎹唴瀹�
- */
- private void batchSwitchComponentAttrOnOrder(Collection<CodeClassifyTemplateAttrVO> attrVOS,List<ClientBusinessObject> dataList) {
- Map<String, CodeClassifyTemplateAttrVO> dateAttrVOMap = attrVOS.stream().filter(s -> StringUtils.isNotBlank(s.getComponentrule())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if(!CollectionUtils.isEmpty(dateAttrVOMap)) {
- dateAttrVOMap.forEach((attrId, attrVO) -> {
- dataList.stream().forEach(cbo -> {
- //浠巈xcel涓婃妸灞炴�ц浆鎹负map
- Map<String,String> thisRowDataMap = new HashMap<>();
- WebUtil.copyValueToMapFromCbos(cbo,thisRowDataMap);
- //缁勫悎鍐呭
- String value = formulaService.getValueByFormula(thisRowDataMap,attrVO.getComponentrule());
- if(value == null){
- value = "";
- }
- try {
- cbo.setAttributeValue(attrId, value);
- }catch (Throwable e){
- logger.error("璁剧疆灞炴�х殑閿欒",e);
- }
- });
- });
- }
- }
-
- /**
- * 鎵归噺杞崲鏃堕棿閮戒负鎸囧畾鐨勬牸寮�
- * @param attrVOS 妯℃澘灞炴��
- * @param cboList 鏁版嵁鐨勫垪琛�
- * @param errorMap 閿欒鐨勪俊鎭�
- */
- private void batchSwitchDateAttrOnOrder(Collection<CodeClassifyTemplateAttrVO> attrVOS,List<ClientBusinessObject> cboList,Map<String,String> errorMap){
- Map<String, CodeClassifyTemplateAttrVO> dateAttrVOMap =attrVOS.stream().filter(s ->
- StringUtils.isNotBlank(s.getCodedateformat()) && VciBaseUtil.getBoolean(s.getFormdisplayflag()) && StringUtils.isBlank(s.getComponentrule())
- && StringUtils.isBlank(s.getClassifyinvokeattr())
- ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if(!CollectionUtils.isEmpty(dateAttrVOMap)) {
- dateAttrVOMap.forEach((attrId, attrVO) -> {
- cboList.stream().forEach(cbo -> {
- String value = cbo.getAttributeValue(attrId);
- if (value == null) {
- value = "";
- }
- if (StringUtils.isNotBlank(value)) {
- boolean formated = false;
- if(StringUtils.isNotBlank(attrVO.getCodedateformat())){
- try {
- Date date = VciDateUtil.str2Date(value, attrVO.getCodedateformat());
- if(date!=null){
- cbo.setAttributeValue(attrId,value);
- formated = true;
- }
- } catch (Exception e) {
- //璇存槑涓嶆槸杩欎釜鏍煎紡
- }
- }
- if(!formated) {
- try {
- DateConverter dateConverter = new DateConverter();
- dateConverter.setAsText(value);
- value = VciDateUtil.date2Str(dateConverter.getValue(), VciDateUtil.DateTimeMillFormat);
- cbo.setAttributeValue(attrId,value);
- }catch (Throwable e){
- //杞崲涓嶄簡
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";灞炴�" + attrVO.getName() + "]鏃堕棿鏍煎紡涓嶆纭�" );
- }
- }
- }
- });
- });
- }
- }
-
- /**
- * 鏍￠獙鏄惁鏋氫妇鐨勫彇鍊艰寖鍥�
- * @param attrVOS 妯℃澘灞炴��
- * @param dataList 鏁版嵁鐨勫垪琛�
- * @return 涓嶇鍚堟灇涓惧彇鍊艰繑鍥炵殑琛屾暟
- */
- private Set<String> batchCheckEnumOnOrder(Collection<CodeClassifyTemplateAttrVO> attrVOS, List<ClientBusinessObject> dataList) {
- //濡傛灉鏋氫妇鍙互淇敼锛屽垯涓嶉渶瑕佹牎楠屾槸鍚︾鍚堟灇涓剧殑閫夐」
- Map<String, CodeClassifyTemplateAttrVO> enumAttrVOMap = attrVOS.stream().filter(s -> (StringUtils.isNotBlank(s.getEnumString()) || StringUtils.isNotBlank(s.getEnumid())) && !VciBaseUtil.getBoolean(s.getEnumeditflag())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if(!CollectionUtils.isEmpty(enumAttrVOMap)){
- return dataList.stream().filter(cbo->
- enumAttrVOMap.keySet().stream().anyMatch(attrId-> {
- String value = cbo.getAttributeValue(attrId);
- if(StringUtils.isNotBlank(value)) {
- CodeClassifyTemplateAttrVO attrVO = enumAttrVOMap.get(attrId);
- List<KeyValue> comboboxKVs = engineService.listComboboxItems(attrVO);
- return !comboboxKVs.stream().anyMatch(s -> value.equalsIgnoreCase(s.getValue()));
- }else{
- return false;
- }
- })).map(s->s.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX)).collect(Collectors.toSet());
- }
- return new HashSet<>();
- }
-
- /**
- * 妫�鏌ユ牎楠岃鍒欐病鏈夐�氳繃鐨勫唴瀹�
- * @param attrVOS 闇�瑕佹牎楠岀殑灞炴��
- * @param dataList 鏁版嵁鐨勫垪琛�
- * @param errorMap 閿欒鐨勪俊鎭槧灏�
- * @return 鏍￠獙涓嶉�氳繃鐨勮鏁�
- */
- private void batchCheckVerifyOnOrder(Collection<CodeClassifyTemplateAttrVO> attrVOS, List<ClientBusinessObject> dataList,Map<String,String> errorMap) {
- Map<String, CodeClassifyTemplateAttrVO> verifyAttrVOMap = attrVOS.stream().filter(s -> StringUtils.isNotBlank(s.getVerifyrule()) && StringUtils.isBlank(s.getComponentrule())
- &&StringUtils.isBlank(s.getClassifyinvokeattr())
- ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if(!CollectionUtils.isEmpty(verifyAttrVOMap)){
- Map<String/**琛屽彿**/,List<String>/**鏍￠獙涓嶉�氳繃鐨勫睘鎬�**/> unPassCheckMap = new HashMap<>();
- verifyAttrVOMap.forEach((attrId,attrVO)->{
- dataList.stream().forEach(cbo -> {
- String value = cbo.getAttributeValue(attrId);
- if(StringUtils.isNotBlank(value) && !value.matches(attrVO.getVerifyrule())){
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- List<String> unPassAttrs = unPassCheckMap.getOrDefault(rowIndex, new ArrayList<>());
- unPassAttrs.add(attrVO.getName());
- unPassCheckMap.put(rowIndex,unPassAttrs);
- }
- });
- });
- if(!CollectionUtils.isEmpty(unPassCheckMap)){
- unPassCheckMap.forEach((rowIndex,unPassAttrs)->{
- errorMap.put(rowIndex,";灞炴�" + unPassAttrs.stream().collect(Collectors.joining(",")) + "]鍐呭涓嶇鍚堟牎楠岃鍒欑殑瑕佹眰");
- });
- }
- }
- }
-
- private void bathcResembleQuery(String codeClassifyOid, CodeClassifyTemplateVO templateVO, List<ClientBusinessObject> cboList,Map<String,String>resembleMap,String btmtypeid,List<DataResembleVO> dataResembleVOS){
- CodeClassifyFullInfoBO fullInfoBO = classifyService.getClassifyFullInfo(codeClassifyOid);
- Map<String, String> conditionMap = new HashMap<>();
- CodeResembleRuleVO resembleRuleVO = Optional.ofNullable(engineService.getUseResembleRule(fullInfoBO, fullInfoBO.getCurrentClassifyVO())).orElseGet(() -> new CodeResembleRuleVO());
- //闇�瑕佽幏鍙栨槸鍚︽湁鐩镐技鏌ヨ灞炴��
- Map<String, CodeClassifyTemplateAttrVO> attrVOs = templateVO.getAttributes().stream().filter(s -> VciBaseUtil.getBoolean(s.getSamerepeatattrflag())).collect(Collectors.toMap(s -> s.getId(), t -> t));
- if (CollectionUtils.isEmpty(attrVOs)) {
- return;
- }
- Map<String, CodeImprotResembleVO> codeImprotResembleVOMap=new HashMap<>();
- List<CodeImprotResembleVO> codeImprotResembleVOList=new ArrayList<>();
- Map<String,String> rowIndePathMap=new HashMap<>();
- cboList.stream().forEach(clientBusinessObject -> {
- CodeImprotResembleVO codeImprotResembleVO=new CodeImprotResembleVO();
- final String[] path = {""};
- List<String> fieldList=new ArrayList<>();
- List<String> rowIndeList=new ArrayList<>();
- String rowIndex = clientBusinessObject.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- attrVOs.forEach((attrId, attrVO) -> {
- String value="";
- /*if (VciQueryWrapperForDO.BASIC_FIELD_MAP.containsKey(attrId)) {
- value = WebUtil.getStringValueFromObject(WebUtil.getValueFromField(WebUtil.getFieldForObject(attrId, orderDTO.getClass()).getName(), orderDTO));
- }else {*/
- value= clientBusinessObject.getAttributeValue(attrId);
- // }
- fieldList.add(attrId);
- value=StringUtils.isBlank(value)?"":value;
- path[0] +=value+"#";
- engineService.wrapperResembleConditionMap(value, resembleRuleVO, attrId, conditionMap);
- });
- List<Map<String,String>> dataMap=new ArrayList<>();
- if(codeImprotResembleVOMap.containsKey(path[0])) {
- codeImprotResembleVO=codeImprotResembleVOMap.get(path[0]);
- rowIndeList=codeImprotResembleVO.getRownIndex();
- dataMap= codeImprotResembleVO.getDataList();
- resembleMap.put(rowIndex, "瀛樺湪鐩镐技鏁版嵁");
- }else{
- if (!CollectionUtils.isEmpty(conditionMap)) {
- Map<String, String> andConditionMap = new HashMap<>();
- andConditionMap.put("islastr", "1");
- andConditionMap.put("islastv", "1");
- conditionMap.putAll(andConditionMap);
- PageHelper pageHelper = new PageHelper(-1);
- pageHelper.addDefaultDesc("id");
- CodeTemplateAttrSqlBO sqlBO = engineService.getSqlByTemplateVO(btmtypeid, templateVO, conditionMap, pageHelper);
- List<ClientBusinessObject> resembleCboList=boService.queryByOnlySql(sqlBO.getSqlUnPage());
- if(!CollectionUtils.isEmpty(resembleCboList)) {
- List<Map<String, String>> finalDataMap = dataMap;
- resembleCboList.stream().forEach(cbo->{
- Map<String,String> resembDataMap=new HashMap<>();
- fieldList.stream().forEach(field->{
- String value=cbo.getAttributeValue(field);
- value=StringUtils.isBlank(value)?"":value;
- resembDataMap.put(field,value);
- });
- resembDataMap.put("id",StringUtils.isBlank(cbo.getAttributeValue("id"))?"":cbo.getAttributeValue("id"));
- resembDataMap.put("rowIndex","");
- finalDataMap.add(resembDataMap);
- });
- resembleMap.put(rowIndex, "瀛樺湪鐩镐技鏁版嵁");
-
- }
- }
- }
- rowIndePathMap.put(rowIndex,path[0]);
- rowIndeList.add(rowIndex);
- codeImprotResembleVO.setPath(path[0]);
- codeImprotResembleVO.setRownIndex(rowIndeList);
- codeImprotResembleVO.setConditionMap(conditionMap);
- codeImprotResembleVO.setFields(fieldList);
- codeImprotResembleVO.setDataList(dataMap);
- codeImprotResembleVOMap.put(path[0],codeImprotResembleVO);
- });
- Map<String, ClientBusinessObject> cboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getAttributeValue((MdmEngineConstant.IMPORT_ROW_INDEX)), t -> t));
- if(!CollectionUtils.isEmpty(rowIndePathMap)){
- rowIndePathMap.forEach((rowIndex, path) -> {
- if(codeImprotResembleVOMap.containsKey(path)){
- CodeImprotResembleVO codeImprotResembleVO= codeImprotResembleVOMap.get(path);
- List<String> fieldList=codeImprotResembleVO.getFields();
- List<String> rownIndexList= codeImprotResembleVO.getRownIndex();
- List<String> newRownIndexList = rownIndexList.stream().filter(cbo -> {
- return rowIndex!=cbo;
- }).collect(Collectors.toList());
- newRownIndexList.stream().forEach(s -> {
- resembleMap.put(s, "瀛樺湪鐩镐技鏁版嵁");
- });
- List<Map<String, String>>newDataList=new ArrayList<>();
- DataResembleVO dataResembleVO=new DataResembleVO();
- dataResembleVO.setOid(cboMap.get(rowIndex).getOid());
- List<ClientBusinessObject> needSaveCboList = cboList.stream().filter(cbo -> {
- String newRowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return rownIndexList.contains(newRowIndex)&&(!newRowIndex.equalsIgnoreCase(rowIndex));
- }).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(needSaveCboList)) {
- needSaveCboList.stream().forEach(cbo -> {
- String newRowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- Map<String, String> resembDataMap = new HashMap<>();
- fieldList.stream().forEach(field -> {
- String value = cbo.getAttributeValue(field);
- value = StringUtils.isBlank(value) ? "" : value;
- resembDataMap.put(field, value);
- });
- resembDataMap.put("id",StringUtils.isBlank(cbo.getAttributeValue("id"))?"":cbo.getAttributeValue("id"));
- resembDataMap.put("rowIndex", newRowIndex);
- newDataList.add(resembDataMap);
- });
- }
- List<Map<String, String>>dataList=codeImprotResembleVO.getDataList();
- newDataList.addAll(dataList);
- dataResembleVO.setDataList(newDataList);
- dataResembleVOS.add(dataResembleVO);
- }
- });
- }
- }
-
- /**
- * 鏍￠獙鍏抽敭灞炴��
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param templateVO 妯℃澘鐨勫唴瀹癸紝蹇呴』鍖呭惈妯℃澘灞炴��
- * @param cboList 鎵归噺鐨勬暟鎹�
- */
- private CodeImportResultVO batchCheckKeyAttrOnOrder(CodeClassifyFullInfoBO classifyFullInfo, CodeClassifyTemplateVO templateVO,
- List<ClientBusinessObject> cboList) {
- //涓嶮dmEngineServiceImpl閲岀殑checkKeyAttrOnOrder鐩镐技
- //鍏堣幏鍙栧叧閿睘鎬х殑瑙勫垯锛屼篃鍒╃敤缁ф壙鐨勬柟寮�
- CodeKeyAttrRepeatRuleVO keyRuleVO = keyRuleService.getRuleByClassifyFullInfo(classifyFullInfo);
- //娉ㄦ剰鐨勬槸keyRuleVO鍙兘涓虹┖锛岃〃绀轰笉浣跨敤瑙勫垯鎺у埗
- //鑾峰彇鎵�鏈夌殑鍏抽敭灞炴��
- Map<String/**灞炴�х殑缂栧彿**/, CodeClassifyTemplateAttrVO> ketAttrMap = templateVO.getAttributes().stream().filter(s -> VciBaseUtil.getBoolean(s.getKeyattrflag())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
-
- boolean trimAll =keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnoreallspaceflag());
- //鍏ㄩ儴鍘荤┖鐨勪紭鍏堢骇澶т簬鍘荤┖
- boolean trim =keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnorespaceflag());
- boolean ignoreCase = keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnorecaseflag());
- boolean ignoreWidth = keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnorewidthflag());
-
- //1. 鎴戜滑闇�瑕佸厛鍒ゆ柇excel瀵煎叆鐨勫唴瀹规槸鍚︽纭�
- CodeImportResultVO resultVO = new CodeImportResultVO();
- resultVO.setKeyAttrRuleInfo(String.format(keyRuleVO ==null?"":"鏌ヨ瑙勫垯锛氬幓闄ょ┖鏍�--{0},蹇界暐澶у皬鍐�--{1},蹇界暐鍏ㄥ崐瑙�--{2},蹇界暐鍏ㄩ儴绌烘牸--{3}",
- new String[]{trim?"鏄�":"鍚�",ignoreCase?"鏄�":"鍚�",ignoreWidth?"鏄�":"鍚�",trimAll?"鏄�":"鍚�"}));
- resultVO.setSelfRepeatRowIndexList(getSelfRepeatRowIndex(ketAttrMap,cboList,keyRuleVO));
- if(!CollectionUtils.isEmpty(resultVO.getSelfRepeatRowIndexList())){
- //鎴戜滑绉婚櫎鏈韩閲嶅鐨勬暟鎹�
- cboList = cboList.stream().filter(s->!resultVO.getSelfRepeatRowIndexList().contains(s.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX))).collect(Collectors.toList());
- }
- //2.鍒ゆ柇鍏抽敭灞炴�у湪绯荤粺閲屾槸鍚﹂噸澶�
- //鍥犱负鏁版嵁閲忓緢澶э紝鎵�浠ュ緱鎯冲姙娉曞苟琛�
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- Map<String,List<ClientBusinessObject>> indexTODataMap=new HashMap<>();
- List<ClientBusinessObject> repeatDataMap = cboList.parallelStream().filter(cbo -> {
- //姣忚閮藉緱鏌ヨ.濡傛灉鍏朵腑鍑虹幇浜嗛敊璇紝鎴戜滑灏辩洿鎺ユ姏鍑哄紓甯革紝鍏朵綑鐨勬樉绀�
- VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
- Map<String, String> conditionMap = new HashMap<>();
- ketAttrMap.forEach((attrId, attrVO) -> {
- String value =cbo.getAttributeValue(attrId.toLowerCase(Locale.ROOT));
- if (value == null) {
- value = "";
- }
- value= value.replace(REQUIRED_CHAR,SPECIAL_CHAR);
- engineService.wrapperKeyAttrConditionMap(value, keyRuleVO, attrId, trim, ignoreCase, ignoreWidth, trimAll, conditionMap);
- });
- if (!CollectionUtils.isEmpty(ketAttrMap)) {
- CodeTemplateAttrSqlBO sqlBO = engineService.getSqlByTemplateVO(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), templateVO, conditionMap, null);
- boolean isKeyCheck= boService.queryCountBySql(sqlBO.getSqlCount(), new HashMap<>()) > 0;
- if(isKeyCheck){
- List<ClientBusinessObject> newCboList= boService.queryByOnlySql(sqlBO.getSqlUnPage());
- indexTODataMap.put(cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX),newCboList);
- }
- return isKeyCheck;
- }else{
- return false;
- }
- }).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(repeatDataMap)){
- resultVO.setKeyAttrRepeatRowIndexList(repeatDataMap.stream().map(s->s.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX)).collect(Collectors.toSet()));
- }
- resultVO.setIndexTODataMap(indexTODataMap);
- resultVO.setSuccess(true);
- return resultVO;
- }
-
- /**
- * 鑾峰彇瀵煎叆鐨勫唴瀹逛腑鍏抽敭灞炴�ч噸澶嶇殑琛屽彿
- * @param ketAttrMap 鍏抽敭灞炴�х殑鏄犲皠
- * @param dataList 瀵煎叆鐨勬暟鎹�
- * @param keyRuleVO 鍏抽敭灞炴�ф帶鍒惰鍒�
- * @return 閲嶅鐨勮鍙�
- */
- private Set<String> getSelfRepeatRowIndex(Map<String/**灞炴�х殑缂栧彿**/, CodeClassifyTemplateAttrVO> ketAttrMap,
- List<ClientBusinessObject> dataList,CodeKeyAttrRepeatRuleVO keyRuleVO){
- Set<String> selfRepeatRowIndexList = new CopyOnWriteArraySet<>();
- boolean trimAll =keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnoreallspaceflag());
- //鍏ㄩ儴鍘荤┖鐨勪紭鍏堢骇澶т簬鍘荤┖
- boolean trim =keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnorespaceflag());
- boolean ignoreCase = keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnorecaseflag());
- boolean ignoreWidth = keyRuleVO ==null?false: VciBaseUtil.getBoolean(keyRuleVO.getIgnorewidthflag());
- //蹇呴』灏嗗睘鎬ф寜鐓ч『搴忔帓搴忓ソ
- List<CodeClassifyTemplateAttrVO> attrVOList = ketAttrMap.values().stream().sorted(((o1, o2) -> o1.getOrdernum().compareTo(o2.getOrdernum()))).collect(Collectors.toList());
- Map<String/**琛屽彿**/,String/**鍏抽敭灞炴�х殑缁勫悎鍐呭**/> rowIndexKeyStringMap = new HashMap<>();
- dataList.parallelStream().forEach(cbo-> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < attrVOList.size(); i++) {
- CodeClassifyTemplateAttrVO attrVO = attrVOList.get(i);
- String attrId = attrVO.getId().toLowerCase(Locale.ROOT);
- String value = cbo.getAttributeValue( attrId);
- if (value == null) {
- value = "";
- }
- if(trim){
- value = value.trim();
- }
- if(trimAll){
- value = value.replace(" ","");
- }
- if(ignoreCase){
- value = value.toLowerCase(Locale.ROOT);
- }
- if(ignoreWidth){
- value = VciBaseUtil.toDBC(value);
- }
- sb.append(value).append("${ks}");
- }
- String keyString = sb.toString();
- if(rowIndexKeyStringMap.containsValue(keyString) && StringUtils.isNotBlank(keyString)){
- selfRepeatRowIndexList.add(rowIndex);
- }else {
- rowIndexKeyStringMap.put(rowIndex, sb.toString());
- }
- });
- //鍥犱负鍙槸鍏抽敭灞炴�ч噸澶嶏紝鎵�浠ユ垜浠笉鑳介噸澶嶇殑澶氭潯閫変竴鏉℃潵鎶ラ敊
- return selfRepeatRowIndexList;
- }
-
- /**
- * 瀵煎嚭鐨勬椂鍊欏皝瑁呭繀杈撳拰鍏抽敭灞炴��
- * @param attrVO 灞炴�х殑鏄剧ず瀵硅薄
- * @param text 鍗曞厓鏍肩殑鍊�
- */
- private Object exportKeyAndRequired(Workbook workbook,CodeClassifyTemplateAttrVO attrVO,Object text){
- //蹇呰緭鍔�*锛屽叧閿睘鎬т负钃濊壊
- if (VciBaseUtil.getBoolean(attrVO.getRequireflag()) || VciBaseUtil.getBoolean(attrVO.getKeyattrflag())) {
- String value = text.toString();
- if(VciBaseUtil.getBoolean(attrVO.getRequireflag())) {
- value += REQUIRED_CHAR;
- }
- if(VciBaseUtil.getBoolean(attrVO.getKeyattrflag())){
- value += KEY_ATTR_CHAR;
- }
- RichTextString ts = new HSSFRichTextString(value);
- if(VciBaseUtil.getBoolean(attrVO.getRequireflag())){
- Font font = workbook.createFont();
- font.setColor(HSSFColor.HSSFColorPredefined.RED.getIndex());
- ts.applyFont(font);
- }
-
- if(VciBaseUtil.getBoolean(attrVO.getKeyattrflag())){
- Font font = workbook.createFont();
- font.setColor(HSSFColor.HSSFColorPredefined.BLUE.getIndex());
- ts.applyFont(font);
- }
- return ts;
- }
- return text;
- }
-
- /**
- * 鏌ヨ鏁版嵁骞跺鍑哄埌excel
- * @param btmTypeId 涓氬姟绫诲瀷
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉
- * @param selectFieldList 鏌ヨ鐨勫瓧娈�
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param templateVO 妯℃澘鐨勪俊鎭�
- * @param exportAttrDTO 瀵煎嚭鐨勫睘鎬�
- * @param excelNameList excel鐨勬枃浠跺悕绉�
- * @param tempFolder 涓存椂鏂囦欢澶�
- * @param excelIndex excel鐨勯『搴�
- */
- private void selectDataAndExportExcelName(String btmTypeId, Map<String, String> conditionMap, PageHelper pageHelper, List<String> selectFieldList,
- CodeClassifyFullInfoBO classifyFullInfo, CodeClassifyTemplateVO templateVO, CodeExportAttrDTO exportAttrDTO,
- List<String> excelNameList, String tempFolder,
- Integer excelIndex) {
- DataGrid<Map<String, String>> dataGrid = engineService.queryGrid(btmTypeId, templateVO, conditionMap, pageHelper);
- if(dataGrid == null || CollectionUtils.isEmpty(dataGrid.getData())){
- return;
- }
- //杞崲鏁版嵁
- List<Map<String, String>> dataMap = dataGrid.getData();
- //灏佽鏌ヨ鍑烘潵鐨勬暟鎹�
- engineService.wrapperData(dataMap, templateVO, selectFieldList,false);
- //modify by weidy@2022-09-27
- //鍥犱负鍦ㄥ垪琛ㄥ拰琛ㄥ崟鐨勬樉绀虹殑鏃跺�欙紝鎴戜滑鐨勫紑鍏崇被鍨嬮〉闈細澶勭悊锛屼絾鏄湪瀵煎嚭鐨勬椂鍊欙紝鎴戜滑闇�瑕佸皢true鍜宖alse閮芥浛鎹㈡垚涓枃
- engineService.wrapperBoolean(dataMap,templateVO);
- Map<String, CodeClassifyTemplateAttrVO> attrVOMap = templateVO.getAttributes().stream().filter(s->selectFieldList.contains(s.getId().toLowerCase(Locale.ROOT))).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- Map<Integer, String> attrIdIndexMap = exportAttrDTO.getAttrIdIndexMap();
- if (CollectionUtils.isEmpty(attrIdIndexMap)) {
- attrIdIndexMap = templateVO.getAttributes().stream().filter(s->selectFieldList.contains(s.getId().toLowerCase(Locale.ROOT))).collect(Collectors.toMap(s -> s.getOrdernum(), t -> t.getId()));
- }
- List<Integer> indexList = attrIdIndexMap.keySet().stream().sorted().collect(Collectors.toList());
-
- String excelName = tempFolder + File.separator +
- classifyFullInfo.getCurrentClassifyVO().getId() + "_" + classifyFullInfo.getCurrentClassifyVO().getName() + "_瀵煎嚭_" + excelIndex + ".xls";
- try {
- new File(excelName).createNewFile();
- } catch (Throwable e) {
- throw new VciBaseException(LangBaseUtil.getErrorMsg(e), new String[]{excelName}, e);
- }
- excelNameList.add(excelName);
- List<WriteExcelData> excelDataList = new ArrayList<>();
- Workbook workbook = new HSSFWorkbook();
- for (int i = 0; i < indexList.size(); i++) {
- String attrId = attrIdIndexMap.get(indexList.get(i)).toLowerCase(Locale.ROOT);
- if (attrVOMap.containsKey(attrId)) {
- CodeClassifyTemplateAttrVO attrVO = attrVOMap.get(attrId);
- Object text = attrVO.getName();
- text = exportKeyAndRequired(workbook,attrVO,text);
- WriteExcelData excelData = new WriteExcelData(0, i, text);
- if(text instanceof RichTextString){
- excelData.setFontColor(String.valueOf(HSSFColor.HSSFColorPredefined.RED.getIndex()));
- }
- excelDataList.add(excelData);
- }
- }
- final Integer[] rowIndex = {0};
- Map<Integer, String> finalAttrIdIndexMap = attrIdIndexMap;
- dataMap.stream().forEach(data -> {
- rowIndex[0]++;
- for (int i = 0; i < indexList.size(); i++) {
- Integer index = indexList.get(i);
- String attrId = finalAttrIdIndexMap.get(index).toLowerCase(Locale.ROOT);
- if (attrVOMap.containsKey(attrId)) {
- CodeClassifyTemplateAttrVO attrVO = attrVOMap.get(attrId);
- if (StringUtils.isNotBlank(attrVO.getEnumid()) || StringUtils.isNotBlank(attrVO.getEnumString())) {
- attrId = attrId + "Text";
- }
- if (StringUtils.isNotBlank(attrVO.getReferbtmid()) || StringUtils.isNotBlank(attrVO.getReferConfig())) {
- attrId = attrId + "name";
- }
- if(VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(attrId)){
- attrId = VciQueryWrapperForDO.LC_STATUS_FIELD_TEXT.toLowerCase(Locale.ROOT);
- }
- excelDataList.add(new WriteExcelData(rowIndex[0], i, data.getOrDefault(attrId, "")));
- }
- }
- });
- WriteExcelOption excelOption = new WriteExcelOption(excelDataList);
- ExcelUtil.writeDataToFile(excelName, excelOption);
- }
-
- /**
- * 鎵归噺鏍￠獙鏁版嵁鐨勪俊鎭�
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param cboList 鏁版嵁鐨勫唴瀹�
- */
- private void batchCheckRequiredAttrOnOrder(CodeClassifyTemplateVO templateVO,List<ClientBusinessObject> cboList,Map<String,String> errorMap){
- Map<String, CodeClassifyTemplateAttrVO> requiredAttrMap = templateVO.getAttributes().stream().filter(s ->
- VciBaseUtil.getBoolean(s.getRequireflag()) && StringUtils.isBlank(s.getComponentrule()) && StringUtils.isBlank(s.getClassifyinvokeattr())//涓嶈兘鏄粍鍚堢殑鍜屽垎绫绘敞鍏ョ殑
- ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- //涓嶮dmEngineServiceImpl閲岄潰鐨刢heckRequiredAttrOnOrder 閫昏緫搴旇鐩镐技
- if(!CollectionUtils.isEmpty(requiredAttrMap)) {
- Set<String> nullRowIndex = cboList.stream().filter(cbo -> requiredAttrMap.keySet().stream().anyMatch(attrId -> StringUtils.isBlank(cbo.getAttributeValue(attrId)))).map(cbo -> cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX)).collect(Collectors.toSet());
- if(!CollectionUtils.isEmpty(nullRowIndex)){
- String checkAttr = requiredAttrMap.values().stream().map(CodeClassifyTemplateAttrVO::getName).collect(Collectors.joining(","));
- nullRowIndex.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鏍￠獙瑙勫垯涓嶉�氳繃锛屾湁鏍￠獙鐨勫睘鎬т负" + checkAttr);
- });
- }
- }
- }
-
- /**
- * 鎵归噺妫�鏌ヤ紒涓氱紪鐮佹槸鍚﹀瓨鍦�
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param cboList 鏁版嵁鐨勫垪琛�
- * @param errorMap 閿欒鐨勪俊鎭�
- */
- private void batchCheckIdExistOnOrder(CodeClassifyTemplateVO templateVO,List<ClientBusinessObject> cboList,Map<String ,String> errorMap){
- List<String> existIds = new ArrayList<>();
- VciBaseUtil.switchCollectionForOracleIn(cboList).stream().forEach(cbos -> {
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("id", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(cbos.stream().map(s -> s.getId()).collect(Collectors.toSet()).toArray(new String[0])) + ")");
- //涓氬姟鏁版嵁濡傛灉鐮佸�煎洖鏀朵細鐩存帴鍒犻櫎鏁版嵁锛屾墍浠ヨ繖閲岀洿鎺ュ垽鏂槸鍚﹀瓨鍦ㄥ嵆鍙�
- existIds.addAll(Optional.ofNullable(boService.queryCBO(templateVO.getBtmTypeId(), conditionMap, new PageHelper(-1), Arrays.stream(new String[]{"id"})
- .collect(Collectors.toList()))).orElseGet(() -> new ArrayList<>()).stream().map(s -> s.getAttributeValue("id")).collect(Collectors.toList()));
- });
- if(!CollectionUtils.isEmpty(existIds)){
- String idFieldName = templateVO.getAttributes().stream().filter(s -> VciQueryWrapperForDO.ID_FIELD.equalsIgnoreCase(s.getId())).findFirst().orElseGet(() -> new CodeClassifyTemplateAttrVO()).getName();
- if(StringUtils.isBlank(idFieldName)){
- idFieldName = "浼佷笟缂栫爜";
- }
- String finalIdFieldName = idFieldName;
- cboList.stream().forEach(cbo->{
- String id = cbo.getId();
- if(StringUtils.isBlank(id)){
- id = cbo.getAttributeValue("id");
- }
- if(existIds.contains(id)){
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- String msg = errorMap.getOrDefault(rowIndex, "");
- msg+=";" + finalIdFieldName + "鐨勫�煎湪绯荤粺涓凡缁忓瓨鍦�";
- errorMap.put(rowIndex,msg);
- }
- });
- }
- }
-
- /**
- * 浠巑ap閲岃幏鍙栧��
- * @param dataMap 鍊肩殑鏄犲皠
- * @param attrId 灞炴�х殑缂栧彿
- * @return 鍊�
- */
- private String getValueFormMap(Map<String,String> dataMap,String attrId){
- attrId = attrId.toLowerCase(Locale.ROOT);
- return dataMap.getOrDefault(attrId,"");
- }
-
- /**
- * 璁剧疆鍊煎埌map涓�
- * @param dataMap 鍊肩殑鏄犲皠鍐呭
- * @param attrId 灞炴�х殑缂栧彿
- * @param value 灞炴�х殑鍊�
- */
- private void setValueToMap(Map<String,String> dataMap,String attrId,String value){
- attrId = attrId.toLowerCase(Locale.ROOT);
- dataMap.put(attrId,value);
- }
- /**
- * 闆嗘垚鎵归噺鐢宠鏁版嵁
- * @param orderDTO 鍒嗙被鐨勪富閿�
- * @param dataObjectVO 鏁版嵁淇℃伅
- * @param resultDataObjectDetailDOs 閿欒淇℃伅
- * @return 鏈夐敊璇俊鎭殑excel
- */
- @Override
- public void batchSyncApplyCode(CodeOrderDTO orderDTO, DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs) {
- Map<String,String> errorMap=new HashMap<>();
- VciBaseUtil.alertNotNull(orderDTO,"缂栫爜鐢宠鐩稿叧鐨勬暟鎹�",orderDTO.getCodeClassifyOid(),"涓婚搴撳垎绫讳富閿�");
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
- //瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
- CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
- //1.鍒ゆ柇瑙勫垯涓櫎浜嗘祦姘寸爜娈碉紝鏄惁鏈夊叾浠栫爜娈�
- engineService.checkSecValueOnOrder(ruleVO,orderDTO);
- //鏌ヨ鍒嗙被鍜屾ā鏉�
- //鍏堟壘鍒版瘡涓�琛岀殑鏍囬锛岀劧鍚庢牴鎹爣棰樻潵鑾峰彇瀵瑰簲鐨勫睘鎬�
- List<RowDatas> rowDataList = dataObjectVO.getRowData();
- Map<String ,RowDatas>rowDataMap=new LinkedHashMap<>();
- rowDataList.stream().forEach(rowData->{
- rowDataMap.put(rowData.getRowIndex(),rowData);
- });
- //鎵剧涓�琛岋紝涓轰簡鎵炬爣棰�
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(orderDTO.getCodeClassifyOid());
-
- //鏍￠獙妯℃澘鏄笉鏄渶鏂扮殑
- //checkTemplateSync(sheetDataSetList,templateVO);
- //闄ゅ幓榛樿鐨勫睘鎬�.杩樻湁鍙湁琛ㄥ崟鏄剧ず鐨勫瓧娈垫墠瀵煎叆
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s ->!MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
- Map<Integer/**鍒楀彿**/,String/**瀛楁鐨勫悕绉�**/> fieldIndexMap = new HashMap<>();
- List<String> titleRowData = dataObjectVO.getColName();
- Map<String/**涓枃鍚嶇О**/, String/**鑻辨枃鍚嶇О**/> attrNameIdMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getName(), t -> t.getId().toLowerCase(Locale.ROOT),(o1, o2)->o2));
- getFieldIndexMap(titleRowData,attrNameIdMap,fieldIndexMap);
-
- //闇�瑕佸垽鏂槸鍚︽墍鏈夌殑灞炴�ч兘鍦ㄦā鏉夸笂浜�
- List<CodeClassifyTemplateAttrVO> unExistAttrVOs = attrVOS.stream().filter(s -> !fieldIndexMap.containsValue(s.getId().toLowerCase(Locale.ROOT))
- && StringUtils.isBlank(s.getComponentrule()) && StringUtils.isBlank(s.getClassifyinvokeattr())//缁勫悎瑙勫垯鍜屽垎绫绘敞鍏ョ‘瀹炴病缁欑敤鎴峰鍑哄幓
- ).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(unExistAttrVOs)){
- throw new VciBaseException("銆�" + unExistAttrVOs.stream().map(CodeClassifyTemplateAttrVO::getName) + "銆戣繖浜涘睘鎬у湪excel涓病鏈夋壘鍒�");
- }
- List<ClientBusinessObject> cboList = new ArrayList<>();
- String fullPath = getFullPath(classifyFullInfo);
-
- // List<CodeClassifyProcessTempVO> codeClassifyProcessTempVOS=codeClassifyProcessTempService.listProcessTemplate(templateVO.getOid(),"code_cls_flow_use_order");
- boolean isProcess=false;
- //娉ㄩ噴鎺夋澶勪笅闈㈡墍鏈夐兘鎸夌収涓嶅垽鏂祦绋嬪瓨鍌ㄧ姸鎬佷簡
- /** if(!CollectionUtils.isEmpty(codeClassifyProcessTempVOS)){
- isProcess=true;
- }***/
- Map<String,String> codeOidToSystemOidMap=new HashMap<>();//瀛樺偍缂栫爜鏁版嵁鍜岄泦鎴愮郴缁熸暟鎹畂id瀵圭収鏄犲皠
- excelToCbo(classifyFullInfo,titleRowData,fieldIndexMap,rowDataList,templateVO,cboList,fullPath,isProcess,"create",errorMap,codeOidToSystemOidMap);
-
- //閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
- //濡傛灉鍑洪敊浜嗭紝鎴戜滑渚濈劧鎵ц鏈夋晥鐨勬暟鎹紝鏃犳晥鐨勬暟鎹啓鍥炲埌excel涓�
- //2.鍒ゆ柇蹇呰緭椤广�傘�傞渶瑕佸叏閮ㄧ殑灞炴�э紝濡傛灉鏄繀杈擄紝浣嗘槸琛ㄥ崟閲岄潰涓嶆樉绀虹殑锛屽彧鑳芥槸鍒嗙被娉ㄥ叆鎴栬�呯粍鍚堣鍒�
- batchCheckRequiredAttrOnOrder(templateVO,cboList,errorMap);
-
-
- /**
- * 鍏抽敭鐔熸倝閿欒鎻愮ず
- */
- Map<String,String> errorKeyMap=new HashMap<>();
-
-
- //3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, templateVO, cboList);
- Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
- Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
- if(!CollectionUtils.isEmpty(selfRepeatRowIndexList)){
- selfRepeatRowIndexList.stream().forEach(rowIndex->{
- /* //浼犲叆鏁版嵁涔嬮棿鍏抽敭灞炴�х殑鏍￠獙
- RowDatas rowData= rowDataMap.get(rowIndex);
- XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- resultDataObjectDetailDO.setCode("");
- resultDataObjectDetailDO.setId(rowData.getOid());
- resultDataObjectDetailDO.setErrorid("1");
- resultDataObjectDetailDO.setMsg(errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�ч噸澶�");
- resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
- */
- errorKeyMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";浼犲叆鐨勬暟鎹腑鍏抽敭灞炴�ч噸澶�");
- });
- }
- /****
- * 鍏抽敭灞炴�т笌绯荤粺涓噸澶嶇殑鍒ゆ柇
- */
- if(!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)){
- keyAttrRepeatRowIndexList.stream().forEach(rowIndex->{
- //浼犲叆鏁版嵁涔嬮棿鍏抽敭灞炴�х殑鏍￠獙
- /* RowDatas rowData= rowDataMap.get(rowIndex);
- XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- resultDataObjectDetailDO.setCode("");
- resultDataObjectDetailDO.setId(rowData.getOid());
- resultDataObjectDetailDO.setErrorid("1");
- resultDataObjectDetailDO.setMsg(errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
- resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
- */
- errorKeyMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
- });
- }
- //鍒嗙被娉ㄥ叆
- batchSwitchClassifyAttrOnOrder(attrVOS,cboList,classifyFullInfo,false);
- //boolean
- reSwitchBooleanAttrOnOrder(attrVOS,cboList);
- // cboList.stream().forEach(cbo->{
- //4.鏍￠獙瑙勫垯
- batchCheckVerifyOnOrder(attrVOS, cboList,errorMap);
- //5.鏍￠獙鏋氫妇鏄惁姝ｇ‘
- batchSwitchEnumAttrOnOrder(attrVOS,cboList,errorMap);
- //6.鏃堕棿鏍煎紡鐨勯獙璇�
- //6.鏃堕棿鐨勶紝蹇呴』缁熶竴涓簓yyy-MM-dd HH:mm:ss
- batchSwitchDateAttrOnOrder(attrVOS,cboList,errorMap);
- //7.澶勭悊鍙傜収鐨勬儏鍐�
- batchSwitchReferAttrOnOrder(attrVOS,cboList,errorMap);
- //鏍￠獙灞炴�ф槸鍚︽纭敊璇俊鎭�
- if(errorMap.size()>0){
- String[] newMsg = {""};
- cboList.stream().forEach(cbo -> {
- String rowIndex =cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- if(errorMap.containsKey(rowIndex)){
- String oid=cbo.getOid();
- String sourceOid=oid;
- if(codeOidToSystemOidMap.containsKey(oid)){
- sourceOid=codeOidToSystemOidMap.get(oid);
- }
- String code="";
- String errorid="103";
- String mes=errorMap.get(rowIndex);
- XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- resultDataObjectDetailDO.setCode(code);
- resultDataObjectDetailDO.setId(sourceOid);
- resultDataObjectDetailDO.setErrorid(errorid);
- resultDataObjectDetailDO.setMsg(mes);
- resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
- }
- });
-
- }
-
- Map<String,String> newKeyMap=new HashedMap();
- if(errorKeyMap.size()>0 ) {
- errorKeyMap.keySet().forEach(key->{
- if(!errorMap.containsKey(key)){
- newKeyMap.put(key,errorKeyMap.get(key));
- }
- });
- if(newKeyMap.size()>0) {
- Set<ClientBusinessObject> editBoList = new HashSet<>();
- Map<String, List<ClientBusinessObject>> indexTodataMap = keyResultVO.getIndexTODataMap();
- cboList.stream().forEach(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- if (indexTodataMap.containsKey(rowIndex)) {
- String oid = cbo.getOid();
- String sourceOid = oid;
- String code = "";
- String errorid = "201";
- if(codeOidToSystemOidMap.containsKey(oid)){
- sourceOid=codeOidToSystemOidMap.get(oid);
- }
- List<ClientBusinessObject> newCboList = indexTodataMap.get(rowIndex);
- if (!CollectionUtils.isEmpty(newCboList)) {
- ClientBusinessObject newCbo= newCboList.get(0);
- String lcstatus =newCbo.getAttributeValue("lcstatus");
- String newOid =newCbo.getAttributeValue("oid");
- String ts =newCbo.getAttributeValue("ts");
- code=newCbo.getAttributeValue("id");
- String lastmodifier=newCbo.getAttributeValue("lastmodifier");
- if (!lcstatus.equals(CodeDefaultLC.RELEASED.getValue())) {
- newCbo.setBusinessObject(cbo.getBusinessObject());
- newCbo.setOid(newOid);
- newCbo.setLastModifier(lastmodifier);
- newCbo.setId(code);
- newCbo.setTs(ts);
- cbo.setLastModifier(cbo.getLastModifier());
- editBoList.add(newCbo);
- }
- String mes = errorKeyMap.get(rowIndex);
- XMLResultDataObjectDetailDO resultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
- resultDataObjectDetailDO.setCode(code);
- resultDataObjectDetailDO.setId(sourceOid);
- resultDataObjectDetailDO.setErrorid(errorid);
- resultDataObjectDetailDO.setMsg(mes);
- resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
- }
- }
- });
- //鍏抽敭鐔熸倝鏇存敼
- if (!CollectionUtils.isEmpty(editBoList)) {
- BatchCBO batchCbos = new BatchCBO();
- batchCbos.setUpdateCbos(editBoList);
- this.boService.persistenceBatch(batchCbos);//鏇存敼鏁版嵁
- }
- errorMap.putAll(errorKeyMap);
- }
- }
-
- // });
- //鏈�鍚庡紕缁勫悎瑙勫垯
- batchSwitchComponentAttrOnOrder(attrVOS,cboList);
- //瑕佹妸浠ヤ笂鐨勯敊璇殑閮芥姏鍑哄悗锛屽啀缁х画澶勭悊鏃堕棿鍜岀粍鍚堣鍒�
- List<ClientBusinessObject> needSaveCboList = cboList.stream().filter(cbo -> {
- String rowIndex =cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
- List<String> needRowIndexList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(needSaveCboList)) {
- //9.鎴戜滑澶勭悊涓氬姟鏁版嵁
- //鐢熸垚缂栫爜鐨勫唴瀹�
- try {
- productCodeService.productCodeAndSaveData(classifyFullInfo, templateVO, ruleVO, orderDTO.getSecDTOList(), needSaveCboList);
- //濡傛灉鏄紪鐮佺敓鎴愬け璐ワ紝鍒欑洿鎺ュ氨澶辫触浜嗭紝鍏朵粬鐨勫垽鏂嚭鏉ユ湁閿欒鐨勬垜浠兘缁熶竴杩斿洖鍒癳xcel閲岄潰
- engineService.batchSaveSelectChar(templateVO, needSaveCboList);
- // if(!isProcess){
- needSaveCboList.stream().forEach(needSaveCbo->{
- XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- resultDataObjectDetailDO.setCode(needSaveCbo.getId());
- String oid=needSaveCbo.getOid();
- String sourceOid=oid;
- if(codeOidToSystemOidMap.containsKey(oid)){
- sourceOid=codeOidToSystemOidMap.get(oid);
- }
- resultDataObjectDetailDO.setId(sourceOid);
- resultDataObjectDetailDO.setErrorid("0");
- resultDataObjectDetailDO.setMsg("鐢宠缂栫爜鎴愬姛");
- resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
- });
- /* }else{
- needSaveCboList.stream().forEach(needSaveCbo->{
- XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- // resultDataObjectDetailDO.setCode(needSaveCbo.getId());//涓嶇敤杩斿洖缂栫爜
- String oid=needSaveCbo.getOid();
- String sourceOid=oid;
- if(codeOidToSystemOidMap.containsKey(oid)){
- sourceOid=codeOidToSystemOidMap.get(oid);
- }
- resultDataObjectDetailDO.setId(sourceOid);
- resultDataObjectDetailDO.setErrorid("204");
- resultDataObjectDetailDO.setMsg("鐢宠缂栫爜鎴愬姛锛岀瓑寰呯紪鐮佺郴缁熷彂甯冿紒");
- resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
- });
-
- }*/
- }catch (Throwable e){
- e.printStackTrace();
- needSaveCboList.stream().forEach(needSaveCbo->{
- XMLResultDataObjectDetailDO resultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- resultDataObjectDetailDO.setCode("");
- String oid=needSaveCbo.getOid();
- String sourceOid=oid;
- if(codeOidToSystemOidMap.containsKey(oid)){
- sourceOid=codeOidToSystemOidMap.get(oid);
- }
- resultDataObjectDetailDO.setId(sourceOid);
- resultDataObjectDetailDO.setErrorid("1");
- resultDataObjectDetailDO.setMsg("淇濆瓨鍑虹幇闂:"+e.getMessage());
- resultDataObjectDetailDOs.add(resultDataObjectDetailDO);
- });
-
- }
- }
- }
-
- /***
- * 闆嗘垚鎵归噺鍚屾鏇存柊鎺ュ彛
- * @param codeClassifyVO;
- * @param dataObjectVO 鏁版嵁淇℃伅
- * @param resultDataObjectDetailDOs 閿欒淇℃伅
- */
- @Override
- public void batchSyncEditDatas(CodeClassifyVO codeClassifyVO,DataObjectVO dataObjectVO, LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs) {
- String errorid="";
- String msg="";
- //鏌ヨ鍒嗙被鍜屾ā鏉�
- //鍏堟壘鍒版瘡涓�琛岀殑鏍囬锛岀劧鍚庢牴鎹爣棰樻潵鑾峰彇瀵瑰簲鐨勫睘鎬�
- List<RowDatas> rowDataList = dataObjectVO.getRowData();
- Map<String, RowDatas> rowDataMap = new LinkedHashMap<>();
- Map<String, RowDatas> codeDataMap = new LinkedHashMap<>();
- rowDataList.stream().forEach(rowData -> {
- rowDataMap.put(rowData.getRowIndex(), rowData);
- codeDataMap.put(rowData.getCode(), rowData);
- });
- //鎵剧涓�琛岋紝涓轰簡鎵炬爣棰�
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
- // 搴旇閮芥槸涓�涓垎绫讳笅鐨勪笟鍔℃暟鎹紝鎵剧涓�鏉＄殑灏辫
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
- //鏍￠獙妯℃澘鏄笉鏄渶鏂扮殑
- //checkTemplateSync(sheetDataSetList,templateVO);
- //闄ゅ幓榛樿鐨勫睘鎬�.杩樻湁鍙湁琛ㄥ崟鏄剧ず鐨勫瓧娈垫墠瀵煎叆
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
- Map<Integer/**鍒楀彿**/, String/**瀛楁鐨勫悕绉�**/> fieldIndexMap = new HashMap<>();
- List<String> titleRowData = dataObjectVO.getColName();
- Map<String/**涓枃鍚嶇О**/, String/**鑻辨枃鍚嶇О**/> attrNameIdMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getName(), t -> t.getId().toLowerCase(Locale.ROOT), (o1, o2) -> o2));
- getFieldIndexMap(titleRowData, attrNameIdMap, fieldIndexMap);
- Map<String, String> cboOidMap = new HashMap<>();
- cboOidMap.put("id", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])) + ")");
- List<ClientBusinessObject> cboList = boService.queryCBO(classifyFullInfo.getTopClassifyVO().getBtmtypeid(), cboOidMap);
- Map<String, ClientBusinessObject> codeSystemObjectMap = cboList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
- Map<String, String> errorMap = new HashMap<>();
- List<CodeOrderDTO> codeOrderDTOList = new ArrayList<>();
- this.getCodeOrderDTOs(codeClassifyVO, templateVO, codeDataMap, codeSystemObjectMap, codeOrderDTOList, errorMap);
- // List<CodeClassifyProcessTempVO> codeClassifyProcessTempVOS=codeClassifyProcessTempService.listProcessTemplate(templateVO.getOid(),"code_cls_flow_use_order");
- boolean isProcess=false;
- /** if(!CollectionUtils.isEmpty(codeClassifyProcessTempVOS)){
- isProcess=true;
- }**/
-
- Map<String, CodeOrderDTO> orderDTOMap = codeOrderDTOList.stream().filter(orderDTO -> orderDTO != null && StringUtils.isNotBlank(orderDTO.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
- List<ClientBusinessObject> updateList = new ArrayList<>();
- List<ClientBusinessObject> deleteList = new ArrayList<>();
-
- BatchCBO batchCBO = new BatchCBO();
- CodeClassifyTemplateVO firstTemplateVO = templateService.getObjectHasAttrByOid(orderDTOMap.values().stream().findFirst().get().getTemplateOid());
- Map<String, ClientBusinessObject> cboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
- // boolean finalIsProcess = isProcess;
- orderDTOMap.keySet().stream().forEach(code -> {
- CodeOrderDTO orderDTO = orderDTOMap.get(code);
- ClientBusinessObject cbo = cboMap.get(code);
- String dataStatus=cbo.getLcStatus();
- RowDatas rowData=codeDataMap.get(code);
- String status=rowData.getStatus();
- String operation=rowData.getOperation();
- if (!cbo.getTs().contains(VciDateUtil.date2Str(orderDTO.getTs(), VciDateUtil.DateTimeFormat))) {
- // throw new VciBaseException("鏁版嵁涓嶆槸鏈�鏂扮殑锛屽彲鑳戒粬浜哄凡缁忎慨鏀癸紝璇峰埛鏂板悗鍐嶈瘯");
- errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+";鏁版嵁涓嶆槸鏈�鏂扮殑锛屽彲鑳戒粬浜哄凡缁忎慨鏀癸紝璇峰埛鏂板悗鍐嶈瘯");
- }
- /* if (!CodeDefaultLC.EDITING.getValue().equalsIgnoreCase(cbo.getLcStatus()) && !orderDTO.isEditInProcess()) {
- throw new VciBaseException("鏁版嵁涓嶆槸{0}鐨勭姸鎬侊紝涓嶅厑璁镐慨鏀�", new String[]{CodeDefaultLC.EDITING.getText()});
- }*/
- if(operation.equals("update")) {
- //1. 鍒ゆ柇蹇呰緭椤�
- checkRequiredAttrOnOrder(templateVO, orderDTO, errorMap);
- //2.鍏堟敞鍏ワ紝鍐嶇粍鍚堬紝鏈�鍚庢牎楠�
- switchClassifyLevelOnOrder(templateVO, classifyFullInfo, orderDTO, errorMap);
- //3.澶勭悊缁勫悎瑙勫垯銆傜粍鍚堣鍒欎笉鑳戒娇鐢ㄧ紪鐮佺殑灞炴�э紝鍥犱负缂栫爜鐨勭敓鎴愬彲鑳芥槸闇�瑕佸睘鎬х殑
- switchComponentAttrOnOrder(templateVO, orderDTO);
- //4.鏍￠獙瑙勫垯
- checkVerifyOnOrder(templateVO, orderDTO, errorMap);
- //5.鍒ゆ柇鍏抽敭灞炴��
- checkKeyAttrOnOrder(classifyFullInfo, templateVO, orderDTO, errorMap);
- //6.鏍￠獙鏋氫妇鐨勫唴瀹规槸鍚︽纭�
- checkEnumOnOrder(templateVO, orderDTO, errorMap);
- //7.澶勭悊鏃堕棿鏍煎紡锛屽湪鏁版嵁搴撻噷闈笉璁烘槸瀛楃涓茶繕鏄棩鏈熸牸寮忥紝閮戒娇鐢ㄧ浉鍚岀殑鏍煎紡瀛樺偍
- switchDateAttrOnOrder(templateVO, orderDTO);
- //榛樿鐨勫唴瀹逛笉鑳藉彉锛屾墍浠ュ彧闇�瑕佹嫹璐濊嚜瀹氫箟鐨勭浉鍏冲睘鎬у嵆鍙�
- copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, true, errorMap);
- //浼佷笟鐮佸拰闆嗗洟鐮佺殑涓嶄慨鏀�
- cbo.setDescription(orderDTO.getDescription());
- cbo.setName(orderDTO.getName());
- try {
- cbo.setAttributeValueWithNoCheck("description", orderDTO.getDescription());
- cbo.setAttributeValue("name", orderDTO.getName());
- // if(finalIsProcess){//鍦ㄦ祦绋嬩腑涓嶅厑璁告洿鏀�
- // errorMap.put(code,errorMap.getOrDefault(code, errorMap.getOrDefault(code,"")+";鏁版嵁"+code+"鍦ㄦ祦绋嬩腑锛屼笉鍏佽鏇存敼!"));
- // }else{
- cbo.setLcStatus(status);
- cbo.setAttributeValue("lcstatus",status);
- // }
- } catch (VCIError e) {
- e.printStackTrace();
- }
- updateList.add(cbo);
- }else if(operation.equals("delete")){//濡傛灉鍦ㄦ祦绋嬩腑涓嶅厑璁稿垹闄わ紝涓嶅湪娴佺▼涓姸鎬佷负鍙戝竷鎴栬�呭仠鐢ㄧ殑鏁版嵁涓嶅厑璁稿垹闄わ紝灏嗗叾鏇存敼涓哄仠鐢紝鍏朵粬鐨勬儏鍐电洿鎺ュ垹闄�
- // if(finalIsProcess){
- // errorMap.put(code,errorMap.getOrDefault(code, errorMap.getOrDefault(code,"")+";鏁版嵁"+code+"鍦ㄦ祦绋嬩腑锛屼笉鍏佽鍒犻櫎!"));
- //}else {
- try {
- Map<String, String> condtionMap = new HashMap<>();
- condtionMap.put("createcodeoid", cbo.getOid());
- logger.info("oid:" + cbo.getOid());
- List<ClientBusinessObject> codeCbos = boService.queryCBO("codeallcode", condtionMap);
- logger.info("codeCbos size:" + codeCbos.size());
- if (!CollectionUtils.isEmpty(codeCbos)) {
- ClientBusinessObject codeCbo = codeCbos.get(0);
- logger.info("codeCbos code:" + codeCbo.getId());
- codeCbo.setLcStatus(CodeDefaultLC.TASK_BACK.getValue());
- codeCbo.setAttributeValue("lcstatus", CodeDefaultLC.TASK_BACK.getValue());
- updateList.add(codeCbo);
- }
- deleteList.add(cbo);
- }catch (VCIError e) {
- e.printStackTrace();
- }
- // }
- }else if(operation.equals("editstatus")){
- try {
- // if (finalIsProcess) {
- // errorMap.put(code, errorMap.getOrDefault(code, errorMap.getOrDefault(code, "") + ";鏁版嵁" + code + "鍦ㄦ祦绋嬩腑锛屼笉鍏佽鏇存敼鐘舵��!"));
- // } else {
- cbo.setLcStatus(status);
- cbo.setAttributeValue("lcstatus", status);
- updateList.add(cbo);
- // }
- }catch (VCIError e) {
- e.printStackTrace();
- }
- }
- });
- /**
- * 閿欒淇℃伅杈撳嚭
- */
- if(errorMap.size()>0){
- errorMap.keySet().forEach(code->{
- if(codeDataMap.containsKey(code)){
- RowDatas rowDatas= codeDataMap.get(code);
- String dataMsg=errorMap.get(code);
- String oid=rowDatas.getOid();
- XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- xmlResultDataObjectDetailDO.setErrorid("103");
- xmlResultDataObjectDetailDO.setMsg(dataMsg);
- xmlResultDataObjectDetailDO.setId(oid);
- xmlResultDataObjectDetailDO.setCode(code);
- resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
- }
- });
- }else {
- //瀛樺偍鏁版嵁
- try {
- batchCBO.getUpdateCbos().addAll(updateList);
- batchCBO.getDeleteCbos().addAll(deleteList);
- boService.persistenceBatch(batchCBO);
- engineService.batchSaveSelectChar(firstTemplateVO, updateList);
- errorid="0";
- msg="鏇存柊/鐘舵�佹洿鏀�/鍒犻櫎鎴愬姛锛�";
- }catch (Throwable e){
- errorid="1";
- msg="淇濆瓨澶辫触锛�"+e;
- }finally {
- String finalMsg = msg;
- String finalErrorid = errorid;
- cboList.stream().forEach(cbo->{
- String code =cbo.getId();
- if(codeDataMap.containsKey(code)) {
- RowDatas rowDatas=codeDataMap.get(code);
- String oid=rowDatas.getOid();
- XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
- xmlResultDataObjectDetailDO.setErrorid(finalErrorid);
- xmlResultDataObjectDetailDO.setMsg(finalMsg);
- xmlResultDataObjectDetailDO.setId(oid);
- xmlResultDataObjectDetailDO.setCode(code);
- resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
- }
- });
-
- }
- }
- }
-
- /***
- * 浠庣紦瀛橀噷鑾峰彇鍒伴渶瑕佸鍏ョ殑鐩稿叧鏁版嵁
- * @param codeClssifyOid
- * @param redisOid
- * @return
- */
- @Override
- public DataGrid<Map<String, String>> gridDatas(String codeClssifyOid, String redisOid) {
- VciBaseUtil.alertNotNull(redisOid,"瀵煎叆鐩镐技鏁版嵁",redisOid,"鏁版嵁缂撳瓨涓婚敭");
- List<CodeImprotDataVO> codeImprotDataVOs = redisService.getCacheList(redisOid+"-"+codeClssifyOid);
- CodeImprotDataVO codeImprotDataVO=new CodeImprotDataVO();
- if(!CollectionUtils.isEmpty(codeImprotDataVOs)){
- if(StringUtils.isNotBlank(codeClssifyOid)){
- Map<String/**鍒嗙被鍚嶇О**/, CodeImprotDataVO/**鑻辨枃鍚嶇О**/> codeClassifyDatasMap = codeImprotDataVOs.stream().collect(Collectors.toMap(s -> s.getCodeClassifyOid(), t -> t,(o1, o2)->o2));
- if(codeClassifyDatasMap.containsKey(codeClssifyOid)){
- codeImprotDataVO= codeClassifyDatasMap.get(codeClssifyOid);
- }else{
- codeImprotDataVO= codeImprotDataVOs.get(0);
- }
- }
- }
- DataGrid<Map<String, String>> dataGrid = new DataGrid<>();
- List<Map<String, String>> dataList = new ArrayList<>();
- if(codeImprotDataVO!=null){
- dataList= codeImprotDataVO.getDatas();
- }
- dataGrid.setData(dataList);
- if (!CollectionUtils.isEmpty(dataList)) {
- dataGrid.setTotal(dataList.size());
- }
- return dataGrid;
- }
-
- /**
- *
- * @param oid
- * @param redisOid
- * @return
- */
- @Override
- public DataGrid<Map<String,String>> gridRowResemble(String oid,String redisOid){
- VciBaseUtil.alertNotNull(redisOid,"瀵煎叆鐩镐技鏁版嵁",redisOid,"鏁版嵁缂撳瓨涓婚敭");
- List<DataResembleVO> codeImprotDataVOs = redisService.getCacheList(redisOid);
- DataGrid<Map<String, String>> dataGrid = new DataGrid<>();
- List<Map<String, String>> dataList = new ArrayList<>();
-
- if(!CollectionUtils.isEmpty(codeImprotDataVOs)){
- Map<String/**鍒嗙被鍚嶇О**/, DataResembleVO/**鏁版嵁瀵硅薄**/> rowResembleDataMap = codeImprotDataVOs.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
- if(rowResembleDataMap.containsKey(oid)){
- DataResembleVO dataResembleVO= rowResembleDataMap.get(oid);
- dataList= dataResembleVO.getDataList();
- }
- }
-
- dataGrid.setData(dataList);
- if (!CollectionUtils.isEmpty(dataList)) {
- dataGrid.setTotal(dataList.size());
- }
- return dataGrid;
- }
- @Override
- public List<CodeImportTemplateVO> gridclassifys(String redisOid) {
- List<CodeImportTemplateVO> codeImportTemplateVOs=new ArrayList<>();
- VciBaseUtil.alertNotNull(redisOid,"鍒嗙被",redisOid,"鍒嗙被缂撳瓨涓婚敭");
- List<CodeImportTemplateVO> redisServiceCacheObjects=redisService.getCacheList(redisOid);
- if(redisServiceCacheObjects!=null){
- codeImportTemplateVOs= redisServiceCacheObjects;
- }
- return codeImportTemplateVOs;
- }
-
- @Override
- public BaseResult batchImportData(List<CodeImprotSaveDatVO> codeImprotSaveDatVOList,String classifyAttr, boolean isImprot) {
- List<SheetRowData> rowDataList = new ArrayList<>();
- List<ClientBusinessObject> allNeedSaveCboList=new ArrayList<>();
- codeImprotSaveDatVOList.stream().forEach(codeImprotSaveDatVO -> {
- List<ClientBusinessObject>cboList=new ArrayList<>();
- List<String> colList=codeImprotSaveDatVO.getClos();
- CodeOrderDTO orderDTO= codeImprotSaveDatVO.getOrderDTO();
-
- List<Map<String, String>> dataList= codeImprotSaveDatVO.getDataList();
- Map<Integer, String> fieldIndexMap = new HashMap();
- for (int i=0;i<dataList.size();i++){
- SheetRowData sheetRowData=new SheetRowData();
- Map<String,String> dataMap= dataList.get(i);
- Map<Integer, String> data = new HashMap();
- final int[] colIndex = {0};
- Map<Integer, String> finalFieldIndexMap = new HashMap<>();
- dataMap.forEach((field, value)->{
- if(!ROW_INDEX.equalsIgnoreCase(field)){
- data.put(colIndex[0],value);
- finalFieldIndexMap.put(colIndex[0]++,field);
- }
- });
- fieldIndexMap=finalFieldIndexMap;
- sheetRowData.setData(data);
- sheetRowData.setRowIndex(i+"");
- rowDataList.add(sheetRowData);
- }
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid());
-
- // CodeClassifyTemplateVO codeClassifyTemplateVO= engineService.getUsedTemplateByClassifyOid(orderDTO.getCodeClassifyOid());
- CodeClassifyTemplateVO codeClassifyTemplateVO= templateServiceI.getObjectHasAttrByOid(orderDTO.getTemplateOid());
- //瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
- CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
- //闄ゅ幓榛樿鐨勫睘鎬�.杩樻湁鍙湁琛ㄥ崟鏄剧ず鐨勫瓧娈垫墠瀵煎叆
- List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyTemplateVO.getAttributes().stream().filter(s ->
- !MdmEngineConstant.DEFAULT_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
- String fullPath = getFullPath(classifyFullInfo);
- excelToCbo(classifyFullInfo,fieldIndexMap,rowDataList, codeClassifyTemplateVO,cboList,fullPath,!isImprot);
- Map<String,String> errorMap=new HashMap<>();
- if(isImprot) {
- Map<String/**涓婚敭**/, String/**璺緞**/> childOidPathMap = getChildClassifyPathMap(classifyFullInfo, fullPath);
- //閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
- //鎵炬墍鏈夌殑鍒嗙被璺緞,闇�瑕佹牎楠岃矾寰勬槸鍚︽纭紝鏄惁閮藉湪褰撳墠鐨勫垎绫荤殑涓嬬骇
- List<CodeClassifyVO> childClassifyVOs = classifyService.listChildrenClassify(orderDTO.getCodeClassifyOid(), true, classifyAttr, true);
- Map<String/**璺緞**/, CodeClassifyVO> pathMap = Optional.ofNullable(childClassifyVOs).orElseGet(() -> new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getPath().startsWith("#") ? s.getPath().substring(1) : s.getPath(), t -> t));
- Map<String/**涓婚敭**/, CodeClassifyVO> classifyVOMap = Optional.ofNullable(childClassifyVOs).orElseGet(() -> new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
- classifyVOMap.put(classifyFullInfo.getCurrentClassifyVO().getOid(), classifyFullInfo.getCurrentClassifyVO());
- pathMap.put("#current#", classifyFullInfo.getCurrentClassifyVO());
- //鎴戜滑闇�瑕佸垽鏂繖浜涘垎绫荤殑妯℃澘鏄笉鏄竴鏍风殑锛屽彧闇�瑕佹牎楠岋紝涓嶇敤鑾峰彇
- //妫�鏌ュ垎绫荤殑璺緞
- checkClassifyPathInHistory(cboList, errorMap, pathMap, childOidPathMap);
- }
- //鍒嗙被娉ㄥ叆
- batchSwitchClassifyAttrOnOrder(attrVOS,cboList,classifyFullInfo,isImprot);
- //boolean
- reSwitchBooleanAttrOnOrder(attrVOS,cboList);
- //4.鏍￠獙瑙勫垯
- batchCheckVerifyOnOrder(attrVOS, cboList,errorMap);
- //5.鏍￠獙鏋氫妇鏄惁姝ｇ‘
- batchSwitchEnumAttrOnOrder(attrVOS, cboList, errorMap);
- //7.澶勭悊鍙傜収鐨勬儏鍐�
- batchSwitchReferAttrOnOrder(attrVOS,cboList,errorMap);
- //6.鏃堕棿鏍煎紡鐨勯獙璇�
- //6.鏃堕棿鐨勶紝蹇呴』缁熶竴涓簓yyy-MM-dd HH:mm:ss
- batchSwitchDateAttrOnOrder(attrVOS,cboList,errorMap);
- //鏈�鍚庡紕缁勫悎瑙勫垯
- batchSwitchComponentAttrOnOrder(attrVOS,cboList);
- //3.鍒ゆ柇鍏抽敭灞炴��
- CodeImportResultVO keyResultVO = batchCheckKeyAttrOnOrder(classifyFullInfo, codeClassifyTemplateVO, cboList);
- Set<String> selfRepeatRowIndexList = keyResultVO.getSelfRepeatRowIndexList();
- Set<String> keyAttrRepeatRowIndexList = keyResultVO.getKeyAttrRepeatRowIndexList();
- if(!CollectionUtils.isEmpty(keyAttrRepeatRowIndexList)){
- keyAttrRepeatRowIndexList.stream().forEach(rowIndex->{
- errorMap.put(rowIndex,errorMap.getOrDefault(rowIndex,"") + ";鍏抽敭灞炴�т笌绯荤粺涓殑閲嶅" );
- });
- }
- //4.鏍￠獙瑙勫垯
- batchCheckVerifyOnOrder(attrVOS, cboList,errorMap);
-
-
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- List<ClientBusinessObject>needSaveCboList = cboList.stream().filter(cbo -> {
- String rowIndex = cbo.getAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX);
- return !errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
-
- if (!CollectionUtils.isEmpty(needSaveCboList)) {
- //9.鎴戜滑澶勭悊涓氬姟鏁版嵁
- if (isImprot) {
- productCodeService.productCodeAndSaveData(classifyFullInfo, codeClassifyTemplateVO, ruleVO, null, needSaveCboList);
- }else {
- productCodeService.productCodeAndSaveData(classifyFullInfo, codeClassifyTemplateVO, ruleVO, orderDTO.getSecDTOList(), needSaveCboList);
- }
- allNeedSaveCboList.addAll(needSaveCboList);
- }
- //濡傛灉鏄紪鐮佺敓鎴愬け璐ワ紝鍒欑洿鎺ュ氨澶辫触浜嗭紝鍏朵粬鐨勫垽鏂嚭鏉ユ湁閿欒鐨勬垜浠兘缁熶竴杩斿洖鍒癳xcel閲岄潰
- engineService.batchSaveSelectChar(codeClassifyTemplateVO, allNeedSaveCboList);
- });
- return BaseResult.success(isImprot?"鎵归噺鍘嗗彶瀵煎叆鎴愬姛":"鎵归噺鐢宠鎴愬姛");
- }
- /***
- *
- * @param codeClassifyVO
- * @param templateVO
- * @param codeDataMap
- * @param codeSystemObjectMap
- * @param codeOrderDTOList
- * @param errorMap
- * @return
- */
- private void getCodeOrderDTOs(CodeClassifyVO codeClassifyVO,CodeClassifyTemplateVO templateVO,Map<String ,RowDatas>codeDataMap,Map<String, ClientBusinessObject> codeSystemObjectMap,List<CodeOrderDTO> codeOrderDTOList,Map<String,String> errorMap){
- codeDataMap.keySet().forEach(code->{
- RowDatas rowDatas=codeDataMap.get(code);
- Map<String, String> data= rowDatas.getFiledValue();
- CodeOrderDTO orderDTO = new CodeOrderDTO();
- if(codeSystemObjectMap.containsKey(code)){
- ClientBusinessObject sysDataObject= codeSystemObjectMap.get(code);
- orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
- orderDTO.setOid(sysDataObject.getOid());//鏁版嵁oid
- orderDTO.setLcStatus(rowDatas.getStatus());//鐘舵��
- orderDTO.setId(code);
- orderDTO.setTs(VciDateUtil.getDateFromStringForVci(sysDataObject.getTs()));
- orderDTO.setBtmname(codeClassifyVO.getBtmname());//涓氬姟绫诲瀷
- orderDTO.setDescription("闆嗘垚璋冪敤:鏇存柊");//鏁版嵁鎻忚堪
- if(data.containsKey("name")){
- String name=data.get("name");
- orderDTO.setName(name);//鍚嶇О灞炴�у��
- }
- orderDTO.setData(data);//璁剧疆鏁版嵁
- orderDTO.setSecDTOList(null);//鍒嗙被鐮佹
- orderDTO.setEditInProcess(false);//鏄惁鍦ㄦ祦绋嬩腑
- orderDTO.setTemplateOid(templateVO.getOid());
- }else{
- errorMap.put("code","缂栫爜涓猴細銆�"+code+"銆戠殑鏁版嵁鍦ㄧ郴缁熶腑涓嶅瓨鍦�");
- }
- codeOrderDTOList.add(orderDTO);
- });
- }
-
- /**
- * 鎷疯礉鏁版嵁鍒癱bo瀵硅薄涓�
- *
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param cbo 涓氬姟鏁版嵁
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param edit 鏄惁涓轰慨鏀�
- */
- private void copyValueToCBO(CodeClassifyFullInfoBO classifyFullInfo, ClientBusinessObject cbo,
- CodeOrderDTO orderDTO, CodeClassifyTemplateVO templateVO,
- boolean edit,Map<String,String> errorMap) {
- String fullPath = "";
- if (!CollectionUtils.isEmpty(classifyFullInfo.getParentClassifyVOs())) {
- fullPath = classifyFullInfo.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel())))
- .map(CodeClassifyVO::getOid).collect(Collectors.joining("##"));
- } else {
- fullPath = classifyFullInfo.getCurrentClassifyVO().getOid();
- }
- orderDTO.getData().forEach((key, value) -> {
- if (!edit || (!boService.checkUnAttrUnEdit(key) &&
- !VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(key))) {
- try {
- cbo.setAttributeValue(key, value);
- } catch (VCIError e) {
- logger.error("璁剧疆灞炴�х殑鍊奸敊璇�", e);
- }
- }
- });
- try {
- cbo.setAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD, classifyFullInfo.getCurrentClassifyVO().getOid());
- cbo.setAttributeValue(MdmEngineConstant.CODE_TEMPLATE_OID_FIELD, templateVO.getOid());
- cbo.setAttributeValue(MdmEngineConstant.CODE_FULL_PATH_FILED, fullPath);
- if (!edit && StringUtils.isBlank(orderDTO.getLcStatus())) {
- //鎵剧敓鍛藉懆鏈熺殑璧峰鐘舵�侊紝
- if (StringUtils.isNotBlank(cbo.getLctId())) {
- OsLifeCycleVO lifeCycleVO = lifeCycleService.getLifeCycleById(cbo.getLctId());
- if (lifeCycleVO != null) {
- cbo.setLcStatus(lifeCycleVO.getStartStatus());
- } else {
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
- }
- } else {
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
- }
-
- }
- int secret = VciBaseUtil.getInt(cbo.getAttributeValue(MdmEngineConstant.SECRET_FIELD));
- if (secret == 0 || !secretService.checkDataSecret(secret)) {
- Integer userSecret = VciBaseUtil.getCurrentUserSecret();
- cbo.setAttributeValue(MdmEngineConstant.SECRET_FIELD, String.valueOf((userSecret == null || userSecret == 0) ? UserSecretEnum.NONE.getValue() : userSecret));
- }
- } catch (Throwable e) {
- logger.error("璁剧疆榛樿鐨勫睘鎬х殑鍊奸敊璇�", e);
- }
- }
-
- /**
- * 杞崲鏃堕棿鐨勬牸寮�
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝闇�瑕佸寘鍚睘鎬�
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void switchDateAttrOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO) {
- Map<String, CodeClassifyTemplateAttrVO> dateAttrVOMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getCodedateformat())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(dateAttrVOMap)) {
- dateAttrVOMap.forEach((attrId, attrVO) -> {
- String value = getValueFromOrderDTO(orderDTO, attrId);
- if (StringUtils.isNotBlank(value)) {
- DateConverter dateConverter = new DateConverter();
- dateConverter.setAsText(value);
- value = VciDateUtil.date2Str(dateConverter.getValue(), VciDateUtil.DateTimeMillFormat);
- setValueToOrderDTO(orderDTO, attrId, value);
- }
- });
- }
- }
- /**
- * 璁剧疆鏂扮殑鍊煎埌鐢宠瀵硅薄涓�
- *
- * @param orderDTO 缂栫爜鐢宠瀵硅薄
- * @param attrId 灞炴�х殑缂栧彿
- * @param value 鍊�
- */
- private void setValueToOrderDTO(CodeOrderDTO orderDTO, String attrId, String value) {
- attrId = attrId.toLowerCase(Locale.ROOT);
- if (VciQueryWrapperForDO.BASIC_FIELD_MAP.containsKey(attrId)) {
- WebUtil.setValueToField(WebUtil.getFieldForObject(attrId, orderDTO.getClass()).getName(), orderDTO, value);
- } else {
- orderDTO.getData().put(attrId, value);
- }
- }
- /**
- * 鏍￠獙鏋氫妇鐨勫唴瀹�
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝闇�瑕佸寘鍚睘鎬�
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void checkEnumOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO,Map<String,String> errorMap) {
- //濡傛灉鏋氫妇鍙互淇敼锛屽垯涓嶉渶瑕佹牎楠屾槸鍚︾鍚堟灇涓剧殑閫夐」
- Map<String, CodeClassifyTemplateAttrVO> enumAttrVOMap = templateVO.getAttributes().stream().filter(s -> (StringUtils.isNotBlank(s.getEnumString()) || StringUtils.isNotBlank(s.getEnumid())) && !VciBaseUtil.getBoolean(s.getEnumeditflag())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(enumAttrVOMap)) {
- enumAttrVOMap.forEach((attrId, attrVO) -> {
- String value = getValueFromOrderDTO(orderDTO, attrId);
- if (StringUtils.isNotBlank(value)) {
- //鏈夊�兼墠鑳芥牎楠�
- List<KeyValue> comboboxKVs = this.engineService.listComboboxItems(attrVO);
- if (!comboboxKVs.stream().anyMatch(s -> value.equalsIgnoreCase(s.getKey()))) {
- errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+";灞炴�с��"+attrVO.getName()+"銆戠殑鍊间笉绗﹀悎鏋氫妇鐨勮姹�");
- //throw new VciBaseException("灞炴�с�恵0}銆戠殑鍊间笉绗﹀悎鏋氫妇鐨勮姹�", new String[]{attrVO.getName()});
- }
- }
- });
- }
- }
-
- /**
- * 鏍￠獙鍏抽敭灞炴��
- *
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param templateVO 妯℃澘鐨勫唴瀹癸紝蹇呴』鍖呭惈妯℃澘灞炴��
- * @param orderDTO 缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅
- */
- private void checkKeyAttrOnOrder(CodeClassifyFullInfoBO classifyFullInfo, CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO,Map<String,String> errorMap) {
- //鍏堣幏鍙栧叧閿睘鎬х殑瑙勫垯锛屼篃鍒╃敤缁ф壙鐨勬柟寮�
- CodeKeyAttrRepeatRuleVO keyRuleVO = keyRuleService.getRuleByClassifyFullInfo(classifyFullInfo);
- //娉ㄦ剰鐨勬槸keyRuleVO鍙兘涓虹┖锛岃〃绀轰笉浣跨敤瑙勫垯鎺у埗
- //鑾峰彇鎵�鏈夌殑鍏抽敭灞炴��
- Map<String, CodeClassifyTemplateAttrVO> ketAttrMap = templateVO.getAttributes().stream().filter(s -> VciBaseUtil.getBoolean(s.getKeyattrflag())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- Map<String, String> conditionMap = new HashMap<>();
- boolean trimAll = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnoreallspaceflag());
- //鍏ㄩ儴鍘荤┖鐨勪紭鍏堢骇澶т簬鍘荤┖
- boolean trim = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorespaceflag());
- boolean ignoreCase = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorecaseflag());
- boolean ignoreWidth = keyRuleVO == null ? false : VciBaseUtil.getBoolean(keyRuleVO.getIgnorewidthflag());
- ketAttrMap.forEach((attrId, attrVO) -> {
- String value = getValueFromOrderDTO(orderDTO, attrId);
- if (value == null) {
- value = "";
- }
- engineService.wrapperKeyAttrConditionMap(value, keyRuleVO, attrId, trim, ignoreCase, ignoreWidth, trimAll, conditionMap);
- });
-
- //娌℃湁闄愬埗鍒嗙被锛屼絾鏄竴涓ā鏉垮彧鍙兘鍦ㄤ竴涓笟鍔＄被鍨嬮噷闈紝鎵�浠ョ洿鎺ユ煡璇㈣繖涓笟鍔＄被鍨嬪嵆鍙�
-
- if (!CollectionUtils.isEmpty(conditionMap)) {
- final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " where 1 = 1 "};
- conditionMap.forEach((key, value) -> {
- sql[0] += " and " + key + " = " + value;
- });
- if (StringUtils.isNotBlank(orderDTO.getOid())) {
- //淇敼鐨勬椂鍊欙紝闇�瑕佹帓闄よ嚜宸�
- sql[0] += " and oid != '" + orderDTO.getOid() + "'";
- } else if (StringUtils.isNotBlank(orderDTO.getCopyFromVersion())) {
- sql[0] += " and oid != '" + orderDTO.getCopyFromVersion() + "'";
- }
- sql[0] += " and islastR = '1' and islastV = '1' ";
- if (boService.queryCountBySql(sql[0], new HashMap<>()) > 0) {
- String ruleInfoMsg = keyRuleVO == null ? "" : "鏌ヨ瑙勫垯锛氬幓闄ょ┖鏍�--{0},蹇界暐澶у皬鍐�--{1},蹇界暐鍏ㄥ崐瑙�--{2},蹇界暐鍏ㄩ儴绌烘牸--{3}";
- String[] objs = new String[]{trim ? "鏄�" : "鍚�", ignoreCase ? "鏄�" : "鍚�", ignoreWidth ? "鏄�" : "鍚�", trimAll ? "鏄�" : "鍚�"};
- String defaultValue=";鏍规嵁鎮ㄥ～鍐欑殑鍏抽敭灞炴�х殑鍐呭锛岀粨鍚堝叧閿睘鎬ф煡璇㈣鍒欙紝鍙戠幇杩欎釜鏁版嵁宸茬粡鍦ㄧ郴缁熶腑瀛樺湪浜嗐�傝淇!銆�";
- String errormsg=defaultValue+MessageFormat.format(ruleInfoMsg, objs);
- errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+errormsg);
- // throw new VciBaseException("鏍规嵁鎮ㄥ～鍐欑殑鍏抽敭灞炴�х殑鍐呭锛岀粨鍚堝叧閿睘鎬ф煡璇㈣鍒欙紝鍙戠幇杩欎釜鏁版嵁宸茬粡鍦ㄧ郴缁熶腑瀛樺湪浜嗐�傝淇!銆�" + ruleInfoMsg, objs);
- }
- }
- }
- /**
- * 鏍￠獙姝ｅ垯琛ㄨ揪寮忔槸鍚︽纭�
- *
- * @param templateVO 妯℃澘鐨勪俊鎭紝蹇呴』鍖呭惈灞炴�х殑鍐呭
- * @param orderDTO 缂栫爜鐢宠鐨勭浉鍏崇殑淇℃伅
- */
- private void checkVerifyOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO,Map<String,String> errorMap) {
- Map<String, CodeClassifyTemplateAttrVO> verifyAttrVOMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getVerifyrule())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(verifyAttrVOMap)) {
- verifyAttrVOMap.forEach((attrId, attrVO) -> {
- String value = getValueFromOrderDTO(orderDTO, attrId);
- if (StringUtils.isNotBlank(value) && !value.matches(attrVO.getVerifyrule())) {
- errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+";灞炴�"+attrVO.getName()+"]鐨勫�间笉绗﹀悎鏍￠獙瑙勫垯鐨勮姹�");
- //鏍￠獙姝ｅ垯琛ㄨ揪寮�
- // throw new VciBaseException("灞炴�{0}]鐨勫�间笉绗﹀悎鏍￠獙瑙勫垯鐨勮姹�", new String[]{attrVO.getName()});
- }
- });
- }
- }
- /**
- * 杞崲缁勫悎瑙勫垯鐨勫��
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝闇�瑕佸寘鍚ā鏉垮睘鎬�
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void switchComponentAttrOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO) {
- Map<String, CodeClassifyTemplateAttrVO> compAttrVOMap = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getComponentrule())).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(compAttrVOMap)) {
- Map<String, String> dataMap = WebUtil.objectToMapString(orderDTO);
-
- Map<String, String> dataLowMap = new HashMap<>();
- if (!CollectionUtils.isEmpty(dataMap)) {
- dataMap.forEach((key, value) -> {
- dataLowMap.put(key.toLowerCase(Locale.ROOT), value);
- });
- }
- dataLowMap.putAll(orderDTO.getData());
- compAttrVOMap.forEach((attrId, attrVO) -> {
- dataLowMap.put(attrId, formulaService.getValueByFormula(dataLowMap, attrVO.getComponentrule()));
- });
- dataLowMap.forEach((key, value) -> {
- setValueToOrderDTO(orderDTO, key, value);
- });
- }
- }
- /**
- * 澶勭悊鍒嗙被娉ㄥ叆鐨勪俊鎭�
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝蹇呴』瑕佸悗妯℃澘鐨勫睘鎬�
- * @param classifyFullInfoBO 鍒嗙被鐨勫叏璺緞
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void switchClassifyLevelOnOrder(CodeClassifyTemplateVO templateVO, CodeClassifyFullInfoBO classifyFullInfoBO, CodeOrderDTO orderDTO,Map<String,String> errorMap) {
- Map<String, CodeClassifyTemplateAttrVO> classifyAttrVOMap = templateVO.getAttributes().stream().filter(
- s -> StringUtils.isNotBlank(s.getClassifyinvokeattr()) && StringUtils.isNotBlank(s.getClassifyinvokelevel())
- ).collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (classifyFullInfoBO.getTopClassifyVO() == null) {
- //闇�瑕侀噸鏂版煡璇竴涓嬶紝鍥犱负杩欎釜鏄寚瀹氱殑鍒嗙被杩涙潵鐨�
-
- }
- if (!CollectionUtils.isEmpty(classifyAttrVOMap)) {
- classifyAttrVOMap.forEach((attrId, attrVO) -> {
- //鍒嗙被娉ㄥ叆鐨勭紪鍙锋垨鑰呭悕绉帮紝
- //灞傜骇鍖呭惈鎸囧畾灞傚拰鏈�灏忓眰
- CodeClassifyVO classifyVO = null;
- if (!CodeLevelTypeEnum.MIN.getValue().equalsIgnoreCase(attrVO.getClassifyinvokelevel()) && !"min".equalsIgnoreCase(attrVO.getClassifyinvokelevel())) {
- //鎸囧畾浜嗗眰绾х殑
- //娉ㄦ剰锛屽洜涓烘煡璇笂绾у垎绫诲嚭鏉ョ殑灞傜骇鏄�掑簭鐨勶紝鍗抽《灞傝妭鐐规槸鏈�澶х殑鍊�
- List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
- int level = VciBaseUtil.getInt(attrVO.getClassifyinvokelevel());
- if (classifyVOS.size() >= level && level > 0) {
- classifyVO = classifyVOS.get(level - 1);
- }
- } else {
- //褰撳墠鐨勫垎绫�
- classifyVO = classifyFullInfoBO.getCurrentClassifyVO();
- }
- if (classifyVO == null) {
- //璇存槑灞傜骇鏈夎
- errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+";鍒嗙被鏍戜笂娌℃湁灞傜骇[" + attrVO.getClassifyinvokelevel() + "]");
- //orderDTO.getData().put(attrId, "鍒嗙被鏍戜笂娌℃湁灞傜骇[" + attrVO.getClassifyinvokelevel() + "]");
- // classifyVO = classifyFullInfoBO.getCurrentClassifyVO();
- } else {
- Map<String, String> classifyDataMap = VciBaseUtil.objectToMapString(classifyVO);
- String value = classifyDataMap.getOrDefault(attrVO.getClassifyinvokeattr(), "");
- orderDTO.getData().put(attrId, value);
- }
- });
- }
- }
-
-
- /**
- * 鏍￠獙灞炴�ф槸鍚︿负蹇呰緭
- *
- * @param templateVO 妯℃澘鐨勬樉绀哄璞★紝闇�瑕佸寘鍚ā鏉垮睘鎬�
- * @param orderDTO 缂栫爜鐢宠鐨勪俊鎭�
- */
- private void checkRequiredAttrOnOrder(CodeClassifyTemplateVO templateVO, CodeOrderDTO orderDTO,Map<String,String> errorMap) {
- Map<String, CodeClassifyTemplateAttrVO> requiredAttrMap = templateVO.getAttributes().stream().filter(
- s -> VciBaseUtil.getBoolean(s.getRequireflag()) && StringUtils.isBlank(s.getComponentrule())
- && StringUtils.isBlank(s.getClassifyinvokeattr()))
- .collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
- if (!CollectionUtils.isEmpty(requiredAttrMap)) {
- requiredAttrMap.forEach((attrId, attrVO) -> {
- //鍙湁浼佷笟缂栫爜锛岀姸鎬侊紝澶囨敞锛屾ā鏉夸富閿紝鍒嗙被涓婚敭杩欏嚑涓槸鍥哄畾鐨勶紝鍏朵綑閮芥槸鑷閰嶇疆鐨�
- if (StringUtils.isBlank(getValueFromOrderDTO(orderDTO, attrId))) {
- errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"") + ";灞炴�с�恵"+attrVO.getName()+"}銆戝繀椤昏杈撳叆(閫夋嫨)鍐呭" );
- // throw new VciBaseException("灞炴�с�恵0}銆戝繀椤昏杈撳叆(閫夋嫨)鍐呭", new String[]{attrVO.getName()});
- }
- });
- }
- }
-
-
-
-
- /**
- * 浠庣紪鐮佺敵璇蜂俊鎭璞′笂鑾峰彇鏌愪釜灞炴�х殑鍊�
- *
- * @param orderDTO 缂栫爜鐢宠瀵硅薄
- * @param attrId 灞炴�х殑缂栧彿
- * @return 鍊�
- */
- private String getValueFromOrderDTO(CodeOrderDTO orderDTO, String attrId) {
- attrId = attrId.toLowerCase(Locale.ROOT);
- String value = null;
- if (VciQueryWrapperForDO.BASIC_FIELD_MAP.containsKey(attrId)) {
- value = WebUtil.getStringValueFromObject(WebUtil.getValueFromField(WebUtil.getFieldForObject(attrId, orderDTO.getClass()).getName(), orderDTO));
- } else {
- //璇存槑鏄嚜琛岄厤缃殑
- //鍓嶇蹇呴』瑕佷紶閫掑皬鍐欑殑灞炴��
- value = orderDTO.getData().getOrDefault(attrId, "");
- }
- return value;
- }
-
- /**
- * excel杞崲涓篶bo鐨勫璞�
- * @param classifyFullInfo 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param codeImprotDataVO: 鍒嗙被瀵瑰簲鐨勬暟鎹�
- * @param cboList 鏁版嵁鐨勫垪琛�
- * @param newCode 鏄惁涓烘壒閲忕敵璇�
- */
- private void excelToCbo(CodeClassifyFullInfoBO classifyFullInfo,CodeImprotDataVO codeImprotDataVO,List<ClientBusinessObject> cboList, boolean newCode){
- String fullPath = getFullPath(classifyFullInfo);
- codeImprotDataVO.getDatas().stream().forEach(rowData -> {
- ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
- rowData.forEach((field,value)->{
- try {
- cbo.setAttributeValueWithNoCheck(field,value);
- if(WebUtil.isDefaultField(field)){
- WebUtil.setValueToField(field, cbo, value);
- }
- } catch (VCIError e) {
- logger.error("璁剧疆灞炴�х殑鍊奸敊璇�",e);
- }
- });
- try {
- if(newCode){
- cbo.setAttributeValue(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD,classifyFullInfo.getCurrentClassifyVO().getOid());
- cbo.setAttributeValue(MdmEngineConstant.CODE_FULL_PATH_FILED,fullPath);
- //cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
- int secret = VciBaseUtil.getInt(cbo.getAttributeValue(MdmEngineConstant.SECRET_FIELD));
- if(secret == 0 || !secretService.checkDataSecret(secret) ){
- Integer userSecret = VciBaseUtil.getCurrentUserSecret();
- cbo.setAttributeValue(MdmEngineConstant.SECRET_FIELD,String.valueOf((userSecret==null || userSecret ==0)? UserSecretEnum.NONE.getValue():userSecret));
- }
- }else{
- //姝ゆ椂杩樻病鏈夎浆鎹㈣矾寰�
- //cbo.setAttributeValue(CODE_FULL_PATH_FILED, childOidPathMap.getOrDefault(rowData.getData().getOrDefault(CODE_CLASSIFY_OID_FIELD,""),fullPath));
- cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
- }
- rowData.put("oid",cbo.getOid());
- cbo.setAttributeValue(MdmEngineConstant.CODE_TEMPLATE_OID_FIELD,codeImprotDataVO.getTemplateOid());
- cbo.setAttributeValue(MdmEngineConstant.IMPORT_ROW_INDEX,rowData.get(MdmEngineConstant.IMPORT_ROW_INDEX));
- }catch (Throwable e){
- logger.error("璁剧疆榛樿鐨勫睘鎬х殑鍊奸敊璇�",e);
- }
- cboList.add(cbo);
- });
-
- }
-
-
- private void createRedisDatas(String uuid, CodeClassifyTemplateVO templateVO, List<CodeImprotDataVO> codeImprotDataVOs, Map<String, String> errorMap, boolean isok){
- codeImprotDataVOs.stream().forEach(codeImprotDataVO -> {
- List<Map<String, String>> dataLists=new ArrayList<>();
- CodeImprotDataVO newCodeImprotDataVO=new CodeImprotDataVO();
- if(errorMap.size()>0) {
- //瑕佹妸浠ヤ笂鐨勯敊璇殑閮芥姏鍑哄悗锛屽啀缁х画澶勭悊鏃堕棿鍜岀粍鍚堣鍒�
- dataLists = codeImprotDataVO.getDatas().stream().filter(cbo -> {
- String rowIndex=cbo.get(MdmEngineConstant.IMPORT_ROW_INDEX);
- return isok? !errorMap.containsKey(rowIndex):errorMap.containsKey(rowIndex);
- }).collect(Collectors.toList());
-
- }else{
- dataLists= codeImprotDataVO.getDatas();
- }
- BeanUtilForVCI.copyPropertiesIgnoreCase(codeImprotDataVO,newCodeImprotDataVO);
- newCodeImprotDataVO.setDatas(dataLists);
- List<CodeImprotDataVO> codeImprotDataVOList=new ArrayList<>();
- codeImprotDataVOList.add(newCodeImprotDataVO);
- redisService.setCacheList(uuid+"-"+codeImprotDataVO.getCodeClassifyOid(), codeImprotDataVOList);
- logger.info(uuid+"-"+codeImprotDataVO.getCodeClassifyOid()+":鏉＄洰鏁�"+codeImprotDataVOList.size());
- //redisService.expire(uuid+"-"+codeImprotDataVO.getCodeClassifyOid(),6000000);//redis杩囨湡鏃堕棿
- });
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
deleted file mode 100644
index f57a5dd..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java
+++ /dev/null
@@ -1,743 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.vci.ubcs.code.constant.MdmEngineConstant;
-import com.vci.ubcs.code.dao.CodeAllCodeDaoI;
-import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
-import com.vci.ubcs.code.enumpack.CodeCutTypeEnum;
-import com.vci.ubcs.code.enumpack.CodeGetValueTypeEnum;
-import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
-import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
-import com.vci.ubcs.code.lifecycle.CodeAllCodeLC;
-import com.vci.ubcs.code.entity.CodeAllCodeDO;
-import com.vci.ubcs.code.entity.CodeSerialValueDO;
-import com.vci.ubcs.code.service.MdmProductCodeServiceI;
-import com.vci.corba.common.VCIError;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.constant.RegExpConstant;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.enumpck.OsCodeFillTypeEnum;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.service.impl.FormulaServiceImpl;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang3.StringUtils;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.dto.CodeOrderSecDTO;
-import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.web.other.BdSelectInputCharAspect.SEP;
-
-/**
- * 鐢熸垚缂栫爜鐨勬湇鍔�
- * @author weidy
- * @date 2022-3-6
- */
-@Service
-public class MdmProductCodeServiceImpl implements MdmProductCodeServiceI {
-
- /**
- * 涓氬姟鏁版嵁鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 鎵�鏈夌殑缂栫爜鐨勫唴瀹�
- */
- @Autowired
- private CodeAllCodeDaoI allCodeMapper;
-
- /**
- * 娴佹按鍙风殑鐩稿叧鐨勪俊鎭�
- */
- @Autowired
- private CodeSerialValueMapper serialValueMapper;
-
- /**
- * 鍏紡鐨勬湇鍔�
- */
- @Autowired
- private FormulaServiceImpl formulaService;
- /**
- * 鐢熸垚缂栫爜--骞朵笖淇濆瓨鏁版嵁
- *
- * @param classifyFullInfoBO 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param templateVO 妯℃澘鐨勬樉绀哄璞�
- * @param ruleVO 缂栫爜瑙勫垯鐨勬樉绀哄璞�
- * @param secDTOList 鍚勪釜鐮佹鐨勫��
- * @param dataCBOList 涓氬姟鏁版嵁
- */
- @Override
- public synchronized List<String> productCodeAndSaveData(CodeClassifyFullInfoBO classifyFullInfoBO, CodeClassifyTemplateVO templateVO,
- CodeRuleVO ruleVO, List<CodeOrderSecDTO> secDTOList, List<ClientBusinessObject> dataCBOList) {
- BatchCBO batchCBO = new BatchCBO();
- WebUtil.setPersistence(false);
- dataCBOList = dataCBOList.stream().sorted(((o1, o2) -> o1.getCreateTime().compareTo(o2.getCreateTime()))).collect(Collectors.toList());
- batchCBO.getCreateCbos().addAll(dataCBOList);
- List<String> codeList = new ArrayList<>();
-
- /*****
- * 淇濊瘉骞跺彂鐨勬椂鍊欙紝鏈�澶ф祦姘村彿閮藉鐨勶紝浣嗘槸杩欑鍔犻攣鏈夊紛绔�
- *
- */
-
- if(dataCBOList.stream().anyMatch(cbo->StringUtils.isNotBlank(cbo.getId()) && StringUtils.isNotBlank(cbo.getAttributeValue(MdmEngineConstant.CODE_SEC_LENGTH_FIELD)))){
- //鏄巻鍙叉暟鎹鍏�
- //鍘嗗彶鏁版嵁鎵ц鐨勬椂鍊欙紝杩欎釜绯荤粺浼氬緢鍗�
- //涓昏鏄负浜嗗綍鍏ユ渶澶ф祦姘村彿鍜宎llcode
- SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
- List<CodeAllCodeDO> allCodeDOList = new ArrayList<>();
- Map<String/**娴佹按渚濇嵁**/,Map<String/**鐮佹鐨勪富閿�**/,Double/**鏈�澶ф祦姘村彿**/>> maxSerialMap = new HashMap<>();
- dataCBOList.parallelStream().forEach(cbo->{
- VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
- String code = cbo.getId();
- List<String> serialUnitList = new ArrayList<>();
- String[] secLengths = cbo.getAttributeValue(MdmEngineConstant.CODE_SEC_LENGTH_FIELD).split("#");
- List<CodeBasicSecVO> secVOList = ruleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
- Map<String/**鐮佹鐨勪富閿�**/,String/**鐮佹鐨勫��**/> serialValueMap = new HashMap<>();
- Map<String, CodeBasicSecVO> secVOMap = secVOList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
- for (int i = 0; i < secLengths.length; i++) {
- CodeBasicSecVO secVO = secVOList.get(i);
- String thisSecValue = "";
- if(i == 0){
- thisSecValue = code.contains("#")?code.substring(0,code.indexOf("#")):code;
- } else if(i == secLengths.length-1){
- //鏈�鍚�
- thisSecValue = code.contains("#")?code.substring(code.lastIndexOf("#")):code;
- }else {
- int start = 0;
- for (int j = 0; j < i; j++) {
- start += VciBaseUtil.getInt(secLengths[j]) + 1;
- }
- thisSecValue = code.substring(start,start+VciBaseUtil.getInt(secLengths[1]));
- }
- if(VciBaseUtil.getBoolean(secVO.getSerialDependFlag())){
- serialUnitList.add(thisSecValue);
- }
- if(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue().equalsIgnoreCase(secVO.getSectype())){
- serialValueMap.put(secVO.getOid(),thisSecValue);
- }
- }
- String serialUnitString = serialUnitList.size() == 0 ? MdmEngineConstant.EMPTY_SERIAL_UNIT : serialUnitList.stream().collect(Collectors.joining(MdmEngineConstant.SERIAL_UNIT_SPACE));
- List<String> serialUnFileStringList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(serialValueMap)){
- serialValueMap.forEach((secOid,secValue)->{
- //瑕佺湅鏄笉鏄ˉ浣嶇殑
- CodeBasicSecVO secVO = secVOMap.get(secOid);
- Double serialDb = null;
- if(OsCodeFillTypeEnum.NONE.getValue().equalsIgnoreCase(secVO.getCodeFillType())){
- //涓嶈ˉ鐮�
- //鎶婃墍鏈変笉鏄暟瀛楃殑鍘绘帀锛屽洜涓哄彲鑳戒細鏄�佹暟鎹紝鏂拌鍒�
- serialDb = VciBaseUtil.getDouble(killUnNumberChar(secValue));
- }else {
- //宸﹀彸濉厖鐨勶紝鎴戜滑闇�瑕�
- serialDb = VciBaseUtil.getDouble(killUnNumberChar(killFillChar(secValue,secVO.getCodeFillSeparator(),
- OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType()))));
- }
- Map<String, Double> thisUnitMaxMap = maxSerialMap.getOrDefault(serialUnitString, new HashMap<>());
- thisUnitMaxMap.put(secOid,serialDb);
- maxSerialMap.put(serialUnitString,thisUnitMaxMap);
- serialUnFileStringList.add(String.valueOf(serialDb));
- });
- }
- CodeAllCodeDO allCodeDO = new CodeAllCodeDO();
- allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
- allCodeDO.setCodeRuleOid(ruleVO.getOid());
- allCodeDO.setId(cbo.getId());
- allCodeDO.setCodeClassifyTemplateOid(templateVO.getOid());
- allCodeDO.setCreateCodeBtm(cbo.getBtmName());
- allCodeDO.setCreateCodeOid(cbo.getOid());
- allCodeDO.setSerialUnit(serialUnitString);
- allCodeDO.setUnFillSerial(serialUnFileStringList.stream().collect(Collectors.joining(MdmEngineConstant.SERIAL_VALUE_SPACE)));
- allCodeDO.setLcStatus(cbo.getLcStatus());
- allCodeDOList.add(allCodeDO);
- });
- //澶勭悊鏈�澶х殑娴佹按鍙�
- List<CodeSerialValueDO> addSerialValueList = new ArrayList<>();
- List<CodeSerialValueDO> editSerialValueList = new ArrayList<>();
- maxSerialMap.forEach((serialUnit,secOidMaxMap)->{
- secOidMaxMap.forEach((secOid,maxSerial)->{
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("codeRuleOid", ruleVO.getOid());
- conditionMap.put("serialUnit", serialUnit);
- //杩欎釜瀛楁鏄负浜嗚В鍐冲涓祦姘寸殑闂
- conditionMap.put("codeSecOid", secOid);
- List<CodeSerialValueDO> serialValueDOS = serialValueMapper.selectByCondition(conditionMap, new PageHelper(-1));
- if (!CollectionUtils.isEmpty(serialValueDOS)) {
- CodeSerialValueDO serialValueDO = serialValueDOS.get(0);
- if(VciBaseUtil.getDouble(serialValueDO.getMaxSerial())<maxSerial){
- serialValueDO.setMaxSerial(String.valueOf(maxSerial));
- editSerialValueList.add(serialValueDO);
- }
- }else{
- //娌℃湁
- CodeSerialValueDO serialValueDO = new CodeSerialValueDO();
- serialValueDO.setCodeRuleOid(ruleVO.getOid());
- serialValueDO.setSerialUnit(serialUnit);
- serialValueDO.setCodeSecOid(secOid);
- serialValueDO.setMaxSerial(maxSerial.toString());
- addSerialValueList.add(serialValueDO);
- }
- });
- });
- if(!CollectionUtils.isEmpty(addSerialValueList)){
- batchCBO.copyFromOther(serialValueMapper.batchInsert(addSerialValueList));
- }
- if(!CollectionUtils.isEmpty(editSerialValueList)){
- batchCBO.copyFromOther(serialValueMapper.batchUpdate(editSerialValueList));
- }
- //澶勭悊allCode
- if(!CollectionUtils.isEmpty(allCodeDOList)){
- Map<String, List<CodeAllCodeDO>> ruleGroup = allCodeDOList.stream().collect(Collectors.groupingBy(s -> s.getCodeRuleOid()));
- Map<String, CodeAllCodeDO> codeDOMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getCodeRuleOid() + SEP + s.getId(), t -> t));
- List<CodeAllCodeDO> addCodeDOs = new ArrayList<>();
- List<CodeAllCodeDO> editCodeDOs = new ArrayList<>();
- ruleGroup.forEach((ruleOid,allCodeDOS)->{
- VciBaseUtil.switchCollectionForOracleIn(allCodeDOS).stream().forEach(codeDOs->{
- Map<String,String> conditionMap = new HashMap<>();
- conditionMap.put("coderuleoid",ruleOid);
- conditionMap.put("id",QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(codeDOs.stream().map(s->s.getId()).collect(Collectors.toList()).toArray(new String[0])) + ")");
- List<CodeAllCodeDO> existCodes = allCodeMapper.selectByCondition(conditionMap, new PageHelper(-1));
- if(!CollectionUtils.isEmpty(existCodes)){
- existCodes.stream().forEach(existCode->{
- String rule_id = existCode.getCodeRuleOid() + SEP + existCode.getId();
- if(codeDOMap.containsKey(rule_id)){
- CodeAllCodeDO newCodeDO = codeDOMap.get(rule_id);
- existCode.setCreateCodeOid(newCodeDO.getOid());
- existCode.setCreateCodeBtm(newCodeDO.getCreateCodeBtm());
- existCode.setCodeClassifyTemplateOid(newCodeDO.getCodeClassifyTemplateOid());
- existCode.setCodeClassifyOid(newCodeDO.getCodeClassifyOid());
- existCode.setLcStatus(newCodeDO.getLcStatus());
- editCodeDOs.add(existCode);
- }
- });
- }
- });
- });
- if(!CollectionUtils.isEmpty(editCodeDOs)){
- Set<String> exitIds = editCodeDOs.stream().map(s -> s.getCodeRuleOid() + SEP + s.getId()).collect(Collectors.toSet());
- addCodeDOs = allCodeDOList.stream().filter(s -> !exitIds.contains(s.getCodeRuleOid() + SEP + s.getId())).collect(Collectors.toList());
- }else{
- addCodeDOs = allCodeDOList;
- }
- if(!CollectionUtils.isEmpty(editCodeDOs)){
- batchCBO.copyFromOther(allCodeMapper.batchUpdate(editCodeDOs));
- }
- if(!CollectionUtils.isEmpty(addCodeDOs)){
- batchCBO.copyFromOther(allCodeMapper.batchInsert(addCodeDOs));
- Map<String, String> statusMap = addCodeDOs.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
- batchCBO.getCreateCbos().stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmName())).forEach(s -> {
- s.setLcStatus(statusMap.get(s.getOid()));
- try {
- s.setAttributeValue("lcstatus",statusMap.get(s.getOid()));
- } catch (VCIError e) {
- e.printStackTrace();
- }
- });
- }
- }
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- return codeList;
- }else {
- List<CodeBasicSecVO> secVOList = ruleVO.getSecVOList().stream().sorted(((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()))).collect(Collectors.toList());
- List<String> serialUnitList = new LinkedList<>();
- List<String> secValueList = new ArrayList<>();
- Map<String, String> secValueMap = secDTOList.stream().collect(Collectors.toMap(s -> s.getSecOid(), s -> s.getSecValue()));
- List<CodeBasicSecVO> serialSecVOList = new ArrayList<>();
- List<CodeBasicSecVO> attrSecVOList = new ArrayList<>();
- for (int i = 0; i < secVOList.size(); i++) {
- CodeBasicSecVO secVO = secVOList.get(i);
- switchSecValue(secVO, secValueMap, classifyFullInfoBO, serialSecVOList, attrSecVOList, serialUnitList, secValueList);
- }
- //澶勭悊灞炴�х爜娈靛拰娴佹按鐮佹
- Map<String/**娴佹按鐮佹鐨勪富閿�**/, Map<String/**娴佹按渚濇嵁**/, Double>> lastMaxSerialValueMap = new HashMap<>();
- List<CodeAllCodeDO> allCodeDOList = new ArrayList<>();
-
- //宸茬粡瀛樺偍鐨勬渶澶ф祦姘村彿鐨勫唴瀹�
- Map<String/**鐮佹鐨勪富閿�**/, Map<String, CodeSerialValueDO>> maxSerialValueMap = new HashMap<>();
-
- for (int i = 0; i < dataCBOList.size(); i++) {
- ClientBusinessObject cbo = dataCBOList.get(i);
- List<String> thisSecValueList = new LinkedList<>();
- for (int j = 0; j < secValueList.size(); j++) {
- thisSecValueList.add(secValueList.get(j));
- }
- List<String> thisSerialUnitList = new LinkedList<>();
- //鍥犱负娴佹按渚濇嵁姣忔鍙兘涓嶄竴鏍凤紝鎵�浠ユ瘡娆￠兘鎷疯礉涓�浠�
- for (int j = 0; j < serialUnitList.size(); j++) {
- thisSerialUnitList.add(serialUnitList.get(j));
- }
- //鍏堢湅鐪嬫湁娌℃湁灞炴�х殑鐮佹
- boolean attrSevIsSerialDepend = CollectionUtils.isEmpty(attrSecVOList) ? false : (attrSecVOList.stream().anyMatch(s -> VciBaseUtil.getBoolean(s.getSerialDependFlag())));
- switchAttrSecValue(attrSecVOList, cbo, thisSecValueList, attrSevIsSerialDepend, thisSerialUnitList);
-
- String serialUnitString = thisSerialUnitList.size() == 0 ? MdmEngineConstant.EMPTY_SERIAL_UNIT : thisSerialUnitList.stream().collect(Collectors.joining(MdmEngineConstant.SERIAL_UNIT_SPACE));
- switchSerialSecValue(serialSecVOList, attrSevIsSerialDepend, ruleVO, serialUnitString, maxSerialValueMap, thisSecValueList, lastMaxSerialValueMap, i == 0);
-
- //缁勮缂栫爜鐨勫��
- cbo.setId(thisSecValueList.stream().collect(Collectors.joining()));
- codeList.add(cbo.getId());
- StringBuilder sb = new StringBuilder();
- //鎶婄爜娈甸噷闈㈤兘鎵句竴涓嬫祦姘村彿
- for (int j = 0; j < serialSecVOList.size(); j++) {
- CodeBasicSecVO secVO = serialSecVOList.get(j);
- Double serialValue = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>()).getOrDefault(serialUnitString, 0d);
- if (serialValue != null) {
- sb.append(String.valueOf(serialValue.longValue())).append(MdmEngineConstant.SERIAL_VALUE_SPACE);
- }
- }
- //瑕佸瓨鍌ㄦ渶鍚庣殑鍏ㄩ儴allcode
- wrapperAllCode(classifyFullInfoBO, ruleVO, cbo, templateVO, allCodeDOList, serialUnitString, sb.toString());
- }
- batchCBO.copyFromOther(allCodeMapper.batchInsert(allCodeDOList));
- saveSerialValue(batchCBO, ruleVO, lastMaxSerialValueMap, maxSerialValueMap);
-
- Map<String, String> statusMap = allCodeDOList.stream().collect(Collectors.toMap(s -> s.getOid(), s -> s.getLcStatus()));
- batchCBO.getCreateCbos().stream().filter(s -> StringUtils.equalsIgnoreCase("codeallcode",s.getBtmName())).forEach(s -> {
- s.setLcStatus(statusMap.get(s.getOid()));
- try {
- s.setAttributeValue("lcstatus",statusMap.get(s.getOid()));
- } catch (VCIError e) {
- e.printStackTrace();
- }
- });
-
-
- }
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- return codeList;
- }
-
- /**
- * 鍘婚櫎琛ヤ綅瀛楃
- * @param s 瀛楃
- * @param fillString 琛ヤ綅瀛楃
- * @param left 鏄惁宸﹁ˉ浣�
- * @return 鏇挎崲鍚庣殑鍊�
- */
- private String killFillChar(String s, String fillString,boolean left){
- Integer index = 0;
- String value = s;
- if(left){
- for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
- if((new String(new char[]{c})).equalsIgnoreCase(fillString)){
- index = i;
- }
- }
- if(index >0){
- value = value.substring(index);
- }
- }else{
- //浠庡彸寰�宸︽壘
- for (int i = s.length()-1; i >=0; i++) {
- char c = s.charAt(i);
- if((new String(new char[]{c})).equalsIgnoreCase(fillString)){
- index = i;
- }
- }
- if(index >0){
- value = value.substring(0,index);
- }
- }
- return value;
-
- }
-
- /**
- * 鍘绘帀涓嶆槸鏁板瓧鐨勫瓧绗�
- * @param s 瀛楃
- * @return 鏇挎崲鍚庣殑鍊�
- */
- private String killUnNumberChar(String s){
- Integer lastUnNumberIndex = 0;
- for (int i = 0; i < s.length(); i++) {
- char c = s.charAt(i);
- if(!(new String(new char[]{c})).matches(RegExpConstant.NUMBER)){
- lastUnNumberIndex = i;
- }
- }
- String value = s;
- if(lastUnNumberIndex >0){
- value = value.substring(lastUnNumberIndex);
- }
- return value;
- }
-
- /**
- * 鍥炴敹鐮佸��
- *
- * @param btmId 涓氬姟鏁版嵁鐨勪笟鍔＄被鍨�
- * @param businessOidCollection 涓氬姟鏁版嵁鐨勪富閿�
- * @return 鍙楀奖鍝嶇殑鏁版嵁鍐呭
- */
- @Override
- public BatchCBO recycleCode(String btmId, Collection<String> businessOidCollection) {
- boolean oldPersistence = WebUtil.isPersistence();
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = new BatchCBO();
- VciBaseUtil.switchCollectionForOracleIn(businessOidCollection).stream().forEach(oids-> {
- Map<String, String> conditionMap = new HashMap<>();
- //缂栫爜瑕佽褰曚负鍥炴敹鐨勭姸鎬�
- conditionMap.put("createcodeoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oids.toArray(new String[0])) + ")");
- conditionMap.put("createcodebtm", btmId);
- List<CodeAllCodeDO> allCodeDOS = allCodeMapper.selectByCondition(conditionMap, new PageHelper(-1));
- if (!CollectionUtils.isEmpty(allCodeDOS)) {
- allCodeDOS.stream().forEach(codeDO->{
- codeDO.setLcStatus(CodeAllCodeLC.TASK_BACK.getValue());
- });
- batchCBO.copyFromOther(allCodeMapper.batchUpdate(allCodeDOS));
- }
- });
- WebUtil.setPersistence(oldPersistence);
- return batchCBO;
- }
-
- /**
- * 杞崲鐮佸�肩殑鍐呭
- * @param secVO 鐮佹鐨勫唴瀹�
- * @param secValueMap 鐮佸�肩殑鍐呭锛宬ey鏄爜娈电殑涓婚敭锛寁alue鏄爜鍊�
- * @param classifyFullInfoBO 鍒嗙被鐨勫叏閮ㄤ俊鎭�
- * @param serialSecVOList 娴佹按鐮佹
- * @param attrSecVOList 灞炴�х爜娈�
- * @param serialUnitList 娴佹按渚濇嵁
- * @param secValueList 鐮佸�煎垪琛�
- */
- private void switchSecValue(CodeBasicSecVO secVO,Map<String,String> secValueMap,
- CodeClassifyFullInfoBO classifyFullInfoBO,List<CodeBasicSecVO> serialSecVOList,
- List<CodeBasicSecVO> attrSecVOList, List<String> serialUnitList,
- List<String> secValueList ){
- CodeSecTypeEnum secType = CodeSecTypeEnum.forValue(secVO.getSectype());
- String secValue = secValueMap.getOrDefault(secVO.getOid(), "");
- switch (secType) {
- case CODE_FIXED_SEC:
- //鍥哄畾鐮佹鐨勶紝鐩存帴鐢ㄧ爜鍊�,涓嶈鐮佸�肩殑闀垮害鏄灏戯紝鍥犱负鍙彉闀垮害鍜屽浐瀹氶暱搴︽槸鎺у埗鍦ㄧ爜娈电鐞嗛噷闈㈢殑鐮佸�煎畾涔夌殑
- break;
- case CODE_DATE_SEC:
- //鏃堕棿鐮佹锛岄渶瑕佸皢褰撳墠鏃堕棿渚濇嵁鏃堕棿鏍煎紡杩涜杞崲.
- //鏃堕棿鐮佹涓嶆秹鍙婂埌鏄惁琛ヤ綅
- secValue = VciDateUtil.date2Str(new Date(), secVO.getCodeDateFormatStr());
- break;
- case CODE_CLASSIFY_SEC:
- //鍒嗙被鐮佹鐨勶紝涔熸槸浠庡墠绔�夋嫨浜嗙爜鍊煎嵆鍙紝涓嶈鐮佸�肩殑闀垮害鏄灏�
- break;
- case CODE_LEVEL_SEC:
- //灞傜骇鐮佹锛岄渶瑕佷粠鍒嗙被涓婅幏鍙栫浉搴旂殑淇℃伅
- if (CodeLevelTypeEnum.MIN.getValue().equalsIgnoreCase(secVO.getCodeLevelType())) {
- //鏈�灏忓眰锛屽洜涓烘垜浠彧鑳藉湪鍙跺瓙鑺傜偣涓婄敵璇风紪鐮侊紝鎵�浠ヨ繖涓氨鏄綋鍓嶅垎绫荤殑
- if (CodeGetValueTypeEnum.CURRENT.getValue().equalsIgnoreCase(secVO.getCodeGetValueType()) || CollectionUtils.isEmpty(classifyFullInfoBO.getParentClassifyVOs())) {
- //灏辨槸褰撳墠鍒嗙被鐨�
- secValue = classifyFullInfoBO.getCurrentClassifyVO().getId();
- } else {
- //鎴戜滑闇�瑕佷粠椤跺眰寮�濮嬫壘鍒板綋鍓嶅垎绫讳负姝�
- secValue = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining()) + classifyFullInfoBO.getCurrentClassifyVO().getId();
- }
- } else {
- //鎸囧畾灞傦紝鎴戜滑闇�瑕侀�氳繃涓婄骇鐨勬潵鑾峰彇
- if (CollectionUtils.isEmpty(classifyFullInfoBO.getParentClassifyVOs())) {
- //璇存槑褰撳墠宸茬粡鏄渶楂樼殑浜�
- secValue = classifyFullInfoBO.getCurrentClassifyVO().getId();
- } else {
- //杩欎釜鎴戜滑闇�瑕佺湅鐪�,灞傜骇鏄笉鏄ぇ浜庝簡鏈�澶у眰绾х殑鏁�
- List<CodeClassifyVO> parentClassifyVOList = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).collect(Collectors.toList());
- if (secVO.getCodeLevelValue() > (parentClassifyVOList.size() + 1)) {
- //鎸囧畾鐨勫眰绾ф瘮褰撳墠鐨勫眰绾ц繕澶т簡锛屾墍浠ュ彧鑳借幏鍙栧綋鍓嶅眰绾т簡
- if (CodeGetValueTypeEnum.CURRENT.getValue().equalsIgnoreCase(secVO.getCodeGetValueType())) {
- secValue = classifyFullInfoBO.getCurrentClassifyVO().getId();
- } else {
- secValue = parentClassifyVOList.stream().map(CodeClassifyVO::getId).collect(Collectors.joining()) + classifyFullInfoBO.getCurrentClassifyVO().getId();
- }
- } else {
- //鎴戜滑鑾峰彇鍏朵腑鎸囧畾灞傜殑鍐呭
- if (CodeGetValueTypeEnum.CURRENT.getValue().equalsIgnoreCase(secVO.getCodeGetValueType())) {
- CodeClassifyVO classifyVO = parentClassifyVOList.stream().filter(s -> s.getDataLevel().intValue() == secVO.getCodeLevelValue().intValue()).findFirst().orElseGet(() -> null);
- if (classifyVO != null) {
- secValue = classifyVO.getId();
- }
- } else {
- //灏忎簬绛変簬鐨勫叏閮ㄦ嬁鍑烘潵
- secValue = parentClassifyVOList.stream().filter(s -> s.getDataLevel().intValue() <= secVO.getCodeLevelValue().intValue()).sorted(((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel()))).map(CodeClassifyVO::getId).collect(Collectors.joining());
- }
- }
- }
- }
- //鐪嬬湅闀垮害鏄惁闇�瑕佹埅鏂�
- if (!CodeCutTypeEnum.NONE.getValue().equalsIgnoreCase(secVO.getValueCutType()) &&
- secVO.getValueCutLength() != null && secVO.getValueCutLength() > 0 && secValue.length() > secVO.getValueCutLength()) {
- if (CodeCutTypeEnum.RIGHT.getValue().equalsIgnoreCase(secVO.getValueCutType())) {
- //宸︽埅鍙栨槸浠庡乏杈瑰壀鎺夛紝鍙虫埅鍙栨槸浠庡彸杈瑰壀鎺�--淇濈暀宸﹁竟
- secValue = secValue.substring(0, secVO.getValueCutLength());
- } else {
- secValue = secValue.substring(secValue.length() - secVO.getValueCutLength());
- }
- }
- break;
- case CODE_REFER_SEC:
- //寮曠敤鐨勫湪椤甸潰涓婂凡缁忛�夋嫨浜嗭紝鎵�浠ョ洿鎺ヤ娇鐢ㄥ墠绔笂浼犻�掔殑鍊�
- //寮曠敤灏辨槸鍙傜収锛屽彲鑳芥槸鍏朵粬鐨勫垎绫伙紙涓氬姟绫诲瀷锛変笅鐨勬暟鎹紝鎵�浠ュ彧鍦ㄩ〉闈笂閫夋嫨
- break;
- case CODE_ATTR_SEC:
- //灞炴�т笌寮曠敤鐨勫尯鍒槸锛屽睘鎬ф槸褰撳墠鏁版嵁閲岀殑灞炴�э紝鑰屽紩鐢ㄥ彲鑳芥槸寮曠敤鍏朵粬鐨勫垎绫荤殑锛堜笟鍔＄被鍨嬶級
- //鍥犱负鍙兘鏄壒閲忕殑鏁版嵁鐨勬搷浣滐紝鎵�浠ユ垜浠繖閲屼笉鑳界洿鎺ュ鐞嗗睘鎬э紝闇�瑕佸悗杈逛竴杈瑰鐞�
- secValue = "${attr_" + secVO.getOid() + "}";
- attrSecVOList.add(secVO);
- break;
- case CODE_VARIABLE_SEC:
- //鍙彉鐮佹锛屾槸鍦ㄩ〉闈笂杈撳叆鍐呭
- if (secValue.length() > VciBaseUtil.getInt(secVO.getCodeSecLength())) {
- throw new VciBaseException("銆恵0}銆戣繖涓爜娈垫槸鍙彉鐮佹锛屼絾鏄幇鍦ㄨ緭鍏ョ殑鐮佸�肩殑闀垮害({1})瓒呰繃浜嗚瀹氱殑闀垮害{2}", new String[]{secVO.getName(), String.valueOf(secValue.length()), secVO.getCodeSecLength()});
- }
- OsCodeFillTypeEnum fillTypeEnum = OsCodeFillTypeEnum.forValue(secVO.getCodeFillType());
- secValue = fillString(VciBaseUtil.getInt(secVO.getCodeSecLength()), fillTypeEnum, secValue, secVO.getCodeFillSeparator());
- break;
- case CODE_SERIAL_SEC:
- //娴佹按鐮佹
- serialSecVOList.add(secVO);
- secValue = "${" + secVO.getOid() + "}";
- default:
- break;
- }
- if (VciBaseUtil.getBoolean(secVO.getSerialDependFlag())) {
- serialUnitList.add(secValue);
- }
- secValueList.add(secValue);
- }
-
-
- /**
- * 琛ヤ綅
- * @param totalLength 鎬婚暱搴�
- * @param fillTypeEnum 琛ヤ綅鏂瑰紡
- * @param text 褰撳墠鐨勫唴瀹�
- * @param fillChar 琛ヤ綅鐨勫瓧绗�
- * @return 涓嶅～鍏呬綅缃拰闀垮害宸茬粡杈惧埌/瓒呰繃鐨勬椂鍊欎笉浼氬～鍏�
- */
- private String fillString(int totalLength,OsCodeFillTypeEnum fillTypeEnum,String text,String fillChar){
- if(text.length() >= totalLength || OsCodeFillTypeEnum.NONE.equals(fillTypeEnum)){
- //涓嶇敤琛ヤ綅浜�
- return text;
- }
- int balance = totalLength - text.length();
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < balance; i++) {
- sb.append(fillChar);
- }
- if(OsCodeFillTypeEnum.LEFT.equals(fillTypeEnum)) {
- text = sb.toString() + text;
- }else {
- text = text + sb.toString();
- }
- return text;
- }
-
- /**
- * 杞崲灞炴�х爜娈电殑鍊�
- * @param attrSecVOList 灞炴�х爜娈电殑鏄剧ず瀵硅薄
- * @param cbo 涓氬姟鏁版嵁锛岀敤浜庤幏鍙栫爜娈电殑鍊�
- * @param thisSecValueList 鐮佸�肩殑鍒楄〃
- * @param attrSevIsSerialDepend 鏄惁鏈変綔涓烘祦姘翠緷鎹�
- * @param serialUnitList 娴佹按渚濇嵁鐨勫唴瀹�
- */
- private void switchAttrSecValue(List<CodeBasicSecVO> attrSecVOList,ClientBusinessObject cbo,
- List<String> thisSecValueList,boolean attrSevIsSerialDepend,
- List<String> serialUnitList){
- if (!CollectionUtils.isEmpty(attrSecVOList)) {
- attrSecVOList.stream().forEach(attrSevVO -> {
- String value = "";
- if (StringUtils.isNotBlank(attrSevVO.getGetValueClass())) {
- //浣跨敤缁勫悎瑙勫垯鏉ュ鐞嗙殑
- value = getValueByFormulaForCBO(cbo, attrSevVO.getGetValueClass());
- } else {
- value = cbo.getAttributeValue(attrSevVO.getReferAttributeId());
- }
- if (value == null) {
- value = "";
- }
- //鏇挎崲secValueList閲岄潰鐨勫唴瀹�
- for (int j = 0; j < thisSecValueList.size(); j++) {
- String secValue = thisSecValueList.get(j);
- if (secValue.equalsIgnoreCase("${attr_" + attrSevVO.getOid() + "}")) {
- thisSecValueList.set(j, value);
- }
- }
- if (attrSevIsSerialDepend) {
- //鏄祦姘翠緷璧栫殑璇濓紝闇�瑕佸幓鏇挎崲涓�涓�
- for (int j = 0; j < serialUnitList.size(); j++) {
- String secValue = serialUnitList.get(j);
- if (secValue.equalsIgnoreCase("${attr_" + attrSevVO.getOid() + "}")) {
- serialUnitList.set(j, value);
- }
- }
- }
- });
- }
- }
-
- /**
- * 浣跨敤CBO澶勭悊缁勫悎瑙勫垯鐨勫唴瀹�
- * @param cbo 鏁版嵁鐨勫唴瀹�
- * @param rule 瑙勫垯鐨勫唴瀹�
- * @return 杞崲鍚庣殑
- */
- private String getValueByFormulaForCBO(ClientBusinessObject cbo,String rule){
- Map<String,String> dataMap = new HashMap<>();
- WebUtil.copyValueToMapFromCbos(cbo,dataMap);
- return formulaService.getValueByFormula(dataMap,rule);
- }
-
- /**
- * 杞崲娴佹按鐮佹鐨勫��
- * @param serialSecVOList 娴佹按鐮佹
- * @param attrSevIsSerialDepend 鏄惁鏈夊睘鎬х爜娈靛弬涓庢祦姘�
- * @param ruleVO 瑙勫垯鐨勫唴瀹�
- * @param serialUnitString 娴佹按渚濇嵁
- * @param maxSerialValueMap 鏈�澶х殑娴佹按鍙�
- * @param thisSecValueList 鏈鐨勭爜鍊�
- * @param lastMaxSerialValueMap 灏佽鍚�
- * @param firstData 鏄惁涓虹涓�鏉℃暟鎹�
- */
- private void switchSerialSecValue(List<CodeBasicSecVO> serialSecVOList,boolean attrSevIsSerialDepend,
- CodeRuleVO ruleVO,String serialUnitString,
- Map<String/**鐮佹鐨勪富閿�**/,Map<String/**娴佹按渚濇嵁**/,CodeSerialValueDO>> maxSerialValueMap,List<String> thisSecValueList,
- Map<String/**鐮佹鐨勪富閿�**/,Map<String/**娴佹按渚濇嵁**/, Double>> lastMaxSerialValueMap,boolean firstData){
- if (!CollectionUtils.isEmpty(serialSecVOList)) {
- for (int j = 0; j < serialSecVOList.size(); j++) {
- CodeBasicSecVO secVO = serialSecVOList.get(j);
- if (attrSevIsSerialDepend || firstData) {
- //濡傛灉灞炴�х爜娈典篃鏄緷璧栵紝鍒欐瘡娆￠兘瑕佹煡璇紝濡傛灉灞炴�х爜娈典笉鏄緷璧栵紝鍒欏彧鏌ヨ涓�娆�
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("codeRuleOid", ruleVO.getOid());
- conditionMap.put("serialUnit", serialUnitString);
- //杩欎釜瀛楁鏄负浜嗚В鍐冲涓祦姘寸殑闂
- conditionMap.put("codeSecOid", secVO.getOid());
- List<CodeSerialValueDO> serialValueDOS = serialValueMapper.selectByCondition(conditionMap, new PageHelper(-1));
- if (!CollectionUtils.isEmpty(serialValueDOS)) {
- Map<String, CodeSerialValueDO> unitSerialMap = maxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>());
- CodeSerialValueDO serialValueDO = serialValueDOS.get(0);
- unitSerialMap.put(serialValueDO.getSerialUnit(),serialValueDO);
- maxSerialValueMap.put(secVO.getOid(), unitSerialMap);
- }
- }
- Double startValue = null;
- if(maxSerialValueMap.containsKey(secVO.getOid()) && maxSerialValueMap.get(secVO.getOid()).containsKey(serialUnitString)){
- startValue = VciBaseUtil.getDouble(maxSerialValueMap.get(secVO.getOid()).get(serialUnitString).getMaxSerial());
- }
- if(lastMaxSerialValueMap.containsKey(secVO.getOid()) && lastMaxSerialValueMap.get(secVO.getOid()).containsKey(serialUnitString)){
- //璇存槑澶氫釜鐢宠锛屼箣鍓嶅凡缁忓姞浜嗘祦姘村彿浜�
- startValue = lastMaxSerialValueMap.get(secVO.getOid()).get(serialUnitString);
- }
- Double thisSerialValue = 0d;
- if (startValue == null) {
- //绗竴涓紪鐮�
- thisSerialValue = VciBaseUtil.getDouble(secVO.getSerialStart());
- } else {
- //娴佹按鍙疯偗瀹氭槸鏁板瓧
- thisSerialValue = startValue + (j + 1) * secVO.getSerialStep();
- }
- //瑕佺湅鏄惁瓒呰繃鏈�澶х殑娴佹按鍊�
- if (thisSerialValue >= secVO.getCodeFillLimit()) {
- throw new VciBaseException("娴佹按鍙峰凡缁忚秴杩囧厑璁哥殑鏈�澶ф祦姘村�納0}",new String[]{secVO.getCodeFillLimit().toString()});
- }
- //瑕佺湅琛ヤ綅鐨勫唴瀹�
- Integer fillLength = VciBaseUtil.getInt(secVO.getCodeFillLength());
- if (fillLength == 0 || fillLength > VciBaseUtil.getInt(secVO.getCodeSecLength())) {
- //闃叉鍦ㄦ坊鍔犵殑鍦版柟娌℃湁鎺у埗姝ｇ‘
- fillLength = VciBaseUtil.getInt(secVO.getCodeSecLength());
- }
- String serialString = String.valueOf(thisSerialValue.longValue());
- serialString = fillString(fillLength, OsCodeFillTypeEnum.forValue(secVO.getCodeFillType()), serialString, secVO.getCodeFillSeparator());
- for (int z = 0; z < thisSecValueList.size(); z++) {
- String secValue = thisSecValueList.get(z);
- if (secValue.equalsIgnoreCase("${" + secVO.getOid() + "}")) {
- thisSecValueList.set(z, serialString);
- }
- }
- Map<String, Double> unitSerialMap = lastMaxSerialValueMap.getOrDefault(secVO.getOid(), new HashMap<>());
- unitSerialMap.put(serialUnitString, thisSerialValue);
- lastMaxSerialValueMap.put(secVO.getOid(),unitSerialMap);
- }
- }
- }
-
- /**
- * 灏佽瀛樺偍鐮佸�肩殑瀵硅薄
- * @param classifyFullInfoBO 鍒嗙被鍏ㄩ儴鐨勪俊鎭�
- * @param ruleVO 瑙勫垯鐨勫唴瀹�
- * @param cbo 涓氬姟鏁版嵁
- * @param templateVO 妯℃澘鐨勪俊鎭�
- * @param allCodeDOList 鎵�鏈夌殑鐮佸�肩殑瀵硅薄鍒楄〃
- */
- private void wrapperAllCode(CodeClassifyFullInfoBO classifyFullInfoBO,CodeRuleVO ruleVO,
- ClientBusinessObject cbo,CodeClassifyTemplateVO templateVO,
- List<CodeAllCodeDO> allCodeDOList,String serialUnitString,String serialValueString){
- CodeAllCodeDO allCodeDO = new CodeAllCodeDO();
- allCodeDO.setCodeClassifyOid(classifyFullInfoBO.getCurrentClassifyVO().getOid());
- allCodeDO.setCodeRuleOid(ruleVO.getOid());
- allCodeDO.setId(cbo.getId());
- allCodeDO.setCodeClassifyTemplateOid(templateVO.getOid());
- allCodeDO.setCreateCodeBtm(cbo.getBtmName());
- allCodeDO.setCreateCodeOid(cbo.getOid());
- allCodeDO.setSerialUnit(serialUnitString);
- allCodeDO.setUnFillSerial(serialValueString);
- allCodeDO.setLcStatus(cbo.getLcStatus());
- allCodeDOList.add(allCodeDO);
- }
-
- /**
- * 淇濆瓨娴佹按鐨勪俊鎭�
- * @param batchCBO 鏁版嵁瀛樺偍瀹瑰櫒
- * @param ruleVO 瑙勫垯鐨勬樉绀哄璞�
- * @param lastMaxSerialValueMap 鏈�澶х殑娴佹按鍊兼槧灏�
- * @param maxSerialValueMap 渚濇嵁瀛樺偍鐨勬渶澶ф祦姘寸殑鍐呭
- */
- private void saveSerialValue(BatchCBO batchCBO,CodeRuleVO ruleVO,
- Map<String/**鐮佹鐨勪富閿�**/,Map<String, Double>> lastMaxSerialValueMap,
- Map<String/**鐮佹鐨勪富閿�**/,Map<String, CodeSerialValueDO>> maxSerialValueMap){
- List<CodeSerialValueDO> editSerialValueDOList = new ArrayList<>();
- List<CodeSerialValueDO> addSerialValueDOList = new ArrayList<>();
- //瀛樺偍鏈�澶ф祦姘村彿
- lastMaxSerialValueMap.forEach((secOid,maxSerialMap)->{
- maxSerialMap.forEach((unit,maxSerial)->{
- CodeSerialValueDO serialValueDO = null;
- if(maxSerialValueMap.containsKey(secOid) && maxSerialValueMap.get(secOid).containsKey(unit)){
- //璇存槑鏈�
- serialValueDO = maxSerialValueMap.get(secOid).get(unit);
- serialValueDO.setMaxSerial(maxSerial.toString());
- editSerialValueDOList.add(serialValueDO);
- }else{
- serialValueDO = new CodeSerialValueDO();
- serialValueDO.setCodeRuleOid(ruleVO.getOid());
- serialValueDO.setSerialUnit(unit);
- serialValueDO.setCodeSecOid(secOid);
- serialValueDO.setMaxSerial(maxSerial.toString());
- addSerialValueDOList.add(serialValueDO);
- }
- });
- });
- if(!CollectionUtils.isEmpty(editSerialValueDOList)){
- batchCBO.copyFromOther(serialValueMapper.batchUpdate(editSerialValueDOList));
- }
- if(!CollectionUtils.isEmpty(addSerialValueDOList)){
- batchCBO.copyFromOther(serialValueMapper.batchInsert(addSerialValueDOList));
- }
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/SysIntAuthorityServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/SysIntAuthorityServiceImpl.java
deleted file mode 100644
index ce71044..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/SysIntAuthorityServiceImpl.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.vci.ubcs.code.mapper.SysIntAuthorityMapper;
-import com.vci.ubcs.code.enumpack.SysIntegrationAuthorityTypeEnum;
-import com.vci.ubcs.code.entity.SysIntAuthorityDO;
-import com.vci.ubcs.code.service.SysIntAuthorityServiceI;
-import com.vci.ubcs.code.service.SysIntInfoServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.service.WebBoServiceI;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.SysIntAuthorityDTO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntAuthorityVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-/**
- * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹湇鍔�
- * @author lihang
- * @date 2022-03-07
- */
-@Service
-public class SysIntAuthorityServiceImpl implements SysIntAuthorityServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private SysIntAuthorityMapper sysIntAuthorityMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 绯荤粺闆嗘垚鐨勬帴鍙ｄ俊鎭湇鍔�
- */
- @Autowired
- private SysIntInfoServiceI sysIntInfoService;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SysIntAuthorityVO> gridSysIntAuthority(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<SysIntAuthorityDO> doList = sysIntAuthorityMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<SysIntAuthorityVO> dataGrid=new DataGrid<SysIntAuthorityVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(sysIntAuthorityDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(sysIntAuthorityMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntAuthorityDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<SysIntAuthorityVO> sysIntAuthorityDO2VOs(Collection<SysIntAuthorityDO> sysIntAuthorityDOs) throws VciBaseException{
- List<SysIntAuthorityVO> voList = new ArrayList<SysIntAuthorityVO>();
- if(!CollectionUtils.isEmpty(sysIntAuthorityDOs)){
- for(SysIntAuthorityDO s: sysIntAuthorityDOs){
- SysIntAuthorityVO vo = sysIntAuthorityDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntAuthorityDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public SysIntAuthorityVO sysIntAuthorityDO2VO(SysIntAuthorityDO sysIntAuthorityDO) throws VciBaseException{
- SysIntAuthorityVO vo = new SysIntAuthorityVO();
- if(sysIntAuthorityDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntAuthorityDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param sysIntAuthorityDTO 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public SysIntAuthorityVO addSave(SysIntAuthorityDTO sysIntAuthorityDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(sysIntAuthorityDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- if (SysIntegrationAuthorityTypeEnum.LOGIN.getValue().equals(sysIntAuthorityDTO.getType())){
- VciBaseUtil.alertNotNull(sysIntAuthorityDTO.getUseraccount(),"鐢ㄦ埛鐧诲綍楠岃瘉鏂瑰紡鐨勯獙璇佺敤鎴�",sysIntAuthorityDTO.getUsercode(),"鐢ㄦ埛鐧诲綍楠岃瘉鏂瑰紡鐨勯獙璇佸瘑鐮�");
- } else if (SysIntegrationAuthorityTypeEnum.TOKEN.getValue().equals(sysIntAuthorityDTO.getType())) {
- VciBaseUtil.alertNotNull(sysIntAuthorityDTO.getToken(),"浠ょ墝楠岃瘉鏂瑰紡鐨勪护鐗�");
- }
- //灏咲TO杞崲涓篋O
- SysIntAuthorityDO sysIntAuthorityDO = new SysIntAuthorityDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntAuthorityDTO,sysIntAuthorityDO);
- sysIntAuthorityMapper.insert(sysIntAuthorityDO);
- return sysIntAuthorityDO2VO(sysIntAuthorityDO);
- }
-
- /**
- * 淇敼绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param sysIntAuthorityDTO 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public SysIntAuthorityVO editSave(SysIntAuthorityDTO sysIntAuthorityDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(sysIntAuthorityDTO,"鏁版嵁瀵硅薄",sysIntAuthorityDTO.getOid(),"绯荤粺闆嗘垚鎺ュ彛鐨勮璇佷富閿�");
- //灏咲TO杞崲涓篋O
- SysIntAuthorityDO sysIntAuthorityDO = selectByOid(sysIntAuthorityDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(sysIntAuthorityDTO,sysIntAuthorityDO);
- sysIntAuthorityMapper.updateByPrimaryKey(sysIntAuthorityDO);
- return sysIntAuthorityDO2VO(sysIntAuthorityDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param sysIntAuthorityDTO 鏁版嵁浼犺緭瀵硅薄
- * @param sysIntAuthorityDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(SysIntAuthorityDTO sysIntAuthorityDTO, SysIntAuthorityDO sysIntAuthorityDO) {
- SysIntAuthorityDO tsDO = new SysIntAuthorityDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntAuthorityDTO,tsDO);
- //boService.checkTs(tsDO);
- if(!checkIsLinked(sysIntAuthorityDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- return !sysIntInfoService.isAlreadyUse(null,oid);
- }
-
- /**
- * 鍒犻櫎绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param sysIntAuthorityDTO 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteSysIntAuthority(SysIntAuthorityDTO sysIntAuthorityDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(sysIntAuthorityDTO,"绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹暟鎹璞�",sysIntAuthorityDTO.getOid(),"绯荤粺闆嗘垚鎺ュ彛鐨勮璇佺殑涓婚敭");
- SysIntAuthorityDO sysIntAuthorityDO = selectByOid(sysIntAuthorityDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(sysIntAuthorityDTO,sysIntAuthorityDO);
- if(baseResult.isSuccess()) {
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = sysIntAuthorityMapper.deleteByPrimaryKey(sysIntAuthorityDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param oid 涓婚敭
- * @return 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public SysIntAuthorityVO getObjectByOid(String oid) throws VciBaseException{
- return sysIntAuthorityDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private SysIntAuthorityDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- SysIntAuthorityDO sysIntAuthorityDO = sysIntAuthorityMapper.selectByPrimaryKey(oid.trim());
- if(sysIntAuthorityDO == null || StringUtils.isBlank(sysIntAuthorityDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return sysIntAuthorityDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇绯荤粺闆嗘垚鎺ュ彛鐨勮璇�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<SysIntAuthorityVO> listSysIntAuthorityByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<SysIntAuthorityDO> sysIntAuthorityDOList = listSysIntAuthorityDOByOidCollections(oidCollections);
- return sysIntAuthorityDO2VOs(sysIntAuthorityDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<SysIntAuthorityDO> listSysIntAuthorityDOByOidCollections(Collection<String> oidCollections){
- List<SysIntAuthorityDO> sysIntAuthorityDOList = new ArrayList<SysIntAuthorityDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<SysIntAuthorityDO> tempDOList = sysIntAuthorityMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- sysIntAuthorityDOList.addAll(tempDOList);
- }
- }
- }
- return sysIntAuthorityDOList;
- }
-
-
-
- /**
- * 鍙傜収绯荤粺闆嗘垚鎺ュ彛鐨勮璇佸垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SysIntAuthorityVO> refDataGridSysIntAuthority(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridSysIntAuthority(conditionMap,pageHelper);
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/SysIntBaseServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/SysIntBaseServiceImpl.java
deleted file mode 100644
index 3cedb55..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/SysIntBaseServiceImpl.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.vci.ubcs.code.mapper.SysIntBaseMapper;
-import com.vci.ubcs.code.entity.SysIntBaseDO;
-import com.vci.ubcs.code.service.SysIntBaseServiceI;
-import com.vci.ubcs.code.service.SysIntInfoServiceI;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.web.pageModel.BatchCBO;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.dto.SysIntBaseDTO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntBaseVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.*;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-/**
- * 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭湇鍔�
- * @author lihang
- * @date 2022-03-07
- */
-@Service
-public class SysIntBaseServiceImpl implements SysIntBaseServiceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private SysIntBaseMapper sysIntBaseMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
-// @Autowired
-// @Lazy
-// private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 绯荤粺闆嗘垚鐨勬帴鍙ｄ俊鎭湇鍔�
- */
- @Autowired
- @Lazy
- private SysIntInfoServiceI sysIntInfoService;
-
-
- /**
- * 鏌ヨ鎵�鏈夌殑绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SysIntBaseVO> gridSysIntBase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<SysIntBaseDO> doList = sysIntBaseMapper.selectByCondition(conditionMap,pageHelper);
- DataGrid<SysIntBaseVO> dataGrid=new DataGrid<SysIntBaseVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(sysIntBaseDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(sysIntBaseMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntBaseDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<SysIntBaseVO> sysIntBaseDO2VOs(Collection<SysIntBaseDO> sysIntBaseDOs) throws VciBaseException{
- List<SysIntBaseVO> voList = new ArrayList<SysIntBaseVO>();
- if(!CollectionUtils.isEmpty(sysIntBaseDOs)){
- for(SysIntBaseDO s: sysIntBaseDOs){
- SysIntBaseVO vo = sysIntBaseDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntBaseDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public SysIntBaseVO sysIntBaseDO2VO(SysIntBaseDO sysIntBaseDO) throws VciBaseException{
- SysIntBaseVO vo = new SysIntBaseVO();
- if(sysIntBaseDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntBaseDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param sysIntBaseDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public SysIntBaseVO addSave(SysIntBaseDTO sysIntBaseDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(sysIntBaseDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- //灏咲TO杞崲涓篋O
- SysIntBaseDO sysIntBaseDO = new SysIntBaseDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntBaseDTO,sysIntBaseDO);
- sysIntBaseMapper.insert(sysIntBaseDO);
- return sysIntBaseDO2VO(sysIntBaseDO);
- }
-
- /**
- * 淇敼绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param sysIntBaseDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public SysIntBaseVO editSave(SysIntBaseDTO sysIntBaseDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(sysIntBaseDTO,"鏁版嵁瀵硅薄",sysIntBaseDTO.getOid(),"绯荤粺闆嗘垚鐨勭郴缁熶俊鎭富閿�");
- //灏咲TO杞崲涓篋O
- SysIntBaseDO sysIntBaseDO = selectByOid(sysIntBaseDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(sysIntBaseDTO,sysIntBaseDO);
- sysIntBaseMapper.updateByPrimaryKey(sysIntBaseDO);
- return sysIntBaseDO2VO(sysIntBaseDO);
- }
-
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param sysIntBaseDTO 鏁版嵁浼犺緭瀵硅薄
- * @param sysIntBaseDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(SysIntBaseDTO sysIntBaseDTO, SysIntBaseDO sysIntBaseDO) {
- SysIntBaseDO tsDO = new SysIntBaseDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntBaseDTO,tsDO);
- //boService.checkTs(tsDO);
- if(!checkIsLinked(sysIntBaseDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- return !sysIntInfoService.isAlreadyUse(oid,null);
- }
-
- /**
- * 鍒犻櫎绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param sysIntBaseDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteSysIntBase(SysIntBaseDTO sysIntBaseDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(sysIntBaseDTO,"绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹璞�",sysIntBaseDTO.getOid(),"绯荤粺闆嗘垚鐨勭郴缁熶俊鎭殑涓婚敭");
- SysIntBaseDO sysIntBaseDO = selectByOid(sysIntBaseDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(sysIntBaseDTO,sysIntBaseDO);
- if(baseResult.isSuccess()) {
-
- }else{
- return baseResult;
- }
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = sysIntBaseMapper.deleteByPrimaryKey(sysIntBaseDO.getOid());
- return (batchCBO!=null && batchCBO.getDeleteCbos() !=null &&batchCBO.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param oid 涓婚敭
- * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞�
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public SysIntBaseVO getObjectByOid(String oid) throws VciBaseException{
- return sysIntBaseDO2VO(selectByOid(oid));
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private SysIntBaseDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- SysIntBaseDO sysIntBaseDO = sysIntBaseMapper.selectByPrimaryKey(oid.trim());
- if(sysIntBaseDO == null || StringUtils.isBlank(sysIntBaseDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return sysIntBaseDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇绯荤粺闆嗘垚鐨勭郴缁熶俊鎭�
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞�
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<SysIntBaseVO> listSysIntBaseByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<SysIntBaseDO> sysIntBaseDOList = listSysIntBaseDOByOidCollections(oidCollections);
- return sysIntBaseDO2VOs(sysIntBaseDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<SysIntBaseDO> listSysIntBaseDOByOidCollections(Collection<String> oidCollections){
- List<SysIntBaseDO> sysIntBaseDOList = new ArrayList<SysIntBaseDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<SysIntBaseDO> tempDOList = sysIntBaseMapper.selectByPrimaryKeyCollection(oids);
- if(!CollectionUtils.isEmpty(tempDOList)){
- sysIntBaseDOList.addAll(tempDOList);
- }
- }
- }
- return sysIntBaseDOList;
- }
-
-
-
- /**
- * 鍙傜収绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SysIntBaseVO> refDataGridSysIntBase(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridSysIntBase(conditionMap,pageHelper);
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/SysIntInfoServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/SysIntInfoServiceImpl.java
deleted file mode 100644
index 75a868c..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/SysIntInfoServiceImpl.java
+++ /dev/null
@@ -1,1093 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.constant.MdmDuckingConstant;
-import com.vci.ubcs.code.constant.MdmEngineConstant;
-import com.vci.ubcs.code.dto.datapush.classify.JsonRootDataDTO;
-import com.vci.ubcs.code.dto.datapush.classify.NodeClassifyDTO;
-import com.vci.ubcs.code.dto.datapush.classify.NodeDataDTO;
-import com.vci.ubcs.code.dto.datapush.classify.NodeLibraryDTO;
-import com.vci.ubcs.code.dto.datapush.result.ResultJsonDTO;
-import com.vci.ubcs.code.dto.datapush.result.ResultNodeDataDTO;
-import com.vci.ubcs.code.dto.datapush.result.ResultNodeObjectDTO;
-import com.vci.ubcs.code.enumpack.SysIntegrationAuthorityTypeEnum;
-import com.vci.ubcs.code.enumpack.SysIntegrationRequestTypeEnum;
-import com.vci.ubcs.code.enumpack.sysIntegrationPushTypeEnum;
-import com.vci.ubcs.code.mapper.*;
-import com.vci.ubcs.code.service.CodeClassifyServiceI;
-import com.vci.ubcs.code.service.MdmEngineServiceI;
-import com.vci.ubcs.code.service.SysIntBaseServiceI;
-import com.vci.ubcs.code.service.SysIntInfoServiceI;
-import com.vci.ubcs.code.utils.HttpUtils;
-import com.vci.ubcs.code.utils.WsErpClientUtil;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.vci.frameworkcore.constant.FrameWorkDefaultValueConstant;
-import com.vci.starter.revision.service.RevisionModelUtil;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.exception.VciBaseException;
-import com.vci.starter.web.pagemodel.BaseResult;
-import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.pagemodel.TreeQueryObject;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.util.VciDateUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.vo.pagemodel.*;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.redis.RedisService;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.web.util.WebUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
-import com.vci.ubcs.code.dto.SysIntHeaderDTO;
-import com.vci.ubcs.code.dto.SysIntInfoDTO;
-import com.vci.ubcs.code.dto.SysIntParamDTO;
-import com.vci.ubcs.code.dto.UpdateSysInfoStatusDTO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.vci.frameworkcore.constant.FrameWorkLangCodeConstant.*;
-
-
-/**
- * 绯荤粺闆嗘垚鍩虹淇℃伅鏈嶅姟
- * @author lihang
- * @date 2022-03-07
- */
-@Service
-public class SysIntInfoServiceImpl implements SysIntInfoServiceI {
-
- @Value("${dataSyncPush.dataParamName:xmlData}")
- public String DATA_PARAM_NAME;
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- /**
- * 鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private SysIntInfoMapper sysIntInfoMapper;
-
- /**
- * 涓氬姟绫诲瀷鎿嶄綔鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- /**
- * 瀵硅薄鐨勬搷浣�
- */
- @Autowired
- private RevisionModelUtil revisionModelUtil;
-
- /**
- * 绯荤粺闆嗘垚涓殑绯荤粺淇℃伅鏈嶅姟
- */
- @Autowired
- private SysIntBaseServiceI sysIntBaseService;
-
- /**
- * 鎺ュ彛鍙傛暟
- */
- @Autowired
- private SysIntParamMapper sysIntParamDaoI;
-
- /**
- * 鎺ュ彛楠岃瘉淇℃伅
- */
- @Autowired
- private SysIntHeaderMapper sysIntHeaderDaoI;
-
- /**
- * 鍒嗙被涓氬姟绫诲瀷鎿嶄綔鏈嶅姟
- */
- @Autowired
- @Lazy
- private CodeClassifyServiceI codeClassifyServiceI;
- /**
- * 缂撳瓨鏈嶅姟
- */
- @Autowired
- private RedisService redisService;
- /**
- * 闆嗘垚鏃ュ織鏁版嵁鎿嶄綔灞�
- */
- @Resource
- private DockingLogeMapper dockingLogeDaoI;
- @Resource
- private DockingTaskMapper dockingTaskDaoI;
- /**
- * 鏁版嵁鏈嶅姟
- */
- @Autowired(required = false)
- @Lazy
- private MdmEngineServiceI mdmEngineServiceI;
-
- /**
- * 鏌ヨ鎵�鏈夌殑绯荤粺闆嗘垚鍩虹淇℃伅
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SysIntInfoVO> gridSysIntInfo(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if (pageHelper == null) {
- pageHelper = new PageHelper(-1);
- }
- pageHelper.addDefaultDesc("createTime");
- List<SysIntInfoDO> doList = sysIntInfoMapper.selectByCondition(conditionMap,pageHelper);
-// Set<String> targetIdList = doList.stream().map(SysIntInfoDO::getTargetSystemOid).collect(Collectors.toSet());
-// Set<String> sourceIdList = doList.stream().map(SysIntInfoDO::getSourceSystemOid).collect(Collectors.toSet());
-// List<String> oidList = new ArrayList<>();
-// oidList.addAll(targetIdList);
-// oidList.addAll(sourceIdList);
-// if (!CollectionUtils.isEmpty(oidList)) {
-// List<SysIntBaseVO> sysIntBaseVOList = (List<SysIntBaseVO>) sysIntBaseService.listSysIntBaseByOids(oidList);
-// matchSysOid2BuildInfoDO(doList, sysIntBaseVOList);
-// }
- DataGrid<SysIntInfoVO> dataGrid=new DataGrid<SysIntInfoVO>();
- if (!CollectionUtils.isEmpty(doList)) {
- dataGrid.setData(sysIntInfoDO2VOs(doList));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(sysIntInfoMapper.countByCondition(conditionMap))));
- }
- return dataGrid;
- }
-
- /**
- * 鏍规嵁BaseVO闆嗗悎涓殑oid瀵笽nfoDO鐨勭洰鏍囩郴缁熶富閿�佹潵婧愮郴缁熶富閿繘琛屽尮閰嶏紝缁勮绯荤粺鍚嶇О鍜岀郴缁熸爣璇�
- * @param doList 绯荤粺闆嗘垚鍩虹淇℃伅瀵硅薄闆嗗悎
- * @param sysIntBaseVOList 绯荤粺闆嗘垚绯荤粺淇℃伅闆嗗悎
- */
- private void matchSysOid2BuildInfoDO(List<SysIntInfoDO> doList, List<SysIntBaseVO> sysIntBaseVOList) {
- doList.forEach(info -> {
- sysIntBaseVOList.stream().filter(vo -> {
- return info.getTargetSystemOid().equals(vo.getOid());
- }).forEach(base -> {
- info.setTargetSysId(base.getId());
- info.setTargetSysName(base.getName());
- });
- sysIntBaseVOList.stream().filter(vo -> {
- return info.getSourceSystemOid().equals(vo.getOid());
- }).forEach(base -> {
- info.setSourceSysId(base.getId());
- info.setSourceSysName(base.getName());
- info.setAuthorityTypeText(SysIntegrationAuthorityTypeEnum.getTextByValue(info.getAuthorityType()));
- });
- });
- }
- @Override
- public List<SysIntInfoDO> selectAll(Map conditonMap){
- return sysIntInfoMapper.selectAll(conditonMap);
- }
-
- /**
- * 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntInfoDOs 鏁版嵁瀵硅薄鍒楄〃
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖鎴栬�呬笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- @Override
- public List<SysIntInfoVO> sysIntInfoDO2VOs(Collection<SysIntInfoDO> sysIntInfoDOs) throws VciBaseException{
- List<SysIntInfoVO> voList = new ArrayList<SysIntInfoVO>();
- if(!CollectionUtils.isEmpty(sysIntInfoDOs)){
- for(SysIntInfoDO s: sysIntInfoDOs){
- SysIntInfoVO vo = sysIntInfoDO2VO(s);
- if(vo != null){
- voList.add(vo);
- }
- }
- }
- return voList;
- }
-
- /**
- * 鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
- * @param sysIntInfoDO 鏁版嵁瀵硅薄
- * @return 鏄剧ず瀵硅薄
- * @throws VciBaseException 鎷疯礉灞炴�у嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public SysIntInfoVO sysIntInfoDO2VO(SysIntInfoDO sysIntInfoDO) throws VciBaseException{
- SysIntInfoVO vo = new SysIntInfoVO();
- if(sysIntInfoDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntInfoDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- vo.setPushTypeText(sysIntegrationPushTypeEnum.getTextByValue(vo.getPushType()));
-
- }
- return vo;
- }
-
- /**
- * 澧炲姞绯荤粺闆嗘垚鍩虹淇℃伅
- * @param sysIntInfoDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public SysIntInfoVO addSave(SysIntInfoDTO sysIntInfoDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(sysIntInfoDTO,"闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
- checkColumnNotNull(sysIntInfoDTO);
- String sourcesystemoid = sysIntInfoDTO.getSourcesystemoid();
- SysIntBaseVO sysIntBaseVO = sysIntBaseService.getObjectByOid(sourcesystemoid);
- sysIntInfoDTO.setSysbaseoid(sourcesystemoid);
- sysIntInfoDTO.setSysbaseid(sysIntBaseVO.getId());
- sysIntInfoDTO.setSysbasename(sysIntBaseVO.getName());
- sysIntInfoDTO.setUsedflag("true");//璁剧疆榛樿鍚敤鐘舵��
-
- //灏咲TO杞崲涓篋O
- SysIntInfoDO sysIntInfoDO = new SysIntInfoDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntInfoDTO,sysIntInfoDO);
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
-
- BatchCBO batchCBO_update = new BatchCBO();
- BatchCBO sysIntInfoBo= sysIntInfoMapper.insert(sysIntInfoDO);
-
- List<SysIntParamDTO> sysIntParamDTOS= sysIntInfoDTO.getSysIntParamDTOs();
- List<SysIntParamDO> sysIntParamDOS=new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntParamDTOS)) {
- sysIntParamDTOS.stream().forEach(sysIntParamDTO -> {
- SysIntParamDO sysIntParamDO = new SysIntParamDO();
- sysIntParamDTO.setInfoOid(sysIntInfoDO.getOid());
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
- sysIntParamDOS.add(sysIntParamDO);
- });
- }
- List<SysIntHeaderDTO> sysIntHeaderDTOs= sysIntInfoDTO.getSysIntHeaderDTOS();
- List<SysIntHeaderDO> sysIntHeaderDOS = new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntHeaderDTOs)) {
- sysIntHeaderDTOs.stream().forEach(sysIntHeaderDTO -> {
- SysIntHeaderDO sysIntHeaderDO = new SysIntHeaderDO();
- sysIntHeaderDTO.setInfoOid(sysIntInfoDO.getOid());
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, sysIntHeaderDO);
- sysIntHeaderDOS.add(sysIntHeaderDO);
- });
- }
-
- batchCBO_update.copyFromOther(sysIntInfoBo);
- //鎵归噺澶勭悊淇濆瓨header瀵硅薄
- if(!CollectionUtils.isEmpty(sysIntHeaderDOS)) {
- BatchCBO sysIntHeaderBO = sysIntHeaderDaoI.batchInsert(sysIntHeaderDOS);
- batchCBO_update.copyFromOther(sysIntHeaderBO);
- }
- //鎵归噺澶勭悊淇濆瓨Param瀵硅薄
- if(!CollectionUtils.isEmpty(sysIntParamDOS)) {
- BatchCBO sysIntParamBO = sysIntParamDaoI.batchInsert(sysIntParamDOS);
- batchCBO_update.copyFromOther(sysIntParamBO);
- }
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO_update);//涓�璧锋墽琛屼繚瀛�
-
- return sysIntInfoDO2VO(sysIntInfoDO,sysIntHeaderDOS,sysIntParamDOS);
- }
-
- /**
- *
- * @param sysIntInfoDO
- * @param sysIntHeaderDOS
- * @param sysIntParamDOS
- * @return
- */
- private SysIntInfoVO sysIntInfoDO2VO(SysIntInfoDO sysIntInfoDO, List<SysIntHeaderDO> sysIntHeaderDOS, List<SysIntParamDO> sysIntParamDOS) {
- SysIntInfoVO vo = new SysIntInfoVO();
- if(sysIntInfoDO != null){
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntInfoDO,vo);
- //濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
- List<SysIntParamVO> sysIntParamVOs=new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntParamDOS)){
- sysIntParamDOS.stream().forEach(sysIntParamDO -> {
- SysIntParamVO sysIntParamVO=new SysIntParamVO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDO,sysIntParamVO);
- sysIntParamVOs.add(sysIntParamVO);
- });
- vo.setSysIntParamVOs(sysIntParamVOs);
- }
- List<SysIntHeaderVO> sysIntHeaderVOs=new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntHeaderDOS)){
- sysIntHeaderDOS.stream().forEach(sysIntHeaderDO -> {
- SysIntHeaderVO sysIntHeaderVO=new SysIntHeaderVO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDO,sysIntHeaderVO);
- sysIntHeaderVOs.add(sysIntHeaderVO);
- });
- vo.setSysIntHeaderVOs(sysIntHeaderVOs);
- }
- }
- return vo;
- }
-
- /**
- * 绯荤粺闆嗘垚鎺ュ彛鍩虹淇℃伅Null瀛楁妫�楠�
- * @param sysIntInfoDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- private void checkColumnNotNull(SysIntInfoDTO sysIntInfoDTO) throws VciBaseException {
- if (SysIntegrationRequestTypeEnum.HTTP.getValue().equals(sysIntInfoDTO.getInterfacetype())){
- VciBaseUtil.alertNotNull(sysIntInfoDTO.getRequesturl(),"HTTP鎺ュ彛鐨勮姹傚湴鍧�",sysIntInfoDTO.getRequestmethod(),"HTTP鎺ュ彛鐨勮姹傛柟寮�");
- }
- if (SysIntegrationRequestTypeEnum.WEB_SERVICE.getValue().equals(sysIntInfoDTO.getInterfacetype())){
- VciBaseUtil.alertNotNull(sysIntInfoDTO.getInterfaceFunction(),"WebService鐨勬帴鍙ｅ嚱鏁�");
- }
- if (SysIntegrationRequestTypeEnum.CLASSPATH.getValue().equals(sysIntInfoDTO.getInterfacetype())){
- VciBaseUtil.alertNotNull(sysIntInfoDTO.getClassPath(),"绫昏矾寰�");
- }
- }
-
- /**
- * 淇敼绯荤粺闆嗘垚鍩虹淇℃伅
- * @param sysIntInfoDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄
- * @return 鎵ц缁撴灉
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽敮涓�椤癸紝蹇呰緭椤逛笉閫氳繃鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public SysIntInfoVO editSave(SysIntInfoDTO sysIntInfoDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(sysIntInfoDTO,"鏁版嵁瀵硅薄",sysIntInfoDTO.getOid(),"绯荤粺闆嗘垚鍩虹淇℃伅涓婚敭");
-
-
- String sourcesystemoid = sysIntInfoDTO.getSourcesystemoid();
- SysIntBaseVO sysIntBaseVO = sysIntBaseService.getObjectByOid(sourcesystemoid);
- sysIntInfoDTO.setSysbaseoid(sourcesystemoid);
- sysIntInfoDTO.setSysbaseid(sysIntBaseVO.getId());
- sysIntInfoDTO.setSysbasename(sysIntBaseVO.getName());
-
- //灏咲TO杞崲涓篋O
- SysIntInfoDO sysIntInfoDO = selectByOid(sysIntInfoDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(sysIntInfoDTO,sysIntInfoDO);
- String sysInfoOid=sysIntInfoDO.getOid();
- List<SysIntParamDTO> sysIntParamDTOS= sysIntInfoDTO.getSysIntParamDTOs();
- List<SysIntParamDO> sysIntParamDOS=new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntParamDTOS)) {
- sysIntParamDTOS.stream().forEach(sysIntParamDTO -> {
- SysIntParamDO sysIntParamDO = new SysIntParamDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
- sysIntParamDOS.add(sysIntParamDO);
- });
- }
- List<SysIntHeaderDTO> sysIntHeaderDTOs= sysIntInfoDTO.getSysIntHeaderDTOS();
- List<SysIntHeaderDO> sysIntHeaderDOS = new ArrayList<>();
- if(!CollectionUtils.isEmpty(sysIntHeaderDTOs)) {
- sysIntHeaderDTOs.stream().forEach(sysIntHeaderDTO -> {
- SysIntHeaderDO sysIntHeaderDO = new SysIntHeaderDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, sysIntHeaderDO);
- sysIntHeaderDOS.add(sysIntHeaderDO);
- });
- }
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
- BatchCBO batchCBO_update = new BatchCBO();
- BatchCBO sysIntInfoBo= sysIntInfoMapper.updateByPrimaryKey(sysIntInfoDO);
-
- batchCBO_update.copyFromOther(sysIntInfoBo);
- //鎵归噺澶勭悊淇濆瓨header瀵硅薄
- if(!CollectionUtils.isEmpty(sysIntHeaderDOS)) {
- List<String> idList=new ArrayList<>();
- List<SysIntHeaderDO> headers_old = getHeadersBySystemInfoOid(sysInfoOid);
- for (SysIntHeaderDO sysIntHeaderDO:headers_old){
- sysIntHeaderDO.setUsedflag(MdmDuckingConstant.FLAG_FAIL);
- idList.add(sysIntHeaderDO.getOid());
- }
- if(idList.size()!=0){
- BatchCBO sysIntHeaderDeleteBO = sysIntHeaderDaoI.batchDeleteByOids(idList);
- batchCBO_update.copyFromOther(sysIntHeaderDeleteBO);
- }
- //鍐嶆柊澧瀐eaders
- for(SysIntHeaderDO sysIntHeaderDO:sysIntHeaderDOS){
- sysIntHeaderDO.setUsedflag(MdmDuckingConstant.FLAG_TRUE);
- sysIntHeaderDO.setInfoOid(sysIntInfoDTO.getOid());
-
- }
- BatchCBO batchCBO_insert = sysIntHeaderDaoI.batchInsert(sysIntHeaderDOS);
- batchCBO_update.copyFromOther(batchCBO_insert);
- }
- //鎵归噺澶勭悊淇濆瓨Param瀵硅薄
- if(!CollectionUtils.isEmpty(sysIntParamDOS)) {
- //鍏堝垹闄arams_old
- List<String> idList=new ArrayList<>();
- List<SysIntParamDO> params_old = getParamsBySystemInfoOid(sysInfoOid);
- for (SysIntParamDO sysIntParamDO:params_old){
- sysIntParamDO.setUsedflag(MdmDuckingConstant.FLAG_FAIL);
- idList.add(sysIntParamDO.getOid());
- }
- if(idList.size()!=0){
- BatchCBO sysIntParamDeleteBO = sysIntParamDaoI.batchDeleteByOids(idList);
- batchCBO_update.copyFromOther(sysIntParamDeleteBO);
- }
- //鍐嶆柊澧瀙arams
- for(SysIntParamDO sysIntParamDOi:sysIntParamDOS){
- sysIntParamDOi.setUsedflag(MdmDuckingConstant.FLAG_TRUE);
- sysIntParamDOi.setInfoOid(sysIntInfoDTO.getOid());
- }
- BatchCBO sysIntParamBO = sysIntParamDaoI.batchInsert(sysIntParamDOS);
- batchCBO_update.copyFromOther(sysIntParamBO);
- }
- WebUtil.setPersistence(true);//涓嶆墽琛屼繚瀛�
- boService.persistenceBatch(batchCBO_update);//涓�璧锋墽琛屼繚瀛�
- return sysIntInfoDO2VO(sysIntInfoDO,sysIntHeaderDOS,sysIntParamDOS);
- }
-
- /**
- * 鏍￠獙鏄惁鍙互鍒犻櫎锛屽鏋滃瓨鍦ㄤ笅绾э紝骞朵笖涓嬬骇鏈夋暟鎹紩鐢ㄥ垯涓嶈兘鍒犻櫎
- * @param sysIntInfoDTO 鏁版嵁浼犺緭瀵硅薄
- * @param sysIntInfoDO 鏁版嵁搴撲腑鐨勬暟鎹璞�
- * @return success涓簍rue涓哄彲浠ュ垹闄わ紝false琛ㄧず鏈夋暟鎹紩鐢紝obj涓簍rue琛ㄧず鏈変笅绾�
- */
- private BaseResult checkIsCanDeleteForDO(SysIntInfoDTO sysIntInfoDTO, SysIntInfoDO sysIntInfoDO) {
- SysIntInfoDO tsDO = new SysIntInfoDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntInfoDTO,tsDO);
- boService.checkTs(tsDO);
- if(!checkIsLinked(sysIntInfoDO.getOid())) {
- return BaseResult.success();
- }else{
- return BaseResult.fail(DATA_LINKED_NOT_DELETE,new String[]{""});
- }
- }
-
- /**
- * 鏍￠獙鏄惁琚紩鐢�
- * @param oid 涓婚敭
- * @throws VciBaseException 琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
- */
- private boolean checkIsLinked(String oid) throws VciBaseException{
- //TODO 娣诲姞闇�瑕佹牎楠屽紩鐢ㄧ殑鍦版柟
- return false;
- }
-
- /**
- * 鍒犻櫎绯荤粺闆嗘垚鍩虹淇℃伅
- * @param sysIntInfoDTO 绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁浼犺緭瀵硅薄锛宱id鍜宼s闇�瑕佷紶杈�
- * @return 鍒犻櫎缁撴灉鍙嶉锛氾細success锛氭垚鍔燂紝fail锛氬け璐�
- * @throws VciBaseException 鍙傛暟涓虹┖锛岃寮曠敤鏃舵姏鍑哄紓甯�
- */
- @Override
- public BaseResult deleteSysIntInfo(SysIntInfoDTO sysIntInfoDTO) throws VciBaseException{
- VciBaseUtil.alertNotNull(sysIntInfoDTO,"绯荤粺闆嗘垚鍩虹淇℃伅鏁版嵁瀵硅薄",sysIntInfoDTO.getOid(),"绯荤粺闆嗘垚鍩虹淇℃伅鐨勪富閿�");
- SysIntInfoDO sysIntInfoDO = selectByOid(sysIntInfoDTO.getOid());
- BaseResult baseResult = checkIsCanDeleteForDO(sysIntInfoDTO,sysIntInfoDO);
- if(baseResult.isSuccess()) {
-
- }else{
- return baseResult;
- }
- WebUtil.setPersistence(false);
- BatchCBO batchCBO_update = new BatchCBO();
- //鎵ц鍒犻櫎鎿嶄綔
- BatchCBO batchCBO = sysIntInfoMapper.deleteByPrimaryKey(sysIntInfoDO.getOid());
- batchCBO_update.copyFromOther(batchCBO);
- List<SysIntHeaderDO> sysIntHeaderDOS=sysIntHeaderDaoI.selectBySysinfoOid(sysIntInfoDO.getOid());
- if(!CollectionUtils.isEmpty(sysIntHeaderDOS)){
- List<String>headerIdList=new ArrayList<>();
- sysIntHeaderDOS.stream().forEach(sysIntHeaderDO -> {
- headerIdList.add(sysIntHeaderDO.getOid());
- });
- BatchCBO headerBO=sysIntHeaderDaoI.batchDeleteByOids(headerIdList);
- batchCBO_update.copyFromOther(headerBO);
- }
- List<SysIntParamDO> sysIntParamDOS=sysIntParamDaoI.selectBySysinfoOid (sysIntInfoDO.getOid());
- if(!CollectionUtils.isEmpty(sysIntParamDOS)){
- List<String>paramIdList=new ArrayList<>();
- sysIntParamDOS.stream().forEach(sysIntParamDO -> {
- paramIdList.add(sysIntParamDO.getOid());
- });
- BatchCBO paramBO= sysIntParamDaoI.batchDeleteByOids(paramIdList);
- batchCBO_update.copyFromOther(paramBO);
- }
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO_update);//涓�璧锋墽琛屼繚瀛�
- return (batchCBO_update!=null && batchCBO_update.getDeleteCbos() !=null &&batchCBO_update.getDeleteCbos().size() > 0)?BaseResult.successMsg(DELETE_SUCCESS):BaseResult.fail(DELETE_FAIL);
- }
-
- /**
- * 涓婚敭鑾峰彇绯荤粺闆嗘垚鍩虹淇℃伅
- * @param oid 涓婚敭
- * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屾暟鎹笉瀛樺湪鏃朵細鎶涘嚭寮傚父
- */
- @Override
- public SysIntInfoVO getObjectByOid(String oid) throws VciBaseException{
-
- SysIntInfoDO sysIntInfoDO= selectByOid(oid);
- List<SysIntHeaderDO> sysIntHeaderDOS=sysIntHeaderDaoI.selectBySysinfoOid(oid.trim());
- List<SysIntParamDO> sysIntParamDOS=sysIntParamDaoI.selectBySysinfoOid(oid.trim());
- return sysIntInfoDO2VO(sysIntInfoDO,sysIntHeaderDOS,sysIntParamDOS);
- }
-
- /**
- * 涓婚敭鏌ヨ鏁版嵁瀵硅薄
- * @param oid 涓婚敭
- * @return 鏁版嵁瀵硅薄
- * @throws VciBaseException 鍙傛暟涓虹┖锛屽苟涓旀暟鎹笉瀛樺湪鐨勬椂鍊欎細鎶涘嚭寮傚父
- */
- private SysIntInfoDO selectByOid(String oid) throws VciBaseException{
- VciBaseUtil.alertNotNull(oid,"涓婚敭");
- SysIntInfoDO sysIntInfoDO = sysIntInfoMapper.selectByPrimaryKey(oid.trim());
- if(sysIntInfoDO == null || StringUtils.isBlank(sysIntInfoDO.getOid())){
- throw new VciBaseException(DATA_OID_NOT_EXIST);
- }
- return sysIntInfoDO;
- }
-
- /**
- * 涓婚敭鎵归噺鑾峰彇绯荤粺闆嗘垚鍩虹淇℃伅
- * @param oidCollections 涓婚敭闆嗗悎锛屼絾鏄彈鎬ц兘褰卞搷锛屽缓璁竴娆℃煡璇笉瓒呰繃10000涓�
- * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄
- * @throws VciBaseException 鏌ヨ鍑虹幇寮傚父鏃朵細鎶涘嚭
- */
- @Override
- public Collection<SysIntInfoVO> listSysIntInfoByOids(Collection<String> oidCollections) throws VciBaseException{
- VciBaseUtil.alertNotNull(oidCollections,"鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<SysIntInfoDO> sysIntInfoDOList = listSysIntInfoDOByOidCollections(oidCollections);
- return sysIntInfoDO2VOs(sysIntInfoDOList);
- }
-
- /**
- * 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
- * @param oidCollections 涓婚敭鐨勯泦鍚�
- * @return 鏁版嵁瀵硅薄鍒楄〃
- */
- private List<SysIntInfoDO> listSysIntInfoDOByOidCollections(Collection<String> oidCollections){
- List<SysIntInfoDO> sysIntInfoDOList = new ArrayList<SysIntInfoDO>();
- if(!CollectionUtils.isEmpty(oidCollections)){
- Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
- for(Collection<String> oids: oidCollectionsList){
- List<SysIntInfoDO> tempDOList = sysIntInfoMapper.selectByPrimaryKeyCollection(oids);
- Set<String> oidSet = tempDOList.stream().map(SysIntInfoDO::getTargetSystemOid).collect(Collectors.toSet());
- oidSet.addAll(tempDOList.stream().map(SysIntInfoDO::getSourceSystemOid).collect(Collectors.toSet()));
- List<SysIntBaseVO> baseVOList = (List<SysIntBaseVO>) sysIntBaseService.listSysIntBaseByOids(oidSet);
- matchSysOid2BuildInfoDO(tempDOList,baseVOList);
- if(!CollectionUtils.isEmpty(tempDOList)){
- sysIntInfoDOList.addAll(tempDOList);
- }
- }
- }
- return sysIntInfoDOList;
- }
-
-
-
- /**
- * 鍙傜収绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃锛岀敓鏁堢殑鍐呭
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public DataGrid<SysIntInfoVO> refDataGridSysIntInfo(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
- if(conditionMap == null){
- conditionMap = new HashMap<String, String>();
- }
- return gridSysIntInfo(conditionMap,pageHelper);
- }
-
- /**
- * 褰撳墠鎺ュ彛淇℃伅鏄惁鏈変娇鐢ㄧ洰鏍囦俊鎭�
- * @param sysOid 绯荤粺Oid
- * @param authorityOid 璁よ瘉鏂瑰紡Oid
- * @return true = 鍦ㄤ娇鐢� 锛沠alse = 鏈娇鐢�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
- @Override
- public boolean isAlreadyUse(String sysOid, String authorityOid) throws VciBaseException {
- Map<String,String> conditionMap = new HashMap<>();
- if (StringUtils.isNotBlank(sysOid)){
- conditionMap.put("sourceSystemOid",sysOid);
- Long countSource = sysIntInfoMapper.countByCondition(conditionMap);
- if (countSource > 0){
- return true;
- }
- conditionMap.clear();
- conditionMap.put("targetSystemOid",sysOid);
- Long countTarget = sysIntInfoMapper.countByCondition(conditionMap);
- if (countTarget > 0){
- return true;
- }
- conditionMap.clear();
- }
- if (StringUtils.isNotBlank(authorityOid)){
- conditionMap.put("authorityOid",authorityOid);
- Long countAuthority = sysIntInfoMapper.countByCondition(conditionMap);
- if (countAuthority > 0){
- return true;
- }
- }
- return false;
- }
-
- //=========浠ヤ笅绯荤粺鍙傛暟鍜岄獙璇佷俊鎭�
-
- /**
- * 鏍规嵁绯荤粺淇℃伅鏌ヨ鎺ュ彛param
- * @param sysInfoOid
- * @return
- */
- @Override
- public List<SysIntParamDO> getParamsBySystemInfoOid(String sysInfoOid){
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(SysIntParamDO.class);
- queryWrapper.addQueryMap("infoOid",sysInfoOid);
- queryWrapper.addQueryMap("usedflag", MdmDuckingConstant.FLAG_TRUE);
- List<SysIntParamDO> all_params = sysIntParamDaoI.selectByWrapper(queryWrapper);
- return all_params;
- }
-
- /**
- * 1銆佸厛鍒犻櫎浠ュ墠鎵�鏈塸aram
- * 2銆佸啀鏌ヨ浼犲叆鐨勬墍鏈塸aram
- * @return
- */
- @Override
- public BaseResult updateParams(String sysInfoOid,List<SysIntParamDO> params){
-
- //鍏堜綔搴熸墍鏈夌殑params_old
- List<SysIntParamDO> params_old = getParamsBySystemInfoOid(sysInfoOid);
- for (SysIntParamDO sysIntParamDO:params_old){
- sysIntParamDO.setUsedflag(MdmDuckingConstant.FLAG_FAIL);
- }
-
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
- BatchCBO batchCBO_update = new BatchCBO();
- if(params_old.size()!=0){
- batchCBO_update = sysIntParamDaoI.batchUpdate(params_old);
- }
-
- if(params!=null&¶ms.size()!=0) {
- //鍐嶆柊澧瀙arams
- for(SysIntParamDO sysIntParamDOi:params){
- sysIntParamDOi.setUsedflag(MdmDuckingConstant.FLAG_TRUE);
- }
- BatchCBO batchCBO_insert = sysIntParamDaoI.batchInsert(params);
- batchCBO_update.copyFromOther(batchCBO_insert);
- }
-
- WebUtil.setPersistence(true);//鎵ц淇濆瓨
- boService.persistenceBatch(batchCBO_update);//涓�璧锋墽琛屼繚瀛�
- return BaseResult.success("淇濆瓨鎴愬姛!");
- }
-
- /**
- * 鏍规嵁绯荤粺淇℃伅鏌ヨ鎺ュ彛header
- * @param sysInfoOid
- * @return
- */
- @Override
- public List<SysIntHeaderDO> getHeadersBySystemInfoOid(String sysInfoOid){
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(SysIntHeaderDO.class);
- queryWrapper.addQueryMap("infoOid",sysInfoOid);
- queryWrapper.addQueryMap("usedflag", MdmDuckingConstant.FLAG_TRUE);
- List<SysIntHeaderDO> all_headers = sysIntHeaderDaoI.selectByWrapper(queryWrapper);
- return all_headers;
- }
-
- /**
- * 1銆佸厛鍒犻櫎浠ュ墠鎵�鏈塰eader
- * 2銆佸啀鏌ヨ浼犲叆鐨勬墍鏈塰eader
- * @return
- */
- @Override
- public BaseResult updateHeaders(String sysInfoOid,List<SysIntHeaderDO> headers){
- //鍏堜綔搴熸墍鏈夌殑headers_old
- List<SysIntHeaderDO> headers_old = getHeadersBySystemInfoOid(sysInfoOid);
- for (SysIntHeaderDO sysIntHeaderDO:headers_old){
- sysIntHeaderDO.setUsedflag(MdmDuckingConstant.FLAG_FAIL);
- }
-
- WebUtil.setPersistence(false);//涓嶆墽琛屼繚瀛�
- BatchCBO batchCBO_update = new BatchCBO();
- if(headers_old.size()!=0){
- batchCBO_update = sysIntHeaderDaoI.batchUpdate(headers_old);
- }
-
- if(headers!=null&&headers.size()!=0) {
- //鍐嶆柊澧瀐eaders
- for(SysIntHeaderDO sysIntHeaderDO:headers){
- sysIntHeaderDO.setUsedflag(MdmDuckingConstant.FLAG_TRUE);
- }
- BatchCBO batchCBO_insert = sysIntHeaderDaoI.batchInsert(headers);
- batchCBO_update.copyFromOther(batchCBO_insert);
- }
-
- WebUtil.setPersistence(true);//鎵ц淇濆瓨
- boService.persistenceBatch(batchCBO_update);//涓�璧锋墽琛屼繚瀛�
- return BaseResult.success("淇濆瓨鎴愬姛!");
- }
-
- @Override
- public List<SysIntInfoDO> getSysInfoByClassifyOid(String[] classifyOids) {
- return null;
- }
-
- /***
- *璁剧疆鏄惁鍚敤/鍋滅敤
- * @param sysInfoStatusDTO
- * @return
- */
- @Override
- public BaseResult updateStatus(UpdateSysInfoStatusDTO sysInfoStatusDTO){
- VciBaseUtil.alertNotNull(sysInfoStatusDTO.getOid(),"鏁版嵁瀵硅薄",sysInfoStatusDTO.getOid(),"绯荤粺闆嗘垚鍩虹淇℃伅涓婚敭");
- SysIntInfoDO sysIntInfoDO = selectByOid(sysInfoStatusDTO.getOid());
- try {
- sysIntInfoDO.setTs(VciDateUtil.str2Date(sysInfoStatusDTO.getTs(), VciDateUtil.DateTimeFormat));
- } catch (Exception e) {
- e.printStackTrace();
- }
- if(sysInfoStatusDTO.getUpdate().equals("disable")) {
- sysIntInfoDO.setUsedflag("false");
- }else{
- sysIntInfoDO.setUsedflag("true");
- }
- sysIntInfoMapper.updateByPrimaryKey(sysIntInfoDO);
- return BaseResult.success();
- }
-
- /***
- * 鎺ㄩ�佸垎绫�/鏁版嵁
- * @param sysIntInfoDTO
- * @return
- * @throws VciBaseException
- */
- @Override
- public BaseResult pushData(SysIntInfoDTO sysIntInfoDTO) throws VciBaseException {
- VciBaseUtil.alertNotNull(sysIntInfoDTO,"鏁版嵁瀵硅薄",sysIntInfoDTO.getOid(),"绯荤粺闆嗘垚鍩虹淇℃伅涓婚敭");
- boolean issuccess=false;
- String type="鏁版嵁鎺ㄩ��";
- if(sysIntInfoDTO.getPushType().equalsIgnoreCase("1")){//鎺ㄩ�佹暟鎹�
- pushDockingTasks(sysIntInfoDTO);
- }else if(sysIntInfoDTO.getPushType().equalsIgnoreCase("2")){//鎺ㄩ�佸垎绫�
- issuccess= pushClsfDatas(sysIntInfoDTO);
- type="鍒嗙被鎺ㄩ��";
- }
- return issuccess?BaseResult.successMsg(type+"鎴愬姛锛�"):BaseResult.successMsg(type+"澶辫触锛�");
- }
- private BaseResult pushDockingTasks(SysIntInfoDTO sysIntInfoDTO) {
- String msg="鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟鎴愬姛锛�";
- try {
- SysIntInfoVO sysIntInfoVO = getObjectByOid(sysIntInfoDTO.getOid());
- String codeClassifyOid = sysIntInfoVO.getClassifyoid();
- CodeClassifyTemplateVO templateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(codeClassifyOid);
- CodeClassifyVO topClassifyVO = codeClassifyServiceI.getTopClassifyVO(codeClassifyOid);
- String btmTypeId = topClassifyVO.getBtmtypeid();
- if (StringUtils.isBlank(btmTypeId)) {
- return BaseResult.fail("杩欎釜鍒嗙被鎵�灞為《灞傚垎绫绘病鏈夋坊鍔犱笟鍔＄被鍨�");
- }
- List<CodeClassifyVO> codeClassifyIdPathVOS = codeClassifyServiceI.listChildrenClassify(topClassifyVO.getOid(), true, "id", false);
- List<CodeClassifyVO> codeClassifynamePathVOS = codeClassifyServiceI.listChildrenClassify(topClassifyVO.getOid(), true, "name", false);
- Map<String/**鍒嗙被oid**/, String/**鍒嗙被浠ｅ彿閾炬帴绗�**/> clsfOidIdMap = codeClassifyIdPathVOS.stream().collect(Collectors.toMap(s -> s.getOid(), t -> reverseOrderByList(t.getPath(), topClassifyVO, 1).toLowerCase(Locale.ROOT), (o1, o2) -> o2));
- Map<String/**鍒嗙被oid**/, String/**鍒嗙被鍚嶇О閾炬帴绗�**/> clsfOidNameMap = codeClassifynamePathVOS.stream().collect(Collectors.toMap(s -> s.getOid(), t -> reverseOrderByList(t.getPath(), topClassifyVO, 2).toLowerCase(Locale.ROOT), (o1, o2) -> o2));
-
- PageHelper pageHelper = new PageHelper();
- pageHelper.setPage(1);
- pageHelper.setLimit(1000000);
- pageHelper.setStart(0);
- HashMap<String, String> conditionMap = new HashMap<>();
- if (!codeClassifyServiceI.checkHasChild(codeClassifyOid)) {
- conditionMap.put(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD, codeClassifyOid);
- } else {
- conditionMap.put(MdmEngineConstant.CODE_CLASSIFY_OID_FIELD, QueryOptionConstant.IN + "(select oid from " + VciBaseUtil.getTableName(MdmBtmTypeConstant.CODE_CLASSIFY)
- + " where lcstatus='" + FrameWorkDefaultValueConstant.FRAMEWORK_DATA_ENABLED +
- "' start with parentCodeClassifyOid = '" + codeClassifyOid + "' CONNECT BY PRIOR OID = parentCodeClassifyOid )");
- }
- conditionMap.put("islastr", "1");
- conditionMap.put("islastv", "1");
- List<String> lcstatusList = new ArrayList<>(Arrays.asList(new String[]{"TakeBack", "Released", "Disabled"}));
- conditionMap.put("lcstatus", QueryOptionConstant.IN + VciBaseUtil.toInSql(lcstatusList.toArray(new String[0])));
-
- CodeTemplateAttrSqlBO sqlBO = mdmEngineServiceI.getSqlByTemplateVO(btmTypeId, templateVO, conditionMap, pageHelper);
- List<Map> maps = boService.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
- List<DockingTaskDO> dockingTaskDO_insert = new ArrayList<>();
- if (!CollectionUtils.isEmpty(maps)) {
- maps.stream().forEach(map -> {
- String btmoid = map.get("oid".toUpperCase(Locale.ROOT)) == null ? "" : map.get("oid".toUpperCase(Locale.ROOT)).toString();//鏁版嵁oid
- String sendtype = map.get("lcstatus".toUpperCase(Locale.ROOT)) == null ? "" : map.get("lcstatus".toUpperCase(Locale.ROOT)).toString();//鏁版嵁鎺ㄩ�佺被鍨�
- String id = map.get("id".toUpperCase(Locale.ROOT)) == null ? "" : map.get("id".toUpperCase(Locale.ROOT)).toString();//缂栫爜
- String btmid = topClassifyVO.getBtmtypeid();//鏁版嵁涓氬姟绫诲瀷
- String classifyoid = map.get("codeclsfid".toUpperCase(Locale.ROOT)) == null ? "" : map.get("codeclsfid".toUpperCase(Locale.ROOT)).toString();//鏁版嵁鎵�鍦ㄧ殑鍒嗙被id
- String date2Str = VciDateUtil.date2Str(new Date(), VciDateUtil.DateTimeFormatStr);
- DockingTaskDO dockingTaskDO = new DockingTaskDO();
- dockingTaskDO.setOid(date2Str +"_"+id);
- dockingTaskDO.setSendflag(MdmDuckingConstant.SEND_FLAG_FALSE);
- dockingTaskDO.setId(id);//缂栫爜
- dockingTaskDO.setUniquecode("");
- dockingTaskDO.setBtmoid(btmoid);//鏁版嵁oid
- dockingTaskDO.setBtmid(btmid);//鏁版嵁涓氬姟绫诲瀷id
- if (clsfOidIdMap.containsKey(classifyoid)) {
- String classifyid = clsfOidIdMap.get(classifyoid);
- dockingTaskDO.setClassifyid(classifyid);//鏁版嵁鍦ㄥ垎绫籭d
- }
- dockingTaskDO.setClassifyoid(classifyoid);//鏁版嵁鎵�鍦ㄥ垎绫籵id
- if (clsfOidNameMap.containsKey(classifyoid)) {
- String classifyname = clsfOidNameMap.get(classifyoid);
- dockingTaskDO.setClassifyname(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
- }
- dockingTaskDO.setSendtype(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
- //String dataoid=redisService.getUUIDEveryDay();
- dockingTaskDO.setDataoid(date2Str +"_"+ btmoid);
- //intinfo
- dockingTaskDO.setSysinfooid(sysIntInfoVO.getOid());//intinfo鐨刼id
- dockingTaskDO.setSystemoid(sysIntInfoVO.getSysbaseoid());//绯荤粺oid
- dockingTaskDO.setSystemcode(sysIntInfoVO.getSysbaseid());//绯荤粺缂栫爜
- dockingTaskDO.setSystemname(sysIntInfoVO.getSysbasename());//绯荤粺name
- dockingTaskDO_insert.add(dockingTaskDO);
- });
- }
- BatchCBO bo = dockingTaskDaoI.batchInsert(dockingTaskDO_insert);
-
- }catch (Throwable e){
- msg="鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!";
- logger.error("鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟澶辫触!"+e);
- e.printStackTrace();
- }finally {
- logger.info(msg);
- return BaseResult.successMsg("鏁版嵁鎺ㄩ�佸埌瀹氭椂浠诲姟鎴愬姛锛�");
- }
- }
- private String reverseOrderByList(String StringValue, CodeClassifyVO topClassifyVO,int type){
- String[] s=StringValue.split("#");
- StringBuffer sb=new StringBuffer();
- List<String> list=new ArrayList<>(Arrays.asList(s));
- Collections.reverse(list);
- System.out.println(list.toString());
- for (String o:list){
- if(StringUtils.isNotBlank(o)){
- sb.append(o).append(",");
- }
- }
- sb.append(type==1?topClassifyVO.getId():topClassifyVO.getName());
- System.out.println(sb.toString());
-
- return sb.toString();
- }
- /***
- * 鍒嗙被鎺ㄩ�侀泦鎴�
- * @param sysIntInfoDTO
- * @return
- */
- private boolean pushClsfDatas(SysIntInfoDTO sysIntInfoDTO){
- SysIntInfoVO sysIntInfoVO= getObjectByOid(sysIntInfoDTO.getOid());
- String classOid= sysIntInfoVO.getClassifyoid();
- List<CodeClassifyVO> listChildrenClassify= codeClassifyServiceI.listChildrenClassify(classOid,true,"id",false);
- List<NodeClassifyDTO>nodeClassifyDTOList=new ArrayList<>();
- JsonRootDataDTO jsonRootDataDTO=new JsonRootDataDTO();
- NodeDataDTO nodeDataDTO=new NodeDataDTO();
- //姣忎釜task涓�涓簨鍔★紝寮�鍚�
- WebUtil.setPersistence(false);
- BatchCBO batchCBO = new BatchCBO();
- boolean isSuccess=false;
- try {
- String sendString = "";
- if (!CollectionUtils.isEmpty(listChildrenClassify)) {
- listChildrenClassify.stream().forEach(codeClassifyVO -> {
- NodeClassifyDTO nodeClassifyDTO = new NodeClassifyDTO();
- nodeClassifyDTO.setClassCode(codeClassifyVO.getId());//鍒嗙被浠ｅ彿
- nodeClassifyDTO.setDescription(codeClassifyVO.getDescription());//鍒嗙被鎻忚堪
- nodeClassifyDTO.setFullPathName(codeClassifyVO.getPath());//鍏ㄨ矾寰�
- nodeClassifyDTO.setLcStatus(codeClassifyVO.getLcStatus());//鐘舵��
- nodeClassifyDTO.setPid(codeClassifyVO.getId());//鐖秈d鑺傜偣
- nodeClassifyDTO.setId(codeClassifyVO.getOid());//鍒嗙被oid
- nodeClassifyDTO.setName(codeClassifyVO.getName());//鍒嗙被鍚嶇О
- nodeClassifyDTOList.add(nodeClassifyDTO);
- });
- NodeLibraryDTO nodeLibraryDTO = new NodeLibraryDTO();
- nodeLibraryDTO.setClassify(nodeClassifyDTOList);
- CodeClassifyVO rootClassify = codeClassifyServiceI.getTopClassifyVO(classOid);
- nodeLibraryDTO.setId(rootClassify.getOid());
- nodeLibraryDTO.setName(rootClassify.getName());
- nodeDataDTO.setLibrary(nodeLibraryDTO);
- jsonRootDataDTO.setData(nodeDataDTO);
- String paramType = sysIntInfoDTO.getParamtype();//xml/json
- if (paramType.equals(MdmDuckingConstant.DATATYPE_JSON)) {
- Object object = JSONObject.toJSON(jsonRootDataDTO);
- sendString = object.toString();
- } else {
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(NodeDataDTO.class);
- xStream.autodetectAnnotations(true);
- sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
- }
- //璋冪敤鎺ュ彛
- callInterface(sendString, sysIntInfoVO, batchCBO);
- isSuccess=true;
- }
- }catch (Throwable e){
- e.printStackTrace();
- isSuccess=false;
- }finally {
- //姣忎竴涓猼ask涓�涓簨鐗�
- WebUtil.setPersistence(true);
- boService.persistenceBatch(batchCBO);
- return true;
- }
- }
- /***
- * 璋冪敤鎺ュ彛
- * @param sysIntInfoVO
- * @throws Throwable
- */
- private void callInterface(String sendString , SysIntInfoVO sysIntInfoVO,BatchCBO batchCBO) throws Throwable{
- String paramString = "";
-
- String backString = "";
- String msg="";
- String url = sysIntInfoVO.getRequesturl();//url
- List<ResultNodeObjectDTO> resultNodeObjectDTOS =new ArrayList<>();
- try {
- String type = sysIntInfoVO.getInterfacetype().toLowerCase(Locale.ROOT);//get/post/webserver/corba
- String paramType = sysIntInfoVO.getParamtype();//xml/json
- String returnType = sysIntInfoVO.getReturntype();//xml/json
- String requestmethod= sysIntInfoVO.getRequestmethod();
- String interfaceFunction = sysIntInfoVO.getInterfaceFunction();//涓昏鏄痺ebservice鐨勬柟娉曞悕
- String namespace = sysIntInfoVO.getNamespace();//namespace
- String soapaction = sysIntInfoVO.getSoapaction();//soapaction
- String targName = sysIntInfoVO.getTargName();//targName
- String cxfaxis = sysIntInfoVO.getCxfaxis();//webservice鏄痗xf/axis
- //鏌ヨparam
- List<SysIntParamVO> sysIntParamVOList = sysIntInfoVO.getSysIntParamVOs();
- //鏌ヨheader
- List<SysIntHeaderVO> sysIntHeaderVOList =sysIntInfoVO.getSysIntHeaderVOs();
- if(type.equals(MdmDuckingConstant.URLTYPE_HTTP)) {
- if (requestmethod.equals(MdmDuckingConstant.URLTYPE_GET)) {//GET璇锋眰
- String sendurl = url + "?" + DATA_PARAM_NAME + "=" + sendString;
- //鎷兼帴param
- for (SysIntParamVO sysIntParamVO : sysIntParamVOList) {
- sendurl = sendurl + "&" + sysIntParamVO.getParamkey() + "=" + sysIntParamVO.getParamvalue();
- }
- paramString = sendurl;
- backString = HttpUtils.get(sendurl);
- } else if (requestmethod.equals(MdmDuckingConstant.URLTYPE_POST)) {//POST璇锋眰
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- if(!CollectionUtils.isEmpty(sysIntParamVOList)) {
- for (SysIntParamVO sysIntParamVO : sysIntParamVOList) {
- params.add(sysIntParamVO.getParamkey(), sysIntParamVO.getParamvalue());
- }
- }
- params.add(DATA_PARAM_NAME,sendString);
- paramString = params.toString();
- MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
- if(!CollectionUtils.isEmpty(sysIntHeaderVOList)) {
- for (SysIntHeaderVO sysIntHeaderVO : sysIntHeaderVOList) {
- headers.add(sysIntHeaderVO.getHeaderkey(), sysIntHeaderVO.getHeaderalue());
- }
- }
- backString = HttpUtils.post(url, params, headers);
- }
- if(backString.startsWith("\"")){
- backString=backString.substring(backString.indexOf("\"")+1);
- }
- if(backString.endsWith("\"")){
- backString=backString.substring(0,backString.lastIndexOf("\""));
- }
- if(backString.contains("\n")){
- String res="\n";
- backString= backString.replaceAll(res,"");
- }
- if(backString.contains("\\")){
- String res="\\\\\"";
- backString= backString.replaceAll(res,"\"").trim();
- }
- }else if (type.equals(MdmDuckingConstant.URLTYPE_WEBSERVICE)) {//webserver璇锋眰
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- for (SysIntParamVO sysIntParamVO : sysIntParamVOList) {
- params.add(sysIntParamVO.getParamkey(), sysIntParamVO.getParamvalue());
- }
- paramString = sendString;
- MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
- for (SysIntHeaderVO sysIntHeaderVO : sysIntHeaderVOList) {
- headers.add(sysIntHeaderVO.getHeaderkey(), sysIntHeaderVO.getHeaderalue());
- }
- backString = WsErpClientUtil.sendMsg(url, namespace, soapaction, interfaceFunction, targName, sendString, 10000);
-
- } else {//corba鎺ュ彛
- //paramString=sendString;
- // backString = jacorbClient.getBOFactoryService().sendCode(sendString);
- }
-
- ResultJsonDTO resultJsonDTO = new ResultJsonDTO();
- if(returnType.equals(MdmDuckingConstant.DATATYPE_JSON)){
- resultJsonDTO =JSONObject.toJavaObject(JSONObject.parseObject(backString), ResultJsonDTO.class);
- }else {
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(ResultNodeDataDTO.class);
- xStream.autodetectAnnotations(true);
- ResultNodeDataDTO resultNodeDataDTO = (ResultNodeDataDTO) xStream.fromXML(backString);
- resultJsonDTO.setData(resultNodeDataDTO);
- }
- ResultNodeDataDTO resultNodeDataDTO=resultJsonDTO.getData();
- resultNodeObjectDTOS=resultNodeDataDTO.getObject();
-
- }catch (Throwable e){
- msg="璋冪敤鎺ュ彛澶辫触:"+e;
- e.printStackTrace();
- // throw new Throwable("璋冪敤鎺ュ彛澶辫触:"+e);
- ResultNodeObjectDTO resultNodeObjectDTO=new ResultNodeObjectDTO();
- resultNodeObjectDTO.setErroid("1");
- resultNodeObjectDTO.setMsg(msg);
- resultNodeObjectDTO.setCode(sysIntInfoVO.getClassifyid());
- resultNodeObjectDTO.setOid(sysIntInfoVO.getClassifyoid());
- resultNodeObjectDTOS.add(resultNodeObjectDTO);
- }finally {
- boolean isSend = false;
- for (ResultNodeObjectDTO resultNodeObjectDTO:resultNodeObjectDTOS){
- String erroid = resultNodeObjectDTO.getErroid();
- msg = resultNodeObjectDTO.getMsg();
- if("0".equals(erroid)){
- isSend = true;
- }else if("1".equals(erroid)){
- isSend=false;
- }else{
- isSend=false;
- }
- DockingLogeDO dockingLogeDO = new DockingLogeDO();
- String oid=redisService.getUUIDEveryDay();
- dockingLogeDO.setOid(oid);
- dockingLogeDO.setSystemcode(sysIntInfoVO.getSysbaseid());
- dockingLogeDO.setSystemname(sysIntInfoVO.getSysbasename());
- dockingLogeDO.setSystemoid(sysIntInfoVO.getSysbaseoid());
- dockingLogeDO.setClassifyoid(sysIntInfoVO.getClassifyoid());
- dockingLogeDO.setClassifyid(sysIntInfoVO.getClassifyid());
- dockingLogeDO.setClassifyname(sysIntInfoVO.getClassifyname());
- dockingLogeDO.setId(sysIntInfoVO.getId());
- dockingLogeDO.setUniquecode("");
- dockingLogeDO.setInterfacestatus(isSend?"true":"false");
- dockingLogeDO.setParamstring(paramString);
- dockingLogeDO.setType(MdmDuckingConstant.DATA_LOGE_OUT);
- dockingLogeDO.setReturnstring(backString);
- dockingLogeDO.setMsg(msg);
- logger.info("闆嗘垚鎺ㄩ�佹暟鎹�,systemcode:"+sysIntInfoVO.getSysbaseid()+",systemname:"+sysIntInfoVO.getSysbasename()+",url:"+url+",param:"+paramString+",e:"+msg);
- BatchCBO dockingLogeDOBo = dockingLogeDaoI.insert(dockingLogeDO);
- batchCBO.copyFromOther(dockingLogeDOBo);
- }
- }
- }
-
- private void initData(String rootClassOid , Map<String,String> clsfOidIdMap,Map<String,String> clsfOidNameMap){
- TreeQueryObject treeQueryObject=new TreeQueryObject();
- treeQueryObject.setParentOid(rootClassOid);
- treeQueryObject.setQueryAllLevel(true);
- List<CodeClassifyDO> codeClassifyDOList=codeClassifyServiceI.selectCodeClassifyDOByTree(treeQueryObject);
- if(!CollectionUtils.isEmpty(codeClassifyDOList)){
- codeClassifyDOList.stream().forEach(codeClassify->{
- String id=codeClassify.getId();
- String name=codeClassify.getName();
- });
-
- }
- }
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
deleted file mode 100644
index e7efd3c..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ /dev/null
@@ -1,915 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.vci.ubcs.code.constant.MdmDuckingConstant;
-import com.vci.ubcs.code.constant.MdmEngineConstant;
-import com.vci.ubcs.code.mapper.DockingLogeMapper;
-import com.vci.ubcs.code.enumpack.CodeSecTypeEnum;
-import com.vci.ubcs.code.entity.CodeClassifyDO;
-import com.vci.ubcs.code.entity.DockingLogeDO;
-import com.vci.ubcs.code.service.CodeClassifyServiceI;
-import com.vci.ubcs.code.service.MdmEngineServiceI;
-import com.vci.ubcs.code.service.MdmIOServiceI;
-import com.vci.ubcs.code.service.UniversalInterfaceI;
-import com.vci.ubcs.code.utils.AttributeMapConfig;
-import com.vci.ubcs.code.utils.gennerAttrMapUtil;
-import com.vci.ubcs.code.vo.pagemodel.*;
-import com.vci.ubcs.code.vo.universalInter.apply.*;
-import com.vci.ubcs.code.vo.universalInter.attrmap.DataObjectVO;
-import com.vci.ubcs.code.vo.universalInter.classify.*;
-import com.vci.ubcs.code.vo.universalInter.data.*;
-import com.vci.ubcs.code.vo.universalInter.result.json.*;
-import com.vci.ubcs.code.vo.universalInter.result.xml.XMLResultClassfyVO;
-import com.vci.ubcs.code.vo.universalInter.result.xml.XMLResultDataObjectDetailDO;
-import com.vci.ubcs.code.vo.universalInter.result.xml.XMLResultSystemVO;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.vci.starter.web.constant.QueryOptionConstant;
-import com.vci.starter.web.pagemodel.SessionInfo;
-import com.vci.starter.web.pagemodel.TreeQueryObject;
-import com.vci.starter.web.util.BeanUtilForVCI;
-import com.vci.starter.web.util.VciBaseUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
-import com.vci.web.pageModel.BatchCBO;
-import com.vci.web.redis.RedisService;
-import com.vci.web.service.WebBoServiceI;
-import com.vci.webservice.annotation.VciWebservice;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.dto.CodeOrderDTO;
-import com.vci.ubcs.code.dto.CodeOrderSecDTO;
-import com.vci.ubcs.code.vo.universalInter.attrmap.ClsfAttrMappingDO;
-import com.vci.ubcs.code.vo.universalInter.attrmap.LibraryClsfDO;
-import com.vci.ubcs.code.vo.universalInter.attrmap.LibraryDO;
-import com.vci.ubcs.code.vo.universalInter.attrmap.RowDatas;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-/***
- * 缁熶竴鎺ュ彛
- */
-@VciWebservice(path = "/universalInterface")
-public class UniversalInterfaceImpl implements UniversalInterfaceI {
-
- /**
- * 鏃ュ織
- */
- private Logger logger = LoggerFactory.getLogger(getClass());
-
- @Autowired
- private AttributeMapConfig attributeMapConfig;
- /**
- * 缂撳瓨鏈嶅姟
- */
- @Autowired
- private RedisService redisService;
- /**
- * 涓婚搴撳垎绫荤殑鏈嶅姟
- */
- @Autowired
- private CodeClassifyServiceI classifyService;
- /**
- * 涓绘暟鎹紩鎿庣殑鏈嶅姟
- */
- @Autowired
- private MdmEngineServiceI engineService;
-
- /**
- * 闆嗘垚鎺ュ彛鏃ュ織鏈嶅姟鐨勯厤缃�
- */
- @Resource
- private DockingLogeMapper dockingLogeDao;
- /**
- * 瀵嗙骇鐨勬湇鍔�
- */
-
- @Autowired
- private MdmIOServiceI mdmIOService;
- /**
- * 鏁版嵁鐨勬湇鍔�
- */
- @Autowired
- @Lazy
- private WebBoServiceI boService;
-
- private static String separator="##VCI##";
- private String errorid="0";
- private String msg="鎴愬姛";
- private String objerrorCode="0";
- private String objerrorMsg="鎴愬姛";
-
- @Override
- public String applyCode(String data, String dataType) throws Throwable {
- String resultStr = "";
- String errorid="0";
- msg="鎴愬姛";
- objerrorCode="0";
- objerrorMsg="鎴愬姛";
- logger.info("鐢宠缂栫爜鐨勬暟鎹弬鏁�:->"+data);
- logger.info("鐢宠缂栫爜鐨勬暟鎹被鍨�:->"+dataType);
- String systemId="";
- List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
- try {
- if(StringUtils.isBlank(data)) {
- errorid="101";
- throw new Throwable("鎺ュ彛鍙傛暟锛氫紶閫掍负绌�");
- }
- InterParameterVO interParameterVO =new InterParameterVO();
- //濡傛灉dataType鏄痻ml鍒欙紝閫氳繃xml搴忓垪鍖栨垚瀵硅薄褰㈠紡锛屽鏋滄槸json鍒欓�氳繃json杞崲鎴愬璞℃牸寮�
- try {
- if ("xml".equals(dataType)) {
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(RootDataVO.class);
- xStream.autodetectAnnotations(true);
- RootDataVO rootDataVO = (RootDataVO) xStream.fromXML(data);
- interParameterVO.setData(rootDataVO);
- } else {
- interParameterVO = JSONObject.toJavaObject(JSONObject.parseObject(data), InterParameterVO.class);
- }
- }catch (Throwable e){
- errorid="101";
- throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
- }
- ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
- systemId = interParameterVO.getData().getSystemId();
- UserVO userVo = interParameterVO.getData().getUser();
- List<ClassfyVO> classVOList = classfysVO.getClassify();
- InterParameterVO finalInterParameterVO = interParameterVO;
-
- //杩欐槸璐﹀彿淇℃伅
- SessionInfo sessionInfo = new SessionInfo();
- sessionInfo.setUserId(userVo.getUserName());
- sessionInfo.setUserName(userVo.getTrueName());
- sessionInfo.setIp(userVo.getIp());
- VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
-
- String finalSystemId = systemId;
- classVOList.stream().forEach(classVO -> {
- logger.info("鍙傛暟锛氬垎绫籆Ode:" + classVO.getClassCode());
- LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
- //鑾峰彇鍒嗙被淇℃伅
- try {
- String libray = classVO.getLibrary();
- CodeClassifyVO codeClassifyVO = getClassfy(classVO);
- logger.info("end锛氬垎绫绘煡璇㈠畬姣�");
- //鑾峰彇鍒嗙被妯℃澘淇℃伅
- if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
- objerrorCode="100";
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧埌鍒嗙被淇℃伅");
- }
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
- if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
- objerrorCode="1";
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
- }
- logger.info("end锛氭ā鏉挎煡璇㈠畬姣�");
- ApplyDatasVO applyDatasVO = classVO.getObjects();
- DataObjectVO dataObjectVO = new DataObjectVO();
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
- this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
- logger.info("end锛氭暟鎹粍缁囧畬姣�");
- //瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
- CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
- if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
- objerrorCode="1";
- logger.info("classifyFullInfo:"+"鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
- }
- CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
- if(ruleVO==null||StringUtils.isBlank(ruleVO.getOid())){
- objerrorCode="102";
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旇鍒�");
- }
- logger.info("end锛氳鍒欒幏鍙栧畬姣�");
- List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(classVO.getSections().getSection(), ruleVO);
- logger.info("end锛氱爜娈佃幏鍙栧畬姣�");
- CodeOrderDTO orderDTO = new CodeOrderDTO();
- orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
- orderDTO.setSecDTOList(codeOrderSecDTOList);//鍒嗙被鐮佹
- mdmIOService.batchSyncApplyCode(orderDTO, dataObjectVO, resultDataObjectDetailDOs);
- logger.info("end锛氱敵璇疯幏鍙栧畬姣�");
- } catch (Throwable e) {
- XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- xmlResultDataObjectDetailDO.setCode("");
- xmlResultDataObjectDetailDO.setId("");
- xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
- xmlResultDataObjectDetailDO.setMsg("缂栫爜鐢宠澶辫触:"+e.getMessage());
- resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
- e.printStackTrace();
- }finally {
- XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
- resultClassfyVO.setClassCode(classVO.getClassCode());
- resultClassfyVO.setLibrary(classVO.getLibrary());
- resultClassfyVO.setFullclsfNamePath(classVO.getFullclsfNamePath());
- resultClassfyVO.setObjects(resultDataObjectDetailDOs);
- resultClassfyVOList.add(resultClassfyVO);
- }
- });
- XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
- xmlResultSystemVO.setClassifys(resultClassfyVOList);
- xmlResultSystemVO.setMsg(msg);
- xmlResultSystemVO.setErrorid(errorid);
- resultStr= transferResultXMl(xmlResultSystemVO,dataType);
- }catch (Throwable e){
- e.printStackTrace();;
- msg="鐢宠缂栫爜澶辫触:"+e.getMessage();
- /* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
- XMLResultSystemVO.setErrorid(errorid);
- XMLResultSystemVO.setMsg("鐢宠缂栫爜澶辫触锛�->"+e.getMessage());
- XMLResultSystemVO.setClassifys(resultClassfyVOList);
- resultStr=transferResultXMl(XMLResultSystemVO,dataType);
-
- logger.error("鐢宠缂栫爜澶辫触锛�->"+e);
- return resultStr;*/
- }finally {
- XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
- xmlResultSystemVO.setClassifys(resultClassfyVOList);
- xmlResultSystemVO.setMsg(msg);
- xmlResultSystemVO.setErrorid(errorid);
- resultStr= transferResultXMl(xmlResultSystemVO,dataType);
- final boolean[] issucess = {true};
- if(!errorid.equals("0")) {
- issucess[0] = false;
- }else {
- if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
- resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
- xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
- if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
- issucess[0] = false;
- msg=objec.getMsg();
- }
- });
- });
- }
-
- }
- try {
- //璁板綍鏃ュ織
- this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCode");
- }catch (Throwable e){
- e.printStackTrace();
- }
- }
- logger.info("杩斿洖鍙傛暟:"+resultStr);
-
- return resultStr;
- }
-
- /***
- * 闆嗘垚鏇存柊鎺ュ彛
- * @param data 锛氭暟鎹俊鎭弬鏁帮細鏍规嵁datatype瀹氫箟鍏舵牸寮弜ml/json
- * @param dataType 纭畾灞炴�т俊鎭弬鏁颁紶杈撴牸寮�
- * @return
- * @throws Throwable
- */
- @Override
- public String syncEditData(String data, String dataType) throws Throwable {
- String resultStr = "";
- String errorid="0";
- msg="鎴愬姛";
- String systemId="";
- objerrorCode="0";
- objerrorMsg="鎴愬姛";
- logger.info("鏇存敼缂栫爜鐨勬暟鎹弬鏁�:->"+data);
- logger.info("鏇存敼缂栫爜鐨勬暟鎹被鍨�:->"+dataType);
- List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
- try {
- if (StringUtils.isBlank(data)) {
- errorid = "101";
- throw new Throwable("鎺ュ彛鍙傛暟锛氫紶閫掍负绌�");
- }
- InterParameterVO interParameterVO = new InterParameterVO();
- //濡傛灉dataType鏄痻ml鍒欙紝閫氳繃xml搴忓垪鍖栨垚瀵硅薄褰㈠紡锛屽鏋滄槸json鍒欓�氳繃json杞崲鎴愬璞℃牸寮�
- try {
- if ("xml".equals(dataType)) {
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(RootDataVO.class);
- xStream.autodetectAnnotations(true);
- RootDataVO rootDataVO = (RootDataVO) xStream.fromXML(data);
- interParameterVO.setData(rootDataVO);
- } else {
- interParameterVO = JSONObject.toJavaObject(JSONObject.parseObject(data), InterParameterVO.class);
- }
- } catch (Throwable e) {
- errorid = "101";
- throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
-
- }
- ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
- systemId = interParameterVO.getData().getSystemId();
- UserVO userVo = interParameterVO.getData().getUser();
- List<ClassfyVO> classVOList = classfysVO.getClassify();
- InterParameterVO finalInterParameterVO = interParameterVO;
- //杩欐槸璐﹀彿淇℃伅
- SessionInfo sessionInfo = new SessionInfo();
- sessionInfo.setUserId(userVo.getUserName());
- sessionInfo.setUserName(userVo.getTrueName());
- sessionInfo.setIp(userVo.getIp());
- VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
- String finalSystemId = systemId;
- classVOList.stream().forEach(classVO->{
- logger.info("鍙傛暟锛氬垎绫籆Ode:" + classVO.getClassCode());
- LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
- //鑾峰彇鍒嗙被淇℃伅
- try {
- String libray = classVO.getLibrary();
- CodeClassifyVO codeClassifyVO = getClassfy(classVO);
- if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
- objerrorCode="100";
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧埌鍒嗙被淇℃伅");
- }
- logger.info("end锛氬垎绫绘煡璇㈠畬姣�");
- //鑾峰彇鍒嗙被妯℃澘淇℃伅
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
- if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
- objerrorCode="102";
- throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
- }
- logger.info("end锛氭ā鏉挎煡璇㈠畬姣�");
- ApplyDatasVO applyDatasVO = classVO.getObjects();
- DataObjectVO dataObjectVO = new DataObjectVO();
- //灏嗛粯璁ょ殑灞炴�у叏閮ㄦ浛鎹㈡帀
- List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormdisplayflag())
- ).collect(Collectors.toList());
- this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
- logger.info("end锛氭暟鎹瀯寤哄畬姣�");
- logger.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
- mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs);
- logger.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
- } catch (Throwable e) {
- XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
- xmlResultDataObjectDetailDO.setCode("");
- xmlResultDataObjectDetailDO.setId("");
- xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
- xmlResultDataObjectDetailDO.setMsg("缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:"+e.getMessage());
- resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
- e.printStackTrace();
- }finally {
- XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
- resultClassfyVO.setClassCode(classVO.getClassCode());
- resultClassfyVO.setLibrary(classVO.getLibrary());
- resultClassfyVO.setFullclsfNamePath(classVO.getFullclsfNamePath());
- resultClassfyVO.setObjects(resultDataObjectDetailDOs);
- resultClassfyVOList.add(resultClassfyVO);
- }
-
- });
- }catch (Throwable e){
- e.printStackTrace();;
- msg="缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:"+e.getMessage();
- /* XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
- XMLResultSystemVO.setErrorid(errorid);
- XMLResultSystemVO.setMsg("鐢宠缂栫爜澶辫触锛�->"+e.getMessage());
- XMLResultSystemVO.setClassifys(resultClassfyVOList);
- resultStr=transferResultXMl(XMLResultSystemVO,dataType);
-
- logger.error("鐢宠缂栫爜澶辫触锛�->"+e);
- return resultStr;*/
- }finally {
- XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
- xmlResultSystemVO.setClassifys(resultClassfyVOList);
- xmlResultSystemVO.setMsg(msg);
- xmlResultSystemVO.setErrorid(errorid);
- resultStr= transferResultXMl(xmlResultSystemVO,dataType);
- final boolean[] issucess = {true};
- if(!errorid.equals("0")) {
- issucess[0] = false;
- }else {
- if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
- resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
- xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
- if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
- issucess[0] = false;
- msg=objec.getMsg();
- }
- });
- });
- }
-
- }
- try {
- //璁板綍鏃ュ織
- this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "syncEditData");
- }catch (Throwable e){
- e.printStackTrace();
- }
- }
- logger.info("杩斿洖鍙傛暟:"+resultStr);
- //瀛樺偍鏃ュ織
- return resultStr;
- }
-
- /****
- * 鏌ヨ鍒嗙被
- * @param data
- * @param dataType
- * @return
- * @throws Throwable
- */
- @Override
- public String queryClassify(String data, String dataType) throws Throwable{
- boolean issucess=false;
- String resultStr = "";
- String errorid="0";
- msg="鎴愬姛";
- String systemId="";
- logger.info("鏌ヨ鍒嗙被鐨勬暟鎹弬鏁�:->"+data);
- logger.info("鏌ヨ鍒嗙被鐨勬暟鎹被鍨�:->"+dataType);
- ResultClassifyVO resultClassifyVO =new ResultClassifyVO();
- List<ClassifyVO> classifyVOList=new ArrayList<>();
- ResultData resultData=new ResultData();
- try {
- if (StringUtils.isBlank(data)) {
- errorid = "101";
- throw new Throwable("鎺ュ彛鍙傛暟锛氫紶閫掍负绌�");
- }
- QueryClassifyVO queryClassifyVO = new QueryClassifyVO();
- //濡傛灉dataType鏄痻ml鍒欙紝閫氳繃xml搴忓垪鍖栨垚瀵硅薄褰㈠紡锛屽鏋滄槸json鍒欓�氳繃json杞崲鎴愬璞℃牸寮�
- try {
- if ("xml".equals(dataType)) {
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(QueryData.class);
- xStream.autodetectAnnotations(true);
- QueryData queryData = (QueryData) xStream.fromXML(data);
- queryClassifyVO.setData(queryData);
- } else {
- queryClassifyVO = JSONObject.toJavaObject(JSONObject.parseObject(data), QueryClassifyVO.class);
- }
- } catch (Throwable e) {
- errorid = "101";
- msg="鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�";
- e.printStackTrace();
- throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
- }
- QueryData queryData=queryClassifyVO.getData();
- UserVO userVo=queryData.getUserVo();
- systemId=queryData.getSystemId();
- QueryLibraryVO libraryVO= queryData.getLibrary();
- String libId= libraryVO.getId();
- List<String> classifyIdList= libraryVO.getClassifyid();
- List<CodeClassifyDO> codeClassifyDOS =new ArrayList<>();
- //杩欐槸璐﹀彿淇℃伅
- //杩欐槸璐﹀彿淇℃伅
- SessionInfo sessionInfo = new SessionInfo();
- sessionInfo.setUserId(userVo.getUserName());
- sessionInfo.setUserName(userVo.getTrueName());
- sessionInfo.setIp(userVo.getIp());
- VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
- if(!CollectionUtils.isEmpty(classifyIdList)){
- //鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyDO.class);
- queryWrapper.addQueryMap("id", QueryOptionConstant.IN + VciBaseUtil.toInSql(classifyIdList.toArray(new String[0])));
- codeClassifyDOS=classifyService.selectByWrapper(queryWrapper);
- }else {
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyDO.class);
- queryWrapper.addQueryMap("id", QueryOptionConstant.IN + VciBaseUtil.toInSql(libId));
- List<CodeClassifyDO> libIdDos =classifyService.selectByWrapper(queryWrapper);
- String oid= libIdDos.get(0).getOid();
-
- TreeQueryObject treeQueryObject=new TreeQueryObject();
- treeQueryObject.setParentOid(oid);
- treeQueryObject.setQueryAllLevel(true);
- codeClassifyDOS=classifyService.selectCodeClassifyDOByTree(treeQueryObject);
- }
- LibraryVO libraryVo=new LibraryVO();
- libraryVo.setId(libId);
- libraryVo.setName("");
- if(!CollectionUtils.isEmpty(codeClassifyDOS)){
- errorid = "0";
- msg="鎴愬姛!";
- codeClassifyDOS.stream().forEach(codeClassifyDO -> {
- ClassifyVO classifyVO=new ClassifyVO();
- classifyVO.setId(codeClassifyDO.getOid());
- classifyVO.setLcStatus(codeClassifyDO.getLcStatus());
- classifyVO.setClassCode(codeClassifyDO.getId());
- classifyVO.setDescription(codeClassifyDO.getDescription());
- classifyVO.setName(codeClassifyDO.getName());
- classifyVO.setPid(codeClassifyDO.getParentCodeClassifyOid());
- classifyVO.setFullPathName(codeClassifyDO.getPath());
- classifyVOList.add(classifyVO);
- });
- libraryVo.setClassify(classifyVOList);
- }else{
- errorid = "100";
- msg="鏈煡璇㈠埌鐩稿叧鐨勫垎绫讳俊鎭�";
- }
- issucess=true;
- resultData.setLibrary(libraryVo);
- }catch (Throwable e){
- e.printStackTrace();;
- msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
- }finally {
- resultData.setErrorid(errorid);
- resultData.setMsg(msg);
- resultClassifyVO.setResultData(resultData);
- }
- if(dataType.equals("xml")){
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(XMLResultSystemVO.class);
- xStream.autodetectAnnotations(true);
- resultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(resultData);
-
- }else{
- Object object = JSONObject.toJSON(resultClassifyVO);
- resultStr = object.toString();
- }
- try {
- //璁板綍鏃ュ織
- this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassify");
- }catch (Throwable e){
- e.printStackTrace();
- }
- logger.info("杩斿洖鍙傛暟:"+resultStr);
- return resultStr;
- }
-
- /***
- *
- * @param data
- * @param dataType
- * @return
- * @throws Throwable
- */
- @Override
- public String queryData(String data, String dataType) throws Throwable {
- boolean issucess=false;
- String resultStr = "";
- String errorid="0";
- msg="鎴愬姛";
- String systemId="";
- logger.info("鏌ヨ鍒嗙被鐨勬暟鎹弬鏁�:->"+data);
- logger.info("鏌ヨ鍒嗙被鐨勬暟鎹被鍨�:->"+dataType);
- DataCondtionsVO dataCondtionsVO=new DataCondtionsVO();
- ResultDataVO resultDataVO=new ResultDataVO();
- try {
- try {
- if ("xml".equals(dataType)) {
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(CondtionsVO.class);
- xStream.autodetectAnnotations(true);
- CondtionsVO condtionsVO = (CondtionsVO) xStream.fromXML(data);
- dataCondtionsVO.setCondtions(condtionsVO);
- } else {
- dataCondtionsVO = JSONObject.toJavaObject(JSONObject.parseObject(data), DataCondtionsVO.class);
- }
- } catch (Throwable e) {
- errorid = "101";
- msg = "鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�";
- e.printStackTrace();
- throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
- }
- CondtionsVO condtionsVO=dataCondtionsVO.getCondtions();
- systemId=condtionsVO.getSystemId();
- UserVO userVo=condtionsVO.getUser();
- CondtionVO condtionVO= condtionsVO.getCondtion();
- SessionInfo sessionInfo = new SessionInfo();
- sessionInfo.setUserId(userVo.getUserName());
- sessionInfo.setUserName(userVo.getTrueName());
- sessionInfo.setIp(userVo.getIp());
- VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
-
- String classCode=condtionVO.getClassCode();
- String library= condtionVO.getLibrary();
- String queryFileds= condtionVO.getQueryFileds();
-
- List<CodeClassifyDO> codeClassifyDOS =new ArrayList<>();
- //鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
- VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyDO.class);
- queryWrapper.addQueryMap("id", QueryOptionConstant.IN + VciBaseUtil.toInSql(classCode));
- List<CodeClassifyDO> libIdDos =classifyService.selectByWrapper(queryWrapper);
- if(!CollectionUtils.isEmpty(libIdDos)){
- CodeClassifyDO currentCodeClassifyDO=libIdDos.get(0);
- String oid=currentCodeClassifyDO.getOid();
- TreeQueryObject treeQueryObject=new TreeQueryObject();
- treeQueryObject.setParentOid(oid);
- treeQueryObject.setQueryAllLevel(true);
- codeClassifyDOS=classifyService.selectCodeClassifyDOByTree(treeQueryObject);
- codeClassifyDOS.add(currentCodeClassifyDO);
- Map<String, CodeClassifyDO> oidCodeclassifyDOMap = codeClassifyDOS.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
-
- List<PropertyVO> propertyVOS=condtionVO.getPro();
- Map<String,String> condtionMap=new HashMap<>();
- propertyVOS.stream().forEach(propertyVO -> {
- condtionMap.put(propertyVO.getFiledName(),propertyVO.getFiledValue());
- });
- condtionMap.put("codeclsfid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) + ")");
- List<ClientBusinessObject> clientBusinessObjects= boService.queryCBO( currentCodeClassifyDO.getBtmTypeId(),condtionMap);
- List<com.vci.ubcs.code.vo.universalInter.data.DataObjectVO> dataObjectVOS=new ArrayList<>();
- if(!CollectionUtils.isEmpty(clientBusinessObjects)){
- CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(currentCodeClassifyDO.getOid());
- Map<String, CodeClassifyTemplateAttrVO> filedAttributeMap = templateVO.getAttributes().stream().filter(attribute -> attribute != null && StringUtils.isNotBlank(attribute.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
-
- clientBusinessObjects.stream().forEach(cbo -> {
- com.vci.ubcs.code.vo.universalInter.data.DataObjectVO dataObjectVO=new com.vci.ubcs.code.vo.universalInter.data.DataObjectVO();
- dataObjectVO.setCode(cbo.getId());
- dataObjectVO.setStatus(cbo.getLcStatus());
- String codeclsfid=cbo.getAttributeValue("codeclsfid");
- if(oidCodeclassifyDOMap.containsKey(codeclsfid)){
- CodeClassifyDO classifyDO= oidCodeclassifyDOMap.get(codeclsfid);
- dataObjectVO.setClassCode(classifyDO.getId());
- }
- dataObjectVO.setLibrary(library);
- String [] newQueryFileds=queryFileds.split(",");
- List<PropertyVO> propertyVOList=new ArrayList<>();
- for(String filed:newQueryFileds){
- String value=cbo.getAttributeValue(filed);
- if(filedAttributeMap.containsKey(filed)){
- CodeClassifyTemplateAttrVO attrVO= filedAttributeMap.get(filed);
- PropertyVO propertyVO=new PropertyVO();
- propertyVO.setFiledName(filed);
- propertyVO.setFiledValue(value);
- propertyVO.setOutname(attrVO.getName());
- propertyVOList.add(propertyVO);
- }
- }
- dataObjectVO.setPro(propertyVOList);
- dataObjectVOS.add(dataObjectVO);
- });
- resultDataVO.setObject(dataObjectVOS);
- }
- }
- errorid = "0";
- msg = "鏁版嵁鏌ヨ鎴愬姛";
- }catch (Throwable e){
- e.printStackTrace();;
- msg="鏌ヨ鏁版嵁澶辫触:"+e.getMessage();
- }finally {
- resultDataVO.setErrorid(errorid);
- resultDataVO.setMsg(msg);
- }
- ResultVO resultVO=new ResultVO();
- resultVO.setData(resultDataVO);
- if(dataType.equals("xml")){
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(XMLResultSystemVO.class);
- xStream.autodetectAnnotations(true);
- resultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(resultDataVO);
- }else{
- Object object = JSONObject.toJSON(resultVO);
- resultStr = object.toString();
- }
- try { //璁板綍鏃ュ織
- this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassify");
- }catch (Throwable e){
- e.printStackTrace();
- }
- logger.info("杩斿洖鍙傛暟:"+resultStr);
- return resultStr;
- }
-
- /***
- * 鏌ヨ鏍￠獙鍒嗙被淇℃伅
- * @param classfyVO
- */
- private CodeClassifyVO getClassfy(ClassfyVO classfyVO) throws Throwable{
- CodeClassifyVO classifyVO = new CodeClassifyVO();
- try {
- String classCode = classfyVO.getClassCode();
- String className = classfyVO.getFullclsfNamePath();
- //鏍规嵁鍒嗙被浠ｅ彿鏌ヨ鍒嗙被淇℃伅
- if (StringUtils.isNotBlank(classfyVO.getClassCode())) {
- Map<String, String> conditionMap = new HashMap<>();
- conditionMap.put("id", classCode);
- VciQueryWrapperForDO wrapper = new VciQueryWrapperForDO(conditionMap, CodeClassifyDO.class);
- List<CodeClassifyDO> codeClassifyDOS = classifyService.selectByWrapper(wrapper);
- if (!CollectionUtils.isEmpty(codeClassifyDOS)) {
- CodeClassifyDO classifyDO = codeClassifyDOS.get(0);
- //灏咲TO杞崲涓篋O
- classifyVO = new CodeClassifyVO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(classifyDO, classifyVO);
- if(StringUtils.isBlank(classifyVO.getOid())){
- throw new Throwable("鏍规嵁鍒嗙被浠ｅ彿鏈煡璇㈠埌鐩稿簲鐨勫垎绫讳俊鎭�");
- }
- }else{
- throw new Throwable("鏍规嵁鍒嗙被浠ｅ彿鏈煡璇㈠埌鐩稿簲鐨勫垎绫讳俊鎭�");
- }
- } else {
- classifyVO = classifyService.getObjectByClsfNamePath(className.replace(separator, "/"));
- if(StringUtils.isBlank(classifyVO.getOid())){
- throw new Throwable("鏍规嵁鍒嗙被鍚嶇О璺緞鏈煡璇㈠埌鐩稿簲鐨勫垎绫讳俊鎭�");
- }
- }
- }catch (Throwable e){
- objerrorCode="100";
- new Throwable("鑾峰彇鍒嗙被淇℃伅澶辫触:"+e.getMessage());
- }
- return classifyVO;
- }
-
- /***
- * 鏍规嵁绌垮叆鐨勫弬鏁颁俊鎭牎楠岀爜娈佃鍒�
- */
- private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOs(List<SectionVO> SectionVOList, CodeRuleVO ruleVO) throws Throwable{
- List<CodeBasicSecVO> codeBasicSecVOS= ruleVO.getSecVOList();
- Map<String,String> sectionVOMap=new HashMap<>();
- SectionVOList.stream().forEach(SectionVO->{
- sectionVOMap.put(SectionVO.getName(),SectionVO.getValue());
- });
- List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
- for(CodeBasicSecVO codeBasicSecVO: codeBasicSecVOS) {
- String sectype = codeBasicSecVO.getSectype();
- if (!sectype.equals(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue())) {
- String name = codeBasicSecVO.getName();
- String sectypeText = codeBasicSecVO.getSectypeText();
- logger.info("鐮佹鍚嶇О:"+name);
- logger.info("鎻忚堪:"+sectypeText);
- CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
- if (sectionVOMap.containsKey(name)) {
- CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
- String sectypeValue = sectionVOMap.get(name);
- logger.info("鐮佹鍊�:"+sectypeValue);
- CodeOrderSecDTO.setSecValue(sectypeValue);
- codeOrderSecDTOList.add(CodeOrderSecDTO);
- } else {
- objerrorCode="101";
- throw new Throwable("浼犲叆鐨勭爜娈佃鍒欑己灏�" + name + "鐮佹");
- }
- }
- }
- return codeOrderSecDTOList;
- }
-
- /***
- * 鏍规嵁灞炴�ф槧灏勮浆鎹㈢紪鐮佹墍闇�瀛楁
- */
- public void getConfigDatas(String systemId, String libray, ApplyDatasVO applyDatasVO, List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList, DataObjectVO dataObjectVO) throws Throwable {
- List<ApplyDataVO> applyDataVOList=applyDatasVO.getObject();
- LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
- //濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
- Map<String, String> attrMapConfigMap=new HashMap<>();
- Map<String, String> propMaps=new HashMap<>();
- try {
- Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
- //stringStringMap.put("RLM","D:\\RLM.xml");
- LibraryDO libraryDO= gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId,stringStringMap);
- List<LibraryClsfDO> libraryClsfDOList=libraryDO.getClsf();
- Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
- if(libPropMaps.containsKey(libray)){
- List<ClsfAttrMappingDO> clsfAttrMappingDOList=libPropMaps.get(libray);
- propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
- }
- }catch (Throwable e){
- objerrorCode="1";
- throw new Throwable("MDM闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
- }
- LinkedList<String> rowNameList=new LinkedList<>();
- LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
- //鏍规嵁鍒嗙被妯℃澘缁勭粐鏁版嵁
- final int[] index = {0};
- try {
- codeClassifyTemplateAttrVOList.stream().forEach(codeClassifyTemplateAttrVO -> {
- String attrName = codeClassifyTemplateAttrVO.getName();
- String field = codeClassifyTemplateAttrVO.getId();
- rowNameList.add(attrName);
- filedIndexMap.put(field, index[0]++);
- });
- dataObjectVO.setColName(rowNameList);//鏀惧叆灞炴��
- attrMapConfigMap.putAll(propMaps);
- LinkedList<RowDatas> rowDataList = new LinkedList<>();
- //Map<String, List<ProppertyVO>> dataPropMap = applyDataVOList.stream().collect(Collectors.toMap(ApplyDataVO::getId, ApplyDataVO::getProp, (key1, key2) -> key2));
- final int[] rowIndex = {0};
- applyDataVOList.stream().forEach(applyDataVO -> {
- rowIndex[0]++;
- RowDatas rowDatas = new RowDatas();
- rowDatas.setOid(applyDataVO.getId());
- rowDatas.setCreator(applyDataVO.getCreator());
- rowDatas.setEditor(applyDataVO.getEditor());
- rowDatas.setCode(applyDataVO.getCode());
- rowDatas.setOperation(applyDataVO.getOperate());
- rowDatas.setStatus(applyDataVO.getStatus());
- rowDatas.setRowIndex(rowIndex[0] + "");
- List<ProppertyVO> proppertyVOList = applyDataVO.getProp();
-
- LinkedHashMap<Integer, String> integerValueMap = new LinkedHashMap<>();
- Map<String, String> filedValueMap = new HashMap<>();
- if (!CollectionUtils.isEmpty(proppertyVOList)) {
- Map<String, String> sourceKeyValueMap = proppertyVOList.stream().collect(Collectors.toMap(ProppertyVO::getKey, ProppertyVO::getValue, (key1, key2) -> key2));
- Map<String, String> keyValueMap = new HashMap<>();
- //鍒ゆ柇attrMapConfigMap鏄惁鏈夊�硷紝濡傛灉娌℃湁鍒欒鏄庡熀纭�榛樿鐨勬槸缂栫爜绯荤粺瀛楁
- if (!CollectionUtils.isEmpty(attrMapConfigMap)) {
- sourceKeyValueMap.keySet().forEach(sourceKey -> {
- String dataValue = sourceKeyValueMap.get(sourceKey);
- if (attrMapConfigMap.containsKey(sourceKey)) {
- String targetKey = attrMapConfigMap.get(sourceKey);
- keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
- }
- });
- } else {
- sourceKeyValueMap.forEach((filed,value)->{
- keyValueMap.put(filed,StringUtils.isBlank(value)?"":value) ;
- });
- }
-
- filedIndexMap.forEach((attrKey, column) -> {
- String keyValue = "";
- if (keyValueMap.containsKey(attrKey)) {
- keyValue =StringUtils.isBlank(keyValueMap.get(attrKey))?"":keyValueMap.get(attrKey);
- }
- integerValueMap.put(column, keyValue);
- filedValueMap.put(attrKey, keyValue);
- });
- }
- rowDatas.setData(integerValueMap);
- rowDatas.setFiledValue(filedValueMap);
- rowDataList.add(rowDatas);
- });
- dataObjectVO.setRowData(rowDataList);
- }catch (Throwable e){
- objerrorCode="1";
- throw new Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
- }
- }
- /***
- * 鏁版嵁缁存姢涓庣紪鐮佺敵璇疯繑鍥�
- * @param resultSystemVO
- * @param dataType
- * @return
- */
- private String transferResultXMl(XMLResultSystemVO resultSystemVO,String dataType){
- String resultStr="";
- if ("xml".equals(dataType)) {
- //缁勭粐杩斿洖鎺ュ彛淇℃伅
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(XMLResultSystemVO.class);
- xStream.autodetectAnnotations(true);
- resultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(resultSystemVO);
- } else {
- List<XMLResultClassfyVO> resultClassfyVOList =resultSystemVO.getClassifys();
- JSONResultDataVO resultDataVO = new JSONResultDataVO();
- JSONResultSystemVO jsonResultSystemVO = new JSONResultSystemVO();
- JSONResultClassfysVO jsonResultClassfysVO = new JSONResultClassfysVO();
- List<JSONResultClassfyVO> jSONResultClassfyVOList = new ArrayList<>();
- resultClassfyVOList.stream().forEach(resultClassfyVO -> {
- List<XMLResultDataObjectDetailDO> xmlResultDataObjectDetailDOS = resultClassfyVO.getObjects();
- List<JSONResultDataObjectDetailDO> JSONResultDataObjectDetailDOList = new ArrayList<>();
- xmlResultDataObjectDetailDOS.stream().forEach(xmlResultDataObjectDetail -> {
- JSONResultDataObjectDetailDO jsonResultDataObjectDetail = new JSONResultDataObjectDetailDO();
- BeanUtilForVCI.copyPropertiesIgnoreCase(xmlResultDataObjectDetail, jsonResultDataObjectDetail);
- JSONResultDataObjectDetailDOList.add(jsonResultDataObjectDetail);
- });
- JSONResultClassfyVO jsonResultClassfyVO = new JSONResultClassfyVO();
- jsonResultClassfyVO.setClassCode(resultClassfyVO.getClassCode());
- jsonResultClassfyVO.setLibrary(resultClassfyVO.getLibrary());
- jsonResultClassfyVO.setFullclsfNamePath(resultClassfyVO.getFullclsfNamePath());
- JSONResultDataObjectDO JSONResultDataObjectDO = new JSONResultDataObjectDO();
- JSONResultDataObjectDO.setObject(JSONResultDataObjectDetailDOList);
- jsonResultClassfyVO.setObjects(JSONResultDataObjectDO);
- jSONResultClassfyVOList.add(jsonResultClassfyVO);
- });
- jsonResultClassfysVO.setClassify(jSONResultClassfyVOList);
- jsonResultSystemVO.setClassifys(jsonResultClassfysVO);
- jsonResultSystemVO.setErrorid(resultSystemVO.getErrorid());
- jsonResultSystemVO.setMsg(resultSystemVO.getMsg());
- resultDataVO.setData(jsonResultSystemVO);
- Object object = JSONObject.toJSON(resultDataVO);
- resultStr = object.toString();
-
- }
- return resultStr;
- }
-
- /***
- * 璁板綍鏃ュ織淇℃伅
- * @param systemId
- * @param parmaData
- * @param result
- * @return
- */
- private void saveLogs(String systemId,String systemName,String parmaData, String result,boolean isSucess,String msg,String operation){
- //璁板綍鏃ュ織淇℃伅
- DockingLogeDO dockingLogeDO=new DockingLogeDO();
- String oid=redisService.getUUIDEveryDay();
- dockingLogeDO.setSystemcode(StringUtils.isBlank(systemId)?"-":systemId);//璁剧疆绯荤粺鏍囪瘑
- dockingLogeDO.setSystemname(StringUtils.isBlank(systemName)?"-":systemName);
- dockingLogeDO.setMsg(msg);//鏃ュ織娑堟伅
- dockingLogeDO.setClassifyid("-");//鍒嗙被缂栧彿
- dockingLogeDO.setClassifyname("-");//鍒嗙被鍚嶇О
- dockingLogeDO.setClassifyoid("-");//鍒嗙被涓婚敭
- dockingLogeDO.setUniquecode("-");//鍞竴鏍囪瘑
- dockingLogeDO.setSystemoid("-");//绯荤粺鏍囪瘑
-// dockingLogeDO.setName(operation);
- dockingLogeDO.setOid(oid);//鏃ュ織涓婚敭
- dockingLogeDO.setParamstring(parmaData);//鍙傛暟淇℃伅
- dockingLogeDO.setReturnstring(result);//杩斿洖淇℃伅
- dockingLogeDO.setType(operation);//鏃ュ織鎿嶄綔绫诲瀷
- if(isSucess) {
- dockingLogeDO.setInterfacestatus(MdmDuckingConstant.INTERFACE_STATUS_TRUE);//鎺ュ彛闆嗘垚鐘舵��
- }else{
- dockingLogeDO.setInterfacestatus(MdmDuckingConstant.INTERFACE_STATUS_FALSE);//鎺ュ彛闆嗘垚鐘舵��
- }
- BatchCBO insert = dockingLogeDao.insert(dockingLogeDO);
- logger.info("闆嗘垚鎺ㄩ�佹暟鎹垚鍔�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/AttributeMapConfig.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/AttributeMapConfig.java
deleted file mode 100644
index 5b8aba6..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/AttributeMapConfig.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-@ConfigurationProperties(prefix="attrconfig")
-@Component
-public class AttributeMapConfig {
- private Map<String,String> system_attrmap;
- /**
- * WRJ涓绘暟鎹笌MPM鏋氫妇鍊兼槧灏勯厤缃�
- */
- private Map<String, List<EnumVO>> mpmEnumMap;
- public Map<String, String> getSystem_attrmap() {
- return system_attrmap;
- }
- public void setSystem_attrmap(Map<String, String> system_attrmap) {
- this.system_attrmap = system_attrmap;
- }
-
- public void setMpmEnumMap(Map<String, List<EnumVO>> mpmEnumMap) {
- this.mpmEnumMap = mpmEnumMap;
- }
-
- public Map<String, List<EnumVO>> getMpmEnumMap() {
- return mpmEnumMap;
- }
-
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/BackXml.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/BackXml.java
deleted file mode 100644
index ce21b1c..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/BackXml.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import java.util.List;
-
-public class BackXml{
- private List<XmlData> datas;
- public String state;//鍏跺疄灏辨槸datacode锛屼篃鏄痗ode
- public String msg;//鍏跺疄灏辨槸datamsg
-
- public List<XmlData> getDatas() {
- return datas;
- }
-
- public void setDatas(List<XmlData> datas) {
- this.datas = datas;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- @Override
- public String toString() {
- return "BackXml{" +
- "datas=" + datas +
- ", state='" + state + '\'' +
- ", msg='" + msg + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/DateUtils.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/DateUtils.java
deleted file mode 100644
index a8f295a..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/DateUtils.java
+++ /dev/null
@@ -1,527 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-/**
- * yyyy-MM-dd HH:mm:ss
- *
- */
-public class DateUtils {
-
- /** 骞�-鏈�-鏃� 鏃�:鍒�:绉� 鏄剧ず鏍煎紡 */
- // 澶囨敞:濡傛灉浣跨敤澶у啓HH鏍囪瘑浣跨敤24灏忔椂鏄剧ず鏍煎紡,濡傛灉浣跨敤灏忓啓hh灏辫〃绀轰娇鐢�12灏忔椂鍒舵牸寮忋��
- public static String DATE_TO_STRING_DETAIAL_PATTERN = "yyyy-MM-dd HH:mm:ss";
-
- /** 骞�-鏈�-鏃� 鏄剧ず鏍煎紡 */
- public static String DATE_TO_STRING_SHORT_PATTERN = "yyyy-MM-dd";
-
- /**
- * 鎶婃棩鏈熷瓧绗︿覆鏍煎紡鍖栨垚鏃ユ湡绫诲瀷锛岄粯璁yyy-MM-dd HH:mm:ss
- * @param dateStr
- * @return
- */
- public static Date convert2Date(String dateStr) {
- return convert2Date(dateStr,DATE_TO_STRING_DETAIAL_PATTERN);
- }
-
- /**
- * 鎶婃棩鏈熷瓧绗︿覆鏍煎紡鍖栨垚鏃ユ湡绫诲瀷
- * @param dateStr
- * @param format
- * @return
- */
- public static Date convert2Date(String dateStr, String format) {
- SimpleDateFormat simple = new SimpleDateFormat(format);
- try {
- simple.setLenient(false);
- return simple.parse(dateStr);
- } catch (Exception e) {
- return null;
- }
- }
-
-
- /**
- * 鎶婃棩鏈熺被鍨嬫牸寮忓寲鎴愬瓧绗︿覆
- * @param date
- * @param format
- * @return
- */
- public static String convert2String(Date date, String format) {
- SimpleDateFormat formater = new SimpleDateFormat(format);
- try {
- return formater.format(date);
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- * 杞瑂ql鐨則ime鏍煎紡
- * @param date
- * @return
- */
- public static java.sql.Timestamp convertSqlTime(Date date){
- java.sql.Timestamp timestamp = new java.sql.Timestamp(date.getTime());
- return timestamp;
- }
-
- /**
- * 杞瑂ql鐨勬棩鏈熸牸寮�
- * @param date
- * @return
- */
- public static java.sql.Date convertSqlDate(Date date){
- java.sql.Date Datetamp = new java.sql.Date(date.getTime());
- return Datetamp;
- }
-
-
- /**
- * 鑾峰彇褰撳墠鏃ユ湡,榛樿yyyy-MM-dd HH:mm:ss
- * @return
- */
- public static String getCurrentDate() {
- return getCurrentDate(DATE_TO_STRING_DETAIAL_PATTERN);
- }
-
- /**
- * 鑾峰彇褰撳墠鏃ユ湡
- * @param format
- * @return
- */
- public static String getCurrentDate(String format) {
- return new SimpleDateFormat(format).format(new Date());
- }
-
- /**
- * 鑾峰彇鏃堕棿鎴�
- * @return
- */
- public static long getTimestamp()
- {
- return System.currentTimeMillis();
- }
-
- /**
- * 鏃堕棿瀛楃涓茶浆鏃堕棿鎴�
- */
- public static long stringToTimestamp(String str){
- long time = 0;
- try {
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Date date = simpleDateFormat.parse(str);
- time = date.getTime();
- }catch (Exception e){
-
- }
- return time;
- }
-
- /**
- * 鑾峰彇鏈堜唤鐨勫ぉ鏁�
- * @param year
- * @param month
- * @return
- */
- public static int getDaysOfMonth(int year, int month) {
- Calendar calendar = Calendar.getInstance();
- calendar.set(year, month - 1, 1);
- return calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
- }
-
- /**
- * 鑾峰彇鏃ユ湡鐨勫勾
- * @param date
- * @return
- */
- public static int getYear(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- return calendar.get(Calendar.YEAR);
- }
-
- /**
- * 鑾峰彇鏃ユ湡鐨勬湀
- * @param date
- * @return
- */
- public static int getMonth(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- return calendar.get(Calendar.MONTH) + 1;
- }
-
- /**
- * 鑾峰彇鏃ユ湡鐨勬棩
- * @param date
- * @return
- */
- public static int getDay(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- return calendar.get(Calendar.DATE);
- }
-
- /**
- * 鑾峰彇鏃ユ湡鐨勬椂
- * @param date
- * @return
- */
- public static int getHour(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- return calendar.get(Calendar.HOUR);
- }
-
- /**
- * 鑾峰彇鏃ユ湡鐨勫垎绉�
- * @param date
- * @return
- */
- public static int getMinute(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- return calendar.get(Calendar.MINUTE);
- }
-
- /**
- * 鑾峰彇鏃ユ湡鐨勭
- * @param date
- * @return
- */
- public static int getSecond(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- return calendar.get(Calendar.SECOND);
- }
-
- /**
- * 鑾峰彇鏄熸湡鍑�
- * @param date
- * @return
- */
- public static int getWeekDay(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
- return dayOfWeek-1;
- }
-
- /**
- * 鑾峰彇鍝竴骞村叡鏈夊灏戝懆
- * @param year
- * @return
- */
- public static int getMaxWeekNumOfYear(int year) {
- Calendar c = new GregorianCalendar();
- c.set(year, Calendar.DECEMBER, 31, 23, 59, 59);
- return getWeekNumOfYear(c.getTime());
- }
-
- /**
- * 鍙栧緱鏌愬ぉ鏄竴骞翠腑鐨勫灏戝懆
- * @param date
- * @return
- */
- public static int getWeekNumOfYear(Date date) {
- Calendar c = new GregorianCalendar();
- c.setFirstDayOfWeek(Calendar.MONDAY);
- c.setMinimalDaysInFirstWeek(7);
- c.setTime(date);
- return c.get(Calendar.WEEK_OF_YEAR);
- }
-
- /**
- * 鍙栧緱鏌愬ぉ鎵�鍦ㄥ懆鐨勭涓�澶�
- * @param date
- * @return
- */
- public static Date getFirstDayOfWeek(Date date) {
- Calendar c = new GregorianCalendar();
- c.setFirstDayOfWeek(Calendar.MONDAY);
- c.setTime(date);
- c.set(Calendar.DAY_OF_WEEK, c.getFirstDayOfWeek());
- return c.getTime();
- }
-
- /**
- * 鍙栧緱鏌愬ぉ鎵�鍦ㄥ懆鐨勬渶鍚庝竴澶�
- * @param date
- * @return
- */
- public static Date getLastDayOfWeek(Date date) {
- Calendar c = new GregorianCalendar();
- c.setFirstDayOfWeek(Calendar.MONDAY);
- c.setTime(date);
- c.set(Calendar.DAY_OF_WEEK, c.getFirstDayOfWeek() + 6);
- return c.getTime();
- }
-
- /**
- * 鍙栧緱鏌愬勾鏌愬懆鐨勭涓�澶� 瀵逛簬浜ゅ弶:2008-12-29鍒�2009-01-04灞炰簬2008骞寸殑鏈�鍚庝竴鍛�,2009-01-05涓�2009骞寸涓�鍛ㄧ殑绗竴澶�
- * @param year
- * @param week
- * @return
- */
- public static Date getFirstDayOfWeek(int year, int week) {
- Calendar calFirst = Calendar.getInstance();
- calFirst.set(year, 0, 7);
- Date firstDate = getFirstDayOfWeek(calFirst.getTime());
-
- Calendar firstDateCal = Calendar.getInstance();
- firstDateCal.setTime(firstDate);
-
- Calendar c = new GregorianCalendar();
- c.set(Calendar.YEAR, year);
- c.set(Calendar.MONTH, Calendar.JANUARY);
- c.set(Calendar.DATE, firstDateCal.get(Calendar.DATE));
-
- Calendar cal = (GregorianCalendar) c.clone();
- cal.add(Calendar.DATE, (week - 1) * 7);
- firstDate = getFirstDayOfWeek(cal.getTime());
-
- return firstDate;
- }
-
- /**
- * 鍙栧緱鏌愬勾鏌愬懆鐨勬渶鍚庝竴澶� 瀵逛簬浜ゅ弶:2008-12-29鍒�2009-01-04灞炰簬2008骞寸殑鏈�鍚庝竴鍛�, 2009-01-04涓�
- * 2008骞存渶鍚庝竴鍛ㄧ殑鏈�鍚庝竴澶�
- * @param year
- * @param week
- * @return
- */
- public static Date getLastDayOfWeek(int year, int week) {
- Calendar calLast = Calendar.getInstance();
- calLast.set(year, 0, 7);
- Date firstDate = getLastDayOfWeek(calLast.getTime());
-
- Calendar firstDateCal = Calendar.getInstance();
- firstDateCal.setTime(firstDate);
-
- Calendar c = new GregorianCalendar();
- c.set(Calendar.YEAR, year);
- c.set(Calendar.MONTH, Calendar.JANUARY);
- c.set(Calendar.DATE, firstDateCal.get(Calendar.DATE));
-
- Calendar cal = (GregorianCalendar) c.clone();
- cal.add(Calendar.DATE, (week - 1) * 7);
- Date lastDate = getLastDayOfWeek(cal.getTime());
-
- return lastDate;
- }
-
-
- private static Date add(Date date, int calendarField, int amount) {
- if (date == null) {
- throw new IllegalArgumentException("The date must not be null");
- } else {
- Calendar c = Calendar.getInstance();
- c.setTime(date);
- c.add(calendarField, amount);
- return c.getTime();
- }
- }
-
- /*
- * 1鍒欎唬琛ㄧ殑鏄骞翠唤鎿嶄綔锛� 2鏄鏈堜唤鎿嶄綔锛� 3鏄鏄熸湡鎿嶄綔锛� 5鏄鏃ユ湡鎿嶄綔锛� 11鏄灏忔椂鎿嶄綔锛� 12鏄鍒嗛挓鎿嶄綔锛� 13鏄绉掓搷浣滐紝
- * 14鏄姣鎿嶄綔
- */
-
- /**
- * 澧炲姞骞�
- * @param date
- * @param amount
- * @return
- */
- public static Date addYears(Date date, int amount) {
- return add(date, 1, amount);
- }
-
- /**
- * 澧炲姞鏈�
- * @param date
- * @param amount
- * @return
- */
- public static Date addMonths(Date date, int amount) {
- return add(date, 2, amount);
- }
-
- /**
- * 澧炲姞鍛�
- * @param date
- * @param amount
- * @return
- */
- public static Date addWeeks(Date date, int amount) {
- return add(date, 3, amount);
- }
-
- /**
- * 澧炲姞澶�
- * @param date
- * @param amount
- * @return
- */
- public static Date addDays(Date date, int amount) {
- return add(date, 5, amount);
- }
-
- /**
- * 澧炲姞鏃�
- * @param date
- * @param amount
- * @return
- */
- public static Date addHours(Date date, int amount) {
- return add(date, 11, amount);
- }
-
- /**
- * 澧炲姞鍒�
- * @param date
- * @param amount
- * @return
- */
- public static Date addMinutes(Date date, int amount) {
- return add(date, 12, amount);
- }
-
- /**
- * 澧炲姞绉�
- * @param date
- * @param amount
- * @return
- */
- public static Date addSeconds(Date date, int amount) {
- return add(date, 13, amount);
- }
-
- /**
- * 澧炲姞姣
- * @param date
- * @param amount
- * @return
- */
- public static Date addMilliseconds(Date date, int amount) {
- return add(date, 14, amount);
- }
-
-
-
- /**
- * time宸�
- * @param before
- * @param after
- * @return
- */
- public static long diffTimes(Date before, Date after){
- return after.getTime() - before.getTime();
- }
-
- /**
- * 绉掑樊
- * @param before
- * @param after
- * @return
- */
- public static long diffSecond(Date before, Date after){
- return (after.getTime() - before.getTime())/1000;
- }
-
- /**
- * 鍒嗙宸�
- * @param before
- * @param after
- * @return
- */
- public static int diffMinute(Date before, Date after){
- return (int)(after.getTime() - before.getTime())/1000/60;
- }
-
- /**
- * 鏃跺樊
- * @param before
- * @param after
- * @return
- */
- public static int diffHour(Date before, Date after){
- return (int)(after.getTime() - before.getTime())/1000/60/60;
- }
-
- /**
- * 澶╂暟宸�
- * @param before
- * @param after
- * @return
- */
- public static int diffDay(Date before, Date after) {
- return Integer.parseInt(String.valueOf(((after.getTime() - before.getTime()) / 86400000)));
- }
-
- /**
- * 鏈堝樊
- * @param before
- * @param after
- * @return
- */
- public static int diffMonth(Date before, Date after){
- int monthAll=0;
- int yearsX = diffYear(before,after);
- Calendar c1 = Calendar.getInstance();
- Calendar c2 = Calendar.getInstance();
- c1.setTime(before);
- c2.setTime(after);
- int monthsX = c2.get(Calendar.MONTH) - c1.get(Calendar.MONTH);
- monthAll=yearsX*12+monthsX;
- int daysX =c2.get(Calendar.DATE) - c1.get(Calendar.DATE);
- if(daysX>0){
- monthAll=monthAll+1;
- }
- return monthAll;
- }
-
- /**
- * 骞村樊
- * @param before
- * @param after
- * @return
- */
- public static int diffYear(Date before, Date after) {
- return getYear(after) - getYear(before);
- }
-
- /**
- * 璁剧疆23:59:59
- * @param date
- * @return
- */
- public static Date setEndDay(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- calendar.set(Calendar.HOUR_OF_DAY, 23);
- calendar.set(Calendar.MINUTE, 59);
- calendar.set(Calendar.SECOND, 59);
- return calendar.getTime();
- }
-
- /**
- * 璁剧疆00:00:00
- * @param date
- * @return
- */
- public static Date setStartDay(Date date) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(date);
- calendar.set(Calendar.HOUR_OF_DAY, 00);
- calendar.set(Calendar.MINUTE, 00);
- calendar.set(Calendar.SECOND, 00);
- return calendar.getTime();
- }
-
-}
-
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/EnumVO.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/EnumVO.java
deleted file mode 100644
index 012f475..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/EnumVO.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-public class EnumVO{
- /***
- *
- */
- private String enumText;
- private String enumValue;
-
- public String getEnumText() {
- return enumText;
- }
-
- public void setEnumText(String enumText) {
- this.enumText = enumText;
- }
-
- public String getEnumValue() {
- return enumValue;
- }
-
- public void setEnumValue(String enumValue) {
- this.enumValue = enumValue;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/HttpUtils.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/HttpUtils.java
deleted file mode 100644
index dd06779..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/HttpUtils.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import org.springframework.http.*;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * http璇锋眰宸ュ叿绫�
- *
- * @since 2020-03-25
- */
-public class HttpUtils {
-
- //Content-Type鐨刱ey
- public static String CONTENT_TYPE = "Content-Type";
- //json鏁版嵁
- public static String CONTENT_TYPE_JSON = MediaType.APPLICATION_JSON_VALUE;
- public static String CONTENT_TYPE_JSON_UTF8 = MediaType.APPLICATION_JSON_UTF8_VALUE;
-
- //琛ㄥ崟鏍煎紡,榛樿
- public static String CONTENT_TYPE_TEXT = MediaType.APPLICATION_FORM_URLENCODED_VALUE;
-
- /**
- * get璇锋眰
- *
- * @param url
- * @return
- */
- public static String get(String url) {
- return get(url, null);
- }
-
- /**
- * get璇锋眰
- *
- * @param url
- * @param headers 璇锋眰澶�
- * @return
- */
- public static String get(String url, MultiValueMap<String, String> headers) {
- return request(url, null, headers, HttpMethod.GET);
- }
-
- /**
- * post璇锋眰
- *
- * @param url
- * @param params 璇锋眰鍙傛暟
- * @return
- */
- public static String post(String url, MultiValueMap<String, String> params) {
- return post(url, params, null);
- }
-
- /**
- * post璇锋眰
- *
- * @param url
- * @param params 璇锋眰鍙傛暟
- * @param headers 璇锋眰澶�
- * @return
- */
- public static String post(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
- return request(url, params, headers, HttpMethod.POST);
- }
-
- /**
- * put璇锋眰
- *
- * @param url
- * @param params 璇锋眰鍙傛暟
- * @return
- */
- public static String put(String url, MultiValueMap<String, String> params) {
- return put(url, params, null);
- }
-
- /**
- * put璇锋眰
- *
- * @param url
- * @param params 璇锋眰鍙傛暟
- * @param headers 璇锋眰澶�
- * @return
- */
- public static String put(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
- return request(url, params, headers, HttpMethod.PUT);
- }
-
- /**
- * delete璇锋眰
- *
- * @param url
- * @param params 璇锋眰鍙傛暟
- * @return
- */
- public static String delete(String url, MultiValueMap<String, String> params) {
- return delete(url, params, null);
- }
-
- /**
- * delete璇锋眰
- *
- * @param url
- * @param params 璇锋眰鍙傛暟
- * @param headers 璇锋眰澶�
- * @return
- */
- public static String delete(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers) {
- return request(url, params, headers, HttpMethod.DELETE);
- }
-
- /**
- * 琛ㄥ崟璇锋眰
- *
- * @param url
- * @param params 璇锋眰鍙傛暟
- * @param headers 璇锋眰澶�
- * @param method 璇锋眰鏂瑰紡
- * @return
- */
- public static String request(String url, MultiValueMap<String, String> params, MultiValueMap<String, String> headers, HttpMethod method) {
- if (params == null) {
- params = new LinkedMultiValueMap<>();
- }
- return request(url, params, headers, method, MediaType.APPLICATION_FORM_URLENCODED);
- }
-
- /**
- * http璇锋眰
- *
- * @param url
- * @param params 璇锋眰鍙傛暟
- * @param headers 璇锋眰澶�
- * @param method 璇锋眰鏂瑰紡
- * @param mediaType 鍙傛暟绫诲瀷
- * @return
- */
- public static String request(String url, Object params, MultiValueMap<String, String> headers, HttpMethod method, MediaType mediaType) {
- if (url == null || url.trim().isEmpty()) {
- return null;
- }
- RestTemplate client = new RestTemplate();
- // header
- HttpHeaders httpHeaders = new HttpHeaders();
- if (headers != null) {
- httpHeaders.addAll(headers);
- }
- // 鎻愪氦鏂瑰紡锛氳〃鍗曘�乯son
- httpHeaders.setContentType(mediaType);
- HttpEntity<Object> httpEntity = new HttpEntity(params, httpHeaders);
- ResponseEntity<String> response = client.exchange(url, method, httpEntity, String.class);
- return response.getBody();
- }
-
- public static MultiValueMap<String, String> set_params_headers(String key,String value,MultiValueMap<String, String> map){
- if(map==null){
- map = new LinkedMultiValueMap<>();
- }
- map.add(key,value);
- return map;
- }
- /**
- * 鑾峰彇ip
- * @param request
- * @return
- */
- public static String getIpAddressFromRequest(HttpServletRequest request){
- String ip = request.getHeader("X-Forwarded-For");
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("WL-Proxy-Client-IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("HTTP_CLIENT_IP");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getHeader("HTTP_X_FORWARDED_FOR");
- }
- if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
- ip = request.getRemoteAddr();
- }
- if (ip == null || ip.length() == 0 || ip.indexOf("0:0:0:0:0:0:0:1") >-1) {
- //0:0:0:0:0:0:0:1鏄湰鏈哄湪璁块棶
- ip = "127.0.0.1";
- }
- return ip;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/Json2XmlUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/Json2XmlUtil.java
deleted file mode 100644
index 6cb301e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/Json2XmlUtil.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import de.odysseus.staxon.json.JsonXMLConfig;
-import de.odysseus.staxon.json.JsonXMLConfigBuilder;
-import de.odysseus.staxon.json.JsonXMLOutputFactory;
-import org.apache.commons.lang3.StringUtils;
-
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLInputFactory;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class Json2XmlUtil {
-
- /**
- * @Description: xml convert to json
- */
- public static String XmlToJson(String xmlString){
-
- StringReader input = new StringReader(xmlString);
- StringWriter output = new StringWriter();
- try {
- JsonXMLConfig config = new JsonXMLConfigBuilder().autoArray(true).autoPrimitive(true).prettyPrint(true).build();
- XMLEventReader reader = XMLInputFactory.newInstance().createXMLEventReader(input);
- XMLEventWriter writer = new JsonXMLOutputFactory(config).createXMLEventWriter(output);
- writer.add(reader);
- reader.close();
- writer.close();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- try {
- output.close();
- input.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return output.toString();
- }
-
- public static String replaceBlank(String jsonString) {
- if(StringUtils.isEmpty(jsonString)){
- return jsonString;
- }
- Pattern p = Pattern.compile("\\s*|\t|\r|\n");
- Matcher m = p.matcher(jsonString);
- String dest = m.replaceAll("");
- return dest;
- }
-
- public static String jsontoxml(JSONObject jo, String gt) {
- StringBuffer xmlStr = new StringBuffer();
- Iterator<Map.Entry<String, Object>> iter = jo.entrySet().iterator();
- while (iter.hasNext()) {
- Map.Entry<String, Object> entry = (Map.Entry<String, Object>) iter.next();
- String key = entry.getKey().toString();
- String val = entry.getValue().toString();
- //鍊奸潪绌�
- if (StringUtils.isNotEmpty(val)) {
- //JSON瀵硅薄
- if (val.substring(0, 1).equals("{")) {
- xmlStr.append(gt);
- xmlStr.append("<");
- xmlStr.append(key);
- xmlStr.append(">");
- xmlStr.append(jsontoxml(JSONObject.parseObject(val), gt + ""));
- xmlStr.append(gt);
- xmlStr.append("</");
- xmlStr.append(key);
- xmlStr.append(">");
- }
- //JSON鏁扮粍
- else if (val.substring(0, 1).equals("[")) {
- JSONArray ja = JSONArray.parseArray(val);
- for (int i = 0; i < ja.size(); i++) {
- JSONObject jo2 = new JSONObject();
- jo2.put(key, ja.getJSONObject(i));
- xmlStr.append(jsontoxml(jo2, gt + ""));
- }
- }
- //JSON鍊�
- else {
- xmlStr.append(gt);
- xmlStr.append("<");
- xmlStr.append(key);
- xmlStr.append(">");
- xmlStr.append(val);
- xmlStr.append("</");
- xmlStr.append(key);
- xmlStr.append(">");
- }
- }
- //鍊间负绌�
- else{
- xmlStr.append(gt);
- xmlStr.append("<");
- xmlStr.append(key);
- xmlStr.append(">");
- xmlStr.append("");
- xmlStr.append("</");
- xmlStr.append(key);
- xmlStr.append(">");
- }
- }
- return xmlStr.toString();
- }
-
- public static String jsonToXml(JSONObject jo0) {
- String xml = jsontoxml(jo0, "");
- return xml;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/PatternUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/PatternUtil.java
deleted file mode 100644
index ddf0feb..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/PatternUtil.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class PatternUtil {
-
- //*${xxx}*
- public static Pattern dynamic = Pattern.compile(".*\\$\\{([a-z]+)\\}.*");
- public static Pattern dynamicLimitCount = Pattern.compile("\\$\\{([a-z]+)\\}");
- /**
- * 鍒ゆ柇鍐呭涓槸鍚﹀寘鍚姩鎬佸弬鏁�(${key}褰㈠紡鐨�)
- *
- * @param content 瑕佸垽鏂殑鍐呭
- * @return
- */
- public static boolean isContainsDynamicParameter(String content) {
- if(StringUtils.isBlank(content)){
- return false;
- }
- return dynamic.matcher(content).matches();
- }
-
- /**
- * 鎸夌収鍔ㄦ�佸唴瀹圭殑鍙傛暟鍑虹幇椤哄簭,灏嗗弬鏁版斁鍒癓ist涓�
- *
- * @param content
- * @return
- */
- public static List<String> getKeyListByContent(String content) {
- if(StringUtils.isBlank(content)){
- return new ArrayList<>();
- }
- Set<String> paramSet = new LinkedHashSet<>();
- Matcher m = dynamicLimitCount.matcher(content);
- while (m.find()) {
- paramSet.add(m.group(1));
- }
- return new ArrayList<>(paramSet);
- }
-
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/Pro.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/Pro.java
deleted file mode 100644
index a58534f..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/Pro.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-public class Pro{
- public String key;
- public String mean;
- public String value;
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public String getMean() {
- return mean;
- }
-
- public void setMean(String mean) {
- this.mean = mean;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "Pro{" +
- "key='" + key + '\'' +
- ", mean='" + mean + '\'' +
- ", value='" + value + '\'' +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/WsAxis2ClientUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/WsAxis2ClientUtil.java
deleted file mode 100644
index 96f9881..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/WsAxis2ClientUtil.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.lang3.StringUtils;
-
-public class WsAxis2ClientUtil {
-
- /**
- * axis2璋冪敤瀹㈡埛绔�
- *
- * @param url 璇锋眰鏈嶅姟鍦板潃
- * @param nameSpace 鍛藉悕绌洪棿
- * @param method 鏂规硶鍚�
- * @param tarName 鍙傛暟鍚嶇О
- * @param xmlData 璇锋眰鎶ユ枃
- * @param timeOutInMilliSeconds 瓒呮椂鏃堕棿
- * @return String 绫诲瀷鐨勫搷搴旀姤鎭�
- */
- public static String sendMsg(String url, String nameSpace,String soapAction, String method, String tarName, String xmlData, long timeOutInMilliSeconds) throws Exception {
- ServiceClient serviceClient = new ServiceClient();
- Options option = new Options();
- option.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
- option.setTransportInProtocol(Constants.TRANSPORT_HTTP);
-
- // 鍊间负targetNamespace+methodName
- if(StringUtils.isEmpty(soapAction)){
- soapAction = nameSpace+method;
- }
- option.setAction(soapAction);
-
- EndpointReference epfs = new EndpointReference(url);
- option.setTo(epfs);
- serviceClient.setOptions(option);
-
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace namespaceOM = fac.createOMNamespace(nameSpace, "");
- OMElement element = fac.createOMElement(method, namespaceOM);
- OMElement theCityCode = fac.createOMElement(tarName, namespaceOM);
- theCityCode.setText(xmlData);
- element.addChild(theCityCode);
-// OMElement theUserID = fac.createOMElement("theUserID ", namespace);
-// theUserID.setText("");
-// element.addChild(theUserID);
-
- OMElement resultOM = serviceClient.sendReceive(element);
-
- String result = resultOM.getFirstElement().getText();
- System.out.println(result);
- return result;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/WsErpClientUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/WsErpClientUtil.java
deleted file mode 100644
index 152bd8d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/WsErpClientUtil.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.lang3.StringUtils;
-
-public class WsErpClientUtil {
-
- /**
- * axis2璋冪敤瀹㈡埛绔�
- *
- * @param url 璇锋眰鏈嶅姟鍦板潃
- * @param nameSpace 鍛藉悕绌洪棿
- * @param method 鏂规硶鍚�
- * @param tarName 鍙傛暟鍚嶇О
- * @param xmlData 璇锋眰鎶ユ枃
- * @param timeOutInMilliSeconds 瓒呮椂鏃堕棿
- * @return String 绫诲瀷鐨勫搷搴旀姤鎭�
- */
- public static String sendMsg(String url, String nameSpace,String soapAction, String method, String tarName, String xmlData, long timeOutInMilliSeconds) throws Exception {
- ServiceClient serviceClient = new ServiceClient();
- Options option = new Options();
- option.setSoapVersionURI(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI);
- option.setTransportInProtocol(Constants.TRANSPORT_HTTP);
-
- // 鍊间负targetNamespace+methodName
- if(StringUtils.isEmpty(soapAction)){
- soapAction = nameSpace+method;
- }
- option.setAction(soapAction);
-
- EndpointReference epfs = new EndpointReference(url);
- option.setTo(epfs);
- serviceClient.setOptions(option);
-
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace namespaceOM = fac.createOMNamespace(nameSpace, "");
- OMElement element = fac.createOMElement(method, namespaceOM);
- OMElement theCityCode = fac.createOMElement(tarName, namespaceOM);
- theCityCode.setText(xmlData);
- element.addChild(theCityCode);
-// OMElement theUserID = fac.createOMElement("theUserID ", namespace);
-// theUserID.setText("");
-// element.addChild(theUserID);
-
- OMElement resultOM = serviceClient.sendReceive(element);
-
- String result = resultOM.getFirstElement().getText();
- System.out.println(result);
- return result;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/XmlData.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/XmlData.java
deleted file mode 100644
index 00e315b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/XmlData.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import java.util.List;
-
-public class XmlData{
- public String unique;
- public String type;//鍒嗙被缂栧彿
- public String sendtype;//鎺ㄩ�佹暟鎹被鍨�
- public String state;//鍏跺疄灏辨槸datacode锛屼篃鏄痗ode
- public String msg;//鍏跺疄灏辨槸datamsg
- public String num;
- public String namepath;
- public String name;
- public String idpath;
- public String id;
- public Integer orderNum;
- public String parentId;
- public List<Pro> pros;
-
-
- public String getUnique() {
- return unique;
- }
-
- public void setUnique(String unique) {
- this.unique = unique;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getNamepath() {
- return namepath;
- }
-
- public void setNamepath(String namepath) {
- this.namepath = namepath;
- }
-
- public String getIdpath() {
- return idpath;
- }
-
- public void setIdpath(String idpath) {
- this.idpath = idpath;
- }
-
- public List<Pro> getPros() {
- return pros;
- }
-
- public String getSendtype() {
- return sendtype;
- }
-
- public void setSendtype(String sendtype) {
- this.sendtype = sendtype;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public void setPros(List<Pro> pros) {
- this.pros = pros;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public int getOrderNum() {
- return orderNum;
- }
-
- public void setOrderNum(int orderNum) {
- this.orderNum = orderNum;
- }
-
- public String getParentId() {
- return parentId;
- }
-
- public void setParentId(String parentId) {
- this.parentId = parentId;
- }
-
- @Override
- public String toString() {
- return "XmlData{" +
- "unique='" + unique + '\'' +
- ", type='" + type + '\'' +
- ", sendtype='" + sendtype + '\'' +
- ", state='" + state + '\'' +
- ", msg='" + msg + '\'' +
- ", num='" + num + '\'' +
- ", namepath='" + namepath + '\'' +
- ", name='" + name + '\'' +
- ", idpath='" + idpath + '\'' +
- ", id='" + id + '\'' +
- ", orderNum='" + orderNum + '\'' +
- ", parentId='" + parentId + '\'' +
- ", pros=" + pros +
- '}';
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/XmlUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/XmlUtil.java
deleted file mode 100644
index e8980df..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/XmlUtil.java
+++ /dev/null
@@ -1,770 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang3.StringUtils;
-import org.dom4j.Attribute;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.vci.ubcs.code.constant.MdmDuckingConstant.*;
-
-
-public class XmlUtil {
- /*
- 绗竴鐗堟湰
- */
- public static Map<String,Object> readPreXml_bak(String xmlData) throws Exception{
-
- Map<String,Object> datasMap = new HashMap<String,Object>();
-
- Document document = DocumentHelper.parseText(xmlData);
- Element datas_element = document.getRootElement();
- Attribute datas_systemid_attr = datas_element.attribute(XML_SYSTEMID);
- String systemid = datas_systemid_attr==null?"":datas_systemid_attr.getValue();//systemid
-
- List<Element> data_elements = datas_element.elements(XML_DATA);
- List<Map<String,Object>> dataMapList = new ArrayList<Map<String,Object>>();
- for (Element data_element:data_elements){
- Map<String,Object> dataMap = new HashMap<String,Object>();
-
- Attribute data_unique_attr = data_element.attribute(XML_UNIQUE);
- String unique = data_unique_attr==null?"":data_unique_attr.getValue();//unique
-
- Attribute data_type_attr = data_element.attribute(XML_TYPE);
- String type = data_type_attr==null?"":data_type_attr.getValue();//type
-
- Element pro_elements = data_element.element(XML_PROS);
- List<Element> attrs_elements = pro_elements.elements(XML_ATTR);
-
- List<Map<String,String>> attrList = new ArrayList<Map<String,String>>();
- for (Element attr_element:attrs_elements){
- Map<String,String> attrMap = new HashMap<String,String>();
-
- Attribute attr_key_attr = attr_element.attribute(XML_KEY);
- String attr_key = attr_key_attr==null?"":attr_key_attr.getValue();//key
-
- Attribute attr_mean_attr = attr_element.attribute(XML_MEAN);
- String attr_mean = attr_mean_attr==null?"":attr_mean_attr.getValue();//mean
-
- String attr_text = attr_element.getText();
-
- attrMap.put(XML_KEY,attr_key);
- attrMap.put(XML_MEAN,attr_mean);
- attrMap.put(XML_TEXT,attr_text);
- attrList.add(attrMap);
- }
- dataMap.put(XML_UNIQUE,unique);
- dataMap.put(XML_TYPE,type);
- dataMap.put(XML_ATTR,attrList);
-
- dataMapList.add(dataMap);
-
- datasMap.put(XML_SYSTEMID,systemid);
- datasMap.put(XML_DATAS,dataMapList);
- }
- return datasMap;
- }
-
- public static String writePreBackXmlData_bak(String code,String msg,List<XmlData> xmlDataList){
- String xmlString = null;
- try {
- Document document = DocumentHelper.createDocument();
- document.setXMLEncoding("UTF-8");
- Element root = document.addElement(XML_DATAS);
- root.addAttribute(XML_CODE, code);
- root.addAttribute(XML_MSG, msg);
- if(xmlDataList!=null) {
- for (XmlData xmlData : xmlDataList) {
- if(xmlData==null){
- continue;
- }
- Element data_element = root.addElement(XML_DATA);
- data_element.addAttribute(XML_UNIQUE, xmlData.getUnique());
- data_element.addAttribute(XML_STATE, xmlData.getState());
- data_element.addAttribute(XML_MSG, xmlData.getMsg());
- data_element.addAttribute(XML_NUM, xmlData.getNum());
- }
- }
- OutputFormat format = OutputFormat.createPrettyPrint();
- XMLWriter writer = new XMLWriter(format);
- writer.write(document);
- xmlString=document.asXML();
- } catch (Exception e) {
- // TODO: handle exception
- }
- return xmlString;
- }
-
- /*
- 鏍规嵁閮ㄩ暱宸茬粡淇敼鐨勭涓�鐗�
- <object>
- <systemid>MPM</systemid>
- <datas>
- <data>
- <unique>oa0001</unique>
- <type>wupin</type>
- <pros>
- <pro>
- <key>code01</key>
- <mean>鎵�灞炵粨鏋�</mean>
- <value>娓╁害璋冭妭鍣�1</value>
- </pro>
- <pro>
- <key>code02</key>
- <mean>涓昏鍔熻兘</mean>
- <value>瀵肩數杩炴帴1</value>
- </pro>
- </pros>
- </data>
- <data>
- <unique>oa0002</unique>
- <type>wupin</type>
- <pros>
- <pro>
- <key>code01</key>
- <mean>鎵�灞炵粨鏋�</mean>
- <value>娓╁害璋冭妭鍣�2</value>
- </pro>
- <pro>
- <key>code02</key>
- <mean>涓昏鍔熻兘</mean>
- <value>瀵肩數杩炴帴2</value>
- </pro>
- </pros>
- </data>
- </datas>
- </object>
- */
- public static Map<String,Object> readPreXml1(String xmlData) throws Exception{
-
- Map<String,Object> datasMap = new HashMap<String,Object>();
-
- Document document = DocumentHelper.parseText(xmlData);
- Element object_element = document.getRootElement();
- Element system_element = object_element.element(XML_SYSTEMID);
- String systemid = system_element.getText();
- Element datas_element = object_element.element(XML_DATAS);
- List<Element> data_elements = datas_element.elements(XML_DATA);
- List<Map<String,Object>> datasList = new ArrayList<Map<String,Object>>();
- for (Element data_element:data_elements){
- Map<String,Object> dataMap = new HashMap<String,Object>();
-
- Attribute data_unique_attr = data_element.attribute(XML_UNIQUE);
- String unique = data_unique_attr==null?"":data_unique_attr.getValue();//unique
-
- Attribute data_type_attr = data_element.attribute(XML_TYPE);
- String type = data_type_attr==null?"":data_type_attr.getValue();//type
-
- Element pros_elements = data_element.element(XML_PROS);
- List<Element> pro_elements = pros_elements.elements(XML_PRO);
-
- List<Map<String,String>> proList = new ArrayList<Map<String,String>>();
- for (Element pro_element:pro_elements){
- Map<String,String> proMap = new HashMap<String,String>();
-
- Element pro_key_element = pro_element.element(XML_KEY);
- String pro_key = pro_key_element==null?"":pro_key_element.getText();//key
-
- Element pro_mean_element = pro_element.element(XML_MEAN);
- String pro_mean = pro_mean_element==null?"":pro_mean_element.getText();//mean
-
- String pro_text = pro_element.getText();
-
- proMap.put(XML_KEY,pro_key);
- proMap.put(XML_MEAN,pro_mean);
- proMap.put(XML_TEXT,pro_text);
- proList.add(proMap);
- }
- dataMap.put(XML_UNIQUE,unique);
- dataMap.put(XML_TYPE,type);
- dataMap.put(XML_PROS,proList);
-
- datasList.add(dataMap);
-
- datasMap.put(XML_SYSTEMID,systemid);
- datasMap.put(XML_DATAS,datasList);
- }
- return datasMap;
- }
-
- /*
- <?xml version="1.0" encoding="UTF-8"?>
- <object>
- <msg>澶勭悊鎴愬姛</msg>
- <code>200</code>
- <datas>
- <data>
- <unique>oa0001</unique>
- <datacode>200</datacode>
- <datamsg>鏍规嵁鍥惧彿鏌ヨ缂栫爜鎴愬姛锛�</datamsg>
- <num>OA-0002-01</num>
- </data>
- <data>
- <unique>oa0002</unique>
- <datacode>400</datacode>
- <datamsg>鎺ユ敹鏁版嵁鎴愬姛锛�</datamsg>
- <num/>
- </data>
- <data>
- <unique>oa0003</unique>
- <datacode>500</datacode>
- <datamsg>鎺ユ敹鏁版嵁澶辫触锛屽弬鏁扮己灏憉nique锛�</datamsg>
- <num/>
- </data>
- </datas>
- </object>
- */
- public static String writePreBackXmlData1(String code,String msg,List<XmlData> xmlDataList){
- String xmlString = null;
- try {
- Document document = DocumentHelper.createDocument();
- document.setXMLEncoding("UTF-8");
- Element object_element = document.addElement(XML_OBJECT);
-
- Element code_element = object_element.addElement(XML_CODE);
- code_element.setText(code);
-
- Element msg_element = object_element.addElement(XML_MSG);
- msg_element.setText(msg);
-
- if(xmlDataList!=null) {
- for (XmlData xmlData : xmlDataList) {
- if(xmlData==null){
- continue;
- }
- Element data_element = object_element.addElement(XML_DATA);
-
- Element unique_element = data_element.addElement(XML_UNIQUE);
- unique_element.setText(xmlData.getUnique());
-
- Element datacode_element = data_element.addElement(XML_DATACODE);
- datacode_element.setText(xmlData.getState());
-
- Element datacmsg_element = data_element.addElement(XML_DATAMSG);
- datacmsg_element.setText(xmlData.getMsg());
-
- Element num_element = data_element.addElement(XML_NUM);
- num_element.setText(xmlData.getNum());
- }
- }
- OutputFormat format = OutputFormat.createPrettyPrint();
- XMLWriter writer = new XMLWriter(format);
- writer.write(document);
- xmlString=document.asXML();
- } catch (Exception e) {
- // TODO: handle exception
- }
- return xmlString;
- }
-
- /*
- 閮ㄩ暱浜茶嚜鍔ㄦ墜淇敼鐨勭増鏈�
- <?xml version="1.0" encoding="UTF-8"?>
- <object systemid="MPM">
- <datas>
- <data unique="oa0001" type="wupin">
- <props>
- <prop key="code01" mean="鎵�灞炵粨鏋�" value="娓╁害璋冭妭鍣�1" />
- <prop key="code02" mean="涓昏鍔熻兘" value="瀵肩數杩炴帴1" />
- </props>
- </data>
- <data unique="oa0002" type="wupin">
- <props>
- <prop key="code01" mean="鎵�灞炵粨鏋�" value="娓╁害璋冭妭鍣�2" />
- <prop key="code02" mean="涓昏鍔熻兘" value="瀵肩數杩炴帴2" />
- </props>
- </data>
- </datas>
- </object>
- */
- public static Map<String,Object> readPreXmlData(String xmlData) throws Exception{
-
- Map<String,Object> datasMap = new HashMap<String,Object>();
-
- Document document = DocumentHelper.parseText(xmlData);
- Element object_element = document.getRootElement();
-
- Attribute systemid_attr = object_element.attribute(XML_SYSTEMID);
- String systemid = systemid_attr.getValue();
-
- Element datas_element = object_element.element(XML_DATAS);
- List<Element> data_elements = datas_element.elements(XML_DATA);
- List<Map<String,Object>> datasList = new ArrayList<Map<String,Object>>();
- for (Element data_element:data_elements){
- Map<String,Object> dataMap = new HashMap<String,Object>();
-
- Attribute data_unique_attr = data_element.attribute(XML_UNIQUE);
- String unique = data_unique_attr==null?"":data_unique_attr.getValue();//unique
-
- Attribute data_type_attr = data_element.attribute(XML_TYPE);
- String type = data_type_attr==null?"":data_type_attr.getValue();//type
-
- Element pros_elements = data_element.element(XML_PROS);
- List<Element> pro_elements = pros_elements.elements(XML_PRO);
-
- List<Map<String,String>> proList = new ArrayList<Map<String,String>>();
- for (Element pro_element:pro_elements){
- Map<String,String> proMap = new HashMap<String,String>();
-
- Attribute pro_key_attr = pro_element.attribute(XML_KEY);
- String pro_key = pro_key_attr==null?"":pro_key_attr.getValue();//key
-
- pro_key = pro_key.toLowerCase();//鍏ㄩ兘杞崲涓哄皬鍐�
-
- Attribute pro_mean_attr = pro_element.attribute(XML_MEAN);
- String pro_mean = pro_mean_attr==null?"":pro_mean_attr.getValue();//mean
-
- Attribute pro_value_attr = pro_element.attribute(XML_VALUE);
- String pro_value = pro_value_attr==null?"":pro_value_attr.getValue();//mean
-
- proMap.put(XML_KEY,pro_key);
- proMap.put(XML_MEAN,pro_mean);
- proMap.put(XML_TEXT,pro_value);
- proList.add(proMap);
- }
- dataMap.put(XML_UNIQUE,unique);
- dataMap.put(XML_TYPE,type);
- dataMap.put(XML_PROS,proList);
-
- datasList.add(dataMap);
-
- datasMap.put(XML_SYSTEMID,systemid);
- datasMap.put(XML_DATAS,datasList);
- }
- return datasMap;
- }
-
- /*
- <?xml version="1.0" encoding="UTF-8"?>
- <object>
- <msg>澶勭悊鎴愬姛</msg>
- <code>200</code>
- <datas>
- <data unique="oa0001" state="200" num="OA-0002-01">
- <msg>鏍规嵁鍥惧彿鏌ヨ缂栫爜鎴愬姛锛�</msg>
- </data>
- <data unique="oa0002" state="400" num="">
- <msg>鎺ユ敹鏁版嵁鎴愬姛锛�</msg>
- </data>
- </datas>
- </object>
- */
- public static String writePreBackXmlData(String code,String msg,List<XmlData> xmlDataList){
- String xmlString = null;
- try {
- Document document = DocumentHelper.createDocument();
- document.setXMLEncoding("UTF-8");
- Element object_element = document.addElement(XML_OBJECT);
-
- Element code_element = object_element.addElement(XML_CODE);
- code_element.setText(code);
-
- Element msg_element = object_element.addElement(XML_MSG);
- msg_element.setText(msg);
-
- Element datas_element = object_element.addElement(XML_DATAS);
-
- if(xmlDataList!=null) {
- for (XmlData xmlData : xmlDataList) {
- if(xmlData==null){
- continue;
- }
- Element data_element = datas_element.addElement(XML_DATA);
-
- data_element.addAttribute(XML_UNIQUE,xmlData.getUnique());
- data_element.addAttribute(XML_STATE,xmlData.getState());
- data_element.addAttribute(XML_NUM,xmlData.getNum());
-
- Element datamsg_element = data_element.addElement(XML_MSG);
- datamsg_element.setText(xmlData.getMsg());
- }
- }
- OutputFormat format = OutputFormat.createPrettyPrint();
- XMLWriter writer = new XMLWriter(format);
- writer.write(document);
- xmlString=document.asXML();
- } catch (Exception e) {
- // TODO: handle exception
- }
- return xmlString;
- }
-
- /*
- 涓绘暟鎹帹閫佺殑xmlData鏍煎紡
- <?xml version="1.0" encoding="UTF-8"?>
- <object>
- <datas>
- <data unique="oa0002" type="wupin" state="3" num="01020000003">
- <namepath>鐗╁搧#鎴愬搧鍙婇檮浠�</namepath>
- <idpath>wuping#cpjfj</idpath>
- <props>
- <prop key="code01" mean="鎵�灞炵粨鏋�" value="娓╁害璋冭妭鍣�2" />
- <prop key="code02" mean="涓昏鍔熻兘" value="瀵肩嚎杩炴帴2" />
- </props>
- </data>
- </datas>
- </object>
- */
- public static String writeSendXmlData(List<XmlData> xmlDataList) {
- String xmlString = null;
- try {
- Document document = DocumentHelper.createDocument();
- document.setXMLEncoding("UTF-8");
- Element object_element = document.addElement(XML_OBJECT);
-
- Element datas_element = object_element.addElement(XML_DATAS);
-
- if (xmlDataList != null) {
- for (XmlData xmlData : xmlDataList) {
- if (xmlData == null) {
- continue;
- }
- Element data_element = datas_element.addElement(XML_DATA);
- data_element.addAttribute(XML_UNIQUE, xmlData.getUnique());
- data_element.addAttribute(XML_TYPE, xmlData.getType());
- data_element.addAttribute(XML_STATE, xmlData.getSendtype());
-
- Element pros_element = data_element.addElement(XML_PROS);
- List<Pro> pros = xmlData.getPros();
- String lcstatue = null;
- String id = null;
- for (Pro pro : pros) {
- if("lcstatus".equals(pro.getKey())){
- lcstatue = pro.getValue();
- }
- if("id".equals(pro.getKey())){
- id = pro.getValue();
- }
- Element pro_element = pros_element.addElement(XML_PRO);
- pro_element.addAttribute(XML_KEY, pro.getKey());
- pro_element.addAttribute(XML_VALUE, pro.getValue());
- pro_element.addAttribute(XML_MEAN, pro.getKey());
- }
- if(StringUtils.isNotEmpty(lcstatue)){
- data_element.addAttribute(XML_STATE, lcstatue);
- }
- if(StringUtils.isNotEmpty(id)){
- data_element.addAttribute(XML_NUM, id);
- }
-
- Element pro_namepath_element = data_element.addElement(XML_NAMEPATH);
- pro_namepath_element.setText(xmlData.getNamepath());
-
- Element pro_idpath_element = data_element.addElement(XML_IDPATH);
- pro_idpath_element.setText(xmlData.getIdpath());
- }
- }
- OutputFormat format = OutputFormat.createPrettyPrint();
- XMLWriter writer = new XMLWriter(format);
- writer.write(document);
- xmlString = document.asXML();
- } catch (Exception e) {
- e.printStackTrace();
- }
- return xmlString;
- }
-
- /*
- 鍒嗙被鏁版嵁鎺ㄩ�佺殑xmlData鏍煎紡
- <?xml version="1.0" encoding="UTF-8"?>
- <object>
- <datas>
- <data>
- <id>shoutao</id>
- <idpath>wuping#shoutao</idpath>
- <name>鎵嬪</name>
- <namepath>鐗╁搧#鎵嬪</namepath>
- <orderNum>2</orderNum>
- <parentId>wuping</parentId>
- </data>
- </datas>
- </object>
- */
- public static String writeSendXmlData_classify(List<XmlData> xmlDataList) {
- String xmlString = null;
- try {
- Document document = DocumentHelper.createDocument();
- document.setXMLEncoding("UTF-8");
- Element object_element = document.addElement(XML_OBJECT);
-
- Element datas_element = object_element.addElement(XML_DATAS);
-
- if (xmlDataList != null) {
- for (XmlData xmlData : xmlDataList) {
- if (xmlData == null) {
- continue;
- }
- Element data_element = datas_element.addElement(XML_DATA);
-
- Element pro_name_element = data_element.addElement(XML_NAME);
- pro_name_element.setText(xmlData.getName());
-
- Element pro_namepath_element = data_element.addElement(XML_NAMEPATH);
- pro_namepath_element.setText(xmlData.getNamepath());
-
- Element pro_id_element = data_element.addElement(XML_ID);
- pro_id_element.setText(xmlData.getId());
-
- Element pro_idpath_element = data_element.addElement(XML_IDPATH);
- pro_idpath_element.setText(xmlData.getIdpath());
-
- Element pro_ordernum_element = data_element.addElement(XML_ORDERNUM);
- pro_ordernum_element.setText(xmlData.getOrderNum()+"");
-
- Element pro_parentid_element = data_element.addElement(XML_PARENTID);
- pro_parentid_element.setText(xmlData.getParentId()==null?"":xmlData.getParentId());
-
- Element pro_state_element = data_element.addElement(XML_STATE);
- pro_state_element.setText(xmlData.getSendtype());
- }
- }
- OutputFormat format = OutputFormat.createPrettyPrint();
- XMLWriter writer = new XMLWriter(format);
- writer.write(document);
- xmlString = document.asXML();
- } catch (Exception e) {
- e.printStackTrace();
- }
- return xmlString;
- }
-
- /*
- <?xml version="1.0" encoding="UTF-8"?>
- <object>
- <msg>澶勭悊鎴愬姛</msg>
- <code>200</code>
- <datas>
- <data unique="oa0001" state="200" num="01020000001">
- <msg>鎺ユ敹鏁版嵁鎴愬姛锛�</msg>
- </data>
- </datas>
- </object>
- */
- public static BackXml readSendXmlData(String xmlData) throws Exception{
-
- BackXml backXml = new BackXml();
- Document document = DocumentHelper.parseText(xmlData);
- Element object_element = document.getRootElement();
-
- Element code_element = object_element.element(XML_CODE);
- String code = code_element.getText();
-
- Element msg_element = object_element.element(XML_MSG);
- String msg = msg_element.getText();
-
- Element datas_element = object_element.element(XML_DATAS);
-
- List<Element> data_elements = datas_element.elements(XML_DATA);
- List<XmlData> datasList = new ArrayList<XmlData>();
- for (Element data_element:data_elements){
- XmlData xmlData_return = new XmlData();
-
- Attribute data_unique_attr = data_element.attribute(XML_UNIQUE);
- String unique = data_unique_attr==null?"":data_unique_attr.getValue();//unique
-
- Attribute data_state_attr = data_element.attribute(XML_STATE);
- String state = data_state_attr==null?"":data_state_attr.getValue();//state
-
- Attribute data_num_attr = data_element.attribute(XML_NUM);
- String num = data_num_attr==null?"":data_num_attr.getValue();//num
-
- Element data_msg_elements = data_element.element(XML_MSG);
- String datamsg = data_msg_elements==null?"":data_msg_elements.getText();//msg
-
- xmlData_return.setUnique(unique);
- xmlData_return.setState(state);
- xmlData_return.setNum(num);
- xmlData_return.setMsg(datamsg);
- datasList.add(xmlData_return);
- }
- backXml.setState(code);
- backXml.setMsg(msg);
- backXml.setDatas(datasList);
- return backXml;
- }
-
- /*
- <?xml version="1.0" encoding="UTF-8"?>
- <object>
- <msg>鎺ㄩ�佹垚鍔�</msg>
- <code>200</code>
- <datas>
- <data>
- <idpath>wuping#shoutao</idpath>
- <state>true</state>
- </data>
- <data>
- <idpath>wuping#fanghufu</idpath>
- <state>false</state>
- </data>
- </datas>
- </object>
- */
- public static BackXml readSendXmlData_classify(String xmlData) throws Exception{
-
- BackXml backXml = new BackXml();
- Document document = DocumentHelper.parseText(xmlData);
- Element object_element = document.getRootElement();
-
- Element code_element = object_element.element(XML_CODE);
- String code = code_element.getText();
-
- Element msg_element = object_element.element(XML_MSG);
- String msg = msg_element.getText();
-
- Element datas_element = object_element.element(XML_DATAS);
-
- List<Element> data_elements = datas_element.elements(XML_DATA);
- List<XmlData> datasList = new ArrayList<XmlData>();
- for (Element data_element:data_elements){
- XmlData xmlData_return = new XmlData();
-
- Element data_idpath_elements = data_element.element(XML_IDPATH);
- String idpath = data_idpath_elements.getText();
-
- Element data_state_elements = data_element.element(XML_STATE);
- String state = data_state_elements.getText();
-
- Element xml_msg_elements = data_element.element(XML_MSG);
- String xml_msg = xml_msg_elements.getText();
-
- xmlData_return.setIdpath(idpath);
- xmlData_return.setMsg(xml_msg);
- xmlData_return.setState(state);
-
- datasList.add(xmlData_return);
- }
- backXml.setState(code);
- backXml.setMsg(msg);
- backXml.setDatas(datasList);
- return backXml;
- }
-
- /*
- <?xml version="1.0" encoding="UTF-8"?>
- <object>
- <msg>澶勭悊鎴愬姛</msg>
- <code>200</code>
- <datas>
- <data unique="oa0001" state="200" num="01020000001">
- <msg>鎺ユ敹鏁版嵁鎴愬姛锛�</msg>
- </data>
- </datas>
- </object>
- */
- public static BackXml readSendJsonData(String jsonData) throws Exception{
-
- BackXml backXml = new BackXml();
- JSONObject json_root = JSONObject.parseObject(jsonData);
- String code = json_root.getString(XML_CODE);
- String msg = json_root.getString(XML_MSG);
- Object datas_obj = json_root.get(XML_DATAS);
-
- List<XmlData> datasList = new ArrayList<XmlData>();
- if(datas_obj!=null){
- JSONArray datas_arr = (JSONArray)datas_obj;
- for (Object data_obj:datas_arr){
- XmlData xmlData_return = new XmlData();
-
- JSONObject data_json = (JSONObject)data_obj;
- String unique = data_json.getString(XML_UNIQUE);
- String state = data_json.getString(XML_STATE);
- String num = data_json.getString(XML_NUM);
- String datamsg = data_json.getString(XML_MSG);
-
- xmlData_return.setUnique(unique);
- xmlData_return.setState(state);
- xmlData_return.setNum(num);
- xmlData_return.setMsg(datamsg);
- datasList.add(xmlData_return);
- }
- }
-
- backXml.setState(code);
- backXml.setMsg(msg);
- backXml.setDatas(datasList);
- return backXml;
- }
-
- //璇诲彇鏁版嵁杞崲xml鏁版嵁涓簃ap
- /*
-<?xml version="1.0" encoding="UTF-8"?>
-<object>
-<datas>
-<data type="wupin">
-<props>
-<prop key="materialtype">
-<prop_tran mdmkey="1001" mdmvalue="鏉愭枡" systemkey="" tranvalue=""/>
-<prop_tran mdmkey="1002" mdmvalue="鎴愬搧" systemkey="" tranvalue=""/>
-<prop_tran mdmkey="1003" mdmvalue="鏈虹墿鏂�" systemkey="" tranvalue=""/>
-<prop_tran mdmkey="1004" mdmvalue="缁间繚" systemkey="" tranvalue=""/>
-<prop_tran mdmkey="1005" mdmvalue="璧勪骇" systemkey="" tranvalue=""/>
-</prop>
-</props>
-</data>
-</datas>
-</object>
- */
- public static Map<String,Object> readTranXml(String tran_xml,String btmid) throws Exception{
- Map<String,Object> retMap = new HashMap<String,Object>();
- if(StringUtils.isEmpty(btmid)){
- return retMap;
- }
- Document document = DocumentHelper.parseText(tran_xml);
- Element object_element = document.getRootElement();
-
- Element datas_element = object_element.element(XML_DATAS);
-
- List<Element> data_elements = datas_element.elements(XML_DATA);
- for (Element data_element:data_elements){
-
- Attribute data_type_attr = data_element.attribute(XML_TYPE);
- String data_type = data_type_attr==null?"":data_type_attr.getValue();
- if(!btmid.equals(data_type)){
- continue;
- }
-
- Element data_pros_elements = data_element.element(XML_PROS);
- List<Element> data_pro_elements = data_pros_elements.elements(XML_PRO);
- for (Element data_pro_element:data_pro_elements) {
- Map<String,String> data_pro_map = new HashMap<String,String>();
- Attribute xml_type_attr = data_pro_element.attribute(XML_KEY);//materialtype
- String xml_type = xml_type_attr==null?"":xml_type_attr.getValue();
-
- List<Element>prop_tran_elements = data_pro_element.elements(XML_PRO_TRAN);//prop_tran
- for (Element prop_tran_element:prop_tran_elements) {
- Attribute mdm_key_attr = prop_tran_element.attribute(XML_MDMKEY);
- String mdm_key = mdm_key_attr==null?"":mdm_key_attr.getValue();
-
- Attribute mdm_value_attr = prop_tran_element.attribute(XML_MDMVALUE);
- String mdm_value = mdm_value_attr==null?"":mdm_value_attr.getValue();
-
- Attribute system_key_attr = prop_tran_element.attribute(XML_SYSTEMKEY);
- String system_key = system_key_attr==null?"":system_key_attr.getValue();
-
- Attribute system_value_attr = prop_tran_element.attribute(XML_SYSTEMVALUE);
- String system_value = system_value_attr==null?"":system_value_attr.getValue();
-
-// data_pro_map.put(XML_MDMKEY,mdm_key);
-// data_pro_map.put(XML_MDMVALUE,mdm_value);
-// data_pro_map.put(XML_SYSTEMKEY,system_key);
-// data_pro_map.put(XML_SYSTEMVALUE,system_value);
- data_pro_map.put(mdm_key,system_key);
- data_pro_map.put(mdm_value,system_value);
- }
- retMap.put(xml_type,data_pro_map);
- }
-
- }
- return retMap;
- }
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/gennerAttrMapUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/gennerAttrMapUtil.java
deleted file mode 100644
index 8dd82f6..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/utils/gennerAttrMapUtil.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.vci.ubcs.code.utils;
-
-import com.vci.ubcs.code.vo.universalInter.attrmap.LibraryDO;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
-import com.vci.starter.web.util.LocalFileUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Map;
-
-public class gennerAttrMapUtil {
- @Autowired
- private AttributeMapConfig attributeMapConfig;
- private static String fileName="";
- private static gennerAttrMapUtil newInstance=null;
- public static gennerAttrMapUtil getNewInstance() {
- if(newInstance==null){
- newInstance=new gennerAttrMapUtil();
- }
- return newInstance;
- }
-
- /****
- * 鑾峰彇
- * @param systemId
- */
- public LibraryDO gennerAttrMapBySystem(String systemId, Map<String, String> system_attrmap) throws Throwable{
- if(StringUtils.isBlank(systemId)){
- throw new Throwable("绯荤粺鏍囪瘑涓虹┖");
- }
- LibraryDO rootDataVO=new LibraryDO();
- if(system_attrmap.containsKey(systemId)){
- String path=system_attrmap.get(systemId);
- String attributeMapData= LocalFileUtil.readContentForFile(path);
- XStream xStream = new XStream(new DomDriver());
- xStream.processAnnotations(LibraryDO.class);
- xStream.autodetectAnnotations(true);
- rootDataVO = (LibraryDO) xStream.fromXML(attributeMapData);
-
- }
- return rootDataVO;
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java
new file mode 100644
index 0000000..050ac0f
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeAllcodeWrapper.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import com.vci.ubcs.code.entity.CodeAllcode;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllcodeVO;
+import java.util.Objects;
+
+/**
+ * 鍏ㄩ儴鐮佸�� 鍖呰绫�,杩斿洖瑙嗗浘灞傛墍闇�鐨勫瓧娈�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+public class CodeAllcodeWrapper extends BaseEntityWrapper<CodeAllcode, CodeAllcodeVO> {
+
+ public static CodeAllcodeWrapper build() {
+ return new CodeAllcodeWrapper();
+ }
+
+ @Override
+ public CodeAllcodeVO entityVO(CodeAllcode CodeAllcode) {
+ CodeAllcodeVO CodeAllcodeVO = Objects.requireNonNull(BeanUtil.copy(CodeAllcode, CodeAllcodeVO.class));
+
+ //User createUser = UserCache.getUser(CodeAllcode.getCreateUser());
+ //User updateUser = UserCache.getUser(CodeAllcode.getUpdateUser());
+ //CodeAllcodeVO.setCreateUserName(createUser.getName());
+ //CodeAllcodeVO.setUpdateUserName(updateUser.getName());
+
+ return CodeAllcodeVO;
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyWrapper.java
new file mode 100644
index 0000000..d0f1e9a
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeClassifyWrapper.java
@@ -0,0 +1,23 @@
+package com.vci.ubcs.code.wrapper;
+
+import com.vci.ubcs.code.entity.CodeClassify;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.Objects;
+
+public class CodeClassifyWrapper extends BaseEntityWrapper<CodeClassify, CodeClassifyVO> {
+
+ public static CodeClassifyWrapper build() {
+ return new CodeClassifyWrapper();
+ }
+
+ @Override
+ public CodeClassifyVO entityVO(CodeClassify codeClassify) {
+ CodeClassifyVO codeClassifyVO = Objects.requireNonNull(BeanUtil.copy(codeClassify, CodeClassifyVO.class));
+ return codeClassifyVO;
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java
new file mode 100644
index 0000000..8aed258
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeRuleWrapper.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the dreamlu.net developer nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * Author: Chill 搴勯獮 (smallchill@163.com)
+ */
+package com.vci.ubcs.code.wrapper;
+
+import com.vci.ubcs.code.entity.CodeRule;
+import com.vci.ubcs.code.lifecycle.CodeRuleLC;
+import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 缂栫爜瑙勫垯 鍖呰绫�,杩斿洖瑙嗗浘灞傛墍闇�鐨勫瓧娈�
+ *
+ * @author ludc
+ * @since 2023-04-03
+ */
+public class CodeRuleWrapper extends BaseEntityWrapper<CodeRule, CodeRuleVO> {
+
+ public static CodeRuleWrapper build() {
+ return new CodeRuleWrapper();
+ }
+
+ @Override
+ public CodeRuleVO entityVO(CodeRule codeRule) {
+ CodeRuleVO codeRuleVO = Objects.requireNonNull(BeanUtil.copy(codeRule, CodeRuleVO.class));
+ codeRuleVO.setLcStatusText(CodeRuleLC.getTextByValue(codeRuleVO.getLcStatus()));
+ return codeRuleVO;
+ }
+
+ @Override
+ public List<CodeRuleVO> listVO(List<CodeRule> list) {
+ return (List)list.stream().map(this::entityVO).collect(Collectors.toList());
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
index 24eb247..67e62cf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -1,76 +1,77 @@
#鏈嶅姟鍣ㄧ鍙�
server:
- port: 36013
+ port: 36014
#鏁版嵁婧愰厤缃�
spring:
datasource:
- url: ${blade.datasource.dev.url}
- username: ${blade.datasource.dev.username}
- password: ${blade.datasource.dev.password}
- messages:
- encoding: UTF-8
- basename: i18n/messages
+ url: ${ubcs.datasource.mdm.dev.url}
+ username: ${ubcs.datasource.mdm.dev.username}
+ password: ${ubcs.datasource.mdm.dev.password}
+#鍏抽棴椹煎嘲鍛藉悕鏄犲皠
+mybatis-plus:
+ configuration:
+ map-underscore-to-camel-case: false
-#####搴旂敤鍩烘湰閰嶇疆
-app:
- name: web
- group: 鍖椾含瀹忓崥杩滆揪绉戞妧鏈夐檺鍏徃
- description: 骞冲彴B/S瀹㈡埛绔�
- private-token-key: vciweb20210212
+######搴旂敤鍩烘湰閰嶇疆
+#app:
+# name: web
+# group: 鍖椾含瀹忓崥杩滆揪绉戞妧鏈夐檺鍏徃
+# description: 骞冲彴B/S瀹㈡埛绔�
+# private-token-key: vciweb20210212
###鏈」鐩殑閰嶇疆锛屾敞鎰弒pring瀹舵棌璇诲彇閰嶇疆鏃讹紝澶у啓瀛楁瘝闇�瑕佽浆鎹负-鐨勬柟寮忥紝鑰宖eign闇�瑕佸ぇ灏忓啓瀹屽叏鐩稿悓
-session:
- session-info-storage-type: "database"
- database-platform: oracle
- clear-session-on-start: false
- ###鏄惁寮�鍚敤鎴峰湪绾挎鏌�
- checkSessionTimeout: false
- ###瀹㈡埛绔垽鏂秴鏃惰疆璇㈡椂闂达紝鍗曚綅涓虹
- sessionInterval: 10
- ###瀹㈡埛绔渶澶у瓨鍦ㄦ椂闂达紝鍗曚綅涓哄垎閽�
- sessionIdlTime: 30
- ###瓒呮椂鎻愰啋鏃堕棿锛屽崟浣嶄负鍒嗛挓
- sessionRemind: 3
-user-table-compatibility: "platform1"
-#鍙�2021鐗堟湰鐨勯儴鍒嗘帴鍙ｇ殑褰卞搷锛屼笅闈㈢殑鍐呭闇�瑕侀厤缃紝
-vciPlatform:
- objectServiceUrl: ""
- cache:
- type: ehcache
-
-##web閰嶇疆
-vciweb:
- debug: true
-file-preview:
- enabled: true
- preview-service-url: "http://dev.yunkeruida.top:28090/vciFilePreview/ajaxPreview.html"
- preview-system-key: plt2020
-docking:
- #鏄惁寮�鍚富鏁版嵁/鍒嗙被鏁版嵁鎺ㄩ�佸悓姝�
- insertCache2: false
- cron: 0 0/1 * * * ?
- #棰勭敵璇锋暟鎹紝閰嶇疆妯℃澘鏂囦欢瀛樻斁鐨勬枃浠跺す
- templateDir: D:\desktop
- tranTemp: D:\mes
- #鍥惧彿鐨刱ey
- tuhao: tuhao
-
-dataSyncPush:
- isStart: false
- cronTime: "0 0/1 * * * ?"
- dataParamName: dataString
- dataTranTemp: D:\desktop
-clsfSyncPush:
- isStart: false
- cronTime: "0 0/1 * * * ?"
- dataParamName: dataString
- dataTranTemp: D:\desktop
-
-attrconfig:
- #绯荤粺闆嗘垚
- system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
- #MPM鏋氫妇鍊煎睘鎬ф槧灏�
- mpmEnumMap: {partType: [{enumValue: 1,enumText: 浜у搧},{enumValue: 2,enumText: 浜у搧},{'enumValue': 3,enumText: 鏍囧噯浠秨,{'enumValue': 7,enumText: 鏉愭枡}]}
+#session:
+# session-info-storage-type: "database"
+# database-platform: oracle
+# clear-session-on-start: false
+# ###鏄惁寮�鍚敤鎴峰湪绾挎鏌�
+# checkSessionTimeout: false
+# ###瀹㈡埛绔垽鏂秴鏃惰疆璇㈡椂闂达紝鍗曚綅涓虹
+# sessionInterval: 10
+# ###瀹㈡埛绔渶澶у瓨鍦ㄦ椂闂达紝鍗曚綅涓哄垎閽�
+# sessionIdlTime: 30
+# ###瓒呮椂鎻愰啋鏃堕棿锛屽崟浣嶄负鍒嗛挓
+# sessionRemind: 3
+#user-table-compatibility: "platform1"
+##鍙�2021鐗堟湰鐨勯儴鍒嗘帴鍙ｇ殑褰卞搷锛屼笅闈㈢殑鍐呭闇�瑕侀厤缃紝
+#vciPlatform:
+# objectServiceUrl: ""
+# cache:
+## type: ehcache
+#
+###web閰嶇疆
+#vciweb:
+# debug: true
+#file-preview:
+# enabled: true
+# preview-service-url: "http://dev.yunkeruida.top:28090/vciFilePreview/ajaxPreview.html"
+# preview-system-key: plt2020
+#docking:
+# #鏄惁寮�鍚富鏁版嵁/鍒嗙被鏁版嵁鎺ㄩ�佸悓姝�
+# insertCache2: false
+# cron: 0 0/1 * * * ?
+# #棰勭敵璇锋暟鎹紝閰嶇疆妯℃澘鏂囦欢瀛樻斁鐨勬枃浠跺す
+# templateDir: D:\desktop
+# tranTemp: D:\mes
+# #鍥惧彿鐨刱ey
+# tuhao: tuhao
+#
+#dataSyncPush:
+# isStart: false
+# cronTime: "0 0/1 * * * ?"
+# dataParamName: dataString
+# dataTranTemp: D:\desktop
+#clsfSyncPush:
+# isStart: false
+# cronTime: "0 0/1 * * * ?"
+# dataParamName: dataString
+# dataTranTemp: D:\desktop
+#
+#attrconfig:
+# #绯荤粺闆嗘垚
+# system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
+# #MPM鏋氫妇鍊煎睘鎬ф槧灏�
+# mpmEnumMap: {partType: [{enumValue: 1,enumText: 浜у搧},{enumValue: 2,enumText: 浜у搧},{'enumValue': 3,enumText: 鏍囧噯浠秨,{'enumValue': 7,enumText: 鏉愭枡}]}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application.yml
deleted file mode 100644
index 2b40fa6..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-spring:
- profiles:
- active: dev
- include: web
- messages:
- encoding: UTF-8
- basename: i18n/messages
\ No newline at end of file
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
index bf4dd92..e656cac 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
@@ -1,6 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeAllCodeMapper">
+<mapper namespace="com.vci.ubcs.code.mapper.CodeAllcodeMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="CodeAllcodeResultMap" type="com.vci.ubcs.code.entity.CodeAllcode">
+ </resultMap>
+
+
+ <select id="selectCodeAllcodePage" resultMap="CodeAllcodeResultMap">
+ select * from PL_CODE_ALLCODE
+ </select>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
index 2f706a3..160e775 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeBasicSecMapper.xml
@@ -2,10 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vci.ubcs.code.mapper.CodeBasicSecMapper">
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="CodeRuleResultMap" type="com.vci.ubcs.code.entity.CodeRule">
+ </resultMap>
+
+ <select id="selectPlCodeRulePage" resultMap="CodeRuleResultMap">
+ select * from PL_CODE_RULE where is_deleted = 0
+ </select>
+ <select id="countByCondition" resultType="com.vci.ubcs.code.entity.CodeBasicSec">
+
+
+ </select>
</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeButtonMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeButtonMapper.xml
deleted file mode 100644
index eacaeeb..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeButtonMapper.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeButtonMapper">
-
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyProcessTempMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyProcessTempMapper.xml
deleted file mode 100644
index 4f2bef5..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyProcessTempMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeClassifyProcessTempMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTempMapItemMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTempMapItemMapper.xml
deleted file mode 100644
index 26ebe50..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTempMapItemMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeClassifyTempMapItemMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateAttrMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateAttrMapper.xml
deleted file mode 100644
index 990b66d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateAttrMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateButtonMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateButtonMapper.xml
deleted file mode 100644
index 653ac5d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateButtonMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeClassifyTemplateButtonMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateMapMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateMapMapper.xml
deleted file mode 100644
index 4919e91..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateMapMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeClassifyTemplateMapMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateMapper.xml
deleted file mode 100644
index 034dbfd..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeClassifyTemplateMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeClassifyTemplateMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml
index 03ff485..f4287d6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeFixedValueMapper.xml
@@ -3,4 +3,5 @@
<mapper namespace="com.vci.ubcs.code.mapper.CodeFixedValueMapper">
+
</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeKeyAttrRepeatRuleMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeKeyAttrRepeatRuleMapper.xml
deleted file mode 100644
index e0ec5a5..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeKeyAttrRepeatRuleMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeKeyAttrRepeatRuleMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
deleted file mode 100644
index e3a79c2..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodePhaseAttrMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodePhaseAttrMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeResembleRuleMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeResembleRuleMapper.xml
deleted file mode 100644
index c320cde..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeResembleRuleMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeResembleRuleMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeRuleMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeRuleMapper.xml
index dbf33c5..cb3e086 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeRuleMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeRuleMapper.xml
@@ -2,5 +2,78 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.vci.ubcs.code.mapper.CodeRuleMapper">
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="codeRuleResultMap" type="com.vci.ubcs.code.entity.CodeRule">
+ <id property="oid" column="OID"/>
+ <result property="btmname" column="BTMNAME"/>
+ <result property="revisionOid" column="REVISIONOID"/>
+ <result property="nameOid" column="NAMEOID"/>
+ <result property="lastR" column="LASTR"/>
+ <result property="firstR" column="FIRSTR"/>
+ <result property="lastV" column="LASTV"/>
+ <result property="firstV" column="FIRSTV"/>
+ <result property="creator" column="CREATOR"/>
+ <result property="createTime" column="CREATETIME"/>
+ <result property="lastModifier" column="LASTMODIFIER"/>
+ <result property="lastModifyTime" column="LASTMODIFYTIME"/>
+ <result property="revisionRule" column="REVISIONVALUE"/>
+ <result property="versionRule" column="VISIONRULE"/>
+ <result property="revisionValue" column="REVISIONRULE"/>
+ <result property="versionValue" column="VERSIONVALUE"/>
+ <result property="revisionSeq" column="REVISIONSEQ"/>
+ <result property="versionSeq" column="VERSIONSEQ"/>
+ <result property="lctid" column="LCTID"/>
+ <result property="lcStatus" column="LCSTATUS"/>
+ <result property="ts" column="TS"/>
+ <result property="id" column="ID"/>
+ <result property="name" column="NAME"/>
+ <result property="description" column="DESCRIPTION"/>
+ <result property="owner" column="OWNER"/>
+ <result property="copyFromVersion" column="COPYFROMVERSION"/>
+ </resultMap>
+
+ <select id="selectCodeRulePage" resultMap="codeRuleResultMap">
+ SELECT PCR.oid,
+ PCR.REVISIONOID,
+ PCR.NAMEOID,
+ PCR.BTMNAME,
+ PCR.LASTR,
+ PCR.FIRSTR,
+ PCR.LASTV,
+ PCR.FIRSTV,
+ PCR.CREATOR,
+ PCR.CREATETIME,
+ PCR.LASTMODIFIER,
+ PCR.LASTMODIFYTIME,
+ PCR.REVISIONRULE,
+ PCR.VERSIONRULE,
+ PCR.REVISIONVALUE,
+ PCR.VERSIONVALUE,
+ PCR.REVISIONSEQ,
+ PCR.VERSIONSEQ,
+ PCR.LCTID,
+ PCR.LCSTATUS,
+ PCR.TS,
+ PCR.ID,
+ PCR.NAME,
+ PCR.DESCRIPTION,
+ PCR.OWNER,
+ PCR.COPYFROMVERSION
+ FROM PL_CODE_RULE PCR
+ <where>
+ <if test="codeRule.id != null and codeRule.id != ''">
+ and ID like concat(concat('%',#{codeRule.id}),'%')
+ </if>
+ <if test="codeRule.name != null and codeRule.name != ''">
+ and NAME like concat(concat('%',#{codeRule.name}),'%')
+ </if>
+ <if test="codeRule.description != null and codeRule.description != ''">
+ and DESCRIPTION like concat(concat('%',#{codeRule.description}),'%')
+ </if>
+ <if test="codeRule.lcStatus != null and codeRule.lcStatus != ''">
+ and lcStatus like concat(concat('%',#{codeRule.lcStatus}),'%')
+ </if>
+ </where>
+ </select>
</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSerialValueMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSerialValueMapper.xml
deleted file mode 100644
index e159c35..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSerialValueMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeSerialValueMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSynonymMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSynonymMapper.xml
deleted file mode 100644
index 478290a..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeSynonymMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeSynonymMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml
deleted file mode 100644
index 4d9062d..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeTemplatePhaseMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeTemplatePhaseMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml
deleted file mode 100644
index c4db54e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.DockingDataMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingLogeMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingLogeMapper.xml
deleted file mode 100644
index 26994e8..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingLogeMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.DockingLogeMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyDataInfoMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyDataInfoMapper.xml
deleted file mode 100644
index 812192f..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyDataInfoMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.DockingPreApplyDataInfoMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyDataMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyDataMapper.xml
deleted file mode 100644
index 0675dc1..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyDataMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.DockingPreApplyDataMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
deleted file mode 100644
index 3da2480..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.DockingPreAttrMappingMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
deleted file mode 100644
index cc9990f..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.DockingPreAttrRangeMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingTaskMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingTaskMapper.xml
deleted file mode 100644
index c276c34..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingTaskMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.DockingTaskMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntAuthorityMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntAuthorityMapper.xml
deleted file mode 100644
index 17b3b57..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntAuthorityMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.SysIntAuthorityMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntBaseMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntBaseMapper.xml
deleted file mode 100644
index db22a07..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntBaseMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.SysIntBaseMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntHeaderMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntHeaderMapper.xml
deleted file mode 100644
index 313b202..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntHeaderMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.SysIntHeaderMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntInfoMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntInfoMapper.xml
deleted file mode 100644
index ff22519..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntInfoMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.SysIntInfoMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntParamMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntParamMapper.xml
deleted file mode 100644
index 753f5b3..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SysIntParamMapper.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.SysIntParamMapper">
-
-
-</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java
index b757628..dae9527 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java
@@ -27,10 +27,10 @@
/**
* 缁熻鎬昏鏁�
*
- * @param plSysStrategy 鏌ヨ鏉′欢
+ * @param sysStrategy 鏌ヨ鏉′欢
* @return 鎬昏鏁�
*/
- long count(Strategy plSysStrategy);
+ long count(Strategy sysStrategy);
/**
* 鏍规嵁鐢ㄦ埛鍚嶄互鍙婄鎴稩D鏌ヨ瀵嗙爜绛栫暐
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/ValueRangeMapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/ValueRangeMapper.java
index 6db1b74..2c25e84 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/ValueRangeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/ValueRangeMapper.java
@@ -19,7 +19,7 @@
* 鏌ヨ鎸囧畾琛屾暟鎹�
*
* @param valueRannge 鏌ヨ鏉′欢
- * @param pageable 鍒嗛〉瀵硅薄
+ * @param pageable 鍒嗛〉瀵硅薄
* @return 瀵硅薄鍒楄〃
*/
List<ValueRange> queryAllByLimit(ValueRange valueRannge, @Param("pageable") Pageable pageable);
@@ -34,7 +34,7 @@
/**
- * 鏍圭┒缁勫悎id鏌ヨ鍙栧��
+ * 鏍规嵁缁勫悎id鏌ヨ鍙栧��
* @return
*/
List<String> queryByCombinationIds(@Param("combinationIds") List<String> combinationIds);
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
index 8673d59..d73d658 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
@@ -81,23 +81,13 @@
if(!Func.isEmpty(dbstrategy)){
throw new ServiceException("璇ュ瘑鐮佺瓥鐣ュ凡瀛樺湪!");
}
+ //妫�楠屽瘑鐮佺瓥鐣ユ槸鍚︾鍚堣姹�
+ checkPwdStrategy(strategy);
//濡傛灉褰撳墠鏂板璁剧疆涓洪粯璁ゅ瘑鐮佺瓥鐣ワ紝闇�瑕佸皢宸插瓨鍦ㄩ粯璁ゅ瘑鐮佺瓥鐣ヤ慨鏀逛负闈為粯璁�
if(strategy.getIsDefault().equals("1") || strategy.getIsDefault() == 1){
this.update(Wrappers.<Strategy>update().lambda()
- .set(Strategy::getIsDefault, CommonConstant.NOT_SEALED_ID)
- .eq(Strategy::getIsDefault, CommonConstant.DATA_SCOPE_CATEGORY));
- }
- if(strategy.getRequiredType() > 0){
- throw new ServiceException("蹇呭～绉嶇被涓嶈兘灏忎簬绛変簬0!");
- }
- if(strategy.getRequiredType() > strategy.getCombinationIds().split(",").length){
- throw new ServiceException("蹇呭～绉嶇被涓嶈兘澶т簬鎵�閫夋嫨鐨勫瘑鐮佺粍鍚堟柟寮忕殑涓暟!");
- }
- if(strategy.getMaxPwdLen() > strategy.getMinPwdLen()){
- throw new ServiceException("瀵嗙爜鏈�澶ч暱搴︿笉鑳藉皬浜庢渶灏忛暱搴�!");
- }
- if(strategy.getMinPwdLen() < strategy.getCombinationIds().split(",").length || strategy.getMaxPwdLen() < strategy.getCombinationIds().split(",").length){
- throw new ServiceException("瀵嗙爜鏈�灏忛暱搴︿笉鑳藉皬浜庣瀵嗙瓥鐣ョ殑鍊�!");
+ .set(Strategy::getIsDefault, CommonConstant.NOT_DEFAULT)
+ .eq(Strategy::getIsDefault, CommonConstant.IS_DEFAULT));
}
if(Func.isEmpty(strategy.getCreateTime())){
strategy.setCreateTime(new Date());
@@ -108,11 +98,13 @@
boolean temp = super.saveOrUpdate(strategy);
return temp;
}else {
+ //妫�楠屽瘑鐮佺瓥鐣ユ槸鍚︾鍚堣姹�
+ checkPwdStrategy(strategy);
//濡傛灉褰撳墠淇敼璁剧疆涓洪粯璁ゅ瘑鐮佺瓥鐣ワ紝闇�瑕佸皢宸插瓨鍦ㄩ粯璁ゅ瘑鐮佺瓥鐣ヤ慨鏀逛负闈為粯璁�
if(strategy.getIsDefault().equals("1") || strategy.getIsDefault() == 1){
this.update(Wrappers.<Strategy>update().lambda()
- .set(Strategy::getIsDefault,CommonConstant.NOT_SEALED_ID)
- .eq(Strategy::getIsDefault,CommonConstant.DATA_SCOPE_CATEGORY));
+ .set(Strategy::getIsDefault,CommonConstant.NOT_DEFAULT)
+ .eq(Strategy::getIsDefault,CommonConstant.IS_DEFAULT));
}else {
if(Func.isEmpty(queryByIsDefault())){
throw new ServiceException("榛樿瀵嗙爜绛栫暐蹇呴』鏈変笖浠呮湁涓�鏉�!");
@@ -127,6 +119,22 @@
}
/**
+ * 妫�楠屽瘑鐮佺瓥鐣ユ槸鍚︾鍚堣姹�
+ * @param strategy
+ */
+ public void checkPwdStrategy(Strategy strategy){
+ if(strategy.getRequiredType() > strategy.getCombinationIds().split(",").length){
+ throw new ServiceException("蹇呭～绉嶇被涓嶈兘澶т簬鎵�閫夋嫨鐨勫瘑鐮佺粍鍚堟柟寮忕殑涓暟!");
+ }
+ if(strategy.getMaxPwdLen() < strategy.getMinPwdLen()){
+ throw new ServiceException("瀵嗙爜鏈�澶ч暱搴︿笉鑳藉皬浜庢渶灏忛暱搴�!");
+ }
+ if(strategy.getMinPwdLen() < strategy.getRequiredType() || strategy.getMaxPwdLen() < strategy.getRequiredType()){
+ throw new ServiceException("瀵嗙爜鏈�灏忛暱搴︿笉鑳藉皬浜庡繀濉绫荤殑鍊�!");
+ }
+ }
+
+ /**
* 閫氳繃涓婚敭鍒犻櫎鏁版嵁
*
* @param ids 涓婚敭
@@ -136,7 +144,7 @@
public boolean deleteByIds(List<String> ids) {
Strategy strategy = this.getOne(Wrappers.<Strategy>query().lambda()
.in(Strategy::getId,ids)
- .eq(Strategy::getIsDefault, CommonConstant.DATA_SCOPE_CATEGORY));
+ .eq(Strategy::getIsDefault, CommonConstant.IS_DEFAULT));
//濡傛灉瀛樺湪榛樿绛栫暐鐨刬d锛屽氨涓嶈兘鐩存帴鍒犻櫎缁欏嚭鎻愮ず
if(!Func.isEmpty(strategy)){
throw new ServiceException("涓嶈兘鍒犻櫎榛樿瀵嗙爜绛栫暐!");
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml
index ca9c542..356ac60 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/ValueRangeMapper.xml
@@ -72,7 +72,7 @@
</where>
</select>
- <select id="queryByCombinationIds" resultType="java.util.List">
+ <select id="queryByCombinationIds" resultType="String">
SELECT "VALUE" FROM PL_SYS_VALUE_RANGE PSVR
WHERE PSVR.COMBINATION_ID IN (
<foreach collection="combinationIds" item="id" separator=",">
--
Gitblit v1.9.3