From 3623c7ad92348e76a917ca844d76d27711d58191 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期四, 26 十二月 2024 16:15:20 +0800
Subject: [PATCH] 集成获取mdm分发通用数据格式接口集成 日志输出到日志文件中

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java
index 5701c22..a6952f7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeMdmInfaceImpl.java
@@ -1,6 +1,7 @@
 package com.vci.ubcs.code.service.impl;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -28,6 +29,7 @@
 import com.vci.ubcs.code.vo.webserviceModel.mdm.MDMParamData;
 import com.vci.ubcs.code.vo.webserviceModel.mdm.MdmResultData;
 import com.vci.ubcs.code.vo.webserviceModel.person.EnumerableData;
+import com.vci.ubcs.code.vo.webserviceModel.person.PersonMasterData;
 import com.vci.ubcs.code.vo.webserviceModel.person.ResultMdMapping;
 import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
 import com.vci.ubcs.code.webService.config.AttributeMapConfig;
@@ -183,6 +185,10 @@
 				throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
 			}
 			List<ClassifyConfig> classifyConfigList=mdmInterFaceConfig.getClassifyconfigs();
+			//masterDataList
+			String masterDataStr = mdmParamData.getMasterData();
+			masterDataList = JSONArray.parseObject(masterDataStr,List.class);
+
 			if(StringUtils.isNotBlank(library)&&StringUtils.isNotBlank(classifyCode)){
 				String finalLibrary = library;
 				classifyConfigList.stream().forEach(classifyConfig -> {
@@ -264,7 +270,7 @@
 			if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
 				throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
 			}
-			masterDataList = mdmParamData.getMasterData();
+
 			List<String> codeList = new ArrayList<>();
 			List<ApplyDataVO> applyDataVOList = new ArrayList<>();
 			List<ApplyDataVO> deleteDataVOList = new ArrayList<>();
@@ -495,6 +501,8 @@
 				log.info("end锛氱敵璇疯幏鍙栧畬姣�");
 			}
 		} catch (Throwable e) {
+			e.printStackTrace();
+			log.info("閿欒淇℃伅***********:"+e);
 			success.set(false);
 			message = "闆嗘垚绯荤粺锛氥��"+systemCode+"銆戞墽琛岄泦鎴愬け璐�:" + e.getMessage();
 			msg ="闆嗘垚绯荤粺锛氥��"+systemCode+"銆戞墽琛岄泦鎴愬け璐�" + e.getMessage();
@@ -702,6 +710,7 @@
 			dataObjectVO.setRowData(rowDataList);
 		}catch (Throwable e){
 			objerrorCode="1";
+			e.printStackTrace();
 			throw new   Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
 		}
 	}

--
Gitblit v1.9.3