From d9fb787c2eb0bc4058087b81bc5f01abbaf2ba65 Mon Sep 17 00:00:00 2001
From: ludc <pUXmgxCf6A>
Date: 星期六, 27 五月 2023 11:41:09 +0800
Subject: [PATCH] 集团集成从code服务里提出来，改造成服务
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java | 550 ++++++++++++
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java | 6
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreAttrRangeVO.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/AttributeMapConfig.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/pom.xml | 35
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreViewModelDTO.java | 5
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingModelVO.java | 42
Source/UBCS/ubcs-service/ubcs-webservice/pom.xml | 46
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreAttrMappingMapper.java | 7
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreApplyFormDTO.java | 6
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreViewModelService.java | 6
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java | 30
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingDataVO.java | 41
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingViewVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingReturnStoreVO.java | 50 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/VciCxfPublishConfig.java | 4
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreMetaAttr.java | 4
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreAttrMapping.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/WsClientUtil.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreMetaAttrDTO.java | 5
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreAttrRangeDTO.java | 4
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreApplyFormMapper.java | 7
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyMetaAttrVO.java | 112 ++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreApplyFormWrapper.java | 6
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifysVO.java | 24
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/annotation/VciWebservice.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/BaseModelVO.java | 333 +++++++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/GroupCodeApplyApplication.java | 17
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MdmBtmTypeConstant.java | 201 ++++
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingGroupDataVO.java | 5
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreApplyFormServiceImpl.java | 17
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreMetaAttrWrapper.java | 7
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyMainVO.java | 35
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreApplyForm.java | 5
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreAttrRange.java | 2
Source/UBCS/ubcs-service/ubcs-code/pom.xml | 25
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrRangeServiceImpl.java | 55 +
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreAttrMappingDTO.java | 6
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreClassifyWrapper.java | 7
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreApplyFormService.java | 4
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/IMdmInterJtClient.java | 32
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreViewModelServiceImpl.java | 24
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreViewModelMapper.java | 7
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java | 21
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java | 229 +++++
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreClassifyService.java | 4
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-prod.yml | 10
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrRangeMapper.xml | 4
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml | 4
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingResultVO.java | 16
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreClassifyMapper.java | 5
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrRangeWrapper.java | 7
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreViewModelVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingResultDataVO.java | 15
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-test.yml | 10
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java | 4
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreApplyFormMapper.xml | 4
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml | 6
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreMetaAttrService.java | 6
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrRangeService.java | 6
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreViewMapper.xml | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 4
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-dev.yml | 19
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java | 42
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingMainDataVO.java | 4
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 32
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreClassifyVO.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreClassify.java | 5
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreMetaAttrVO.java | 2
Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreMetaAttrMapper.xml | 4
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreViewModel.java | 2
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingMainData.java | 3
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrMappingWrapper.java | 7
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/MainData.java | 57 +
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreMetaAttrMapper.java | 7
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyVO.java | 85 +
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreAttrMappingVO.java | 6
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 5
/dev/null | 36
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreMetaAttrServiceImpl.java | 15
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyViewVO.java | 44
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreViewWrapper.java | 7
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreAttrRangeMapper.java | 7
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyModeAttrVO.java | 51 +
Source/UBCS/ubcs-service-api/pom.xml | 1
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java | 50
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java | 32
89 files changed, 2,421 insertions(+), 259 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/pom.xml b/Source/UBCS/ubcs-service-api/pom.xml
index e1875a9..8ee821c 100644
--- a/Source/UBCS/ubcs-service-api/pom.xml
+++ b/Source/UBCS/ubcs-service-api/pom.xml
@@ -25,6 +25,7 @@
<module>ubcs-omd-api</module>
<module>ubcs-util-api</module>
<module>ubcs-ddl-api</module>
+ <module>ubcs-webservice-api</module>
</modules>
<dependencies>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/ResultDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/ResultDataVO.java
deleted file mode 100644
index 6e2f501..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/ResultDataVO.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.vci.ubcs.code.vo.webserviceModel.group;
-
-import lombok.Data;
-
-@Data
-public class ResultDataVO<T> {
- /***
- * 娑堟伅
- */
- private String code;
-
- private String msg;
-
- private T data;
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataObjectVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataObjectVO.java
deleted file mode 100644
index e2c9379..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataObjectVO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.vci.ubcs.code.vo.webserviceModel.group.result;
-
-
-public class DataObjectVO {
-
- private String msg;
-
- private String code;
-
- private DataVO data;
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public DataVO getData() {
- return data;
- }
-
- public void setData(DataVO data) {
- this.data = data;
- }
-
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MdmBtmTypeConstant.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MdmBtmTypeConstant.java
new file mode 100644
index 0000000..ed3f9a8
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MdmBtmTypeConstant.java
@@ -0,0 +1,201 @@
+package com.vci.ubcs.starter.util;
+
+/**
+ * 涓绘暟鎹浉鍏崇殑涓氬姟绫诲瀷缂栧彿
+ */
+public class MdmBtmTypeConstant {
+
+
+ /**
+ * 鐘舵��
+ */
+ public static final String CODE_STATUS_FILED = "lcstatus";
+
+ /**
+ * 闆嗗洟鐮佺殑瀛楁
+ */
+ public static final String CODE_GROUP_FIELD = "groupcode";
+
+ /**
+ * 鍒嗙被鐨勪富閿瓧娈�
+ */
+ public static final String CODE_CLASSIFY_OID_FIELD = "codeclsfid";
+ /**
+ * 涓婚搴撳垎绫�
+ */
+ public static final String CODE_CLASSIFY = "codeclassify";
+ /**
+ * 涓婚搴撳垎绫诲寘鍚殑妯℃澘
+ */
+ public static final String CODE_CLASSIFY_TEMPLATE = "codeclstemplate";
+ /**
+ * 涓婚搴撳垎绫绘ā鏉� 鍖呭惈鐨勫睘鎬�
+ */
+ public static final String CODE_CLASSIFY_TEMPLATE_ATTR = "codeclstempattr";
+
+ /**
+ * 涓绘暟鎹腑鐨勬寜閽墿灞�
+ */
+ public static final String CODE_BUTTON = "codebutton";
+ /**
+ * 涓绘暟鎹腑鐨勬ā鏉垮叧鑱旂殑鎸夐挳
+ */
+ public static final String CODE_TEMPLATE_BUTTON = "codetempbutton";
+ /**
+ * 涓绘暟鎹腑鐨勭紪鐮佽鍒�
+ */
+ public static final String CODE_RULE = "coderule";
+
+
+ /**
+ * 鍏抽敭灞炴�у垽鏂噸澶�
+ */
+ public static final String CODE_KEY_ATTR_REPEAT_RULE = "codekeyattrrepeat";
+
+ /**
+ * 鐩镐技鏌ヨ瑙勫垯
+ */
+ public static final String CODE_RESEMBLE_RULE = "coderesemblerule";
+ /**
+ * 妯℃澘闃舵
+ */
+ public static final String CODE_TEMPLATE_PHASE = "codetempphase";
+ /**
+ * 闃舵鐨勫睘鎬�
+ */
+ public static final String CODE_PHASE_ATTR = "codephaseattr";
+ /**
+ * 闃舵鐨勫睘鎬�
+ */
+ public static final String CODE_PHASE_ATTR_TABLENAME = "code_phaseattr";
+
+ /**
+ * 涓绘暟鎹垎绫讳娇鐢ㄧ殑娴佺▼妯℃澘
+ */
+ public static final String CODE_CLASSIFY_PROCESS_TEMPLATE = "codeclsflowtemp";
+
+ /**
+ *鍒嗙被鐨勬ā鏉垮搴旀祦绋嬩腑鐨勯樁娈甸厤缃�
+ */
+ public static final String CODE_CLASSIFY_PROCESS_PHASE = "codeclsflowphase" ;
+
+ /**
+ * 鍥哄畾鐮佺殑鐮佸��
+ */
+ public static final String CODE_FIXED_VALUE = "codefixedvalue";
+
+ /**
+ * 鍒嗙被鐮佺殑鐮佸��
+ */
+ public static final String CODE_CLASSIFY_VALUE = "codeclassifyvalue";
+
+ /**
+ * 鏄犲皠瑙勫垯
+ */
+ public static final String CODE_TEMPLATE_MAP = "codetempmap";
+ /**
+ * 鏄犲皠瑙勫垯鏄庣粏
+ */
+ public static final String CODE_TEMPLATE_MAP_ITEM = "codetempmapitem";
+ /**
+ * 鐮佹鍩虹淇℃伅
+ */
+ public static final String CODE_BASIC_SEC = "codebasicsec";
+
+ /**
+ * 鍚屼箟璇嶉厤缃�
+ */
+ public static final String CODE_SYNONYM = "codesynonym";
+ /**
+ * 鍏ㄩ儴鐨勭爜鍊�
+ */
+ public static final String CODE_ALL_CODE = "codeallcode";
+
+ /**
+ * 缂栫爜瑙勫垯鐨勬祦姘村��
+ */
+ public static final String CODE_SERIAL_VALUE = "codeserialvalue" ;
+
+ /**
+ * 璧勬簮瀵规帴閫氱煡銆佹煡璇㈡帴鍙ｆ棩蹇�
+ */
+ public static final String DOCKING_LOGE = "codedockinglog";
+
+ /**
+ * 璧勬簮瀵规帴瑙﹀彂鍣ㄦ彃鍏ヨ鎺ㄩ�佺殑鏁版嵁
+ */
+ public static final String DOCKING_DATA = "codedockingdata";
+
+ /**
+ * 璧勬簮瀵规帴瑙﹀彂鍣ㄦ彃鍏ヨ鎺ㄩ�佺殑鏁版嵁鍜岀郴缁熶俊鎭�
+ */
+ public static final String DOCKING_TASK = "codedockingtask";
+
+ /**
+ * 棰勭敵璇锋暟鎹�
+ */
+ public static final String DOCKING_PRE_APPLY_DATA = "dockingpadata";
+
+ /**
+ * 棰勭敵璇锋暟鎹俊鎭�
+ */
+ public static final String DOCKING_PRE_APPLY_DATA_INFO = "dockingpadatainfo";
+
+ /**
+ * 绯荤粺闆嗘垚鐨勭郴缁�
+ */
+ public static final String SYS_INT_BASE = "sysintbase";
+ /**
+ * 绯荤粺闆嗘垚鎺ュ彛鐨勫熀纭�淇℃伅
+ */
+ public static final String SYS_INT_INFO = "sysintinfo";
+
+ /**
+ * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佹柟寮�
+ */
+ public static final String SYS_INT_AUTHORITY = "sysintauthority";
+
+ /**
+ * 绯荤粺闆嗘垚鎺ュ彛鐨勫弬鏁�,http瀵瑰簲鐨刾aramter
+ */
+ public static final String SYS_INT_PARAMTERY = "sysintparemter";
+
+ /**
+ * 绯荤粺闆嗘垚鎺ュ彛鐨勮璇佷俊鎭�,http瀵瑰簲鐨刪eader,webserver瀵瑰簲鐨勮处鍙峰瘑鐮佺瓑淇℃伅
+ */
+ public static final String SYS_INT_HEADER = "sysintheader";
+
+
+ /**
+ * 闆嗘垚灞炴�ф槧灏勫叧绯讳笟鍔＄被鍨�
+ */
+ public static final String DOCKING_PRE_JINTEGMAPCONFIG = "jintegmapconfig";
+
+ /**
+ * 闆嗘垚闆嗗洟鍒嗙被涓氬姟绫诲瀷
+ */
+ public static final String DOCKING_PRE_JCLASSIFY = "jclassify";
+ /**
+ * 闆嗘垚闆嗗洟妯″瀷灞炴�т笟鍔＄被鍨�
+ */
+ public static final String DOCKING_PRE_JMETAATRR = "jmetaattr";
+
+ /**
+ * 闆嗘垚灞炴�у彇鍊艰寖鍥村叧绯讳笟鍔＄被鍨�
+ */
+ public static final String DOCKING_PRE_JRANGE = "jrange";
+
+
+ /**
+ * 闆嗘垚闆嗗洟鐢宠鍗曚笟鍔＄被鍨�
+ */
+ public static final String DOCKING_PRE_JAPPLYFORM = "japplyform";
+
+
+
+ /**
+ * 闆嗘垚闆嗗洟妯″瀷灞炴�т笟鍔＄被鍨�
+ */
+ public static final String DOCKING_PRE_JVIEWMODEL = "jviewmodel";
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/pom.xml b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/pom.xml
new file mode 100644
index 0000000..a6c7ec2
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>ubcs-service-api</artifactId>
+ <groupId>com.vci.ubcs</groupId>
+ <version>3.0.1.RELEASE</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>ubcs-webservice-api</artifactId>
+ <name>${project.artifactId}</name>
+ <version>3.0.1.RELEASE</version>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-util-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-util-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreApplyFormDTO.java
similarity index 93%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreApplyFormDTO.java
index 6364f4c..4d2b304 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreApplyFormDTO.java
@@ -1,7 +1,7 @@
-package com.vci.ubcs.code.dto;
+package com.vci.ubcs.code.webservice.dto;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-import io.swagger.annotations.ApiModelProperty;
+
+import com.vci.ubcs.code.webservice.vo.BaseModelVO;
/**
* 璁板綍闆嗘垚灞炴暟鎹敵璇穒d
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-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreAttrMappingDTO.java
similarity index 96%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrMappingDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreAttrMappingDTO.java
index 3484adf..c898dad 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-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreAttrMappingDTO.java
@@ -1,8 +1,8 @@
-package com.vci.ubcs.code.dto;
+package com.vci.ubcs.code.webservice.dto;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
+import com.vci.ubcs.code.webservice.vo.BaseModelVO;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
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-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreAttrRangeDTO.java
similarity index 94%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreAttrRangeDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreAttrRangeDTO.java
index 1039f65..382928b 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-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreAttrRangeDTO.java
@@ -1,6 +1,6 @@
-package com.vci.ubcs.code.dto;
+package com.vci.ubcs.code.webservice.dto;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.webservice.vo.BaseModelVO;
/**
* 璁板綍闆嗘垚灞炴�у彇鍊艰寖鍥撮厤缃�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java
similarity index 94%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java
index afe3d45..1021e7e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreClassifyDTO.java
@@ -1,6 +1,6 @@
-package com.vci.ubcs.code.dto;
+package com.vci.ubcs.code.webservice.dto;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.webservice.vo.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreMetaAttrDTO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreMetaAttrDTO.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreMetaAttrDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreMetaAttrDTO.java
index ca6ec62..83a3ee3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreMetaAttrDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreMetaAttrDTO.java
@@ -1,7 +1,6 @@
-package com.vci.ubcs.code.dto;
+package com.vci.ubcs.code.webservice.dto;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-
+import com.vci.ubcs.code.webservice.vo.BaseModelVO;
public class DockingPreMetaAttrDTO extends BaseModelVO {
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreViewModelDTO.java
similarity index 91%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreViewModelDTO.java
index da14768..3fa725b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/dto/DockingPreViewModelDTO.java
@@ -1,7 +1,6 @@
-package com.vci.ubcs.code.dto;
+package com.vci.ubcs.code.webservice.dto;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
+import com.vci.ubcs.code.webservice.vo.BaseModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreApplyForm.java
similarity index 93%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreApplyForm.java
index 7b82cd1..b6270ed 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreApplyForm.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.entity;
+package com.vci.ubcs.code.webservice.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
@@ -6,13 +6,14 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
/**
* 闆嗗洟缂栫爜鐢宠鍗曡褰曞璞�
* @author xiejun
* @date 2023-05-22
*/
@Data
-@TableName("PL_CODE_JINTEGMAPCONFIG")
+@TableName("PL_CODE_JAPPLYCODEFORM")
@ApiModel(value = "DockingPreApplyForm", description = "闆嗗洟缂栫爜鐢宠鍗曡褰曞璞�")
@EqualsAndHashCode
public class DockingPreApplyForm extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrMapping.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreAttrMapping.java
similarity index 97%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrMapping.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreAttrMapping.java
index 1372480..4038928 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrMapping.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreAttrMapping.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.entity;
+package com.vci.ubcs.code.webservice.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,8 +7,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.List;
/**
* 璁板綍闆嗘垚灞炴�т笌涓绘暟鎹睘鎬ф槧灏勫叧绯诲璞�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrRange.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreAttrRange.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrRange.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreAttrRange.java
index 0f98be4..9fd8874 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreAttrRange.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreAttrRange.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.entity;
+package com.vci.ubcs.code.webservice.entity;
import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreClassify.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreClassify.java
similarity index 92%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreClassify.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreClassify.java
index 9ef9f13..eac2632 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreClassify.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreClassify.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.entity;
+package com.vci.ubcs.code.webservice.entity;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,13 +7,14 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+
/**
* 璁板綍闆嗘垚闆嗗洟鍒嗙被淇℃伅
* @author xiejun
* @date 2023-05-22
*/
@Data
-@TableName("PL_CODE_CLASSIFY")
+@TableName("PL_CODE_JCLASSIFY")
@ApiModel(value = "DockingPreClassify", description = "闆嗘垚闆嗗洟鍒嗙被淇℃伅")
@EqualsAndHashCode
public class DockingPreClassify extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreMetaAttr.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreMetaAttr.java
similarity index 94%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreMetaAttr.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreMetaAttr.java
index a69a6eb..b7ca250 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreMetaAttr.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreMetaAttr.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.entity;
+package com.vci.ubcs.code.webservice.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +9,7 @@
import lombok.EqualsAndHashCode;
@Data
-@TableName("PL_CODE_JVIEWMODE")
+@TableName("PL_CODE_JMETAATTR")
@ApiModel(value = "DockingPreViewModel", description = "闆嗗洟鍒嗙被妯″瀷瑙嗗浘淇℃伅")
@EqualsAndHashCode
public class DockingPreMetaAttr extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreViewModel.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreViewModel.java
similarity index 95%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreViewModel.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreViewModel.java
index 79799d1..0e8c862 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreViewModel.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/entity/DockingPreViewModel.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.entity;
+package com.vci.ubcs.code.webservice.entity;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/IMdmInterJtClient.java
new file mode 100644
index 0000000..f873239
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/IMdmInterJtClient.java
@@ -0,0 +1,32 @@
+package com.vci.ubcs.code.webservice.feign;
+
+
+import com.vci.ubcs.code.webservice.vo.DockingResultVO;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+/****
+ * 闆嗗洟鐮佺敵璇锋彁渚涚粰澶栭儴璋冪敤鎺ュ彛
+ * @author xiejun
+ * @date 2023-05-26
+ */
+@FeignClient(
+ value = "ubcs-code"
+)
+public interface IMdmInterJtClient {
+
+ String API_PREFIX = "/mdmInterService";
+ String RETURNGROUPCODE = API_PREFIX + "/getApplyGroupCode";
+
+ /***
+ * 灏嗛泦鍥㈢敵璇锋垚鍔熺殑缂栫爜瀛樺叆鐩稿叧鏁版嵁涔嬩腑
+ * @param dockingResultVO
+ * @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
+ */
+ @GetMapping(RETURNGROUPCODE)
+ public R getApplyGroupCode( @RequestParam("dockingResultVO") DockingResultVO dockingResultVO);
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java
new file mode 100644
index 0000000..e861b2b
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/feign/MdmApplyGroupCodeProvider.java
@@ -0,0 +1,42 @@
+package com.vci.ubcs.code.webservice.feign;
+
+/***
+ * @author xiejun
+ * @date 2023-05-26
+ */
+
+import com.vci.ubcs.code.webservice.vo.DockingGroupDataVO;
+import com.vci.ubcs.code.webservice.vo.DockingResultVO;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.constraints.NotNull;
+
+/****
+ * 闆嗗洟鐮佺敵璇锋彁渚涚粰澶栭儴璋冪敤鎺ュ彛
+ * @author xiejun
+ * @date 2023-05-26
+ */
+@FeignClient(name = "qmsIntegration",
+ url = "${docking.apply.jtInterUrl:http://116.205.176.185:8099}",
+ path = "")
+public interface MdmApplyGroupCodeProvider {
+
+ /**
+ * mdm鍚戦泦鍥㈢敵璇烽泦鍥㈢爜鎺ュ彛
+ * @param dockingGroupDataVO AO/TO鐨勪俊鎭�
+ * @return 鎵ц缁撴灉
+ */
+ @PostMapping("/externalMainData/receiveAddApply")
+ DockingResultVO receiveAddApply(@NotNull @RequestBody DockingGroupDataVO dockingGroupDataVO)throws VciBaseException;
+ /**
+ * mdm鍚戦泦鍥㈡洿鏂伴泦鍥㈢爜鎺ュ彛
+ * @param dockingGroupDataVO AO/TO鐨勪俊鎭�
+ * @return 鎵ц缁撴灉
+ */
+
+ @PostMapping("/externalMainData/receiveAddApply")
+ DockingResultVO receiveEditApply(@NotNull @RequestBody DockingGroupDataVO dockingGroupDataVO)throws VciBaseException;
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/BaseModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/BaseModelVO.java
new file mode 100644
index 0000000..0098f1f
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/BaseModelVO.java
@@ -0,0 +1,333 @@
+//
+// Source code recreated from a .class file by IntelliJ IDEA
+// (powered by FernFlower decompiler)
+//
+package com.vci.ubcs.code.webservice.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+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 Integer revisionSeq;
+ private String revisionValue;
+ private String versionRule;
+ private Integer versionSeq;
+ private String versionValue;
+ private String lcStatus;
+ private String lcStatusText;
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
+ 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 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 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='" + ", copyFromVersion='" + this.copyFromVersion + '\'' + ", secretGrade=" + this.secretGrade + ", secretGradeText='" + this.secretGradeText + '\'' + ", lctid='" + this.lctid + '\'' + ", data=" + this.data + '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyMainVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyMainVO.java
new file mode 100644
index 0000000..15a6104
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyMainVO.java
@@ -0,0 +1,35 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import java.util.List;
+import java.util.Map;
+
+/***
+ * 鍒嗙被淇℃伅锛屽強鍏舵ā鍨嬭鍥惧璞�
+ * @author xiejun
+ * @date 2023-05-26
+ */
+public class DockingClassifyMainVO {
+
+ /**
+ * 鍒嗙被瀵硅薄鐨勬ā鍨嬭鍥�
+ */
+ private Map<String,List<DockingClassifyViewVO>>classInfos;
+ /***
+ * 鍒嗙被闆嗗悎
+ */
+ private List<DockingClassifyVO> classList;
+
+ public Map<String, List<DockingClassifyViewVO>> getClassInfos() {
+ return classInfos;
+ }
+ public void setClassInfos(Map<String, List<DockingClassifyViewVO>> classInfos) {
+ this.classInfos = classInfos;
+ }
+ public List<DockingClassifyVO> getClassList() {
+ return classList;
+ }
+ public void setClassList(List<DockingClassifyVO> classList) {
+ this.classList = classList;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyMetaAttrVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyMetaAttrVO.java
new file mode 100644
index 0000000..d7c7f78
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyMetaAttrVO.java
@@ -0,0 +1,112 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import java.util.Map;
+
+/***
+ * 闆嗗洟鍒嗙被灞炴�т俊鎭�
+ * @author xiejun
+ * @date 2023-05-26
+ */
+public class DockingClassifyMetaAttrVO {
+
+ /***
+ * 涓枃鍚嶇О
+ */
+ private String chineseName;
+ /***
+ * 鑻辨枃鍚嶇О
+ */
+ private String englishName;
+ /***
+ * 绫诲瀷
+ */
+ private Integer metadataType;
+ /***
+ * 鏄惁蹇呭～
+ */
+ private Integer necessaryConf;
+ /**
+ * 榛樿鍊�
+ */
+ private String defaultValue;
+ /***
+ * 涓嬪睘瀵硅薄
+ */
+ private DockingClassifyMetaAttrVO compositeMeta;
+
+ /**
+ * 鍊煎煙
+ */
+ private Map<String,String> range;
+
+
+ public String getChineseName() {
+ return chineseName;
+ }
+
+
+ public void setChineseName(String chineseName) {
+ this.chineseName = chineseName;
+ }
+
+
+ public String getEnglishName() {
+ return englishName;
+ }
+
+
+ public void setEnglishName(String englishName) {
+ this.englishName = englishName;
+ }
+
+
+ public Integer getMetadataType() {
+ return metadataType;
+ }
+
+
+ public void setMetadataType(Integer metadataType) {
+ this.metadataType = metadataType;
+ }
+
+
+ public Integer getNecessaryConf() {
+ return necessaryConf;
+ }
+
+
+ public void setNecessaryConf(Integer necessaryConf) {
+ this.necessaryConf = necessaryConf;
+ }
+
+
+ public String getDefaultValue() {
+ return defaultValue;
+ }
+
+
+ public void setDefaultValue(String defaultValue) {
+ this.defaultValue = defaultValue;
+ }
+
+
+ public Map<String, String> getRange() {
+ return range;
+ }
+
+
+ public void setRange(Map<String, String> range) {
+ this.range = range;
+ }
+
+
+ public DockingClassifyMetaAttrVO getCompositeMeta() {
+ return compositeMeta;
+ }
+
+
+ public void setCompositeMeta(DockingClassifyMetaAttrVO compositeMeta) {
+ this.compositeMeta = compositeMeta;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyModeAttrVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyModeAttrVO.java
new file mode 100644
index 0000000..8bba504
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyModeAttrVO.java
@@ -0,0 +1,51 @@
+package com.vci.ubcs.code.webservice.vo;
+
+/***
+ * 鎺ュ彛浼犻�掑璞�
+ * @author xiejun
+ * @date 2023-05-26
+ */
+public class DockingClassifyModeAttrVO {
+ /***
+ * 绯荤粺鏍囪瘑
+ */
+ private String sysName;
+ /***
+ * 鏁版嵁闆�
+ */
+ private DockingClassifyMainVO mainData;
+ private String applyEntId;
+ /***
+ * 鏁版嵁闆�
+ */
+ private DockingClassifyMainVO dataStructure;
+
+ public String getSysName() {
+ return sysName;
+ }
+ public void setSysName(String sysName) {
+ this.sysName = sysName;
+ }
+ public String getApplyEntId() {
+ return applyEntId;
+ }
+ public void setApplyEntId(String applyEntId) {
+ this.applyEntId = applyEntId;
+ }
+ public DockingClassifyMainVO getDataStructure() {
+ return dataStructure;
+ }
+ public void setDataStructure(DockingClassifyMainVO dataStructure) {
+ this.dataStructure = dataStructure;
+ }
+ public DockingClassifyMainVO getMainData() {
+ return mainData;
+ }
+ public void setMainData(DockingClassifyMainVO mainData) {
+ this.mainData = mainData;
+ }
+
+
+
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyVO.java
new file mode 100644
index 0000000..32f58b4
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyVO.java
@@ -0,0 +1,85 @@
+package com.vci.ubcs.code.webservice.vo;
+
+/***
+ * 闆嗗洟鍒嗙被淇℃伅
+ * @author xiejun
+ * @date 2023-05-26
+ */
+public class DockingClassifyVO {
+
+ /**
+ * 涓婚敭ID
+ */
+ private String id;
+
+
+ /**
+ * 鍒嗙被鍚嶇О
+ */
+ private String className;
+
+ /***
+ * 鍒嗙被浠ｅ彿
+ */
+ private String classNumber;
+
+
+ private String version;
+
+ /**
+ * 鐖禝D
+ */
+ private String pid ;
+
+ /***
+ * 鑺傜偣鍒嗙被閾捐矾
+ */
+ private String nodeLink;
+ /**
+ * 鑺傜偣鍒嗙被閾捐矾
+ */
+ private String nodeLinkName;
+ public String getId() {
+ return id;
+ }
+ public void setId(String id) {
+ this.id = id;
+ }
+ public String getClassName() {
+ return className;
+ }
+ public void setClassName(String className) {
+ this.className = className;
+ }
+ public String getPid() {
+ return pid;
+ }
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
+ public String getNodeLink() {
+ return nodeLink;
+ }
+ public void setNodeLink(String nodeLink) {
+ this.nodeLink = nodeLink;
+ }
+ public String getNodeLinkName() {
+ return nodeLinkName;
+ }
+ public void setNodeLinkName(String nodeLinkName) {
+ this.nodeLinkName = nodeLinkName;
+ }
+ public String getClassNumber() {
+ return classNumber;
+ }
+ public void setClassNumber(String classNumber) {
+ this.classNumber = classNumber;
+ }
+ public String getVersion() {
+ return version;
+ }
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyViewVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyViewVO.java
new file mode 100644
index 0000000..c682fdd
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifyViewVO.java
@@ -0,0 +1,44 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import java.util.List;
+
+/***
+ * 瑙嗗浘妯″瀷瀵硅薄
+ * @author xj
+ * @date 2023-05-26
+ */
+public class DockingClassifyViewVO {
+
+ /**
+ * 妯″瀷瑙嗗浘鍚嶇О
+ */
+ private String viewName;
+
+ /***
+ * 褰卞搷缂栫爜椤圭殑鏁版嵁
+ */
+ private String impactList;
+
+ /**
+ * 妯″瀷瑙嗗浘灞炴�ч泦鍚�
+ */
+ private List<DockingClassifyMetaAttrVO> metaList;
+ public String getViewName() {
+ return viewName;
+ }
+ public void setViewName(String viewName) {
+ this.viewName = viewName;
+ }
+ public List<DockingClassifyMetaAttrVO> getMetaList() {
+ return metaList;
+ }
+ public void setMetaList(List<DockingClassifyMetaAttrVO> metaList) {
+ this.metaList = metaList;
+ }
+ public String getImpactList() {
+ return impactList;
+ }
+ public void setImpactList(String impactList) {
+ this.impactList = impactList;
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifysVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifysVO.java
new file mode 100644
index 0000000..3cee524
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingClassifysVO.java
@@ -0,0 +1,24 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import java.util.List;
+import java.util.Map;
+
+/***
+ * 闆嗗洟鍒嗙被淇℃伅
+ * @author xiejun
+ * @date 2023-05-26
+ */
+public class DockingClassifysVO {
+
+ private Map<String,List<DockingClassifyViewVO>> classInfos;
+
+ public Map<String, List<DockingClassifyViewVO>> getClassInfos() {
+ return classInfos;
+ }
+
+ public void setClassInfos(Map<String, List<DockingClassifyViewVO>> classInfos) {
+ this.classInfos = classInfos;
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingDataVO.java
new file mode 100644
index 0000000..4ddefed
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingDataVO.java
@@ -0,0 +1,41 @@
+package com.vci.ubcs.code.webservice.vo;
+
+
+/***
+ * 杩斿洖瀵硅薄淇℃伅
+ * @author xiejun
+ * @date 2023-05-26
+ */
+public class DockingDataVO {
+
+ private String msg;
+
+ private String code;
+
+ private DockingMainDataVO data;
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public DockingMainDataVO getData() {
+ return data;
+ }
+
+ public void setData(DockingMainDataVO data) {
+ this.data = data;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingGroupDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingGroupDataVO.java
similarity index 73%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingGroupDataVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingGroupDataVO.java
index 7688858..06d0a19 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingGroupDataVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingGroupDataVO.java
@@ -1,8 +1,7 @@
-package com.vci.ubcs.code.vo.webserviceModel.group;
+package com.vci.ubcs.code.webservice.vo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
import java.util.List;
/***
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingMainData.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingMainData.java
similarity index 89%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingMainData.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingMainData.java
index 772edef..168be50 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingMainData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingMainData.java
@@ -1,6 +1,5 @@
-package com.vci.ubcs.code.vo.webserviceModel.group;
+package com.vci.ubcs.code.webservice.vo;
-import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingMainDataVO.java
similarity index 85%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingMainDataVO.java
index 8c9ae96..f912e08 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingMainDataVO.java
@@ -1,6 +1,6 @@
-package com.vci.ubcs.code.vo.webserviceModel.group.result;
+package com.vci.ubcs.code.webservice.vo;
-public class DataVO {
+public class DockingMainDataVO {
private String applyId;
private String customCoding;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingModelVO.java
new file mode 100644
index 0000000..845e0c2
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingModelVO.java
@@ -0,0 +1,42 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import java.util.List;
+
+/***
+ * 闆嗗洟鍒嗙被淇℃伅
+ * @author xiejun
+ * @date 2023-05-26
+ */
+
+public class DockingModelVO {
+ private int code;
+ private String msg;
+ private List<DockingClassifyVO> data;
+ public int getCode() {
+ return code;
+ }
+ public void setCode(int code) {
+ this.code = code;
+ }
+ public String getMsg() {
+ return msg;
+ }
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+ public List<DockingClassifyVO> getData() {
+ return data;
+ }
+ public void setData(List<DockingClassifyVO> data) {
+ this.data = data;
+ }
+
+ @Override
+ public String toString() {
+ return "ClsfModeObject{" +
+ "code=" + code +
+ ", msg='" + msg + '\'' +
+ ", data=" + data +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyFormVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java
similarity index 91%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyFormVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java
index 23d85ab..bf7280d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyFormVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java
@@ -1,8 +1,4 @@
-package com.vci.ubcs.code.vo.pagemodel;
-
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.xml.soap.SAAJResult;
+package com.vci.ubcs.code.webservice.vo;
/**
* 璁板綍闆嗘垚灞炴暟鎹敵璇穒d
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-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreAttrMappingVO.java
similarity index 96%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrMappingVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreAttrMappingVO.java
index 8a460d3..53327b7 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-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreAttrMappingVO.java
@@ -1,8 +1,4 @@
-package com.vci.ubcs.code.vo.pagemodel;
-
-
-import com.vci.ubcs.code.dto.DockingPreAttrRangeDTO;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+package com.vci.ubcs.code.webservice.vo;
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-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreAttrRangeVO.java
similarity index 94%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreAttrRangeVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreAttrRangeVO.java
index 774bcea..32c3b02 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-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreAttrRangeVO.java
@@ -1,6 +1,4 @@
-package com.vci.ubcs.code.vo.pagemodel;
-
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+package com.vci.ubcs.code.webservice.vo;
/**
* 璁板綍闆嗘垚灞炴�у彇鍊艰寖鍥撮厤缃�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreClassifyVO.java
similarity index 97%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreClassifyVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreClassifyVO.java
index 4b9f618..4fbd1a3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreClassifyVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreClassifyVO.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.vo.pagemodel;
+package com.vci.ubcs.code.webservice.vo;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreMetaAttrVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreMetaAttrVO.java
similarity index 97%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreMetaAttrVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreMetaAttrVO.java
index 4225cd6..1557a52 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreMetaAttrVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreMetaAttrVO.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.vo.pagemodel;
+package com.vci.ubcs.code.webservice.vo;
/**
* 璁板綍闆嗘垚闆嗗洟鍒嗙被淇℃伅
* @author xiejun
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreViewModelVO.java
similarity index 97%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreViewModelVO.java
index f4d047c..be07f0b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreViewModelVO.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.vo.pagemodel;
+package com.vci.ubcs.code.webservice.vo;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingResultDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingResultDataVO.java
new file mode 100644
index 0000000..faf9f6d
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingResultDataVO.java
@@ -0,0 +1,15 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import lombok.Data;
+
+@Data
+public class DockingResultDataVO<T> {
+ /***
+ * 娑堟伅
+ */
+ private String code;
+
+ private String msg;
+
+ private T data;
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/ResultDataObject.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingResultVO.java
similarity index 69%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/ResultDataObject.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingResultVO.java
index 2a7dcf7..8199526 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/ResultDataObject.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingResultVO.java
@@ -1,9 +1,15 @@
-package com.vci.ubcs.code.vo.webserviceModel.group.result;
+package com.vci.ubcs.code.webservice.vo;
+
import java.util.List;
-public class ResultDataObject {
+/***
+ * 杩斿洖瀵硅薄淇℃伅
+ * @author xiejun
+ * @date 2023-05-26
+ */
+public class DockingResultVO {
/**
* 鐘舵�佺爜 1锛氭垚鍔燂紱2锛氬け璐�
*/
@@ -15,7 +21,7 @@
/***
* 鏁版嵁瀵硅薄
*/
- private List<DataObjectVO> data;
+ private List<DockingDataVO> data;
public String getCode() {
return code;
}
@@ -29,11 +35,11 @@
this.msg = msg;
}
- public List<DataObjectVO> getData() {
+ public List<DockingDataVO> getData() {
return data;
}
- public void setData(List<DataObjectVO> data) {
+ public void setData(List<DockingDataVO> data) {
this.data = data;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingReturnStoreVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingReturnStoreVO.java
new file mode 100644
index 0000000..346fe52
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingReturnStoreVO.java
@@ -0,0 +1,50 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import java.util.List;
+
+/***
+ * 闆嗗洟鐮佺敵璇疯繑鍥為泦鍥㈢爜瀵硅薄
+ * @author xiejun
+ * @date 2023-5-26
+ */
+public class DockingReturnStoreVO {
+ /**
+ * 鍒嗙被id
+ */
+ private String classId;
+ /**
+ * 婧愮郴缁熷悕绉�
+ */
+ private String sysName;
+
+ /***
+ * 鐢宠鍗曡祴鐮佺粨鏋�
+ */
+ private List<MainData>mainData;
+
+ public String getClassId() {
+ return classId;
+ }
+
+ public void setClassId(String classId) {
+ this.classId = classId;
+ }
+
+ public String getSysName() {
+ return sysName;
+ }
+
+ public void setSysName(String sysName) {
+ this.sysName = sysName;
+ }
+
+ public List<MainData> getMainData() {
+ return mainData;
+ }
+
+ public void setMainData(List<MainData> mainData) {
+ this.mainData = mainData;
+ }
+
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingViewVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingViewVO.java
similarity index 88%
rename from Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingViewVO.java
rename to Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingViewVO.java
index e1e3b95..b40081a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingViewVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingViewVO.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.code.vo.webserviceModel.group;
+package com.vci.ubcs.code.webservice.vo;
import lombok.Data;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/MainData.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/MainData.java
new file mode 100644
index 0000000..b4b08cc
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/MainData.java
@@ -0,0 +1,57 @@
+package com.vci.ubcs.code.webservice.vo;
+
+import java.util.List;
+
+
+public class MainData {
+ /**
+ * 鐢宠鍗曞彿
+ */
+ private String applyId;
+ /**
+ * 鐢宠鍗曠姸鎬侊紙1 闆嗗洟瀹℃牳涓�,2闆嗗洟瀹℃牳涓�, 3 闆嗗洟瀹℃牳涓�,4 瀹℃牳缁撴潫锛岃祴鐮佸け璐�,5瀹℃牳缁撴潫锛岃祴鐮佹垚鍔� 6锛氬緟301璧嬬爜 7:宸茶祴鐮� 8锛氬凡璧嬬爜锛堟部鐢級9锛氬鏍镐腑锛�
+ */
+ private String formState;
+ /**
+ * 涓绘暟鎹紪鐮�
+ */
+ private String customCoding;
+ /**
+ * 鐢宠鍗曚腑缂栫爜瑙嗗浘淇℃伅
+ */
+ private List<DockingViewVO> viewInfos;
+ public String getApplyId() {
+ return applyId;
+ }
+ public void setApplyId(String applyId) {
+ this.applyId = applyId;
+ }
+ public String getFormState() {
+ return formState;
+ }
+ public void setFormState(String formState) {
+ this.formState = formState;
+ }
+ public String getCustomCoding() {
+ return customCoding;
+ }
+ public void setCustomCoding(String customCoding) {
+ this.customCoding = customCoding;
+ }
+ public List<DockingViewVO> getViewInfos() {
+ return viewInfos;
+ }
+ public void setViewInfos(List<DockingViewVO> viewInfos) {
+ this.viewInfos = viewInfos;
+ }
+
+ @Override
+ public String toString() {
+ return "MainData{" +
+ "applyId='" + applyId + '\'' +
+ ", formState='" + formState + '\'' +
+ ", customCoding='" + customCoding + '\'' +
+ ", viewInfos=" + viewInfos +
+ '}';
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index 43e9353..c885818 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -51,11 +51,34 @@
<version>${mybatisplus.join.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
+ <version>3.3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--<dependency>
<groupId>com.vci.ubcs</groupId>
<artifactId>ubcs-webservice</artifactId>
<version>3.0.1.RELEASE</version>
<scope>compile</scope>
- </dependency>
+ </dependency>-->
</dependencies>
<build>
<plugins>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
index 6fce916..e3053e2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
@@ -166,24 +166,24 @@
public static final String SYS_INT_HEADER = "sysintheader";
- /**
- * 闆嗘垚灞炴�ф槧灏勫叧绯讳笟鍔＄被鍨�
- */
- public static final String DOCKING_PRE_JINTEGMAPCONFIG = "jintegmapconifg";
+ /**
+ * 闆嗘垚灞炴�ф槧灏勫叧绯讳笟鍔＄被鍨�
+ */
+ public static final String DOCKING_PRE_JINTEGMAPCONFIG = "jintegmapconfig";
- /**
- * 闆嗘垚闆嗗洟鍒嗙被涓氬姟绫诲瀷
- */
- public static final String DOCKING_PRE_JCLASS = "jclass";
- /**
- * 闆嗘垚闆嗗洟妯″瀷灞炴�т笟鍔＄被鍨�
- */
- public static final String DOCKING_PRE_JMETAATRR = "jmetaattr";
+ /**
+ * 闆嗘垚闆嗗洟鍒嗙被涓氬姟绫诲瀷
+ */
+ public static final String DOCKING_PRE_JCLASSIFY = "jclassify";
+ /**
+ * 闆嗘垚闆嗗洟妯″瀷灞炴�т笟鍔＄被鍨�
+ */
+ public static final String DOCKING_PRE_JMETAATRR = "jmetaattr";
- /**
- * 闆嗘垚灞炴�у彇鍊艰寖鍥村叧绯讳笟鍔＄被鍨�
- */
- public static final String DOCKING_PRE_JRANGE = "jrange";
+ /**
+ * 闆嗘垚灞炴�у彇鍊艰寖鍥村叧绯讳笟鍔＄被鍨�
+ */
+ public static final String DOCKING_PRE_JRANGE = "jrange";
/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/IMdmInterJtClient.java
deleted file mode 100644
index de03dae..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/IMdmInterJtClient.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.vci.ubcs.code.feign;
-
-
-import com.vci.ubcs.code.vo.webserviceModel.group.DockingGroupDataVO;
-import com.vci.ubcs.code.vo.webserviceModel.group.result.ResultDataObject;
-import org.springblade.core.tool.api.R;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import javax.validation.constraints.NotNull;
-
-/**
- * 涓庨泦鍥㈢郴缁熼泦鎴愮殑璋冪敤鍣�
- * @author xiejun
- * @date 2023-5-24
- */
-@FeignClient(name = "groupCOdeIntegration",
- url = "${docking.apply.jtInterUrl:http://116.205.176.185:8099}",
- path = "")
-public interface IMdmInterJtClient {
-
- /**
- * mdm璋冪敤闆嗗洟mdm鐢宠闆嗗洟缂栫爜
- * @param dockingGroupDataVO AO/TO鐨勪俊鎭�
- * @return 鎵ц缁撴灉
- */
- @PostMapping("/externalMainData/receiveAddApply")
- ResultDataObject receiveAddApply(@NotNull @RequestBody DockingGroupDataVO dockingGroupDataVO);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmInterJtClient.java
deleted file mode 100644
index be1e1fc..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmInterJtClient.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.vci.ubcs.code.feign;
-
-public class MdmInterJtClient {
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreApplyFormMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreApplyFormMapper.java
deleted file mode 100644
index 290485b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreApplyFormMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.vci.ubcs.code.entity.DockingPreApplyForm;
-
-public interface DockingPreApplyFormMapper extends BaseMapper<DockingPreApplyForm> {
-}
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 40b81a6..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreAttrMappingMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.vci.ubcs.code.entity.DockingPreAttrMapping;
-
-public interface DockingPreAttrMappingMapper extends BaseMapper<DockingPreAttrMapping> {
-}
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 7dc54e5..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreAttrRangeMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.vci.ubcs.code.entity.DockingPreAttrRange;
-
-public interface DockingPreAttrRangeMapper extends BaseMapper<DockingPreAttrRange> {
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreMetaAttrMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreMetaAttrMapper.java
deleted file mode 100644
index 3b4b2c3..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreMetaAttrMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.vci.ubcs.code.entity.DockingPreMetaAttr;
-
-public interface DockingPreMetaAttrMapper extends BaseMapper<DockingPreMetaAttr> {
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreViewModelMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreViewModelMapper.java
deleted file mode 100644
index 3c6f82e..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreViewModelMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.vci.ubcs.code.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.vci.ubcs.code.entity.DockingPreViewModel;
-
-public interface DockingPreViewModelMapper extends BaseMapper<DockingPreViewModel> {
-}
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
index c9cf1ad..f5be509 100644
--- 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
@@ -25,8 +25,6 @@
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 com.vci.ubcs.omd.feign.IBtmTypeClient;
-import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.bo.WriteExcelData;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.poi.bo.ReadExcelOption;
@@ -48,7 +46,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.cache.utils.CacheUtil;
-import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -677,6 +674,7 @@
return excelName;
}
+
/**
* 瀵煎叆鍒嗙被
*
@@ -1123,6 +1121,7 @@
return fullInfo;
}
+
/**
* 缁熻瀛愯妭鐐圭殑涓暟
*
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreApplyFormServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreApplyFormServiceImpl.java
deleted file mode 100644
index 11910a7..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreApplyFormServiceImpl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.DockingPreApplyForm;
-import com.vci.ubcs.code.mapper.DockingPreApplyFormMapper;
-import com.vci.ubcs.code.service.IDockingPreApplyFormService;
-import org.springframework.stereotype.Service;
-
-/***
- *闆嗗洟灞炴�ф槧灏勬湇鍔�
- * @author xiejun
- * @date 2023-05-22
- */
-@Service
-public class DockingPreApplyFormServiceImpl extends ServiceImpl<DockingPreApplyFormMapper, DockingPreApplyForm> implements IDockingPreApplyFormService {
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java
deleted file mode 100644
index 66b5da9..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java
+++ /dev/null
@@ -1,589 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.feign.IMdmInterJtClient;
-import com.vci.ubcs.code.mapper.DockingPreAttrMappingMapper;
-import com.vci.ubcs.code.service.*;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
-import com.vci.ubcs.code.vo.webserviceModel.group.DockingGroupDataVO;
-import com.vci.ubcs.code.vo.webserviceModel.group.DockingMainData;
-import com.vci.ubcs.code.vo.webserviceModel.group.DockingViewVO;
-import com.vci.ubcs.code.vo.webserviceModel.group.ResultDataVO;
-import com.vci.ubcs.code.vo.webserviceModel.group.result.DataObjectVO;
-import com.vci.ubcs.code.vo.webserviceModel.group.result.DataVO;
-import com.vci.ubcs.code.vo.webserviceModel.group.result.ResultDataObject;
-import com.vci.ubcs.code.wrapper.DockingPreAttrMappingWrapper;
-import com.vci.ubcs.code.wrapper.DockingPreAttrRangeWrapper;
-import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.revision.model.BaseModel;
-import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
-import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
-import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/***
- *闆嗗洟灞炴�ф槧灏勬湇鍔�
- * @author xiejun
- * @date 2023-05-22
- */
-@Service
-public class DockingPreAttrMappingServiceImpl extends ServiceImpl<DockingPreAttrMappingMapper, DockingPreAttrMapping> implements IDockingPreAttrMappingService {
-
-
-
- @Value("${docking.apply.unitCode:410-MDM}")
- public String dockingApplyUnitCode;
- @Autowired(required = false)
- private IMdmInterJtClient mdmInterJtClient;
-
- /***
- * 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
- */
- @Autowired(required = false)
- private DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
-
- /***
- * 涓氬姟鏁版嵁灞炴�ф湇鍔�
- */
- @Autowired(required = false)
- private MdmEngineService mdmEngineService;
-
- /***
- * 闆嗗洟灞炴�ф湇鍔�
- */
- @Autowired(required = false)
- private IDockingPreMetaAttrService dockingPreMetaAttrService;
- /***
- * 灞炴�у彇鍊艰寖鍥存湇鍔�
- */
- @Autowired(required = false)
- private IDockingPreAttrRangeService dockingPreAttrRangeService;
-
-
- /***
- * 闆嗗洟鍒嗙被鏈嶅姟
- */
- @Autowired(required = false)
- private IDockingPreClassifyService dockingPreClassifyService;
-
- /***
- * 鐢宠鍗曟湇鍔�
- */
- @Autowired(required = false)
- private IDockingPreApplyFormService dockingPreApplyFormService;
-
-
- /***
- * 妯″瀷瑙嗗浘鍗曟湇鍔�
- */
- @Autowired(required = false)
- private IDockingPreViewModelService dockingPreViewModelService;
-
-
- /***
- * 鏍规嵁涓绘暟鎹垎绫讳富閿幏鍙栧垎绫讳俊鎭厤缃�
- * @param codeClassifyId
- * @return
- */
- @Override
- public List<DockingPreAttrMappingVO> getDockingAttrMappingsByCodeClassifyId(String codeClassifyId,String sourceClassifyId) {
- VciBaseUtil.alertNotNull(codeClassifyId,"涓绘暟鎹垎绫讳富閿�");
- //VciBaseUtil.alertNotNull(sourceClassifyId,"闆嗗洟鍒嗙被涓婚敭");
- //棣栧厛鑾峰彇鍒嗙被妯℃澘灞炴�э紝鐒跺悗涓庡睘鎬ч厤缃潗姣旇緝锛屼互闃茶鏈夊鍒犲睘鎬х殑鍙兘
- List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,sourceClassifyId));
- List<DockingPreAttrMapping> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getSourceClassifyId, sourceClassifyId).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId));
- Map<String/**灞炴�т富閿�**/, DockingPreAttrMapping> dockingPreAttrMappingMap = dockingPreAttrMappings.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getMetaListId(), t -> t));
-
- List<DockingPreAttrMapping> newDockingPreAttrMappingList=new ArrayList<>();
- dockingPreMetaAttrList.stream().forEach(dockingPreMetaAttr -> {
- String attrOid=dockingPreMetaAttr.getOid();
- DockingPreAttrMapping dockingPreAttrMapping=new DockingPreAttrMapping();
- if(dockingPreAttrMappingMap.containsKey(attrOid)){
- dockingPreAttrMapping= dockingPreAttrMappingMap.get(attrOid);
- }else{
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
- dockingPreAttrMapping.setMetaListId(dockingPreMetaAttr.getOid());//灞炴�т富閿�
- dockingPreAttrMapping.setSourceAttrKey(dockingPreMetaAttr.getEnglishName());//鑻辨枃鍚嶇О
- dockingPreAttrMapping.setSourceAttrName(dockingPreMetaAttr.getChineseName());//涓枃鍚嶇О
- dockingPreAttrMapping.setSourceClassifyId(dockingPreMetaAttr.getSourceClassifyId());//闆嗗洟鍒嗙被oid
- dockingPreAttrMapping.setSourceClassifyName("");//鍒嗙被鍚嶇О
- dockingPreAttrMapping.setViewModeId(dockingPreMetaAttr.getViewModelId());//妯″瀷瑙嗗浘id
- dockingPreAttrMapping.setViewModelName("");//鍒嗙被妯″瀷鍚嶇О
- dockingPreAttrMapping.setViewName("");//鍒嗙被妯″瀷鍚嶇О
-
- }
- newDockingPreAttrMappingList.add(dockingPreAttrMapping);
- });
- return dockingPreAttrMappingDO2VOS(dockingPreAttrMappings,false);
- }
-
- /***
- * 鏋勯�犲櫒鏌ヨ鏂瑰紡
- * @param wrapper 鏌ヨ灏佽鍣�
- * @return
- */
- @Override
- public List<DockingPreAttrMapping> selectByWrapper(Wrapper wrapper) {
- return dockingPreAttrMappingMapper.selectList(wrapper);
- }
-
- /****
- * 闆嗗洟灞炴�ф槧灏勯厤缃繚瀛�
- * @param dockingPreAttrMappingVOList
- * @return
- * @throws VciBaseException
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList) throws Exception {
- if(org.springframework.util.CollectionUtils.isEmpty(dockingPreAttrMappingVOList)){
- return new ArrayList<>();
- }
- /**
- * 1.浼犻�掕繃鏉ョ殑鏈夊彲鑳戒富鏁版嵁妯℃澘鏂板灞炴�э紝杩欐牱鐨勯渶瑕佹坊鍔狅紝涔熸湁鍙兘鍒犻櫎鐨勫睘鎬э紝杩欐牱鐨勬槧灏勯渶瑕佸垹闄�
- * 涔熸湁鏇存柊鐨勮繖鏍峰垯鏇存柊
- */
- List<DockingPreAttrMapping> newDockingPreAttrMapping=new ArrayList<>();
- List<String>appingConfigOidList=new ArrayList<>();
- List<String>attrIdList=new ArrayList<>();
- List<String> attributeOidList=new ArrayList<>();
- List<DockingPreAttrRange> newDockingPreAttrRangeList=new ArrayList<>();
- List<DockingPreAttrRangeVO> newDockingPreAttrRangeVOList=new ArrayList<>();
- dockingPreAttrMappingVOList.stream().forEach(dockingPreAttrMappingVO -> {
- List<DockingPreAttrRangeVO>dockingPreAttrRangeVOList=dockingPreAttrMappingVO.getDockingPreAttrRangeVoList();
- appingConfigOidList.add(dockingPreAttrMappingVO.getOid());
- if(!CollectionUtils.isEmpty(dockingPreAttrRangeVOList)) {
- attrIdList.add(dockingPreAttrMappingVO.getMetaListId());
- newDockingPreAttrRangeVOList.addAll(dockingPreAttrRangeVOList);
- }
- });
- //灏嗗睘鎬у彇鍊艰寖鍥磋浆鎴愭暟鎹寔涔呭眰瀵硅薄
- newDockingPreAttrRangeList=DockingPreAttrRangeWrapper.build().voentitys(newDockingPreAttrRangeVOList);
- //灏嗗睘鎬ф槧灏勯厤缃俊鎭浆鎹负闇�瑕佹暟鎹寔涔呭眰淇濆瓨鐨勫璞�
- newDockingPreAttrMapping=DockingPreAttrMappingWrapper.build().voentitys(dockingPreAttrMappingVOList);
-
- List<DockingPreAttrRange> oldDockingPreAttrRangeList=new ArrayList<>();
- if(!org.springframework.util.CollectionUtils.isEmpty(attrIdList)) {
- //鑾峰彇瀛樺湪鐨勫睘鎬у彇鍊艰寖鍥�.
- oldDockingPreAttrRangeList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().in(DockingPreAttrRange::getMetaListId,attrIdList));
- }
- //鑾峰彇瀛樺湪鐨勫睘鎬ф槧灏�.
- List<DockingPreAttrMapping> oldDataAttrMapping = dockingPreAttrMappingMapper.selectList(Wrappers.<DockingPreAttrMapping>query().lambda().in(DockingPreAttrMapping::getOid,appingConfigOidList));
-
- Map<String/**oid**/,DockingPreAttrMapping/**灞炴�у璞�**/> allSaveAttrMappingMap = newDockingPreAttrMapping.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
- Map<String/**oid**/,DockingPreAttrMapping/**瀵硅薄**/> oldAttrMappingMap =oldDataAttrMapping.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
- //闇�瑕佸垹闄ょ殑灞炴�ф槧灏�
- List<String> deleteIdList=new ArrayList<>();
- oldDataAttrMapping.stream().forEach(cbo -> {
- String oid =cbo.getOid();
- if(!allSaveAttrMappingMap.containsKey(oid)){
- deleteIdList.add(oid);
- }
- });
- this.removeBatchByIds(deleteIdList);//鍒犻櫎宸茬粡涓㈡帀鐨�
- this.saveOrUpdateBatch(newDockingPreAttrMapping);//娣诲姞鏇存柊鏂扮殑閰嶇疆淇℃伅
-
- //鍙栧�艰寖鍥村鐞�
- if(!CollectionUtils.isEmpty(newDockingPreAttrRangeList)) {
- Map<String/**oid**/, DockingPreAttrRange/**灞炴�у璞�**/> allSaveAttrAttrRangeDOMap =newDockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t, (o1, o2) -> o2));
- Map<String/**oid**/, DockingPreAttrRange/**瀵硅薄**/> oldSaveAttrAttrRangeDOMap = oldDockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t, (o1, o2) -> o2));
-
- //闇�瑕佸垹闄ょ殑灞炴�у彇鍊艰寖鍥�
- List<String> deleteRangeIdList = new ArrayList<>();
- oldDockingPreAttrRangeList.stream().forEach(cbo -> {
- String oid = cbo.getOid();
- if (!allSaveAttrAttrRangeDOMap.containsKey(oid)) {
- deleteRangeIdList.add(oid);
- }
- });
- dockingPreAttrRangeService.removeBatchByIds(deleteIdList);//鍒犻櫎宸茬粡涓㈡帀鐨�
- dockingPreAttrRangeService.saveOrUpdateBatch(newDockingPreAttrRangeList);//娣诲姞鏇存柊鏂扮殑閰嶇疆淇℃伅
- }
- return dockingPreAttrMappingVOList;
- }
- private String code="";
-
- private String msg="";
-
- /***
- * 鍍忛泦鍥㈢敵璇烽泦鍥㈢爜
- * @param oids
- * @param btmName
- * @return
- * @throws Exception
- */
- @Override
- @Transactional
- public R applyGroupCode(String oids, String btmName) throws VciBaseException {
- List<BaseModel> updateCbos=new ArrayList<BaseModel>();
- List<DockingPreApplyForm> dockingPreAttrMappings=new ArrayList<>();
- VciBaseUtil.alertNotNull(oids,"閫夋嫨鐨勬暟鎹�");
- VciBaseUtil.alertNotNull(btmName,"涓氬姟绫诲瀷");
- //List<BaseModelVO> codeWupins=mdmEngineService.listByIds(VciBaseUtil.str2List(oids));
- List<BaseModelVO> dataModelList = new ArrayList<>();
- if (!CollectionUtils.isEmpty(dataModelList)) {
- DockingGroupDataVO dockingGroupDataVO = new DockingGroupDataVO();
- //鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
- Map<String, DockingPreApplyForm> addDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
- Map<String, DockingPreApplyForm> editDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
- Map<String, BaseModelVO> baseModelVOMap = new HashMap<String, BaseModelVO>();
- //缁勭粐鏁版嵁
- dockingGroupDataVO = queryApplycodeDataObjects(dataModelList, addDockingPreApplyFormMap, editDockingPreApplyFormMap, baseModelVOMap);
- ResultDataObject resultDataObject = mdmInterJtClient.receiveAddApply(dockingGroupDataVO);
- code = resultDataObject.getCode();
- msg = resultDataObject.getMsg();
- if ("1".equals(resultDataObject.getCode())) {//缁撴灉姝ｇ‘鐨勬儏鍐�
- List<DataObjectVO> dataObjectVOList = resultDataObject.getData();
- dataObjectVOList.stream().forEach(dataObject -> {
- boolean isEditDatas = false;
- String code2 = dataObject.getCode();
- DataVO data2 = dataObject.getData();
- String applyId = data2.getApplyId();//鐢宠鍗昳d
- String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();//闆嗗洟鐮佹
- msg = dataObject.getMsg();
- if (code2.equals("1")) {//缁撴灉姝ｇ‘鐨勬儏鍐�
- if (!"".equals(customCoding)) {
- isEditDatas = true;
- }
- }
- //闇�瑕佷慨鏀圭殑鐢宠鍗曟暟鎹�
- if (editDockingPreApplyFormMap.containsKey(applyId)) {
- DockingPreApplyForm dockingPreApplyForm = editDockingPreApplyFormMap.get(applyId);
- dockingPreApplyForm.setCode(code2);
- dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
- dockingPreApplyForm.setGroupCode(customCoding);
- ObjectMapper mp = new ObjectMapper();
- String writeValueAsString = null;
- try {
- writeValueAsString = mp.writeValueAsString(dataObject);
- dockingPreApplyForm.setContent(writeValueAsString);
- } catch (JsonProcessingException e) {
- }
- }
- //鏂板鐨勭敵璇峰崟鏁版嵁
- if (addDockingPreApplyFormMap.containsKey(applyId)) {
- DockingPreApplyForm dockingPreApplyForm = addDockingPreApplyFormMap.get(applyId);
- dockingPreApplyForm.setCode(code2);
- dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
- dockingPreApplyForm.setGroupCode(customCoding);
- ObjectMapper mp = new ObjectMapper();
- String writeValueAsString = null;
- try {
- writeValueAsString = mp.writeValueAsString(dataObject);
- dockingPreApplyForm.setContent(writeValueAsString);
- } catch (JsonProcessingException e) {
- }
- }
- //濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
- if (isEditDatas) {
- if (baseModelVOMap.containsKey(applyId)) {
- BaseModelVO baseModelVO = baseModelVOMap.get(applyId);
- BaseModel baseModel = new BaseModel();
- BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
- baseModelVO.setId(customCoding);
- updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
- }
- }
- });
- } else {
- editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
- dockingPreApplyForm.setCode("2");
- dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
- dockingPreApplyForm.setContent("");
- dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
- });
- addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
- dockingPreApplyForm.setCode("2");
- dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
- dockingPreApplyForm.setContent("");
- dockingPreApplyForm.setGroupCode("");
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
- });
- }
- if (editDockingPreApplyFormMap.size() > 0) {
- dockingPreAttrMappings.addAll(editDockingPreApplyFormMap.values());//娣诲姞鐢宠鍗曟暟鎹�
- }
- if (addDockingPreApplyFormMap.size() > 0) {
- dockingPreAttrMappings.addAll(addDockingPreApplyFormMap.values());//闇�瑕佷慨鏀圭殑鐢宠鍗曟暟鎹�
- }
- //淇濆瓨琛ㄥ崟鏁版嵁
- dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
- //mdmEngineService.saveBatch(updateCbos);//淇濆瓨鏁版嵁
- }
- return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
- }
-
- /***
- * 瀵硅薄杞崲
- * @param dockingPreAttrMappings
- * @return
- */
- private List<DockingPreAttrMappingVO> dockingPreAttrMappingDO2VOS(Collection<DockingPreAttrMapping> dockingPreAttrMappings,boolean contain) {
- List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>();
- dockingPreAttrMappingVOList=DockingPreAttrMappingWrapper.build().entityVOs(dockingPreAttrMappings);
- if(CollectionUtils.isEmpty(dockingPreAttrMappingVOList)){
- dockingPreAttrMappingVOList.stream().distinct().forEach(dockingPreAttrMappingVO -> {
- if(contain) {
- List<DockingPreAttrRangeVO> dockingPreAttrRangeVOList= dockingPreAttrRangeService.getDockingPreAttrRangesByMetaId(dockingPreAttrMappingVO.getMetaListId());
- dockingPreAttrMappingVO.setDockingPreAttrRangeVoList(dockingPreAttrRangeVOList);
- }
- });
- }
- return dockingPreAttrMappingVOList;
- }
-
-
- /**
- * 缁勭粐鏁版嵁
- * */
- private DockingGroupDataVO queryApplycodeDataObjects(List<BaseModelVO> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModelVO> codeWupinMap) throws VciBaseException{
- try {
- String curUserName = AuthUtil.getUser().getUserName();
- //鐢宠鐨勬暟鎹�
- List<DockingMainData> mainDataList=new ArrayList<DockingMainData>();
- for (BaseModelVO dataBusinessObject : codeWupins) {
- String format = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
- String codeclsfid = dataBusinessObject.getData().getOrDefault("codeclsfid","");
- String btmName = dataBusinessObject.getBtmname();
- String oid = dataBusinessObject.getOid();
-
- DockingPreApplyForm dockingPreApplyForm = new DockingPreApplyForm();
-
- String dataOid = dataBusinessObject.getOid();
- Map<String, String> conditionsMap = new HashMap<String, String>();
- List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, "1"));
- String apllyCode = "";
- if (!CollectionUtils.isEmpty(applyFormObjects)) {
- dockingPreApplyForm = applyFormObjects.get(0);
- apllyCode = dockingPreApplyForm.getId();
- editDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
- } else {
- apllyCode = dockingApplyUnitCode + "-" + format;
- dockingPreApplyForm.setId(apllyCode);
- dockingPreApplyForm.setName("");
- dockingPreApplyForm.setOperationType("2");
- dockingPreApplyForm.setDescription(dataBusinessObject.getDescription());//鑾峰彇鏁版嵁鎻忚堪淇℃伅
- dockingPreApplyForm.setDataOid(oid);
- dockingPreApplyForm.setDataBtmName(btmName);
- addDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
- }
-
- codeWupinMap.put(apllyCode, dataBusinessObject);//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
- conditionsMap = new HashMap<String, String>();
- conditionsMap.put("jtargetclsfid", codeclsfid);//瑙嗗浘oid
-
- List<DockingPreAttrMapping> dockingPreAttrMappingList = this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, codeclsfid));
- if (CollectionUtils.isEmpty(dockingPreAttrMappingList)) {
- throw new Exception("鏍规嵁鎵�閫夌殑鏁版嵁锛屾病鏈夋壘鍒板搴旂殑闆嗗洟鍒嗙被璁剧疆锛岃鏍稿!");
- }
- String jsourceclsfid = dockingPreAttrMappingList.get(0).getSourceClassifyId();
- //鑾峰彇鏁版嵁妯″瀷鍒嗙被淇℃伅
- DockingPreClassify dockingPreClassify = dockingPreClassifyService.getById(jsourceclsfid);
- DockingMainData mainData = new DockingMainData();
- mainData.setApplyEntId(dockingApplyUnitCode);//鐢宠鍗曚綅浠ｇ爜
- mainData.setApplyId(apllyCode);//鐢宠鍗曞彿
- mainData.setClassName(dockingPreClassify.getGetNodeLinkName());//鍒嗙被鍚嶇О
- mainData.setCreateBy(curUserName);//
- mainData.setSecretLevel("鍐呴儴");//瀵嗙骇锛岄粯璁や负鍐呴儴
- mainData.setViewInfos(getviewInfos(dockingPreClassify, dataBusinessObject));//鑾峰彇瑙嗗浘妯″瀷
- mainDataList.add(mainData);
- }
- //鏍规嵁鏁版嵁妯″瀷锛岀粍缁囨墍闇�瑕佹暟鎹�
- DockingGroupDataVO postParameters=new DockingGroupDataVO();
- postParameters.setSysName("420-CODE");//绯荤粺鏍囪瘑
- postParameters.setMainData(mainDataList);//
- return postParameters;
- } catch (Throwable e) {
- // TODO Auto-generated catch block
- throw new VciBaseException("鏌ヨ鏁版嵁鍑洪敊"+e);
- }
- }
-
- /**
- * 鑾峰彇妯″瀷瑙嗗浘
- * @param dockingPreClassify
- * @param dataBusinessObject
- * @throws VciBaseException
- */
- private List<DockingViewVO>getviewInfos(DockingPreClassify dockingPreClassify,BaseModelVO dataBusinessObject) throws Throwable{
- List<DockingViewVO> viewInfoList=new ArrayList<>();
- String jclassOid= dockingPreClassify.getOid();
- Map<String,String>conditionsMap=new HashMap<String, String>();
- conditionsMap.put("jsourceclsfid",jclassOid);
- conditionsMap.put("jviewname","缂栫爜瑙嗗浘");//鐢宠鍙紶缂栫爜瑙嗗浘
- //鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
- List<DockingPreViewModel> dockingPreViewModels= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,jclassOid).eq(DockingPreViewModel::getViewName,"缂栫爜瑙嗗浘"));
- for (DockingPreViewModel dockingPreViewModel : dockingPreViewModels) {
- //缁勭粐鏁版嵁灞炴�т俊鎭�
- DockingViewVO viewInfo=new DockingViewVO();
- viewInfo.setViewName(dockingPreViewModel.getViewName());//瑙嗗浘鍚嶇О
- viewInfo.setViewValue(getViewValueList(dockingPreViewModel,jclassOid,dataBusinessObject));//瑙嗗浘
- viewInfoList.add(viewInfo);
- }
- return viewInfoList;
- }
-
- /***
- * 鑾峰彇閰嶇疆淇℃伅
- * @param dockingPreViewModel
- * @param jclassOid
- * @param dataBusinessObject
- * @return
- * @throws VciBaseException
- */
- private List<Map<String, Object>> getViewValueList(DockingPreViewModel dockingPreViewModel,String jclassOid,BaseModelVO dataBusinessObject) throws Throwable{
- //鏋勯�犳ā鍨嬭鍥炬暟鎹�
- List<Map<String, Object>> viewValueList=new ArrayList<Map<String,Object>>();
- String oid = dockingPreViewModel.getOid();
- Map<String,String> dataValueMap=dataBusinessObject.getData();
- String codeClassifyId=dataValueMap.get("codeclsfid");
- Map<String,String>conditionsMap=new HashMap<String, String>();
-
-
-
- List<DockingPreAttrMapping> dockingPreAttrMappingList = this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda()
- .eq(DockingPreAttrMapping::getSourceClassifyId, jclassOid).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId));
- if(CollectionUtils.isEmpty(dockingPreAttrMappingList)) {
- return viewValueList;
- }
-
- Map<String,DockingPreAttrMapping> jintegmappconfigMap=new HashMap<String, DockingPreAttrMapping>();
- for (DockingPreAttrMapping businessObject : dockingPreAttrMappingList) {
- jintegmappconfigMap.put(businessObject.getSourceAttrKey(), businessObject);
- }
- List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper(
- Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getViewModelId,dockingPreViewModel.getOid())
- .eq(DockingPreMetaAttr::getSourceClassifyId,dockingPreViewModel.getSourceClassifyId()));
-
- Map<String,Object> viewValueMap=new HashMap<String,Object>();
- for (DockingPreMetaAttr dockingPreMetaAttr : dockingPreMetaAttrList) {
- String jenglishname=dockingPreMetaAttr.getEnglishName();////闆嗗洟閰嶇疆灞炴��
- if(jintegmappconfigMap.containsKey(jenglishname)){
- DockingPreAttrMapping dockingPreAttrMapping=jintegmappconfigMap.get(jenglishname);
- String attrId = dockingPreAttrMapping.getTargetAttrId();//缂栫爜灞炴�d
- String jtargetattrkey = dockingPreAttrMapping.getTargetAttrKey();//缂栫爜灞炴�d
- Object newVaue=null;
- if(StringUtils.isNotBlank(jtargetattrkey)){
- getAttrRange(dockingPreMetaAttr);//鑾峰彇瀛楁鍙栧�艰寖鍥�
- String value=dataValueMap.get(jtargetattrkey)==null?"":dataValueMap.getOrDefault(jtargetattrkey,"");
- newVaue = getVaue(dockingPreMetaAttr, value);
- }else{
- newVaue = getVaue(dockingPreMetaAttr, "");
- }
- if(newVaue==null||"".equals(newVaue)){
- newVaue= dockingPreMetaAttr.getDefaultValue();
- }
- viewValueMap.put(jenglishname, newVaue);
- }
- }
-
- viewValueList.add(viewValueMap);
- return viewValueList;
- }
-
- /***
- * 鑾峰彇灞炴�ф灇涓炬槧灏勯厤缃�
- */
- Map<String,Map<String,DockingPreAttrRange>> attrRangeMap=new HashMap<String, Map<String,DockingPreAttrRange>>();
- private void getAttrRange(DockingPreMetaAttr jmetaatter) throws Throwable{
-
- String jmetalistoid = jmetaatter.getOid();
- if(attrRangeMap.containsKey(jmetalistoid)) {
- return;
- }
- Map<String,String>conditionsMap=new HashMap<String, String>();
- conditionsMap.put("jmetalistid", jmetalistoid);//瑙嗗浘oid
- List<DockingPreAttrRange> dockingPreAttrRangeList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().eq(DockingPreAttrRange::getMetaListId, jmetalistoid));
- if (CollectionUtils.isEmpty(dockingPreAttrRangeList)) {
- return;
- }
- Map<String, DockingPreAttrRange> rangeMap = new HashMap<String, DockingPreAttrRange>();
- rangeMap = dockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getNumTextValue(), t -> t, (o1, o2) -> o2));
- attrRangeMap.put(jmetalistoid, rangeMap);
-
- }
- /****
- * 鍊肩被鍨嬭浆鎹�
- * @param jmetaatter
- * @param value
- * @return
- * @throws Throwable
- */
- private Object getVaue(DockingPreMetaAttr jmetaatter,String value) throws Throwable{
- //jmetadatatype 鍏冩暟鎹被鍨嬶紙1 瀛楃鍨�, 2 鏁村瀷, 3 闀挎暣鍨�, 4 鍗曠簿搴�, 5 鍙岀簿搴�,6 鏃ユ湡鍨�, 7 鏃堕棿鍨�, 8 甯冨皵鍨�, 9 鏂囦欢, 10澶嶅悎鍨嬶級
- int jmetadatatype = jmetaatter.getMetaDataType();
- String jmetalistoid = jmetaatter.getOid();
- Map<String, DockingPreAttrRange> rangeMap=new HashMap<String, DockingPreAttrRange>();
- if(attrRangeMap.containsKey(jmetalistoid)){
- rangeMap = attrRangeMap.get(jmetalistoid);
- if(rangeMap.containsKey(value)){
- DockingPreAttrRange dockingPreAttrRange = rangeMap.get(value);
- value=dockingPreAttrRange.getNumText();//灏嗙紪鐮佸睘鎬у煙鍊艰浆鎹㈡垚闆嗗洟瀵瑰簲鐨勫煙鍊�
- }
- }
-
- if(jmetadatatype==1){//1 瀛楃鍨�
- return StringUtils.isBlank(value)?"":value;
- }else if(jmetadatatype==2){//2 鏁村瀷
- return StringUtils.isBlank(value)?null:Integer.parseInt(value);
- }else if(jmetadatatype==3){//3 闀挎暣鍨�
- return StringUtils.isBlank(value)?null:Long.parseLong(value);
- }else if(jmetadatatype==4){//4 鍗曠簿搴�,
- return StringUtils.isBlank(value)?null:Float.parseFloat(value);
- }else if(jmetadatatype==5){// 5 鍙岀簿搴�
- return StringUtils.isBlank(value)?null:Double.parseDouble(value);
- }else if(jmetadatatype==6){//6 鏃ユ湡鍨�
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-mm-dd");
- if(StringUtils.isBlank(value)) {
- return null;
- }else {
- try {
- return simpleDateFormat.parse(value);
- } catch (ParseException e) {
- throw new VciBaseException("date", new String[]{"鏃ユ湡鏍煎紡杞崲閿欒"});
- }
- }
- }else if(jmetadatatype==7){//7 鏃堕棿鍨�
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
- if(StringUtils.isBlank(value)) {
- return null;
- }else{
- try {
- return simpleDateFormat.parse(value);
- } catch (ParseException e) {
- throw new VciBaseException("date", new String[]{"鏃ユ湡鏍煎紡杞崲閿欒"});
- }
- }
- }else if(jmetadatatype==8){//8 甯冨皵鍨�
- return value;
- }else if(jmetadatatype==9){//9 鏂囦欢,
- return value;
- }else if(jmetadatatype==10){//10澶嶅悎鍨�
- return value;//绗﹀悎鍨嬫槸浠�涔堜笢涓滃浣曞鐞�
- }
- return value;
- }
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrRangeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrRangeServiceImpl.java
deleted file mode 100644
index 6f67a30..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrRangeServiceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.vci.ubcs.code.service.impl;
-
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.DockingPreAttrRange;
-import com.vci.ubcs.code.mapper.DockingPreAttrRangeMapper;
-import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
-import com.vci.ubcs.code.wrapper.DockingPreAttrRangeWrapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import java.util.List;
-
-/***
- *闆嗗洟灞炴�у彇鍊艰寖鍥存湇鍔�
- * @author xiejun
- * @date 2023-05-22
- */
-@Service
-public class DockingPreAttrRangeServiceImpl extends ServiceImpl<DockingPreAttrRangeMapper, DockingPreAttrRange> implements IDockingPreAttrRangeService {
- @Autowired(required = false)
- DockingPreAttrRangeMapper dockingPreAttrRangeMapper;
- @Override
- public List<DockingPreAttrRangeVO> getDockingPreAttrRangesByMetaId(String meatId) {
- List<DockingPreAttrRange> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().eq(DockingPreAttrRange::getMetaListId, meatId));
- return DockingPreAttrRangeWrapper.build().entityVOs(dockingPreAttrMappings);
- }
-
- @Override
- public List<DockingPreAttrRange> selectByWrapper(Wrapper wrapper) {
- return dockingPreAttrRangeMapper.selectList(wrapper);
- }
-
-}
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
index 0ea0711..f43debb 100644
--- 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
@@ -20,12 +20,12 @@
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultClassfyVO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultSystemVO;
+import com.vci.ubcs.code.webService.annotation.VciWebservice;
+import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.SessionInfo;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.webservice.annotation.VciWebservice;
-import com.vci.ubcs.webservice.config.AttributeMapConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java
index 695bc04..8dc780f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/util/gennerAttrMapUtil.java
@@ -4,8 +4,8 @@
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
import com.vci.ubcs.code.vo.webserviceModel.attrmap.LibraryDO;
+import com.vci.ubcs.code.webService.config.AttributeMapConfig;
import com.vci.ubcs.starter.util.LocalFileUtil;
-import com.vci.ubcs.webservice.config.AttributeMapConfig;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.Map;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/WsClientUtil.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/WsClientUtil.java
similarity index 97%
rename from Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/WsClientUtil.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/WsClientUtil.java
index 19965ff..4d7fcf2 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/WsClientUtil.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/WsClientUtil.java
@@ -1,4 +1,4 @@
-/*
+package com.vci.ubcs.code.webService;/*
package com.vci.ubcs.webservice;
import org.apache.axiom.om.OMAbstractFactory;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/annotation/VciWebservice.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/annotation/VciWebservice.java
similarity index 92%
rename from Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/annotation/VciWebservice.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/annotation/VciWebservice.java
index af6a79f..a007076 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/annotation/VciWebservice.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/annotation/VciWebservice.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.webservice.annotation;
+package com.vci.ubcs.code.webService.annotation;
import org.springframework.core.annotation.AliasFor;
import org.springframework.stereotype.Component;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/config/AttributeMapConfig.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/AttributeMapConfig.java
similarity index 95%
rename from Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/config/AttributeMapConfig.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/AttributeMapConfig.java
index 89d1203..126250c 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/config/AttributeMapConfig.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/AttributeMapConfig.java
@@ -1,4 +1,4 @@
-package com.vci.ubcs.webservice.config;
+package com.vci.ubcs.code.webService.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/config/VciCxfPublishConfig.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/VciCxfPublishConfig.java
similarity index 96%
rename from Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/config/VciCxfPublishConfig.java
rename to Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/VciCxfPublishConfig.java
index 9fa68ec..30ab765 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/webservice/config/VciCxfPublishConfig.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/webService/config/VciCxfPublishConfig.java
@@ -1,9 +1,9 @@
-package com.vci.ubcs.webservice.config;
+package com.vci.ubcs.code.webService.config;
import com.alibaba.cloud.commons.lang.StringUtils;
+import com.vci.ubcs.code.webService.annotation.VciWebservice;
import com.vci.ubcs.starter.web.util.ApplicationContextProvider;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
-import com.vci.ubcs.webservice.annotation.VciWebservice;
import lombok.extern.slf4j.Slf4j;
import org.apache.cxf.Bus;
import org.apache.cxf.jaxws.EndpointImpl;
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 1096c57..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
@@ -12,10 +12,6 @@
mybatis-plus:
configuration:
map-underscore-to-camel-case: false
-docking:
- apply:
- jtInterUrl: http://116.205.176.185:8099
- unitCode: 410-MDM
######搴旂敤鍩烘湰閰嶇疆
#app:
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/pom.xml b/Source/UBCS/ubcs-service/ubcs-webservice/pom.xml
index 9a66984..3d17a56 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/pom.xml
@@ -15,31 +15,33 @@
<modelVersion>4.0.0</modelVersion>
<dependencies>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-spring-boot-starter-jaxws</artifactId>
- <version>3.3.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>com.vci.ubcs</groupId>
+ <artifactId>ubcs-util-api</artifactId>
+ <version>3.0.1.RELEASE</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>cn.easyproject</groupId>
+ <artifactId>orai18n</artifactId>
+ <version>${orai18n.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.oracle.database.jdbc</groupId>
+ <artifactId>ojdbc8</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-core-boot</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-annotations</artifactId>
+ <version>2.0.9</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.vci.ubcs</groupId>
- <artifactId>ubcs-util-api</artifactId>
+ <artifactId>ubcs-webservice-api</artifactId>
<version>3.0.1.RELEASE</version>
<scope>compile</scope>
</dependency>
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/GroupCodeApplyApplication.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/GroupCodeApplyApplication.java
new file mode 100644
index 0000000..0fafad4
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/GroupCodeApplyApplication.java
@@ -0,0 +1,17 @@
+import org.springblade.core.cloud.client.UbcsCloudApplication;
+import org.springblade.core.launch.UbcsApplication;
+import org.springblade.core.launch.constant.AppConstant;
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * 闆嗗洟鐮佺敵璇锋帴鍙ｅ惎鍔ㄥ櫒
+ *
+ * @author
+ * ludc
+ */
+@UbcsCloudApplication
+public class GroupCodeApplyApplication {
+ public static void main(String[] args) {
+ UbcsApplication.run(AppConstant.APPLICATION_NAME_PREFIX+"applyjtcodeservice", GroupCodeApplyApplication.class, args);
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
similarity index 83%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
index fbc0489..22951d0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -1,22 +1,17 @@
-package com.vci.ubcs.code.controller;
+package com.vci.ubcs.code.webservice.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
-import com.vci.ubcs.code.entity.DockingPreApplyForm;
-import com.vci.ubcs.code.feign.IMdmInterJtClient;
-import com.vci.ubcs.code.service.IDockingPreApplyFormService;
-import com.vci.ubcs.code.service.IDockingPreAttrMappingService;
-import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
-import com.vci.ubcs.code.service.IDockingPreClassifyService;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyFormVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
-import com.vci.ubcs.code.wrapper.DockingPreApplyFormWrapper;
-import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.code.webservice.service.*;
+import com.vci.ubcs.code.webservice.wrapper.DockingPreApplyFormWrapper;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
+import com.vci.ubcs.code.webservice.vo.BaseModelVO;
+import com.vci.ubcs.code.webservice.vo.DockingPreApplyFormVO;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -24,7 +19,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.*;
-
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
@@ -44,6 +38,12 @@
* 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
*/
private final IDockingPreAttrMappingService dockingPreAttrMappingService;
+
+/**
+ * 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
+ */
+ private final IGroupMdmInterService groupMdmInterService;
+
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
*/
@@ -125,7 +125,7 @@
* @return 涓婚搴撳垎绫绘樉绀烘爲
*/
@GetMapping("/referTree")
- public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject) {
+ public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
}
@@ -139,7 +139,7 @@
public R applyGroupCode(String oids,String btmName){
List<BaseModelVO> BaseModelVOs=new ArrayList<>();
try {
- return dockingPreAttrMappingService.applyGroupCode(oids,btmName);
+ return groupMdmInterService.applyGroupCode(oids,btmName);
}catch (Throwable e){
return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreApplyFormMapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreApplyFormMapper.java
new file mode 100644
index 0000000..2a3dbd0
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreApplyFormMapper.java
@@ -0,0 +1,7 @@
+package com.vci.ubcs.code.webservice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
+
+public interface DockingPreApplyFormMapper extends BaseMapper<DockingPreApplyForm> {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreAttrMappingMapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreAttrMappingMapper.java
new file mode 100644
index 0000000..fdda598
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreAttrMappingMapper.java
@@ -0,0 +1,7 @@
+package com.vci.ubcs.code.webservice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping;
+
+public interface DockingPreAttrMappingMapper extends BaseMapper<DockingPreAttrMapping> {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreAttrRangeMapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreAttrRangeMapper.java
new file mode 100644
index 0000000..dd767d0
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreAttrRangeMapper.java
@@ -0,0 +1,7 @@
+package com.vci.ubcs.code.webservice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrRange;
+
+public interface DockingPreAttrRangeMapper extends BaseMapper<DockingPreAttrRange> {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreClassifyMapper.java
similarity index 80%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreClassifyMapper.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreClassifyMapper.java
index 351634f..c82a2fb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreClassifyMapper.java
@@ -1,8 +1,7 @@
-package com.vci.ubcs.code.mapper;
+package com.vci.ubcs.code.webservice.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.vci.ubcs.code.entity.CodeClassify;
-import com.vci.ubcs.code.entity.DockingPreClassify;
+import com.vci.ubcs.code.webservice.entity.DockingPreClassify;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreMetaAttrMapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreMetaAttrMapper.java
new file mode 100644
index 0000000..3f40a7a
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreMetaAttrMapper.java
@@ -0,0 +1,7 @@
+package com.vci.ubcs.code.webservice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr;
+
+public interface DockingPreMetaAttrMapper extends BaseMapper<DockingPreMetaAttr> {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreViewModelMapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreViewModelMapper.java
new file mode 100644
index 0000000..fe709ee
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/mapper/DockingPreViewModelMapper.java
@@ -0,0 +1,7 @@
+package com.vci.ubcs.code.webservice.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.webservice.entity.DockingPreViewModel;
+
+public interface DockingPreViewModelMapper extends BaseMapper<DockingPreViewModel> {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreApplyFormService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreApplyFormService.java
similarity index 67%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreApplyFormService.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreApplyFormService.java
index 8ca312e..25b537e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreApplyFormService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreApplyFormService.java
@@ -1,7 +1,7 @@
-package com.vci.ubcs.code.service;
+package com.vci.ubcs.code.webservice.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.DockingPreApplyForm;
+import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
/***
* 闆嗗洟鐢宠鍗曟湇鍔�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java
similarity index 67%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java
index 34c66a3..83e37e6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java
@@ -1,11 +1,9 @@
-package com.vci.ubcs.code.service;
+package com.vci.ubcs.code.webservice.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.DockingPreAttrMapping;
-import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
-import org.springblade.core.tool.api.R;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
import java.util.List;
@@ -21,7 +19,7 @@
* @param codeClassifyId
* @return
*/
- List<DockingPreAttrMappingVO> getDockingAttrMappingsByCodeClassifyId(String codeClassifyId,String sourceClassifyId);
+ List<DockingPreAttrMappingVO> getDockingAttrMappingsByCodeClassifyId(String codeClassifyId, String sourceClassifyId);
/**
* 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
@@ -37,12 +35,7 @@
*/
public List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingVO> dockingPreAttrMappingDTOS)throws Exception;
- /***
- * 涓绘暟鎹儚闆嗗洟鐢宠缂栫爜
- * @param oids
- * @param btmName
- * @return
- * @throws Exception
- */
- public R applyGroupCode(String oids, String btmName)throws Throwable;
+
+ boolean checkHasConfigByTragetCodeclassifyId(String targetClassifyId);
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrRangeService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrRangeService.java
similarity index 75%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrRangeService.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrRangeService.java
index 38bc9e8..e72c760 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrRangeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrRangeService.java
@@ -1,9 +1,9 @@
-package com.vci.ubcs.code.service;
+package com.vci.ubcs.code.webservice.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.DockingPreAttrRange;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrRange;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreClassifyService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreClassifyService.java
similarity index 83%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreClassifyService.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreClassifyService.java
index b48c619..f552c41 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreClassifyService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreClassifyService.java
@@ -1,9 +1,9 @@
-package com.vci.ubcs.code.service;
+package com.vci.ubcs.code.webservice.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.DockingPreClassify;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.code.webservice.entity.DockingPreClassify;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreMetaAttrService.java
similarity index 77%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreMetaAttrService.java
index a625756..031a4d8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreMetaAttrService.java
@@ -1,9 +1,9 @@
-package com.vci.ubcs.code.service;
+package com.vci.ubcs.code.webservice.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.DockingPreMetaAttr;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr;
+import com.vci.ubcs.code.webservice.vo.DockingPreMetaAttrVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreViewModelService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreViewModelService.java
similarity index 76%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreViewModelService.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreViewModelService.java
index 9f24bc3..35961f5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreViewModelService.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreViewModelService.java
@@ -1,8 +1,8 @@
-package com.vci.ubcs.code.service;
+package com.vci.ubcs.code.webservice.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.DockingPreViewModel;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreViewModel;
+import com.vci.ubcs.code.webservice.vo.DockingPreViewModelVO;
import java.util.List;
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java
new file mode 100644
index 0000000..c416cbf
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java
@@ -0,0 +1,30 @@
+package com.vci.ubcs.code.webservice.service;
+
+
+import org.springblade.core.tool.api.R;
+
+/***
+ * 涓庨泦鍥㈤泦鎴愭湇鍔�
+ * @author xiejun
+ */
+public interface IGroupMdmInterService {
+ /***
+ * 涓绘暟鎹儚闆嗗洟鐢宠缂栫爜
+ * @param oids
+ * @param btmName
+ * @return 杩斿洖缁撴灉淇℃伅
+ * @throws Exception
+ */
+ public R applyGroupCode(String oids, String btmName)throws Throwable;
+
+ /***
+ * 涓绘暟鎹儚闆嗗洟鏇存敼缂栫爜
+ * @param oids 闇�瑕佷慨鏀圭殑鏁版嵁涓婚敭鏁扮粍
+ * @param btmName 涓氬姟绫诲瀷
+ * @return 杩斿洖缁撴灉淇℃伅
+ * @throws Throwable
+ */
+
+ public R receiveEditApply(String oids, String btmName)throws Throwable;
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreApplyFormServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreApplyFormServiceImpl.java
new file mode 100644
index 0000000..993e26a
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreApplyFormServiceImpl.java
@@ -0,0 +1,17 @@
+package com.vci.ubcs.code.webservice.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.webservice.mapper.DockingPreApplyFormMapper;
+import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
+import com.vci.ubcs.code.webservice.service.IDockingPreApplyFormService;
+import org.springframework.stereotype.Service;
+
+/***
+ *闆嗗洟灞炴�ф槧灏勬湇鍔�
+ * @author xiejun
+ * @date 2023-05-22
+ */
+@Service
+public class DockingPreApplyFormServiceImpl extends ServiceImpl<DockingPreApplyFormMapper, DockingPreApplyForm> implements IDockingPreApplyFormService {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
new file mode 100644
index 0000000..8764874
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -0,0 +1,229 @@
+package com.vci.ubcs.code.webservice.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.webservice.mapper.DockingPreAttrMappingMapper;
+import com.vci.ubcs.code.webservice.service.IDockingPreAttrMappingService;
+import com.vci.ubcs.code.webservice.service.IDockingPreAttrRangeService;
+import com.vci.ubcs.code.webservice.service.IDockingPreMetaAttrService;
+import com.vci.ubcs.code.webservice.wrapper.DockingPreAttrMappingWrapper;
+import com.vci.ubcs.code.webservice.wrapper.DockingPreAttrRangeWrapper;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrRange;
+import com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/***
+ *闆嗗洟灞炴�ф槧灏勬湇鍔�
+ * @author xiejun
+ * @date 2023-05-22
+ */
+@Service
+public class DockingPreAttrMappingServiceImpl extends ServiceImpl<DockingPreAttrMappingMapper, DockingPreAttrMapping> implements IDockingPreAttrMappingService {
+
+
+
+ /***
+ * 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
+ */
+ @Autowired(required = false)
+ private DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
+
+ /***
+ * 涓氬姟鏁版嵁灞炴�ф湇鍔�
+ */
+ //@Autowired(required = false)
+ //private MdmEngineService mdmEngineService;
+
+ /***
+ * 闆嗗洟灞炴�ф湇鍔�
+ */
+ @Autowired(required = false)
+ private IDockingPreMetaAttrService dockingPreMetaAttrService;
+ /***
+ * 灞炴�у彇鍊艰寖鍥存湇鍔�
+ */
+ @Autowired(required = false)
+ private IDockingPreAttrRangeService dockingPreAttrRangeService;
+
+
+
+
+
+ /***
+ * 鏍规嵁涓绘暟鎹垎绫讳富閿幏鍙栧垎绫讳俊鎭厤缃�
+ * @param codeClassifyId
+ * @return
+ */
+ @Override
+ public List<DockingPreAttrMappingVO> getDockingAttrMappingsByCodeClassifyId(String codeClassifyId,String sourceClassifyId) {
+ VciBaseUtil.alertNotNull(codeClassifyId,"涓绘暟鎹垎绫讳富閿�");
+ VciBaseUtil.alertNotNull(sourceClassifyId,"闆嗗洟鍒嗙被涓婚敭");
+ //棣栧厛鑾峰彇鍒嗙被妯℃澘灞炴�э紝鐒跺悗涓庡睘鎬ч厤缃潗姣旇緝锛屼互闃茶鏈夊鍒犲睘鎬х殑鍙兘
+ List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,sourceClassifyId));
+ List<DockingPreAttrMapping> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getSourceClassifyId, sourceClassifyId).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId));
+ Map<String/**灞炴�т富閿�**/, DockingPreAttrMapping> dockingPreAttrMappingMap = dockingPreAttrMappings.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getMetaListId(), t -> t));
+
+ List<DockingPreAttrMapping> newDockingPreAttrMappingList=new ArrayList<>();
+ dockingPreMetaAttrList.stream().forEach(dockingPreMetaAttr -> {
+ String attrOid=dockingPreMetaAttr.getOid();
+ DockingPreAttrMapping dockingPreAttrMapping=new DockingPreAttrMapping();
+ if(dockingPreAttrMappingMap.containsKey(attrOid)){
+ dockingPreAttrMapping= dockingPreAttrMappingMap.get(attrOid);
+ }else{
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ dockingPreAttrMapping.setMetaListId(dockingPreMetaAttr.getOid());//灞炴�т富閿�
+ dockingPreAttrMapping.setSourceAttrKey(dockingPreMetaAttr.getEnglishName());//鑻辨枃鍚嶇О
+ dockingPreAttrMapping.setSourceAttrName(dockingPreMetaAttr.getChineseName());//涓枃鍚嶇О
+ dockingPreAttrMapping.setSourceClassifyId(dockingPreMetaAttr.getSourceClassifyId());//闆嗗洟鍒嗙被oid
+ dockingPreAttrMapping.setSourceClassifyName("");//鍒嗙被鍚嶇О
+ dockingPreAttrMapping.setViewModeId(dockingPreMetaAttr.getViewModelId());//妯″瀷瑙嗗浘id
+ dockingPreAttrMapping.setViewModelName("");//鍒嗙被妯″瀷鍚嶇О
+ dockingPreAttrMapping.setViewName("");//鍒嗙被妯″瀷鍚嶇О
+
+ }
+ newDockingPreAttrMappingList.add(dockingPreAttrMapping);
+ });
+ return dockingPreAttrMappingDO2VOS(dockingPreAttrMappings,false);
+ }
+
+ /***
+ * 鏋勯�犲櫒鏌ヨ鏂瑰紡
+ * @param wrapper 鏌ヨ灏佽鍣�
+ * @return
+ */
+ @Override
+ public List<DockingPreAttrMapping> selectByWrapper(Wrapper wrapper) {
+ return dockingPreAttrMappingMapper.selectList(wrapper);
+ }
+
+ /****
+ * 闆嗗洟灞炴�ф槧灏勯厤缃繚瀛�
+ * @param dockingPreAttrMappingVOList
+ * @return
+ * @throws VciBaseException
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList) throws Exception {
+ if(org.springframework.util.CollectionUtils.isEmpty(dockingPreAttrMappingVOList)){
+ return new ArrayList<>();
+ }
+ /**
+ * 1.浼犻�掕繃鏉ョ殑鏈夊彲鑳戒富鏁版嵁妯℃澘鏂板灞炴�э紝杩欐牱鐨勯渶瑕佹坊鍔狅紝涔熸湁鍙兘鍒犻櫎鐨勫睘鎬э紝杩欐牱鐨勬槧灏勯渶瑕佸垹闄�
+ * 涔熸湁鏇存柊鐨勮繖鏍峰垯鏇存柊
+ */
+ List<DockingPreAttrMapping> newDockingPreAttrMapping=new ArrayList<>();
+ List<String>appingConfigOidList=new ArrayList<>();
+ List<String>attrIdList=new ArrayList<>();
+ List<String> attributeOidList=new ArrayList<>();
+ List<DockingPreAttrRange> newDockingPreAttrRangeList=new ArrayList<>();
+ List<DockingPreAttrRangeVO> newDockingPreAttrRangeVOList=new ArrayList<>();
+ dockingPreAttrMappingVOList.stream().forEach(dockingPreAttrMappingVO -> {
+ List<DockingPreAttrRangeVO>dockingPreAttrRangeVOList=dockingPreAttrMappingVO.getDockingPreAttrRangeVoList();
+ appingConfigOidList.add(dockingPreAttrMappingVO.getOid());
+ if(!CollectionUtils.isEmpty(dockingPreAttrRangeVOList)) {
+ attrIdList.add(dockingPreAttrMappingVO.getMetaListId());
+ newDockingPreAttrRangeVOList.addAll(dockingPreAttrRangeVOList);
+ }
+ });
+ //灏嗗睘鎬у彇鍊艰寖鍥磋浆鎴愭暟鎹寔涔呭眰瀵硅薄
+ newDockingPreAttrRangeList= DockingPreAttrRangeWrapper.build().voentitys(newDockingPreAttrRangeVOList);
+ //灏嗗睘鎬ф槧灏勯厤缃俊鎭浆鎹负闇�瑕佹暟鎹寔涔呭眰淇濆瓨鐨勫璞�
+ newDockingPreAttrMapping= DockingPreAttrMappingWrapper.build().voentitys(dockingPreAttrMappingVOList);
+
+ List<DockingPreAttrRange> oldDockingPreAttrRangeList=new ArrayList<>();
+ if(!org.springframework.util.CollectionUtils.isEmpty(attrIdList)) {
+ //鑾峰彇瀛樺湪鐨勫睘鎬у彇鍊艰寖鍥�.
+ oldDockingPreAttrRangeList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().in(DockingPreAttrRange::getMetaListId,attrIdList));
+ }
+ //鑾峰彇瀛樺湪鐨勫睘鎬ф槧灏�.
+ List<DockingPreAttrMapping> oldDataAttrMapping = dockingPreAttrMappingMapper.selectList(Wrappers.<DockingPreAttrMapping>query().lambda().in(DockingPreAttrMapping::getOid,appingConfigOidList));
+
+ Map<String/**oid**/,DockingPreAttrMapping/**灞炴�у璞�**/> allSaveAttrMappingMap = newDockingPreAttrMapping.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
+ Map<String/**oid**/,DockingPreAttrMapping/**瀵硅薄**/> oldAttrMappingMap =oldDataAttrMapping.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t,(o1, o2)->o2));
+ //闇�瑕佸垹闄ょ殑灞炴�ф槧灏�
+ List<String> deleteIdList=new ArrayList<>();
+ oldDataAttrMapping.stream().forEach(cbo -> {
+ String oid =cbo.getOid();
+ if(!allSaveAttrMappingMap.containsKey(oid)){
+ deleteIdList.add(oid);
+ }
+ });
+ this.removeBatchByIds(deleteIdList);//鍒犻櫎宸茬粡涓㈡帀鐨�
+ this.saveOrUpdateBatch(newDockingPreAttrMapping);//娣诲姞鏇存柊鏂扮殑閰嶇疆淇℃伅
+
+ //鍙栧�艰寖鍥村鐞�
+ if(!CollectionUtils.isEmpty(newDockingPreAttrRangeList)) {
+ Map<String/**oid**/, DockingPreAttrRange/**灞炴�у璞�**/> allSaveAttrAttrRangeDOMap =newDockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t, (o1, o2) -> o2));
+ Map<String/**oid**/, DockingPreAttrRange/**瀵硅薄**/> oldSaveAttrAttrRangeDOMap = oldDockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getOid(), t -> t, (o1, o2) -> o2));
+
+ //闇�瑕佸垹闄ょ殑灞炴�у彇鍊艰寖鍥�
+ List<String> deleteRangeIdList = new ArrayList<>();
+ oldDockingPreAttrRangeList.stream().forEach(cbo -> {
+ String oid = cbo.getOid();
+ if (!allSaveAttrAttrRangeDOMap.containsKey(oid)) {
+ deleteRangeIdList.add(oid);
+ }
+ });
+ dockingPreAttrRangeService.removeBatchByIds(deleteIdList);//鍒犻櫎宸茬粡涓㈡帀鐨�
+ dockingPreAttrRangeService.saveOrUpdateBatch(newDockingPreAttrRangeList);//娣诲姞鏇存柊鏂扮殑閰嶇疆淇℃伅
+ }
+ return dockingPreAttrMappingVOList;
+ }
+
+ /***
+ * 鏍规嵁涓绘暟鎹畂id妫�娴嬫槸鍚﹀睘鎬ф槧灏勯厤缃�
+ * @param targetClassifyId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public boolean checkHasConfigByTragetCodeclassifyId(String targetClassifyId){
+ Long count =0L;
+ try {
+ count = dockingPreAttrMappingMapper.selectCount(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, targetClassifyId));
+ }catch (Throwable e){
+ e.printStackTrace();;
+ } finally {
+ return count>0?true:false;
+ }
+ }
+
+
+ /***
+ * 瀵硅薄杞崲
+ * @param dockingPreAttrMappings
+ * @return
+ */
+ private List<DockingPreAttrMappingVO> dockingPreAttrMappingDO2VOS(Collection<DockingPreAttrMapping> dockingPreAttrMappings,boolean contain) {
+ List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>();
+ dockingPreAttrMappingVOList=DockingPreAttrMappingWrapper.build().entityVOs(dockingPreAttrMappings);
+ if(CollectionUtils.isEmpty(dockingPreAttrMappingVOList)){
+ dockingPreAttrMappingVOList.stream().distinct().forEach(dockingPreAttrMappingVO -> {
+ if(contain) {
+ List<DockingPreAttrRangeVO> dockingPreAttrRangeVOList= dockingPreAttrRangeService.getDockingPreAttrRangesByMetaId(dockingPreAttrMappingVO.getMetaListId());
+ dockingPreAttrMappingVO.setDockingPreAttrRangeVoList(dockingPreAttrRangeVOList);
+ }
+ });
+ }
+ return dockingPreAttrMappingVOList;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrRangeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrRangeServiceImpl.java
new file mode 100644
index 0000000..69425b5
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrRangeServiceImpl.java
@@ -0,0 +1,55 @@
+package com.vci.ubcs.code.webservice.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.webservice.mapper.DockingPreAttrRangeMapper;
+import com.vci.ubcs.code.webservice.service.IDockingPreAttrRangeService;
+import com.vci.ubcs.code.webservice.wrapper.DockingPreAttrRangeWrapper;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrRange;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/***
+ *闆嗗洟灞炴�у彇鍊艰寖鍥存湇鍔�
+ * @author xiejun
+ * @date 2023-05-22
+ */
+@Service
+@Slf4j
+public class DockingPreAttrRangeServiceImpl extends ServiceImpl<DockingPreAttrRangeMapper, DockingPreAttrRange> implements IDockingPreAttrRangeService {
+ @Autowired(required = false)
+ DockingPreAttrRangeMapper dockingPreAttrRangeMapper;
+
+ /***
+ * 鏍规嵁闆嗗洟灞炴�т富閿煡璇㈠叾鍙栧�艰寖鍥�
+ * @param meatId
+ * @return
+ */
+ @Override
+ public List<DockingPreAttrRangeVO> getDockingPreAttrRangesByMetaId(String meatId) {
+ log.info("鏌ヨ闆嗗洟灞炴��->"+meatId+"鍙栧�艰寖鍥磗tart");
+ VciBaseUtil.alertNotNull(meatId,"灞炴�т富閿�");
+ List<DockingPreAttrRange> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().eq(DockingPreAttrRange::getMetaListId, meatId));
+ log.info("鏌ヨ闆嗗洟灞炴��->"+meatId+"鍙栧�艰寖鍥磂nd");
+ return DockingPreAttrRangeWrapper.build().entityVOs(dockingPreAttrMappings);
+
+ }
+
+ /****
+ * 鏋勯�犲櫒鏌ヨ鏂瑰紡
+ * @param wrapper 鏌ヨ灏佽鍣�
+ * @return
+ */
+ @Override
+ public List<DockingPreAttrRange> selectByWrapper(Wrapper wrapper) {
+ return dockingPreAttrRangeMapper.selectList(wrapper);
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java
similarity index 67%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java
index c2ca759..5872185 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreClassifyServiceImpl.java
@@ -1,26 +1,29 @@
-package com.vci.ubcs.code.service.impl;
+package com.vci.ubcs.code.webservice.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.DockingPreClassify;
-import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
-import com.vci.ubcs.code.mapper.DockingPreClassifyMapper;
-import com.vci.ubcs.code.service.IDockingPreClassifyService;
-import com.vci.ubcs.code.service.IDockingPreViewModelService;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
-import com.vci.ubcs.code.wrapper.DockingPreClassifyWrapper;
+import com.vci.ubcs.code.webservice.mapper.DockingPreClassifyMapper;
+import com.vci.ubcs.code.webservice.service.IDockingPreApplyFormService;
+import com.vci.ubcs.code.webservice.service.IDockingPreAttrMappingService;
+import com.vci.ubcs.code.webservice.service.IDockingPreClassifyService;
+import com.vci.ubcs.code.webservice.service.IDockingPreViewModelService;
+import com.vci.ubcs.code.webservice.wrapper.DockingPreClassifyWrapper;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.code.webservice.entity.DockingPreClassify;
+import com.vci.ubcs.code.webservice.vo.DockingPreClassifyVO;
+import com.vci.ubcs.code.webservice.vo.DockingPreViewModelVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
-import static com.vci.ubcs.code.constant.MdmBtmTypeConstant.CODE_CLASSIFY_OID_FIELD;
-import static com.vci.ubcs.code.service.impl.CodeClassifyServiceImpl.PARENT_FIELD_NAME;
/**
* 闆嗗洟鍒嗙被涓氬姟鏈嶅姟
@@ -30,6 +33,10 @@
@Service
@Slf4j
public class DockingPreClassifyServiceImpl extends ServiceImpl<DockingPreClassifyMapper, DockingPreClassify> implements IDockingPreClassifyService {
+ /**
+ * 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
+ */
+ public static final String PARENT_FIELD_NAME = "parentCodeClassifyOid";
/***
* 闆嗗洟鍒嗙被灞炴��
*/
@@ -41,6 +48,14 @@
*/
@Resource
private IDockingPreViewModelService dockingPreViewModelService;
+
+
+ /***
+ *闆嗗洟闆嗘垚閰嶇疆鏈嶅姟
+ */
+ @Resource
+ private IDockingPreAttrMappingService dockingPreAttrMappingService;
+
/**
* 瀵硅薄鐨勬搷浣�
@@ -61,16 +76,19 @@
List<DockingPreClassifyVO> dockingPreClassifyVOS= getCompanyGourpClassByParentId(treeQueryObject.getParentOid(),true);
List<Tree> tree= revisionModelUtil.doList2Trees(dockingPreClassifyVOS,treeWrapperOptions,(DockingPreClassifyVO s) ->{
//鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
- return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
- .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
+ 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=dockingPreClassifyMapper.checkHasChild(trees.getOid());
//濡傛灉涓庢潯浠朵紶杩囨潵鐨勫�煎尮閰嶇殑涓婂垯璁剧疆涓洪�変腑
- if(conditionMap.containsKey(CODE_CLASSIFY_OID_FIELD)){
- trees.setChecked(true);
+ if(conditionMap.containsKey(MdmBtmTypeConstant.CODE_CLASSIFY_OID_FIELD)){
+ String codeClassifyId=conditionMap.get(MdmBtmTypeConstant.CODE_CLASSIFY_OID_FIELD);
+ boolean checkHas=dockingPreAttrMappingService.checkHasConfigByTragetCodeclassifyId(codeClassifyId);
+ if(checkHas) {
+ trees.setChecked(true);
+ }
}
;
if(checkHasChild){
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreMetaAttrServiceImpl.java
similarity index 72%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreMetaAttrServiceImpl.java
index f03a6cf..f2ae771 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreMetaAttrServiceImpl.java
@@ -1,14 +1,13 @@
-package com.vci.ubcs.code.service.impl;
+package com.vci.ubcs.code.webservice.service.impl;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.DockingPreAttrMapping;
-import com.vci.ubcs.code.entity.DockingPreMetaAttr;
-import com.vci.ubcs.code.mapper.DockingPreMetaAttrMapper;
-import com.vci.ubcs.code.service.IDockingPreMetaAttrService;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
-import com.vci.ubcs.code.wrapper.DockingPreMetaAttrWrapper;
+import com.vci.ubcs.code.webservice.mapper.DockingPreMetaAttrMapper;
+import com.vci.ubcs.code.webservice.service.IDockingPreMetaAttrService;
+import com.vci.ubcs.code.webservice.wrapper.DockingPreMetaAttrWrapper;
+import com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr;
+import com.vci.ubcs.code.webservice.vo.DockingPreMetaAttrVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -41,7 +40,7 @@
public List<DockingPreMetaAttrVO> selectDockingPreMetaAttrByViewModelId(String viewModelId) {
log.info("鏍规嵁妯″瀷瑙嗗浘oid"+viewModelId+"鏌ヨ鏁版嵁 star");
List<DockingPreMetaAttr> dockingPreMetaAttrList= selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getViewModelId,viewModelId));
- List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList=DockingPreMetaAttrWrapper.build().entityVOs(dockingPreMetaAttrList);
+ List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList= DockingPreMetaAttrWrapper.build().entityVOs(dockingPreMetaAttrList);
log.info("鏍规嵁妯″瀷瑙嗗浘oid"+viewModelId+"鏌ヨ鏁版嵁 end");
return dockingPreMetaAttrVOList;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreViewModelServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreViewModelServiceImpl.java
similarity index 73%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreViewModelServiceImpl.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreViewModelServiceImpl.java
index 2e322bd..1d6a08b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreViewModelServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreViewModelServiceImpl.java
@@ -1,18 +1,18 @@
-package com.vci.ubcs.code.service.impl;
+package com.vci.ubcs.code.webservice.service.impl;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.DockingPreMetaAttr;
-import com.vci.ubcs.code.entity.DockingPreViewModel;
-import com.vci.ubcs.code.mapper.DockingPreViewModelMapper;
-import com.vci.ubcs.code.service.IDockingPreMetaAttrService;
-import com.vci.ubcs.code.service.IDockingPreViewModelService;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
-import com.vci.ubcs.code.wrapper.DockingPreMetaAttrWrapper;
-import com.vci.ubcs.code.wrapper.DockingPreViewWrapper;
+import com.vci.ubcs.code.webservice.mapper.DockingPreViewModelMapper;
+import com.vci.ubcs.code.webservice.service.IDockingPreMetaAttrService;
+import com.vci.ubcs.code.webservice.service.IDockingPreViewModelService;
+import com.vci.ubcs.code.webservice.wrapper.DockingPreMetaAttrWrapper;
+import com.vci.ubcs.code.webservice.wrapper.DockingPreViewWrapper;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr;
+import com.vci.ubcs.code.webservice.entity.DockingPreViewModel;
+import com.vci.ubcs.code.webservice.vo.DockingPreMetaAttrVO;
+import com.vci.ubcs.code.webservice.vo.DockingPreViewModelVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -32,7 +32,7 @@
* 闆嗗洟鍒嗙被灞炴��
*/
@Resource
- private DockingPreViewModelMapper dockingPreViewModelMapper;
+ private DockingPreViewModelMapper dockingPreViewModelMapper;
/***
@@ -52,7 +52,7 @@
log.info("鏍规嵁鍒嗙被id->"+classifyId+",鏌ヨ鍒嗙被瑙嗗浘statr");
VciBaseUtil.alertNotNull(classifyId,"闆嗗洟鍒嗙被涓婚敭");
List<DockingPreViewModel> dockingPreViewModels= dockingPreViewModelMapper.selectList(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,classifyId));
- List<DockingPreViewModelVO> dockingPreViewModelVOS=DockingPreViewWrapper.build().entityVOs(dockingPreViewModels);
+ List<DockingPreViewModelVO> dockingPreViewModelVOS= DockingPreViewWrapper.build().entityVOs(dockingPreViewModels);
if(isContainAttr) {
dockingPreViewModelVOS.stream().forEach(dockingPreViewModelVO -> {
String viewModelVOOid=dockingPreViewModelVO.getOid();
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
new file mode 100644
index 0000000..2cdc8d6
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/GroupMdmInterServiceImpl.java
@@ -0,0 +1,550 @@
+package com.vci.ubcs.code.webservice.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vci.ubcs.code.webservice.entity.*;
+import com.vci.ubcs.code.webservice.vo.*;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
+import com.vci.ubcs.code.webservice.feign.MdmApplyGroupCodeProvider;
+import com.vci.ubcs.code.webservice.mapper.DockingPreAttrMappingMapper;
+import com.vci.ubcs.code.webservice.service.*;
+import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/***
+ * 涓庨泦鍥㈤泦鎴愭湇鍔�
+ * @author xiejun
+ * @date 2023-05-26
+ */
+@Service
+@Slf4j
+public class GroupMdmInterServiceImpl implements IGroupMdmInterService {
+
+ private String code="";
+
+ private String msg="";
+
+ @Value("${docking.apply.unitCode:410-MDM}")
+ public String dockingApplyUnitCode;
+ @Autowired(required = false)
+ private MdmApplyGroupCodeProvider mdmApplyGroupCodeProvider;
+ /***
+ * 闆嗗洟鍒嗙被鏈嶅姟
+ */
+ @Autowired(required = false)
+ private IDockingPreClassifyService dockingPreClassifyService;
+
+ /***
+ * 鐢宠鍗曟湇鍔�
+ */
+ @Autowired(required = false)
+ private IDockingPreApplyFormService dockingPreApplyFormService;
+
+
+ /***
+ * 妯″瀷瑙嗗浘鍗曟湇鍔�
+ */
+ @Autowired(required = false)
+ private IDockingPreViewModelService dockingPreViewModelService;
+
+
+ /***
+ * 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
+ */
+ @Autowired(required = false)
+ private DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
+ /***
+ * 灞炴�у彇鍊艰寖鍥存湇鍔�
+ */
+ @Autowired(required = false)
+ private IDockingPreAttrRangeService dockingPreAttrRangeService;
+
+
+ /***
+ * 闆嗗洟灞炴�ф湇鍔�
+ */
+ @Autowired(required = false)
+ private IDockingPreMetaAttrService dockingPreMetaAttrService;
+ /***
+ * 涓绘暟鎹儚闆嗗洟鐢宠缂栫爜
+ * @param oids 闇�瑕佺敵璇风殑鏁版嵁涓婚敭鏁扮粍
+ * @param btmName 涓氬姟绫诲瀷
+ * @return 杩斿洖缁撴灉淇℃伅
+ * @throws Exception
+ */
+ @Override
+ @Transactional
+ public R applyGroupCode(String oids, String btmName) throws VciBaseException {
+ try {
+ List<BaseModel> updateCbos = new ArrayList<BaseModel>();
+
+ List<DockingPreApplyForm> dockingPreAttrMappings = new ArrayList<>();
+ VciBaseUtil.alertNotNull(oids, "閫夋嫨鐨勬暟鎹�");
+ VciBaseUtil.alertNotNull(btmName, "涓氬姟绫诲瀷");
+ //List<BaseModelVO> codeWupins=mdmEngineService.listByIds(VciBaseUtil.str2List(oids));
+ List<BaseModelVO> dataModelList = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(dataModelList)) {
+ DockingGroupDataVO dockingGroupDataVO = new DockingGroupDataVO();
+ //鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+ Map<String, DockingPreApplyForm> addDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
+ Map<String, DockingPreApplyForm> editDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
+ Map<String, BaseModelVO> baseModelVOMap = new HashMap<String, BaseModelVO>();
+ //缁勭粐鏁版嵁
+ dockingGroupDataVO = queryApplycodeDataObjects(1, dataModelList, addDockingPreApplyFormMap, editDockingPreApplyFormMap, baseModelVOMap);
+ DockingResultVO resultDataObject = mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
+ code = resultDataObject.getCode();
+ msg = resultDataObject.getMsg();
+ if ("1".equals(resultDataObject.getCode())) {//缁撴灉姝ｇ‘鐨勬儏鍐�
+ List<DockingDataVO> dataObjectVOList = resultDataObject.getData();
+ dataObjectVOList.stream().forEach(dataObject -> {
+ boolean isEditDatas = false;
+ String code2 = dataObject.getCode();
+ DockingMainDataVO data2 = dataObject.getData();
+ String applyId = data2.getApplyId();//鐢宠鍗昳d
+ String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();//闆嗗洟鐮佹
+ msg = dataObject.getMsg();
+ if (code2.equals("1")) {//缁撴灉姝ｇ‘鐨勬儏鍐�
+ if (!"".equals(customCoding)) {
+ isEditDatas = true;
+ }
+ }
+ //闇�瑕佷慨鏀圭殑鐢宠鍗曟暟鎹�
+ if (editDockingPreApplyFormMap.containsKey(applyId)) {
+ DockingPreApplyForm dockingPreApplyForm = editDockingPreApplyFormMap.get(applyId);
+ dockingPreApplyForm.setCode(code2);
+ dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
+ dockingPreApplyForm.setGroupCode(customCoding);
+ ObjectMapper mp = new ObjectMapper();
+ String writeValueAsString = null;
+ try {
+ writeValueAsString = mp.writeValueAsString(dataObject);
+ dockingPreApplyForm.setContent(writeValueAsString);
+ } catch (JsonProcessingException e) {
+ }
+ }
+ //鏂板鐨勭敵璇峰崟鏁版嵁
+ if (addDockingPreApplyFormMap.containsKey(applyId)) {
+ DockingPreApplyForm dockingPreApplyForm = addDockingPreApplyFormMap.get(applyId);
+ dockingPreApplyForm.setCode(code2);
+ dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
+ dockingPreApplyForm.setGroupCode(customCoding);
+ ObjectMapper mp = new ObjectMapper();
+ String writeValueAsString = null;
+ try {
+ writeValueAsString = mp.writeValueAsString(dataObject);
+ dockingPreApplyForm.setContent(writeValueAsString);
+ } catch (JsonProcessingException e) {
+ }
+ }
+ //濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
+ if (isEditDatas) {
+ if (baseModelVOMap.containsKey(applyId)) {
+ BaseModelVO baseModelVO = baseModelVOMap.get(applyId);
+ BaseModel baseModel = new BaseModel();
+ BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ baseModelVO.setId(customCoding);
+ updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
+ }
+ }
+ });
+ } else {
+ editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
+ dockingPreApplyForm.setCode("2");
+ dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
+ dockingPreApplyForm.setContent("");
+ dockingPreApplyForm.setGroupCode("");
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ });
+ addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
+ dockingPreApplyForm.setCode("2");
+ dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
+ dockingPreApplyForm.setContent("");
+ dockingPreApplyForm.setGroupCode("");
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ });
+ }
+ if (editDockingPreApplyFormMap.size() > 0) {
+ dockingPreAttrMappings.addAll(editDockingPreApplyFormMap.values());//娣诲姞鐢宠鍗曟暟鎹�
+ }
+ if (addDockingPreApplyFormMap.size() > 0) {
+ dockingPreAttrMappings.addAll(addDockingPreApplyFormMap.values());//闇�瑕佷慨鏀圭殑鐢宠鍗曟暟鎹�
+ }
+ //淇濆瓨琛ㄥ崟鏁版嵁
+ dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
+ //mdmEngineService.saveBatch(updateCbos);//淇濆瓨鏁版嵁
+ }
+ return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
+ }catch (VciBaseException e){
+ return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛"+e);
+ }
+ }
+
+ /***
+ * 涓绘暟鎹儚闆嗗洟鏇存敼缂栫爜
+ * @param oids 闇�瑕佷慨鏀圭殑鏁版嵁涓婚敭鏁扮粍
+ * @param btmName 涓氬姟绫诲瀷
+ * @return 杩斿洖缁撴灉淇℃伅
+ * @throws Throwable
+ */
+ @Override
+ public R receiveEditApply(String oids, String btmName) throws VciBaseException {
+ List<BaseModel> updateCbos=new ArrayList<BaseModel>();
+ List<DockingPreApplyForm> dockingPreAttrMappings=new ArrayList<>();
+ VciBaseUtil.alertNotNull(oids,"閫夋嫨鐨勬暟鎹�");
+ VciBaseUtil.alertNotNull(btmName,"涓氬姟绫诲瀷");
+ //List<BaseModelVO> codeWupins=mdmEngineService.listByIds(VciBaseUtil.str2List(oids));
+ List<BaseModelVO> dataModelList = new ArrayList<>();
+ try {
+ if (!CollectionUtils.isEmpty(dataModelList)) {
+ DockingGroupDataVO dockingGroupDataVO = new DockingGroupDataVO();
+ //鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+ Map<String, DockingPreApplyForm> addDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
+ Map<String, DockingPreApplyForm> editDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
+ Map<String, BaseModelVO> baseModelVOMap = new HashMap<String, BaseModelVO>();
+ //缁勭粐鏁版嵁
+ dockingGroupDataVO = queryApplycodeDataObjects(2, dataModelList, addDockingPreApplyFormMap, editDockingPreApplyFormMap, baseModelVOMap);
+ DockingResultVO resultDataObject = mdmApplyGroupCodeProvider.receiveEditApply(dockingGroupDataVO);
+ code = resultDataObject.getCode();
+ msg = resultDataObject.getMsg();
+ if ("1".equals(resultDataObject.getCode())) {//缁撴灉姝ｇ‘鐨勬儏鍐�
+ List<DockingDataVO> dataObjectVOList = resultDataObject.getData();
+ dataObjectVOList.stream().forEach(dataObject -> {
+ boolean isEditDatas = false;
+ String code2 = dataObject.getCode();
+ DockingMainDataVO data2 = dataObject.getData();
+ String applyId = data2.getApplyId();//鐢宠鍗昳d
+ String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();//闆嗗洟鐮佹
+ msg = dataObject.getMsg();
+ if (code2.equals("1")) {//缁撴灉姝ｇ‘鐨勬儏鍐�
+ if (!"".equals(customCoding)) {
+ isEditDatas = true;
+ }
+ }
+ //闇�瑕佷慨鏀圭殑鐢宠鍗曟暟鎹�
+ if (editDockingPreApplyFormMap.containsKey(applyId)) {
+ DockingPreApplyForm dockingPreApplyForm = editDockingPreApplyFormMap.get(applyId);
+ dockingPreApplyForm.setCode(code2);
+ dockingPreApplyForm.setMsg("淇敼锛�" + msg);
+ dockingPreApplyForm.setGroupCode(customCoding);
+ ObjectMapper mp = new ObjectMapper();
+ String writeValueAsString = null;
+ try {
+ writeValueAsString = mp.writeValueAsString(dataObject);
+ dockingPreApplyForm.setContent(writeValueAsString);
+ } catch (JsonProcessingException e) {
+ }
+ }
+ //鏂板鐨勭敵璇峰崟鏁版嵁
+ if (addDockingPreApplyFormMap.containsKey(applyId)) {
+ DockingPreApplyForm dockingPreApplyForm = addDockingPreApplyFormMap.get(applyId);
+ dockingPreApplyForm.setCode(code2);
+ dockingPreApplyForm.setMsg("淇敼锛�" + msg);
+ dockingPreApplyForm.setGroupCode(customCoding);
+ ObjectMapper mp = new ObjectMapper();
+ String writeValueAsString = null;
+ try {
+ writeValueAsString = mp.writeValueAsString(dataObject);
+ dockingPreApplyForm.setContent(writeValueAsString);
+ } catch (JsonProcessingException e) {
+ }
+ }
+ //濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
+ if (isEditDatas) {
+ if (baseModelVOMap.containsKey(applyId)) {
+ BaseModelVO baseModelVO = baseModelVOMap.get(applyId);
+ BaseModel baseModel = new BaseModel();
+ BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+ baseModelVO.setId(customCoding);
+ updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
+ }
+ }
+ });
+ } else {
+ editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
+ dockingPreApplyForm.setCode("2");
+ dockingPreApplyForm.setMsg("淇敼锛�" + msg);
+ dockingPreApplyForm.setContent("");
+ dockingPreApplyForm.setGroupCode("");
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+ });
+ addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
+ dockingPreApplyForm.setCode("2");
+ dockingPreApplyForm.setMsg("淇敼锛�" + msg);
+ dockingPreApplyForm.setContent("");
+ dockingPreApplyForm.setGroupCode("");
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+ });
+ }
+ if (editDockingPreApplyFormMap.size() > 0) {
+ dockingPreAttrMappings.addAll(editDockingPreApplyFormMap.values());//娣诲姞鐢宠鍗曟暟鎹�
+ }
+ if (addDockingPreApplyFormMap.size() > 0) {
+ dockingPreAttrMappings.addAll(addDockingPreApplyFormMap.values());//闇�瑕佷慨鏀圭殑鐢宠鍗曟暟鎹�
+ }
+ //淇濆瓨琛ㄥ崟鏁版嵁
+ dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
+ //mdmEngineService.saveBatch(updateCbos);//淇濆瓨鏁版嵁
+ }
+ return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
+ }catch (VciBaseException e){
+ return R.fail("鐢宠鎺ュ彛璋冪敤澶辫触"+e.getMessage());
+ }
+ }
+
+
+ /**
+ * 缁勭粐鏁版嵁
+ * */
+ private DockingGroupDataVO queryApplycodeDataObjects(int optationtype,List<BaseModelVO> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModelVO> codeWupinMap) throws VciBaseException{
+ try {
+ String curUserName = AuthUtil.getUser().getUserName();
+ //鐢宠鐨勬暟鎹�
+ List<DockingMainData> mainDataList=new ArrayList<DockingMainData>();
+ for (BaseModelVO dataBusinessObject : codeWupins) {
+ String format = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
+ String codeclsfid = dataBusinessObject.getData().getOrDefault("codeclsfid","");
+ String btmName = dataBusinessObject.getBtmname();
+ String oid = dataBusinessObject.getOid();
+
+ DockingPreApplyForm dockingPreApplyForm = new DockingPreApplyForm();
+
+ String dataOid = dataBusinessObject.getOid();
+ Map<String, String> conditionsMap = new HashMap<String, String>();
+ List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, optationtype));
+ String apllyCode = "";
+ if (!CollectionUtils.isEmpty(applyFormObjects)) {
+ dockingPreApplyForm = applyFormObjects.get(0);
+ apllyCode = dockingPreApplyForm.getId();
+ editDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+ } else {
+ apllyCode = dockingApplyUnitCode + "-" + format;
+ dockingPreApplyForm.setId(apllyCode);
+ dockingPreApplyForm.setName("");
+ dockingPreApplyForm.setOperationType(optationtype+"");
+ dockingPreApplyForm.setDescription(dataBusinessObject.getDescription());//鑾峰彇鏁版嵁鎻忚堪淇℃伅
+ dockingPreApplyForm.setDataOid(oid);
+ dockingPreApplyForm.setDataBtmName(btmName);
+ addDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+ }
+
+ codeWupinMap.put(apllyCode, dataBusinessObject);//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
+ conditionsMap = new HashMap<String, String>();
+ conditionsMap.put("jtargetclsfid", codeclsfid);//瑙嗗浘oid
+
+ List<DockingPreAttrMapping> dockingPreAttrMappingList = dockingPreAttrMappingMapper.selectList(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, codeclsfid));
+ if (CollectionUtils.isEmpty(dockingPreAttrMappingList)) {
+ throw new Exception("鏍规嵁鎵�閫夌殑鏁版嵁锛屾病鏈夋壘鍒板搴旂殑闆嗗洟鍒嗙被璁剧疆锛岃鏍稿!");
+ }
+ String jsourceclsfid = dockingPreAttrMappingList.get(0).getSourceClassifyId();
+ //鑾峰彇鏁版嵁妯″瀷鍒嗙被淇℃伅
+ DockingPreClassify dockingPreClassify = dockingPreClassifyService.getById(jsourceclsfid);
+ DockingMainData mainData = new DockingMainData();
+ mainData.setApplyEntId(dockingApplyUnitCode);//鐢宠鍗曚綅浠ｇ爜
+ mainData.setApplyId(apllyCode);//鐢宠鍗曞彿
+ mainData.setClassName(dockingPreClassify.getGetNodeLinkName());//鍒嗙被鍚嶇О
+ mainData.setCreateBy(curUserName);//
+ mainData.setSecretLevel("鍐呴儴");//瀵嗙骇锛岄粯璁や负鍐呴儴
+ mainData.setViewInfos(getviewInfos(optationtype,dockingPreClassify, dataBusinessObject));//鑾峰彇瑙嗗浘妯″瀷
+ mainDataList.add(mainData);
+ }
+ //鏍规嵁鏁版嵁妯″瀷锛岀粍缁囨墍闇�瑕佹暟鎹�
+ DockingGroupDataVO postParameters=new DockingGroupDataVO();
+ postParameters.setSysName("420-CODE");//绯荤粺鏍囪瘑
+ postParameters.setMainData(mainDataList);//
+ return postParameters;
+ } catch (Throwable e) {
+ // TODO Auto-generated catch block
+ throw new VciBaseException("鏌ヨ鏁版嵁鍑洪敊"+e);
+ }
+ }
+
+ /**
+ * 鑾峰彇妯″瀷瑙嗗浘
+ * @param dockingPreClassify
+ * @param dataBusinessObject
+ * @throws VciBaseException
+ */
+ private List<DockingViewVO>getviewInfos(int type, DockingPreClassify dockingPreClassify, BaseModelVO dataBusinessObject) throws Throwable{
+ List<DockingViewVO> viewInfoList=new ArrayList<>();
+ String jclassOid= dockingPreClassify.getOid();
+ List<DockingPreViewModel> dockingPreViewModels=new ArrayList<>();
+ if(type==1) {
+ //鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
+ dockingPreViewModels= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,jclassOid).eq(DockingPreViewModel::getViewName,"缂栫爜瑙嗗浘"));
+ }else{
+ //鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
+ dockingPreViewModels= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,jclassOid));
+ }
+ for (DockingPreViewModel dockingPreViewModel : dockingPreViewModels) {
+ //缁勭粐鏁版嵁灞炴�т俊鎭�
+ DockingViewVO viewInfo=new DockingViewVO();
+ viewInfo.setViewName(dockingPreViewModel.getViewName());//瑙嗗浘鍚嶇О
+ viewInfo.setViewValue(getViewValueList(dockingPreViewModel,jclassOid,dataBusinessObject));//瑙嗗浘
+ viewInfoList.add(viewInfo);
+ }
+ return viewInfoList;
+ }
+
+ /***
+ * 鑾峰彇閰嶇疆淇℃伅
+ * @param dockingPreViewModel
+ * @param jclassOid
+ * @param dataBusinessObject
+ * @return
+ * @throws VciBaseException
+ */
+ private List<Map<String, Object>> getViewValueList(DockingPreViewModel dockingPreViewModel,String jclassOid,BaseModelVO dataBusinessObject) throws Throwable{
+ //鏋勯�犳ā鍨嬭鍥炬暟鎹�
+ List<Map<String, Object>> viewValueList=new ArrayList<Map<String,Object>>();
+ String oid = dockingPreViewModel.getOid();
+ Map<String,String> dataValueMap=dataBusinessObject.getData();
+ String codeClassifyId=dataValueMap.get("codeclsfid");
+ Map<String,String>conditionsMap=new HashMap<String, String>();
+
+
+
+ List<DockingPreAttrMapping> dockingPreAttrMappingList = dockingPreAttrMappingMapper.selectList(Wrappers.<DockingPreAttrMapping>query().lambda()
+ .eq(DockingPreAttrMapping::getSourceClassifyId, jclassOid).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId));
+ if(CollectionUtils.isEmpty(dockingPreAttrMappingList)) {
+ return viewValueList;
+ }
+
+ Map<String,DockingPreAttrMapping> jintegmappconfigMap=new HashMap<String, DockingPreAttrMapping>();
+ for (DockingPreAttrMapping businessObject : dockingPreAttrMappingList) {
+ jintegmappconfigMap.put(businessObject.getSourceAttrKey(), businessObject);
+ }
+ List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper(
+ Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getViewModelId,dockingPreViewModel.getOid())
+ .eq(DockingPreMetaAttr::getSourceClassifyId,dockingPreViewModel.getSourceClassifyId()));
+
+ Map<String,Object> viewValueMap=new HashMap<String,Object>();
+ for (DockingPreMetaAttr dockingPreMetaAttr : dockingPreMetaAttrList) {
+ String jenglishname=dockingPreMetaAttr.getEnglishName();////闆嗗洟閰嶇疆灞炴��
+ if(jintegmappconfigMap.containsKey(jenglishname)){
+ DockingPreAttrMapping dockingPreAttrMapping=jintegmappconfigMap.get(jenglishname);
+ String attrId = dockingPreAttrMapping.getTargetAttrId();//缂栫爜灞炴�d
+ String jtargetattrkey = dockingPreAttrMapping.getTargetAttrKey();//缂栫爜灞炴�d
+ Object newVaue=null;
+ if(StringUtils.isNotBlank(jtargetattrkey)){
+ getAttrRange(dockingPreMetaAttr);//鑾峰彇瀛楁鍙栧�艰寖鍥�
+ String value=dataValueMap.get(jtargetattrkey)==null?"":dataValueMap.getOrDefault(jtargetattrkey,"");
+ newVaue = getVaue(dockingPreMetaAttr, value);
+ }else{
+ newVaue = getVaue(dockingPreMetaAttr, "");
+ }
+ if(newVaue==null||"".equals(newVaue)){
+ newVaue= dockingPreMetaAttr.getDefaultValue();
+ }
+ viewValueMap.put(jenglishname, newVaue);
+ }
+ }
+
+ viewValueList.add(viewValueMap);
+ return viewValueList;
+ }
+
+ /***
+ * 鑾峰彇灞炴�ф灇涓炬槧灏勯厤缃�
+ */
+ Map<String,Map<String, DockingPreAttrRange>> attrRangeMap=new HashMap<String, Map<String,DockingPreAttrRange>>();
+ private void getAttrRange(DockingPreMetaAttr jmetaatter) throws Throwable{
+
+ String jmetalistoid = jmetaatter.getOid();
+ if(attrRangeMap.containsKey(jmetalistoid)) {
+ return;
+ }
+ Map<String,String>conditionsMap=new HashMap<String, String>();
+ conditionsMap.put("jmetalistid", jmetalistoid);//瑙嗗浘oid
+ List<DockingPreAttrRange> dockingPreAttrRangeList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().eq(DockingPreAttrRange::getMetaListId, jmetalistoid));
+ if (CollectionUtils.isEmpty(dockingPreAttrRangeList)) {
+ return;
+ }
+ Map<String, DockingPreAttrRange> rangeMap = new HashMap<String, DockingPreAttrRange>();
+ rangeMap = dockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getNumTextValue(), t -> t, (o1, o2) -> o2));
+ attrRangeMap.put(jmetalistoid, rangeMap);
+
+ }
+ /****
+ * 鍊肩被鍨嬭浆鎹�
+ * @param jmetaatter
+ * @param value
+ * @return
+ * @throws Throwable
+ */
+ private Object getVaue(DockingPreMetaAttr jmetaatter,String value) throws Throwable{
+ //jmetadatatype 鍏冩暟鎹被鍨嬶紙1 瀛楃鍨�, 2 鏁村瀷, 3 闀挎暣鍨�, 4 鍗曠簿搴�, 5 鍙岀簿搴�,6 鏃ユ湡鍨�, 7 鏃堕棿鍨�, 8 甯冨皵鍨�, 9 鏂囦欢, 10澶嶅悎鍨嬶級
+ int jmetadatatype = jmetaatter.getMetaDataType();
+ String jmetalistoid = jmetaatter.getOid();
+ Map<String, DockingPreAttrRange> rangeMap=new HashMap<String, DockingPreAttrRange>();
+ if(attrRangeMap.containsKey(jmetalistoid)){
+ rangeMap = attrRangeMap.get(jmetalistoid);
+ if(rangeMap.containsKey(value)){
+ DockingPreAttrRange dockingPreAttrRange = rangeMap.get(value);
+ value=dockingPreAttrRange.getNumText();//灏嗙紪鐮佸睘鎬у煙鍊艰浆鎹㈡垚闆嗗洟瀵瑰簲鐨勫煙鍊�
+ }
+ }
+
+ if(jmetadatatype==1){//1 瀛楃鍨�
+ return StringUtils.isBlank(value)?"":value;
+ }else if(jmetadatatype==2){//2 鏁村瀷
+ return StringUtils.isBlank(value)?null:Integer.parseInt(value);
+ }else if(jmetadatatype==3){//3 闀挎暣鍨�
+ return StringUtils.isBlank(value)?null:Long.parseLong(value);
+ }else if(jmetadatatype==4){//4 鍗曠簿搴�,
+ return StringUtils.isBlank(value)?null:Float.parseFloat(value);
+ }else if(jmetadatatype==5){// 5 鍙岀簿搴�
+ return StringUtils.isBlank(value)?null:Double.parseDouble(value);
+ }else if(jmetadatatype==6){//6 鏃ユ湡鍨�
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-mm-dd");
+ if(StringUtils.isBlank(value)) {
+ return null;
+ }else {
+ try {
+ return simpleDateFormat.parse(value);
+ } catch (ParseException e) {
+ throw new VciBaseException("date", new String[]{"鏃ユ湡鏍煎紡杞崲閿欒"});
+ }
+ }
+ }else if(jmetadatatype==7){//7 鏃堕棿鍨�
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
+ if(StringUtils.isBlank(value)) {
+ return null;
+ }else{
+ try {
+ return simpleDateFormat.parse(value);
+ } catch (ParseException e) {
+ throw new VciBaseException("date", new String[]{"鏃ユ湡鏍煎紡杞崲閿欒"});
+ }
+ }
+ }else if(jmetadatatype==8){//8 甯冨皵鍨�
+ return value;
+ }else if(jmetadatatype==9){//9 鏂囦欢,
+ return value;
+ }else if(jmetadatatype==10){//10澶嶅悎鍨�
+ return value;//绗﹀悎鍨嬫槸浠�涔堜笢涓滃浣曞鐞�
+ }
+ return value;
+ }
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreApplyFormWrapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreApplyFormWrapper.java
similarity index 91%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreApplyFormWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreApplyFormWrapper.java
index 9954956..f9f6a4a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreApplyFormWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreApplyFormWrapper.java
@@ -1,8 +1,8 @@
-package com.vci.ubcs.code.wrapper;
+package com.vci.ubcs.code.webservice.wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.vci.ubcs.code.entity.DockingPreApplyForm;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyFormVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreApplyForm;
+import com.vci.ubcs.code.webservice.vo.DockingPreApplyFormVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrMappingWrapper.java
similarity index 91%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrMappingWrapper.java
index 8bad0a0..0aa56b7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrMappingWrapper.java
@@ -1,8 +1,8 @@
-package com.vci.ubcs.code.wrapper;
+package com.vci.ubcs.code.webservice.wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.vci.ubcs.code.entity.DockingPreAttrMapping;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -10,6 +10,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Objects;
+
/**
*闆嗗洟缂栫爜闆嗘垚灞炴�ф槧灏勯厤缃寘瑁呯被
*
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrRangeWrapper.java
similarity index 91%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrRangeWrapper.java
index f5ef92c..3b169cc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreAttrRangeWrapper.java
@@ -1,8 +1,8 @@
-package com.vci.ubcs.code.wrapper;
+package com.vci.ubcs.code.webservice.wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.vci.ubcs.code.entity.DockingPreAttrRange;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreAttrRange;
+import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -10,6 +10,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Objects;
+
/**
*闆嗗洟缂栫爜鍒嗙被妯″瀷瑙嗗浘灞炴�у彇鍊艰寖鍥村寘瑁呯被
*
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreClassifyWrapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreClassifyWrapper.java
similarity index 91%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreClassifyWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreClassifyWrapper.java
index e57caee..0010b97 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreClassifyWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreClassifyWrapper.java
@@ -1,8 +1,8 @@
-package com.vci.ubcs.code.wrapper;
+package com.vci.ubcs.code.webservice.wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.vci.ubcs.code.entity.DockingPreClassify;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreClassify;
+import com.vci.ubcs.code.webservice.vo.DockingPreClassifyVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -10,6 +10,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Objects;
+
/**
*闆嗗洟缂栫爜鍒嗙被鍖呰绫�
*
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreMetaAttrWrapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreMetaAttrWrapper.java
similarity index 91%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreMetaAttrWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreMetaAttrWrapper.java
index e880044..85c716d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreMetaAttrWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreMetaAttrWrapper.java
@@ -1,8 +1,8 @@
-package com.vci.ubcs.code.wrapper;
+package com.vci.ubcs.code.webservice.wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.vci.ubcs.code.entity.DockingPreMetaAttr;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr;
+import com.vci.ubcs.code.webservice.vo.DockingPreMetaAttrVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -10,6 +10,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Objects;
+
/**
*闆嗗洟缂栫爜鐢宠妯″瀷灞炴�у寘瑁呯被
*
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreViewWrapper.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreViewWrapper.java
similarity index 91%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreViewWrapper.java
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreViewWrapper.java
index 518e96f..bd2b398 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreViewWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/wrapper/DockingPreViewWrapper.java
@@ -1,8 +1,8 @@
-package com.vci.ubcs.code.wrapper;
+package com.vci.ubcs.code.webservice.wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.vci.ubcs.code.entity.DockingPreViewModel;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
+import com.vci.ubcs.code.webservice.entity.DockingPreViewModel;
+import com.vci.ubcs.code.webservice.vo.DockingPreViewModelVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -10,6 +10,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Objects;
+
/**
*闆嗗洟缂栫爜鐢宠瑙嗗浘鍖呰绫�
*
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..26ee9bb
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-dev.yml
@@ -0,0 +1,19 @@
+#鏈嶅姟鍣ㄧ鍙�
+server:
+ port: 36016
+
+#鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ 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
+docking:
+ apply:
+ jtInterUrl: http://116.205.176.185:8099
+ unitCode: 410-MDM
+
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-prod.yml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..8931921
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-prod.yml
@@ -0,0 +1,10 @@
+#鏈嶅姟鍣ㄧ鍙�
+server:
+ port: 8107
+
+#鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ url: ${ubcs.datasource.mdm.dev.url}
+ username: ${ubcs.datasource.mdm.dev.username}
+ password: ${ubcs.datasource.mdm.dev.password}
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-test.yml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-test.yml
new file mode 100644
index 0000000..8931921
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/application-test.yml
@@ -0,0 +1,10 @@
+#鏈嶅姟鍣ㄧ鍙�
+server:
+ port: 8107
+
+#鏁版嵁婧愰厤缃�
+spring:
+ datasource:
+ url: ${ubcs.datasource.mdm.dev.url}
+ username: ${ubcs.datasource.mdm.dev.username}
+ password: ${ubcs.datasource.mdm.dev.password}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyFormMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreApplyFormMapper.xml
similarity index 93%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyFormMapper.xml
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreApplyFormMapper.xml
index 32a794f..a313684 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyFormMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreApplyFormMapper.xml
@@ -1,8 +1,8 @@
<?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.DockingPreApplyFormMapper">
+<mapper namespace="com.vci.ubcs.code.webservice.mapper.DockingPreApplyFormMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreApplyForm">
+ <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.webservice.entity.DockingPreApplyForm">
<result column="OID" property="oid"/>
<result column="REVISIONOID" property="revisionOid"/>
<result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
similarity index 92%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
index c75f1f1..e07dcc1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
@@ -1,8 +1,8 @@
<?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 namespace="com.vci.ubcs.code.webservice.mapper.DockingPreAttrMappingMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="plDockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrMapping">
+ <resultMap id="plDockingPreAttrMappingResultMap" type="com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping">
<result column="OID" property="oid"/>
<result column="REVISIONOID" property="revisionOid"/>
<result column="NAMEOID" property="nameOid"/>
@@ -36,7 +36,7 @@
<result column="TARGETATTRID" property="targetAttrId"/>
<result column="TARGETCLSFID" property="targetClassifyId"/>
<result column="VIEWMODEID" property="viewModeId"/>
- <result column="VIEWMODENAME" property="viewModeName"/>
+ <result column="VIEWMODENAME" property="viewModelName"/>
<result column="TARGETATTRKEY" property="targetAttrKey"/>
<result column="TARGETATTRNAME" property="targetAttrName"/>
<result column="SOURCEATTRKEY" property="sourceAttrKey"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
similarity index 93%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
index dbb11bc..8b4f8f1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
@@ -1,8 +1,8 @@
<?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 namespace="com.vci.ubcs.code.webservice.mapper.DockingPreAttrRangeMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="plDockingPreAttrRangeResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrRange">
+ <resultMap id="plDockingPreAttrRangeResultMap" type="com.vci.ubcs.code.webservice.entity.DockingPreAttrRange">
<result column="OID" property="oid"/>
<result column="REVISIONOID" property="revisionOid"/>
<result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreClassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml
similarity index 96%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreClassifyMapper.xml
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml
index 7c45672..f030ee1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreClassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreClassifyMapper.xml
@@ -1,8 +1,8 @@
<?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.DockingPreClassifyMapper">
+<mapper namespace="com.vci.ubcs.code.webservice.mapper.DockingPreClassifyMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="plDockingClassifyResultMap" type="com.vci.ubcs.code.entity.DockingPreClassify">
+ <resultMap id="plDockingClassifyResultMap" type="com.vci.ubcs.code.webservice.entity.DockingPreClassify">
<result column="OID" property="oid"/>
<result column="REVISIONOID" property="revisionOid"/>
<result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreMetaAttrMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreMetaAttrMapper.xml
similarity index 94%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreMetaAttrMapper.xml
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreMetaAttrMapper.xml
index c1f8fa4..34e9f7b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreMetaAttrMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreMetaAttrMapper.xml
@@ -1,8 +1,8 @@
<?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.DockingPreMetaAttrMapper">
+<mapper namespace="com.vci.ubcs.code.webservice.mapper.DockingPreMetaAttrMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="plDockingPreMetaAttrResultMap" type="com.vci.ubcs.code.entity.DockingPreMetaAttr">
+ <resultMap id="plDockingPreMetaAttrResultMap" type="com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr">
<result column="OID" property="oid"/>
<result column="REVISIONOID" property="revisionOid"/>
<result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreViewMapper.xml b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreViewMapper.xml
similarity index 93%
rename from Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreViewMapper.xml
rename to Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreViewMapper.xml
index f88b982..6b0905d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreViewMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/resources/mapper/DockingPreViewMapper.xml
@@ -1,8 +1,8 @@
<?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.DockingPreViewModelMapper">
+<mapper namespace="com.vci.ubcs.code.webservice.mapper.DockingPreViewModelMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="plDockingPreViewModelResultMap" type="com.vci.ubcs.code.entity.DockingPreViewModel">
+ <resultMap id="plDockingPreViewModelResultMap" type="com.vci.ubcs.code.webservice.entity.DockingPreViewModel">
<result column="OID" property="oid"/>
<result column="REVISIONOID" property="revisionOid"/>
<result column="NAMEOID" property="nameOid"/>
--
Gitblit v1.9.3