From 0496aed6e04c5084f05ce1035ba9ec38e3d4e9c7 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期五, 01 十一月 2024 15:17:41 +0800
Subject: [PATCH] 集成获取mdm分发通用数据格式接口集成

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java |  971 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 791 insertions(+), 180 deletions(-)

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 28b5aa4..4690e47 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
@@ -8,6 +8,7 @@
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
 import com.vci.ubcs.code.constant.MdmDuckingConstant;
+import com.vci.ubcs.code.dto.CodeBZApplyDTO;
 import com.vci.ubcs.code.dto.CodeOrderDTO;
 import com.vci.ubcs.code.dto.CodeOrderSecDTO;
 import com.vci.ubcs.code.entity.*;
@@ -17,6 +18,7 @@
 import com.vci.ubcs.code.util.ClientBusinessObject;
 import com.vci.ubcs.code.util.gennerAttrMapUtil;
 import com.vci.ubcs.code.vo.pagemodel.*;
+import com.vci.ubcs.code.vo.webserviceModel.applybz.*;
 import com.vci.ubcs.code.vo.webserviceModel.person.*;
 import com.vci.ubcs.code.vo.webserviceModel.apply.*;
 import com.vci.ubcs.code.vo.webserviceModel.attrmap.*;
@@ -36,7 +38,6 @@
 import com.vci.ubcs.code.webService.annotation.VciWebservice;
 import com.vci.ubcs.code.webService.config.AttributeMapConfig;
 import com.vci.ubcs.code.webService.config.PersonAndDeptConfig;
-import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
 import com.vci.ubcs.omd.feign.IBtmTypeClient;
 import com.vci.ubcs.omd.vo.BtmTypeVO;
 import com.vci.ubcs.starter.exception.VciBaseException;
@@ -53,16 +54,26 @@
 import com.vci.ubcs.system.vo.DeptVO;
 import com.vci.ubcs.system.vo.RoleVO;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+
 import javax.annotation.Resource;
-import javax.servlet.ServletRequest;
+import javax.jws.WebMethod;
+import javax.servlet.http.HttpServletRequest;
+import javax.xml.ws.WebServiceContext;
+import javax.xml.ws.handler.MessageContext;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
@@ -74,21 +85,71 @@
 @Service
 @Slf4j
 @VciWebservice(path = "/universalInterface")
-public class UniversalInterfaceImpl<IDockingLogeServiceing> implements UniversalInterfaceI {
+public class UniversalInterfaceImpl implements UniversalInterfaceI {
+
+	/***
+	 * 鎿嶄綔绫诲瀷
+	 */
+	@Value("${bzApply.operationType:operationType}")
+	private String operationType;
+	/***
+	 * 鏄惁绯诲垪
+	 */
+	@Value("${bzApply.isSeries:isSeries}")
+	private String isSeries;
+	/***
+	 *鍙戝竷鏃堕棿
+	 */
+	@Value("${bzApply.releaseTime:releaseTime}")
+	private String releaseTime;
+	/***
+	 * 婧愭爣鍑嗗彿
+	 */
+	@Value("${bzApply.oldCode:oldCode}")
+	private String oldCode;
+
+	/***
+	 * 绯诲垪娴佹按
+	 */
+	@Value("${bzApply.seriesFlow:seriesFlow}")
+	private String seriesFlow;
+
+	/***
+	 * 鏄惁鍙樻洿绯诲垪
+	 */
+	@Value("${bzApply.isEditSeries:isEditSeries}")
+	private String isEditSeries;
+
+	/***
+	 * 鎺у埗鏄惁鍐欏叆鍊肩殑鐮佹鍚嶇О
+	 */
+	@Value("${bzApply.secName:绯诲垪鍙穧")
+	private String secName;
+
+	/***
+	 * 鎺у埗鏄惁鍐欏叆鍊肩殑鐮佹鍚嶇О
+	 */
+	@Value("${bzApply.yearSecName:骞翠唬鍙穧")
+	private String yearSecName;
+
 	@Value("${code.universalinterface.checkSystemConfig:true}")
 	public boolean CODE_CHECKCONFIG;
+
 	@Autowired(required = false)
 	private AttributeMapConfig attributeMapConfig;
+
 	/***
 	 * 浜哄憳鐩稿叧閰嶇疆鏈嶅姟
 	 */
 	@Autowired(required = false)
 	private PersonAndDeptConfig personAndDeptConfig;
+
 	/**
 	 * 缂撳瓨鏈嶅姟
 	 */
 	//@Autowired
 	//private RedisService redisService;
+
 	/**
 	 * 涓婚搴撳垎绫荤殑鏈嶅姟
 	 */
@@ -128,7 +189,6 @@
 	/**
 	 * 瀵嗙骇鐨勬湇鍔�
 	 */
-
 	@Resource
 	private MdmIOService mdmIOService;
 
@@ -144,11 +204,48 @@
 	@Resource
 	private IDockingLogeService dockingLogeService;
 
+	@Resource
+	private IPasswordFreeLoginService passwordFreeLoginService;
+
+	/**
+	 * 鑷畾涔夊苟鍙慒orkJoinPool
+	 */
+	private static final ForkJoinPool customForkJoinPool = new ForkJoinPool(Runtime.getRuntime().availableProcessors() - 1);
+
 	private  static String separator="##VCI##";
 	private  String errorid="0";
 	private String msg="鎴愬姛";
 	private  String objerrorCode="0";
 	private String objerrorMsg="鎴愬姛";
+
+	private final ThreadLocal<HttpServletRequest> threadLocal = new ThreadLocal<>();
+
+	@Resource
+	private WebServiceContext webServiceContext;
+
+	@Override
+	public void setThreadLocal(ThreadLocal<HttpServletRequest> requestThreadLocal){
+		this.threadLocal.set(requestThreadLocal.get());
+		requestThreadLocal.remove();
+	}
+
+	@WebMethod
+	private HttpServletRequest getRequest() {
+		//rest璇锋眰鏂瑰紡鑾峰彇request
+		HttpServletRequest request = this.threadLocal.get();
+		if(Func.isEmpty(request)){
+			try {
+				// webservice璇锋眰鏂瑰紡鑾峰彇HttpServletRequest瀵硅薄
+				request = (HttpServletRequest)webServiceContext.getMessageContext().get(MessageContext.SERVLET_REQUEST);
+			}catch (Exception e){
+				throw new ServiceException("鑾峰彇httpServletRequest澶辫触锛屽師鍥�:"+e.getMessage());
+			}
+		}else {
+			this.threadLocal.remove();
+		}
+		return request;
+	}
+
 	/***
 	 * 鐢宠缂栫爜鎺ュ彛
 	 * @param data 浼犻�掔殑鏁版嵁鍙傛暟
@@ -191,19 +288,25 @@
 			ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
 			systemId = interParameterVO.getData().getSystemId();
 			UserVO userVo = interParameterVO.getData().getUser();
+			//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+			try {
+				passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(Locale.ROOT), this.getRequest());
+			}catch (Throwable e){
+				errorid[0] ="1";
+				throw new Throwable("鐢ㄦ埛閴存潈澶辫触锛屽師鍥狅細"+e.getMessage());
+			}
 			List<ClassfyVO> classVOList = classfysVO.getClassify();
-			InterParameterVO finalInterParameterVO = interParameterVO;
-
+			//InterParameterVO finalInterParameterVO = interParameterVO;
 			//杩欐槸璐﹀彿淇℃伅
 			SessionInfo sessionInfo = new SessionInfo();
 			sessionInfo.setUserId(userVo.getUserName());
 			sessionInfo.setUserName(userVo.getTrueName());
 			sessionInfo.setIp(userVo.getIp());
 			VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
-//			List<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new ArrayList<>();
+			//List<XMLResultDataObjectDetailDO> allResultDataObjectDetailDOS=new ArrayList<>();
 			String finalSystemId = systemId;
 			classVOList.stream().forEach(classVO -> {
-				log.info("鍙傛暟锛氬垎绫籆Ode:" + classVO.getClassCode());
+				log.info("鍙傛暟锛氬垎绫籆ode:" + classVO.getClassCode());
 				boolean isCodeOrGroupCode=false;
 				LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
 				String libray ="";
@@ -222,7 +325,7 @@
 						//鏍¢獙鏄惁閰嶇疆
 						DockingSystemConfig dockingSystemConfig=null;
 						dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
-						if(dockingSystemConfig==null){
+						if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
 							errorid[0] ="101";
 							throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
 						}
@@ -236,7 +339,8 @@
 					log.info("end锛氭ā鏉挎煡璇㈠畬姣�");
 					ApplyDatasVO applyDatasVO = classVO.getObjects();
 					DataObjectVO dataObjectVO = new DataObjectVO();
-					List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
+					List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
+						((Func.isNotEmpty(s.getClassifyInvokeAttr()) || Func.isNotEmpty(s.getClassifyInvokeAttrName())) || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
 					).collect(Collectors.toList());
 					this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
 					log.info("end锛氭暟鎹粍缁囧畬姣�");
@@ -274,7 +378,6 @@
 							resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
 						});
 					}else{
-
 						XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
 						xmlResultDataObjectDetailDO.setCode("");
 						xmlResultDataObjectDetailDO.setId("");
@@ -283,6 +386,7 @@
 						resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
 					}
 					e.printStackTrace();
+					log.error(e.getMessage());
 				}finally {
 					XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
 					resultClassfyVO.setClassCode(classVO.getClassCode());
@@ -301,6 +405,7 @@
 		}catch (Throwable e){
 			e.printStackTrace();
 			msg="鐢宠缂栫爜澶辫触:"+e.getMessage();
+			log.error(msg);
           /*  XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
             XMLResultSystemVO.setErrorid(errorid);
             XMLResultSystemVO.setMsg("鐢宠缂栫爜澶辫触锛�->"+e.getMessage());
@@ -322,10 +427,10 @@
 				if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
 					resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
 						xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
-							if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
+							if (!(objec.getErrorid().equals("0")||objec.getErrorid().equals("201") ||objec.getErrorid().equals("205")|| objec.getErrorid().equals("204"))) {
 								issucess[0] = false;
-								msg=objec.getMsg();
 							}
+							msg=objec.getMsg();
 						});
 					});
 				}
@@ -336,14 +441,13 @@
 				this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCode");
 			}catch (Throwable e){
 				e.printStackTrace();
+				log.error(e.getMessage());
 			}
 		}
 		log.info("杩斿洖鍙傛暟:"+resultStr);
 		//璋冪敤闆嗗洟鐢宠鎺ュ彛鐢宠闆嗗洟鐮�
 		return resultStr;
 	}
-
-
 
 	/****
 	 * 浜哄憳鏁版嵁鍚屾
@@ -353,7 +457,6 @@
 	 */
 	@Override
 	public ResultOrgData syncDataForPerson(PersonData personData) {
-
 		boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
 		ResultOrgData resultOrgData=new ResultOrgData();
 
@@ -364,10 +467,15 @@
 		if(isUsedFlag){
 			AtomicBoolean success= new AtomicBoolean(true);
 			List<PersonMasterData> masterDataList=new ArrayList<>();
-			List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields());
+			List<String> fields = Func.toStrList(personAndDeptConfig.getPersonFields());
 			try {
 				if(personData==null){
 					throw new Throwable("浼犲叆鍙傛暟涓簄ull");
+				}
+				try {
+					passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
+				}catch (Throwable e){
+					throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
 				}
 				masterDataList = personData.getMasterData();
 				String personLibrary = personAndDeptConfig.getPersonLibrary();
@@ -380,7 +488,7 @@
 				ClassfyVO classfyVO = new ClassfyVO();
 				classfyVO.setLibrary(personLibrary);
 				classfyVO.setClassCode(personClassCode);
-				CodeClassifyVO  codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
+				CodeClassifyVO codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
 				log.info("end锛氬垎绫绘煡璇㈠畬姣�");
 				//鑾峰彇鍒嗙被妯℃澘淇℃伅
 				if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -393,12 +501,12 @@
 					throw  new  Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
 				}
 
-				List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
+				List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
+					((Func.isNotEmpty(s.getClassifyInvokeAttr()) || Func.isNotEmpty(s.getClassifyInvokeAttrName())) || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
 				).collect(Collectors.toList());
 
 				List<PersonMasterData> personMasterDataList= personData.getMasterData();
-				List<Map> dataList=new ArrayList<>();
-
+				//List<Map> dataList=new ArrayList<>();
 				List<String> codeList=new ArrayList<>();
 
 				List<ApplyDataVO> applyDataVOList=new ArrayList<>();
@@ -417,7 +525,7 @@
 					 */
 					fields.stream().forEach(field->{
 						if(dataMap.containsKey(field)){
-							String enumFiled= dataMap.get(field);
+							String enumFiled = dataMap.get(field);
 							EnumerableData enumerableData=JSONObject.toJavaObject(JSONObject.parseObject(enumFiled),EnumerableData.class);
 							String enumCode=enumerableData.getCode();
 							//String enumCodeValue=enumerableData.getName();
@@ -437,11 +545,11 @@
 
 					object.setProp(proppertyVOList);
 					if(personMasterData.getDr()==1){
-						object.setOperate("delete");//鎿嶄綔绫诲瀷
+						//鎿嶄綔绫诲瀷
+						object.setOperate("delete");
 						deleteDataVOList.add(object);
 					}else{
-						String worker_category=personMasterData.getWorker_category();
-
+						//String worker_category=personMasterData.getWorker_category();
 						object.setOperate("create");
 						applyDataVOList.add(object);
 					}
@@ -469,11 +577,12 @@
 				sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
 				sb.append(")");
 				List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
+				DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
 				List<ClientBusinessObject> cboList=	ChangeMapTOClientBusinessObjects(dataMapList);
 				ApplyDatasVO applyDatasVO=new ApplyDatasVO();
 				ApplyDatasVO editDatasVO=new ApplyDatasVO();
 				if(!CollectionUtils.isEmpty(cboList)){
-				Map<String,ClientBusinessObject> oldpplyDataVOMap=	cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+				Map<String,ClientBusinessObject> oldpplyDataVOMap =	cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
 					//鏁版嵁搴撲笉瀛樺湪鐨�
 					List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
 						String code =cbo.getCode();
@@ -513,13 +622,17 @@
 						throw  new Throwable("缂栫爜瑙勫垯");
 					}
 					List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>();
-					dataObjectVO.getRowData().parallelStream().forEach(rowData->{
+					final List<RowDatas> rowDatas = dataObjectVO.getRowData();
+					rowDatas.parallelStream().forEach(rowData->{
 						String mesg="";
 						try {
 							CodeOrderDTO orderDTO = new CodeOrderDTO();
 							List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
 							orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
 							orderDTO.setTemplateOid(templateVO.getOid());
+							orderDTO.setCreator(rowData.getCreator());
+							orderDTO.setLastModifier(rowData.getEditor());
+							orderDTO.setLcStatus(rowData.getStatus());
 							if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
 								ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
 									if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
@@ -534,7 +647,7 @@
 							orderDTO.setCodeRuleOid(ruleVO.getOid());
 							orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
 							orderDTO.setData(rowData.getFiledValue());
-							String code=engineService.addSaveCode(orderDTO);
+							String code=engineService.addSaveCodeNotauthUser(orderDTO,false);
 							if(StringUtils.isNotBlank(code)) {
 								StringBuffer sqlsb = new StringBuffer();
 								sqlsb.append(" select * from ");
@@ -560,6 +673,7 @@
 						} catch (Exception e) {
 							mesg=e.getMessage();
 							e.printStackTrace();
+							throw new ServiceException(e.getMessage());
 						}finally {
 							XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
 							x.setId(rowData.getOid());
@@ -572,21 +686,25 @@
 					resultDataObjectDetailDOs.addAll(xDOs);
 					boolean finalSuccess1 = success.get();
 					String finalMessage1 = message;
-					resultDataObjectDetailDOs.stream().forEach(resultDataObjectDetailDO->{
-						ResultMdMapping resultMdMapping=new ResultMdMapping();
-						resultMdMapping.setBusiDataId(resultDataObjectDetailDO.getId());
-						resultMdMapping.setSuccess(finalSuccess1);
-						resultMdMapping.setEntityCode(" ");
-						resultMdMapping.setMdmCode(resultDataObjectDetailDO.getCode());
-						resultMdMapping.setMessage(finalMessage1);
-						resultMdMapping.setSubMdMappings(null);
-						resultMdMappingList.add(resultMdMapping);
-					});
+					// 闄愬埗绾跨▼骞惰鏁伴噺
+					customForkJoinPool.submit(()->{
+						resultDataObjectDetailDOs.stream().forEach(resultDataObjectDetailDO->{
+							ResultMdMapping resultMdMapping=new ResultMdMapping();
+							resultMdMapping.setBusiDataId(resultDataObjectDetailDO.getId());
+							resultMdMapping.setSuccess(finalSuccess1);
+							resultMdMapping.setEntityCode(" ");
+							resultMdMapping.setMdmCode(resultDataObjectDetailDO.getCode());
+							resultMdMapping.setMessage(finalMessage1);
+							resultMdMapping.setSubMdMappings(null);
+							resultMdMappingList.add(resultMdMapping);
+						});
+					}).join();
 					log.info("end锛氱敵璇疯幏鍙栧畬姣�");
 				}
 			}catch (Throwable e){
 				success.set(false);
-				message="浜哄憳鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
+				message = "浜哄憳鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
+				msg = "浜哄憳鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
 				//缁勭粐杩斿洖缁撴灉
 				boolean finalSuccess = success.get();
 				String finalMessage = message;
@@ -603,7 +721,7 @@
 				resultOrgData.setMessage(message);
 				resultOrgData.setSuccess(success.get());
 				resultOrgData.setMdMappings(resultMdMappingList);
-				Object object = JSONObject.toJSON(resultOrgData);
+				//Object object = JSONObject.toJSON(resultOrgData);
 			}
 			String resultStr = JSONObject.toJSONString(resultOrgData);
 			String data = JSONObject.toJSONString(personData);
@@ -617,6 +735,7 @@
 
 		return resultOrgData;
 	}
+
 	/****
 	 * 閮ㄩ棬鏁版嵁鍚屾
 	 * @param orgData
@@ -627,31 +746,36 @@
 	public ResultOrgData syncDataForOrg(OrgData orgData) {
 		boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
 		ResultOrgData resultOrgData=new ResultOrgData();
-		boolean isPersonApplyGroupCode= personAndDeptConfig.isPersonApplyGroupCode();
+		// boolean isPersonApplyGroupCode= personAndDeptConfig.isDeptApplyGroupCode();
 		List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
 		AtomicBoolean success= new AtomicBoolean(true);
 		String message="";
 		String systemCode="";
 		if(isUsedFlag){
-			List<OrgMasterData> orgMasterDataList=new ArrayList<>();
-			List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields());
+			List<OrgMasterData> orgMasterDataList = new ArrayList<>();
+			List<String> fields = Func.toStrList(personAndDeptConfig.getDeptFields());
 			try {
 				if(orgData==null){
 					throw new Throwable("浼犲叆鍙傛暟涓簄ull");
 				}
 				systemCode=orgData.getSystemCode();
-				orgMasterDataList = orgData.getMasterData();
-				String personLibrary = personAndDeptConfig.getPersonLibrary();
-				if (StringUtils.isBlank(personLibrary)) {
-					success.set(false);
-					log.info("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary);
-					throw  new Throwable("闆嗘垚閰嶇疆缂哄皯浜哄憳搴撹妭鐐逛俊鎭�,personLibrary->" + personLibrary);
+				try {
+					passwordFreeLoginService.pwdFreeLoginByBoolean(systemCode.toLowerCase(),this.getRequest());
+				}catch (Throwable e){
+					throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
 				}
-				String personClassCode = personAndDeptConfig.getPersonClassCode();
+				orgMasterDataList = orgData.getMasterData();
+				String deptLibrary = personAndDeptConfig.getDeptLibrary();
+				if (StringUtils.isBlank(deptLibrary)) {
+					success.set(false);
+					log.info("闆嗘垚閰嶇疆缂哄皯閮ㄩ棬搴撹妭鐐逛俊鎭�,deptLibrary->" + deptLibrary);
+					throw  new Throwable("闆嗘垚閰嶇疆缂哄皯閮ㄩ棬搴撹妭鐐逛俊鎭�,deptLibrary->" + deptLibrary);
+				}
+				String deptClassCode = personAndDeptConfig.getDeptClassCode();
 				ClassfyVO classfyVO = new ClassfyVO();
-				classfyVO.setLibrary(personLibrary);
-				classfyVO.setClassCode(personClassCode);
-				CodeClassifyVO  codeClassifyVO=this.getClassfy(classfyVO,personLibrary);
+				classfyVO.setLibrary(deptLibrary);
+				classfyVO.setClassCode(deptClassCode);
+				CodeClassifyVO codeClassifyVO = this.getClassfy(classfyVO,deptLibrary);
 				log.info("end锛氬垎绫绘煡璇㈠畬姣�");
 				//鑾峰彇鍒嗙被妯℃澘淇℃伅
 				if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
@@ -661,12 +785,12 @@
 				CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
 				if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
 					success.set(false);
-					throw  new  Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
+					throw new Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旀ā鏉�");
 				}
 
-				List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
+				List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
+					((Func.isNotEmpty(s.getClassifyInvokeAttr()) || Func.isNotEmpty(s.getClassifyInvokeAttrName())) || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
 				).collect(Collectors.toList());
-				List<Map> dataList=new ArrayList<>();
 				List<String> codeList=new ArrayList<>();
 				List<ApplyDataVO> applyDataVOList=new ArrayList<>();
 				List<ApplyDataVO> deleteDataVOList=new ArrayList<>();
@@ -675,10 +799,10 @@
 					object.setCode(orgMasterData.getMdm_code());//缂栫爜
 					object.setCreator(orgMasterData.getCreator());//鍒涘缓鑰�
 					object.setEditor(orgMasterData.getModifier());//淇敼鑰�
-					object.setId(orgMasterData.getPk_mdm());//涓婚敭
+					object.setId(orgMasterData.getDepartment_code());//涓婚敭
 					object.setStatus(CodeDefaultLC.RELEASED.getValue());//鐘舵�佸垯闇�瑕佸垽鏂�
 					Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
-					List<ProppertyVO> proppertyVOList=new ArrayList<>();
+					List<ProppertyVO> proppertyVOList = new ArrayList<>();
 					/***
 					 * 鏍规嵁閰嶇疆鏂囦欢鑾峰彇鏋氫妇鍊�
 					 */
@@ -707,7 +831,6 @@
 						object.setOperate("delete");//鎿嶄綔绫诲瀷
 						deleteDataVOList.add(object);
 					}else{
-
 						object.setOperate("create");
 						applyDataVOList.add(object);
 					}
@@ -723,10 +846,10 @@
 					throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷瀵硅薄锛�");
 				}
 				String tableName = btmTypeVO.getTableName();
-				if (com.alibaba.nacos.common.utils.StringUtils.isBlank(tableName)) {
+				if (StringUtils.isBlank(tableName)) {
 					throw new Throwable("鏍规嵁涓氬姟绫诲瀷鏈煡璇㈠埌涓氬姟绫诲瀷鐩稿叧鑱旂殑琛�");
 				}
-				StringBuffer sb=new StringBuffer();
+				StringBuffer sb = new StringBuffer();
 				sb.append(" select * from ");
 				sb.append(tableName);
 				sb.append(" where 1=1 ");
@@ -734,15 +857,16 @@
 				sb.append(" and id in (");
 				sb.append(VciBaseUtil.toInSql(codeList.toArray(new String[0])));
 				sb.append(")");
-				List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
-				List<ClientBusinessObject> cboList=	ChangeMapTOClientBusinessObjects(dataMapList);
+				List<Map<String,String>> dataMapList = commonsMapper.queryByOnlySqlForMap(sb.toString());
+				DefaultAttrAssimtUtil.mapToLowerCase(dataMapList,true);
+				List<ClientBusinessObject> cboList = ChangeMapTOClientBusinessObjects(dataMapList);
 				ApplyDatasVO applyDatasVO=new ApplyDatasVO();
 				ApplyDatasVO editDatasVO=new ApplyDatasVO();
 				if(!CollectionUtils.isEmpty(cboList)){
-					Map<String,ClientBusinessObject> oldpplyDataVOMap=	cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+					Map<String,ClientBusinessObject> oldpplyDataVOMap =	cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
 					//鏁版嵁搴撲笉瀛樺湪鐨�
 					List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
-						String code =cbo.getCode();
+						String code = cbo.getCode();
 						return !oldpplyDataVOMap.containsKey(code);
 					}).collect(Collectors.toList());
 					applyDatasVO.setObject(applyApplyDataVOList);
@@ -763,15 +887,15 @@
 				LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs=new LinkedList<>();
 				if(editDatasVO.getObject()!=null&&editDatasVO.getObject().size()>0){
 					DataObjectVO dataObjectVO = new DataObjectVO();
-					this.getConfigDatas(systemCode, personLibrary, editDatasVO, attrVOS, dataObjectVO);
+					this.getConfigDatas(systemCode, deptLibrary, editDatasVO, attrVOS, dataObjectVO);
 					log.info("start锛氫慨鏀规暟鎹墽琛屽畬姣�");
-					boolean  personApplyGroupCode =personAndDeptConfig.isPersonApplyGroupCode();
+					boolean personApplyGroupCode = personAndDeptConfig.isPersonApplyGroupCode();
 					mdmIOService.batchSyncEditDatas(codeClassifyVO,dataObjectVO, resultDataObjectDetailDOs,personApplyGroupCode);
 					log.info("end锛氫慨鏀规暟鎹墽琛屽畬姣�");
 				}
 				if(applyDatasVO.getObject()!=null&&applyDatasVO.getObject().size()>0) {
 					DataObjectVO dataObjectVO = new DataObjectVO();
-					this.getConfigDatas(systemCode, personLibrary, applyDatasVO, attrVOS, dataObjectVO);
+					this.getConfigDatas(systemCode, deptLibrary, applyDatasVO, attrVOS, dataObjectVO);
 
 					CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
 					CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
@@ -779,29 +903,35 @@
 						throw  new Throwable("缂栫爜瑙勫垯");
 					}
 					List<XMLResultDataObjectDetailDO> xDOs=new CopyOnWriteArrayList<>();
-					dataObjectVO.getRowData().parallelStream().forEach(rowData->{
-						String mesg="";
-						try {
-							CodeOrderDTO orderDTO = new CodeOrderDTO();
-							List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
-							orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
-							orderDTO.setTemplateOid(templateVO.getOid());
-							if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
-								ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
-									if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
-										CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
-										CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
-										CodeOrderSecDTO.setSecValue(rowData.getCode());
-										codeOrderSecDTOList.add(CodeOrderSecDTO);
-
-									}
-								});
-							}
-							orderDTO.setCodeRuleOid(ruleVO.getOid());
-							orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
-							orderDTO.setData(rowData.getFiledValue());
-							String code=engineService.addSaveCode(orderDTO);
-							if(StringUtils.isNotBlank(code)) {
+					//闄愬埗绾跨▼骞惰鏁伴噺
+					customForkJoinPool.submit(()->{
+						dataObjectVO.getRowData().parallelStream().forEach(rowData->{
+							String mesg="";
+							try {
+								CodeOrderDTO orderDTO = new CodeOrderDTO();
+								List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
+								orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//鍒嗙被涓婚敭
+								orderDTO.setTemplateOid(templateVO.getOid());
+								orderDTO.setCreator(rowData.getCreator());
+								orderDTO.setLastModifier(rowData.getEditor());
+								orderDTO.setLcStatus(rowData.getStatus());
+								if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) {
+									ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> {
+										if (codeBasicSecVO.getSecType().equals("codevariablesec")) {
+											//瑙勫垯涔嬪畾涔変负鍙彉鐮佹瀛樺偍涓绘暟鎹紶閫掕繃鏉ョ殑鏁版嵁
+											CodeOrderSecDTO CodeOrderSecDTO = new CodeOrderSecDTO();
+											CodeOrderSecDTO.setSecOid(codeBasicSecVO.getOid());
+											CodeOrderSecDTO.setSecValue(rowData.getOid());
+											codeOrderSecDTOList.add(CodeOrderSecDTO);
+										}
+									});
+								}
+								orderDTO.setCodeRuleOid(ruleVO.getOid());
+								orderDTO.setSecDTOList(codeOrderSecDTOList);//瀛樺偍缂栫爜
+								orderDTO.setData(rowData.getFiledValue());
+								String code = engineService.addSaveCodeNotauthUser(orderDTO,false);
+							/*if(StringUtils.isNotBlank(code)) {
+								//rowData.setCode(code);
 								StringBuffer sqlsb = new StringBuffer();
 								sqlsb.append(" select * from ");
 								sqlsb.append(tableName);
@@ -822,20 +952,21 @@
 										mesg = "鏁版嵁淇濆瓨鎴愬姛锛岀瓑寰呯敵璇烽泦鍥㈢爜";
 									}
 								}
+							}*/
+							} catch (Exception e) {
+								mesg=e.getMessage();
+								e.printStackTrace();
+								throw new ServiceException(e.getMessage());
+							}finally {
+								XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
+								x.setId(rowData.getOid());
+								x.setCode(rowData.getCode());
+								x.setMsg(mesg);
+								x.setErrorid("1");
+								xDOs.add(x);
 							}
-						} catch (Exception e) {
-							mesg=e.getMessage();
-							e.getMessage();
-							e.printStackTrace();
-						}finally {
-							XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
-							x.setId(rowData.getOid());
-							x.setCode(rowData.getCode());
-							x.setMsg(mesg);
-							x.setErrorid("1");
-							xDOs.add(x);
-						}
-					});
+						});
+					}).join();
 					resultDataObjectDetailDOs.addAll(xDOs);
 					boolean finalSuccess1 = success.get();
 					String finalMessage1 = message;
@@ -853,7 +984,8 @@
 				}
 			}catch (Throwable e){
 				success.set(false);
-				message="浜哄憳鏁版嵁鎺ュ彈澶辫触:"+e.getMessage();
+				message = "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
+				msg = "閮ㄩ棬鏁版嵁鎺ユ敹澶辫触:"+e.getMessage();
 				//缁勭粐杩斿洖缁撴灉
 				boolean finalSuccess = success.get();
 				String finalMessage = message;
@@ -883,6 +1015,7 @@
 		}
 		return resultOrgData;
 	}
+
 	/***
 	 * 缁熶竴鏇存柊鎺ュ彛锛堟洿鏀圭姸鎬侊紝鏇存敼灞炴�т俊鎭級鎺ュ彛
 	 * @param data
@@ -927,8 +1060,16 @@
 			ClassfysVO classfysVO = interParameterVO.getData().getClassifys();
 			systemId = interParameterVO.getData().getSystemId();
 			UserVO userVo = interParameterVO.getData().getUser();
+			//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+			//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+			try {
+				passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+			}catch (Throwable e){
+				errorid = "1";
+				throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+			}
 			List<ClassfyVO> classVOList = classfysVO.getClassify();
-			InterParameterVO finalInterParameterVO = interParameterVO;
+			//InterParameterVO finalInterParameterVO = interParameterVO;
 			//杩欐槸璐﹀彿淇℃伅
 			SessionInfo sessionInfo = new SessionInfo();
 			sessionInfo.setUserId(userVo.getUserName());
@@ -954,7 +1095,7 @@
 					if(CODE_CHECKCONFIG) {
 						//鏍¢獙鏄惁閰嶇疆
 						DockingSystemConfig dockingSystemConfig= checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getValue(),codeClassifyVO.getOid());
-						if(dockingSystemConfig==null){
+						if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
 							objerrorCode ="101";
 							throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
 						}
@@ -971,7 +1112,8 @@
 					ApplyDatasVO applyDatasVO = classVO.getObjects();
 					DataObjectVO dataObjectVO = new DataObjectVO();
 					//灏嗛粯璁ょ殑灞炴�у叏閮ㄦ浛鎹㈡帀
-					List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) && VciBaseUtil.getBoolean(s.getFormDisplayFlag())
+					List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
+						((Func.isNotEmpty(s.getClassifyInvokeAttr()) || Func.isNotEmpty(s.getClassifyInvokeAttrName())) || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
 					).collect(Collectors.toList());
 					this.getConfigDatas(finalSystemId, libray, applyDatasVO, attrVOS, dataObjectVO);
 					log.info("end锛氭暟鎹瀯寤哄畬姣�");
@@ -1010,7 +1152,7 @@
 				}
 			});
 		}catch (Throwable e){
-			e.printStackTrace();;
+			e.printStackTrace();
 			msg="缂栫爜鏇存敼/鐘舵�佹洿鏀�/鍒犻櫎:"+e.getMessage();
           /*  XMLResultSystemVO XMLResultSystemVO=new XMLResultSystemVO();
             XMLResultSystemVO.setErrorid(errorid);
@@ -1033,10 +1175,10 @@
 				if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
 					resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
 						xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
-							if (!(objec.getErrorid().equals("0") || objec.getErrorid().equals("204"))) {
+							if (!(objec.getErrorid().equals("0")||objec.getErrorid().equals("201") ||objec.getErrorid().equals("205")|| objec.getErrorid().equals("204"))) {
 								issucess[0] = false;
-								msg=objec.getMsg();
 							}
+							msg=objec.getMsg();
 						});
 					});
 				}
@@ -1072,7 +1214,7 @@
 		log.info("鏌ヨ鍒嗙被鐨勬暟鎹被鍨�:->"+dataType);
 		ResultClassifyVO resultClassifyVO =new ResultClassifyVO();
 		List<ClassifyVO> classifyVOList=new ArrayList<>();
-		com.vci.ubcs.code.vo.webserviceModel.classify.ResultData resultData=new com.vci.ubcs.code.vo.webserviceModel.classify.ResultData();
+		ResultData resultData=new ResultData();
 		try {
 			if (StringUtils.isBlank(data)) {
 				errorid = "101";
@@ -1099,6 +1241,15 @@
 			QueryData queryData=queryClassifyVO.getData();
 			UserVO userVo=queryData.getUser();
 			systemId=queryData.getSystemId();
+			//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+			//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+			try {
+				passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+			}catch (Throwable e){
+				errorid = "1";
+				throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+			}
+
 			QueryLibraryVO libraryVO= queryData.getLibrary();
 			String libId= libraryVO.getId();
 			List<String> classifyIdList=  libraryVO.getClassifyid();
@@ -1123,7 +1274,7 @@
 				throw new Throwable("鎺ュ彛鍙傛暟锛氳处鍙蜂俊鎭幏鍙栧け璐�");
 			}
 			List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().in(CodeClassify::getId, libId));
-			if(CollectionUtils.isEmpty(libIdDos)) {
+			if(!CollectionUtils.isEmpty(libIdDos)) {
 				CodeClassify libCodeClassify =libIdDos.get(0);
 				String oid=libCodeClassify.getOid();
 				if (!CollectionUtils.isEmpty(classifyIdList)) {
@@ -1156,10 +1307,10 @@
 						throw new Throwable(msg);
 					}
 				} else {
-					TreeQueryObject treeQueryObject = new TreeQueryObject();
+					/*TreeQueryObject treeQueryObject = new TreeQueryObject();
 					treeQueryObject.setParentOid(oid);
-					treeQueryObject.setQueryAllLevel(true);
-					codeClassifyVOS = classifyService.selectCodeClassifyDOByTree(treeQueryObject);
+					treeQueryObject.setQueryAllLevel(true);*/
+					codeClassifyVOS = classifyService.getIdPathToNamePathByParentId(oid,false);
 				}
 			}else{
 				errorid = "101";
@@ -1179,7 +1330,7 @@
 					classifyVO.setDescription(codeClassifyDO.getDescription());
 					classifyVO.setName(codeClassifyDO.getName());
 					classifyVO.setPid(codeClassifyDO.getParentCodeClassifyOid());
-					classifyVO.setFullPathName(codeClassifyDO.getPath());
+					classifyVO.setFullPathName(codeClassifyDO.getNamePath());
 					classifyVOList.add(classifyVO);
 				});
 				libraryVo.setClassify(classifyVOList);
@@ -1190,7 +1341,7 @@
 			issucess=true;
 			resultData.setLibrary(libraryVo);
 		}catch (Throwable e){
-			e.printStackTrace();;
+			e.printStackTrace();
 			msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
 		}finally {
 			resultData.setErrorid(errorid);
@@ -1230,7 +1381,7 @@
 		boolean issucess=false;
 		String resultStr = "";
 		String errorid="0";
-		msg="鎴愬姛";
+		msg = "鏁版嵁鏌ヨ鎴愬姛";
 		String systemId="";
 		log.info("鏌ヨ鍒嗙被鐨勬暟鎹弬鏁�:->"+data);
 		log.info("鏌ヨ鍒嗙被鐨勬暟鎹被鍨�:->"+dataType);
@@ -1256,6 +1407,14 @@
 			CondtionsVO condtionsVO=dataCondtionsVO.getCondtions();
 			systemId=condtionsVO.getSystemId();
 			UserVO userVo=condtionsVO.getUser();
+			//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+			//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+			try {
+				passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+			}catch (Throwable e){
+				errorid = "1";
+				throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+			}
 			CondtionVO condtionVO= condtionsVO.getCondtion();
 			SessionInfo sessionInfo = new SessionInfo();
 			sessionInfo.setUserId(userVo.getUserName());
@@ -1303,7 +1462,7 @@
 					if(CODE_CHECKCONFIG) {
 						//鏍¢獙鏄惁閰嶇疆
 						DockingSystemConfig dockingSystemConfig= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getValue(),currentCodeClassify[0].getOid());
-						if(dockingSystemConfig==null){
+						if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
 							errorid ="101";
 							throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ systemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+currentCodeClassify[0].getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
 						}
@@ -1314,8 +1473,8 @@
 					TreeQueryObject treeQueryObject=new TreeQueryObject();
 					treeQueryObject.setParentOid(oid);
 					treeQueryObject.setQueryAllLevel(true);
-					dataCodeClassifyVOList=classifyService.selectCodeClassifyDOByTree(treeQueryObject);
-					dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0]));
+					dataCodeClassifyVOList=classifyService.selectAllClassifyByOid(oid,"oid");//.selectCodeClassifyDOByTree(treeQueryObject);
+					//dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0]));
 					Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
 
 					List<PropertyVO>  propertyVOS=condtionVO.getPro();
@@ -1352,7 +1511,8 @@
 					sb.append(" and lastr=1 and lastv=1" );
 					sb.append(" and codeclsfid in (" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) +")");
 					sb.append(" and Lcstatus in (" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) +")");
-					List<Map<String,String>>  newDataList= commonsMapper.queryByOnlySqlForMap(sb.toString());
+					List<Map<String,String>> newDataList = commonsMapper.queryByOnlySqlForMap(sb.toString());
+					DefaultAttrAssimtUtil.mapToLowerCase(newDataList,true);
 					List<ClientBusinessObject> clientBusinessObjects=	ChangeMapTOClientBusinessObjects(newDataList);
 					List<com.vci.ubcs.code.vo.webserviceModel.data.DataObjectVO> dataObjectVOS=new ArrayList<>();
 					if(!CollectionUtils.isEmpty(clientBusinessObjects)){
@@ -1392,6 +1552,9 @@
 							dataObjectVOS.add(dataObjectVO);
 						});
 						resultDataVO.setObject(dataObjectVOS);
+					}else{
+						errorid = "0";
+						msg = "鎺ュ彛鍙傛暟锛歝lassCode 鏈煡璇㈠埌瀵瑰簲鐨勬暟鎹�";
 					}
 				}else{
 					errorid = "101";
@@ -1402,10 +1565,8 @@
 				errorid = "101";
 				msg = "鎺ュ彛鍙傛暟锛歭ibrary 鏈煡璇㈠埌瀵瑰簲鐨勫簱鑺傜偣淇℃伅";
 			}
-			errorid = "0";
-			msg = "鏁版嵁鏌ヨ鎴愬姛";
 		}catch (Throwable e){
-			e.printStackTrace();;
+			e.printStackTrace();
 			msg="鏌ヨ鏁版嵁澶辫触:"+e.getMessage();
 		}finally {
 			resultDataVO.setErrorid(errorid);
@@ -1432,11 +1593,8 @@
 		return resultStr;
 	}
 
-
-
 	@Override
 	public String queryClassifyRule(String data, String dataType) throws Throwable {
-
 		boolean issucess=false;
 		String resultStr = "";
 		String errorid="0";
@@ -1473,6 +1631,15 @@
 			QueryData queryData=queryClassifyVO.getData();
 			UserVO userVo=queryData.getUser();
 			systemId=queryData.getSystemId();
+			//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+			//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(),this.getRequest());
+			try {
+				passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+			}catch (Throwable e){
+				errorid = "1";
+				throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+			}
+
 			QueryLibraryVO libraryVO= queryData.getLibrary();
 			String libId= libraryVO.getId();
 			List<String> classifyIdList=  libraryVO.getClassifyid();
@@ -1538,7 +1705,7 @@
 										String num=StringUtils.isBlank(codeFixedValueVO.getOrderNum()+"")?"":codeFixedValueVO.getOrderNum()+"";
 										String name=StringUtils.isBlank(codeFixedValueVO.getName())?"":codeFixedValueVO.getName();
 										String description=StringUtils.isBlank(codeFixedValueVO.getDescription())?"":codeFixedValueVO.getDescription();
-									CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,name,"",description);
+									CodeSectionValueVO sectionValueVO=new CodeSectionValueVO(id,num,value,id,"",description);
 									codeSectionValueVOList.add(sectionValueVO);
 									});
 								}else if(secType.equals("codeclassifysec")){//鍒嗙被鐮佹
@@ -1611,11 +1778,11 @@
 											if (!CollectionUtils.isEmpty(ListMap)) {
 												ListMap.stream().forEach(map -> {
 													num[0]++;
-													String id = map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
-													String value = map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
-													String text = map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
-													String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
-													CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, "", description);
+													String id =Func.isNull(map.getOrDefault("OID".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
+													String value = Func.isNull(map.getOrDefault(valueField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
+													String text =Func.isNull(map.getOrDefault(textField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
+													String description =Func.isNull(map.getOrDefault("description".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
+													CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, id, "", description);
 													codeSectionValueVOList.add(sectionValueVO);
 												});
 											}
@@ -1700,11 +1867,11 @@
 											if (!CollectionUtils.isEmpty(ListMap)) {
 												ListMap.stream().forEach(map -> {
 													num[0]++;
-													String id = map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
-													String value = map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
-													String text = map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
-													String description = map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
-													String pid = map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), "").toString();
+													String id =Func.isNull(map.getOrDefault("OID".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("OID".toUpperCase(Locale.ROOT), "").toString();
+													String value =Func.isNull(map.getOrDefault(valueField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(valueField.toUpperCase(Locale.ROOT), "").toString();
+													String text =Func.isNull(map.getOrDefault(textField.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(textField.toUpperCase(Locale.ROOT), "").toString();
+													String description =Func.isNull(map.getOrDefault("description".toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault("description".toUpperCase(Locale.ROOT), "").toString();
+													String pid =Func.isNull(map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), ""))?"":map.getOrDefault(parentFieldName.toUpperCase(Locale.ROOT), "").toString();
 													CodeSectionValueVO sectionValueVO = new CodeSectionValueVO(id, num[0] + "", value, text, pid, description);
 													codeSectionValueVOList.add(sectionValueVO);
 												});
@@ -1782,10 +1949,10 @@
 									}
 									log.info(libId);
 								}else if(secType.equals("codelevelsec")) {//灞傜骇鐮佹
-									int level = codeBasicSecVO.getCodeLevelValue();
 									CodeClassifyVO levelCodeClassifyVO = new CodeClassifyVO();
 									CodeClassifyFullInfoBO classifyFullInfoBO = this.classifyService.getClassifyFullInfo(codeClassifyDO.getOid());
 									if(codeBasicSecVO.getCodeLevelType().equals("code_level_special")){//鎸囧畾灞傜骇
+										int level = codeBasicSecVO.getCodeLevelValue();
 										List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
 										if (classifyVOS.size() >= level && level > 0) {
 											levelCodeClassifyVO = classifyVOS.get(level - 1);
@@ -1856,7 +2023,7 @@
 			issucess=true;
 			resultClassifyRuleData.setLibrary(resultLibraryVO);
 		}catch (Throwable e){
-			e.printStackTrace();;
+			e.printStackTrace();
 			msg="鏌ヨ鍒嗙被澶辫触:"+e.getMessage();
 		}finally {
 			resultClassifyRuleData.setErrorid(errorid);
@@ -1885,6 +2052,225 @@
 	}
 
 	/***
+	 * 鏍囧噯鍖栫敓鎴愭帴鍙�
+	 * @param data 鏁版嵁淇℃伅
+	 * @param dataType 鏁版嵁鏍煎紡绫诲瀷
+	 * @return
+	 */
+	public String applyCodeForBZ(String data,String dataType){
+		String resultStr = "";
+		log.info("鏂规硶->applyCodeForBZ start");
+		final String[] errorid = {"0"};
+		msg="鎴愬姛";
+		objerrorCode="0";
+		objerrorMsg="鎴愬姛";
+		log.info("鐢宠缂栫爜鐨勬暟鎹弬鏁�:->"+data);
+		log.info("鐢宠缂栫爜鐨勬暟鎹被鍨�:->"+dataType);
+		String systemId="";
+		List<XMLResultClassfyVO> resultClassfyVOList = new ArrayList<>();
+		LinkedList<XMLResultDataObjectDetailDO> resultDataObjectDetailDOs = new LinkedList<>();
+		try {
+			ClassfyBZVO classfyBZVO = null;
+			if (StringUtils.isBlank(data)) {
+				errorid[0] = "101";
+				throw new Throwable("鎺ュ彛鍙傛暟锛歞ataString 浼犻�掍负绌�");
+			}
+			ApplyBZParamVO applyBZParamVO = new ApplyBZParamVO();
+			//濡傛灉dataType鏄痻ml鍒欙紝閫氳繃xml搴忓垪鍖栨垚瀵硅薄褰㈠紡锛屽鏋滄槸json鍒欓�氳繃json杞崲鎴愬璞℃牸寮�
+			try {
+				if ("xml".equals(dataType)) {
+					XStream xStream = new XStream(new DomDriver());
+					xStream.processAnnotations(ApplyBZVO.class);
+					xStream.autodetectAnnotations(true);
+					ApplyBZVO rootDataVO = (ApplyBZVO) xStream.fromXML(data);
+					applyBZParamVO.setData(rootDataVO);
+				} else {
+					applyBZParamVO = JSONObject.toJavaObject(JSONObject.parseObject(data), ApplyBZParamVO.class);
+				}
+			} catch (Throwable e) {
+				errorid[0] = "101";
+				throw new Throwable("鎺ュ彛鍙傛暟锛氫紶鍏ユ暟鎹弬鏁拌В鏋愬け璐�");
+			}
+			classfyBZVO = applyBZParamVO.getData().getClassify();
+			systemId = applyBZParamVO.getData().getSystemId();
+			UserVO userVo = applyBZParamVO.getData().getUser();
+			//鍏嶅瘑鐧诲綍鐢宠token锛宺equest涓坊鍔犵敤鎴蜂俊鎭�
+			//passwordFreeLoginService.pwdFreeLoginByBoolean(userVo.getUserName(), this.getRequest());
+			try {
+				passwordFreeLoginService.pwdFreeLoginByBoolean(systemId.toLowerCase(),this.getRequest());
+			}catch (Throwable e){
+				errorid[0] = "1";
+				throw new Throwable("鐢ㄦ埛閴存潈澶辫触");
+			}
+			//杩欐槸璐﹀彿淇℃伅
+			SessionInfo sessionInfo = new SessionInfo();
+			sessionInfo.setUserId(userVo.getUserName());
+			sessionInfo.setUserName(userVo.getTrueName());
+			sessionInfo.setIp(userVo.getIp());
+			VciBaseUtil.setCurrentUserSessionInfo(sessionInfo);
+			String finalSystemId = systemId;
+			String libray="";
+			boolean isCodeOrGroupCode=false;
+			libray = classfyBZVO.getLibrary();
+			CodeClassifyVO codeClassifyVO = getClassfy(classfyBZVO,libray);
+			log.info("end锛氬垎绫绘煡璇㈠畬姣�");
+			//鑾峰彇鍒嗙被妯℃澘淇℃伅
+			if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
+				objerrorCode="100";
+				throw  new  Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧埌鍒嗙被淇℃伅");
+			}
+			String operation="";
+			if(CODE_CHECKCONFIG) {
+				//鏍¢獙鏄惁閰嶇疆
+				DockingSystemConfig dockingSystemConfig=null;
+				dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
+				if(dockingSystemConfig==null||StringUtils.isBlank(dockingSystemConfig.getOid())){
+					errorid[0] ="101";
+					throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠$悊鍛橈紒");
+				}
+				isCodeOrGroupCode="true".equals(dockingSystemConfig.getIsGroupCodeFlag())?true:false;
+			}
+			CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
+			if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
+				objerrorCode="100";
+				throw  new  Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栫郴缁熶腑瀵瑰簲妯℃澘");
+			}
+			log.info("end锛氭ā鏉挎煡璇㈠畬姣�");
+			ApplyBZDatasVO applyBZDatasVO = classfyBZVO.getObjects();
+				DataObjectVO dataObjectVO = new DataObjectVO();
+			List<CodeClassifyTemplateAttrVO> attrVOS = templateVO.getAttributes().stream().filter(s -> !DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
+				((Func.isNotEmpty(s.getClassifyInvokeAttr()) || Func.isNotEmpty(s.getClassifyInvokeAttrName())) || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
+			).collect(Collectors.toList());
+			List<ApplyBZDataVO> applyBZDataVOList=	applyBZDatasVO.getObject();
+			if(applyBZDataVOList.size()>1){
+				objerrorCode="1";
+				throw  new  Throwable ("鏍囧噯鐢宠鍙敮鎸佷竴鏉℃暟鎹敵璇�");
+			}
+			String finalLibray = libray;
+			ClassfyBZVO finalClassfyBZVO = classfyBZVO;
+			//瑙勫垯鐨勪富閿渶瑕佸幓鑾峰彇
+			CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(codeClassifyVO.getOid());
+			if(classifyFullInfo==null ||classifyFullInfo.getCurrentClassifyVO()==null || StringUtils.isBlank(classifyFullInfo.getCurrentClassifyVO().getOid())){
+				objerrorCode="1";
+				log.info("classifyFullInfo:"+"鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
+				throw  new  Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙栧垎绫荤浉鍏充俊鎭�");
+			}
+			CodeRuleVO ruleVO = engineService.getCodeRuleByClassifyFullInfo(classifyFullInfo);
+			if(ruleVO==null||StringUtils.isBlank(ruleVO.getOid())){
+				objerrorCode="102";
+				throw  new  Throwable ("鏍规嵁浼犺緭鐨勫垎绫伙紝鏈幏鍙朚DM绯荤粺涓搴旇鍒�");
+			}
+			log.info("end锛氳鍒欒幏鍙栧畬姣�");
+			List<CodeOrderSecDTO> codeOrderSecDTOList = getRuleCodeOrderSecDTOs(classfyBZVO.getSections().getSection(), ruleVO,classifyFullInfo);
+			log.info("end锛氱爜娈佃幏鍙栧畬姣�");
+			CodeBZApplyDTO codeBZApplyDTO=new CodeBZApplyDTO();
+			codeBZApplyDTO.setSecDTOList(codeOrderSecDTOList);//鍒嗙被鐮佹
+			applyBZDataVOList.stream().forEach(applyBZDataVO -> {
+				String code="";
+				String id=applyBZDataVO.getId();
+				try {
+					List<ProppertyVO> proppertyVOList=applyBZDataVO.getProp();
+					String oldCodeValue=applyBZDataVO.getOldCode();
+					setPropertyValue(oldCode,oldCodeValue,proppertyVOList);//婧愭爣鍑嗗彿
+					boolean editSeriesFlag= applyBZDataVO.isEditSeriesFlag();
+					setPropertyValue(isEditSeries,String.valueOf(editSeriesFlag),proppertyVOList);//鏄惁鏇翠负绯诲垪
+					boolean seriesFlag=applyBZDataVO.isSeriesFlag();
+					setPropertyValue(isSeries,String.valueOf(seriesFlag),proppertyVOList);//婧愭爣鍑嗙被鍨�
+					String operationTypeValue=applyBZDataVO.getOperationType();
+					setPropertyValue(operationType,operationTypeValue,proppertyVOList);//鎿嶄綔绫诲瀷1:鍒跺畾锛�2:淇
+					String releaseTimeValue= applyBZDataVO.getReleaseTime();
+					setPropertyValue(releaseTime,releaseTimeValue,proppertyVOList);//鍙戝竷鏃堕棿
+					String seriesFlow=applyBZDataVO.getSeriesFlow();//绯诲垪娴佹按
+					codeBZApplyDTO.setOldCode(oldCodeValue);
+					codeBZApplyDTO.setReleaseTime(releaseTimeValue);
+					codeBZApplyDTO.setEditSeries(editSeriesFlag);
+					codeBZApplyDTO.setSeries(seriesFlag);
+					codeBZApplyDTO.setOperationType(operationTypeValue);
+					codeBZApplyDTO.setSeriesFlow(seriesFlow);
+					codeBZApplyDTO.setCodeClassifyOid(codeClassifyVO.getOid());
+					codeBZApplyDTO.setCodeRuleOid(ruleVO.getOid());
+					codeBZApplyDTO.setTemplateOid(templateVO.getOid());
+					codeBZApplyDTO.setCreator(applyBZDataVO.getCreator());
+					codeBZApplyDTO.setLastModifier(applyBZDataVO.getEditor());
+					codeBZApplyDTO.setLcStatus(applyBZDataVO.getStatus());
+					ApplyBZDatasVO newApplyBZDatasVO=new ApplyBZDatasVO();
+					applyBZDataVO.setProp(proppertyVOList);
+					newApplyBZDatasVO.setObject(Arrays.asList(applyBZDataVO));
+					log.info("end锛氭暟鎹粍缁囧畬姣�");
+					this.getConfigDatas(finalSystemId, finalLibray, newApplyBZDatasVO, attrVOS, dataObjectVO);
+					log.info("end锛氭暟鎹粍缁囧畬姣�");
+					codeBZApplyDTO.setData(dataObjectVO.getRowData().get(0).getFiledValue());
+					code=engineService.addSaveBZCodeNotauthUser(codeBZApplyDTO,false);
+					msg="缂栫爜鐢宠鎴愬姛:缂栫爜涓猴細"+code;
+				} catch (Throwable e) {
+					objerrorCode = "1";
+					msg="缂栫爜鐢宠澶辫触:" +e.getMessage();
+					e.printStackTrace();
+				}finally {
+					XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO = new XMLResultDataObjectDetailDO();
+					xmlResultDataObjectDetailDO.setCode(code);
+					xmlResultDataObjectDetailDO.setId(id);
+					xmlResultDataObjectDetailDO.setErrorid(objerrorCode);
+					xmlResultDataObjectDetailDO.setMsg(msg);
+					resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
+				}
+			});
+			XMLResultClassfyVO resultClassfyVO = new XMLResultClassfyVO();
+			resultClassfyVO.setClassCode(finalClassfyBZVO.getClassCode());
+			resultClassfyVO.setLibrary(finalClassfyBZVO.getLibrary());
+			resultClassfyVO.setFullclsfNamePath(finalClassfyBZVO.getFullclsfNamePath());
+			resultClassfyVO.setObjects(resultDataObjectDetailDOs);
+			resultClassfyVOList.add(resultClassfyVO);
+			XMLResultSystemVO xmlResultSystemVO = new XMLResultSystemVO();
+			xmlResultSystemVO.setClassifys(resultClassfyVOList);
+			xmlResultSystemVO.setMsg(msg);
+			xmlResultSystemVO.setErrorid(errorid[0]);
+			resultStr = transferResultXMl(xmlResultSystemVO, dataType);
+		}catch (Throwable e){
+			e.printStackTrace();
+			msg="鐢宠缂栫爜澶辫触:"+e.getMessage();
+		}finally {
+			XMLResultSystemVO xmlResultSystemVO=new XMLResultSystemVO();
+			xmlResultSystemVO.setClassifys(resultClassfyVOList);
+			xmlResultSystemVO.setMsg(msg);
+			xmlResultSystemVO.setErrorid(errorid[0]);
+			resultStr= transferResultXMl(xmlResultSystemVO,dataType);
+			final boolean[] issucess = {true};
+			if(!errorid[0].equals("0")) {
+				issucess[0] = false;
+			}else {
+				if(!CollectionUtils.isEmpty(resultClassfyVOList)) {
+					resultClassfyVOList.stream().forEach(xMLResultClassfyVO -> {
+						xMLResultClassfyVO.getObjects().stream().forEach(objec -> {
+							if (!(objec.getErrorid().equals("0")||objec.getErrorid().equals("201")||objec.getErrorid().equals("205") || objec.getErrorid().equals("204"))) {
+								issucess[0] = false;
+							}
+							msg=objec.getMsg();
+						});
+					});
+				}
+			}
+			try {
+				//璁板綍鏃ュ織
+				this.saveLogs(systemId, systemId, data, resultStr, issucess[0], msg, "applyCodeForBZ");
+			}catch (Throwable e){
+				e.printStackTrace();
+			}
+		}
+		log.info("杩斿洖鍙傛暟:"+resultStr);
+		//璋冪敤闆嗗洟鐢宠鎺ュ彛鐢宠闆嗗洟鐮�
+		return resultStr;
+	}
+
+	private void setPropertyValue(String key,String value,List<ProppertyVO> proppertyVOList){
+		ProppertyVO proppertyVO=new ProppertyVO();
+		proppertyVO.setKey(key);
+		proppertyVO.setValue(StringUtils.isBlank(value)?"":value);
+		proppertyVOList.add(proppertyVO);
+
+	}
+
+	/***
 	 * 鏌ヨ鏍¢獙鍒嗙被淇℃伅
 	 * @param classfyVO
 	 */
@@ -1901,7 +2287,50 @@
 				if (!CollectionUtils.isEmpty(codeClassifyList)) {
 					codeClassifyList.stream().forEach(codeClassify -> {
 						CodeClassifyVO codeClassifyVO=  classifyService.getTopClassifyVO(codeClassify.getOid());
-						if(codeClassifyVO.getId().equals(libray)){
+						if(codeClassifyVO.getId().toUpperCase(Locale.ROOT).equals(libray.toUpperCase(Locale.ROOT))){
+							newCodeClassify[0] =codeClassify;
+						}
+					});
+					classifyVO = new CodeClassifyVO();
+					BeanUtilForVCI.copyPropertiesIgnoreCase(newCodeClassify[0], classifyVO);
+					//灏咲TO杞崲涓篋O
+					if(StringUtils.isBlank(classifyVO.getOid())){
+						throw new  Throwable("鐢宠缂栫爜鐨勫垎绫伙細銆�"+classCode+"銆戜笉灞炰簬搴撹妭鐐广��"+libray+"銆戯紝璇锋鏌ュ弬鏁板垎绫昏妭鐐�/搴撹妭鐐逛俊鎭槸鍚﹀尮閰�");
+					}
+				}else{
+					throw new  Throwable("鏍规嵁鍒嗙被浠e彿鏈煡璇㈠埌鐩稿簲鐨勫垎绫讳俊鎭�");
+				}
+			} else {
+				classifyVO = classifyService.getObjectByClsfNamePath(className.replace(separator, "/"));
+				if(StringUtils.isBlank(classifyVO.getOid())){
+					throw new  Throwable("鏍规嵁鍒嗙被鍚嶇О璺緞鏈煡璇㈠埌鐩稿簲鐨勫垎绫讳俊鎭�");
+				}
+			}
+		}catch (Throwable e){
+			objerrorCode="100";
+			throw 	new  Throwable("鑾峰彇鍒嗙被淇℃伅澶辫触:"+e.getMessage());
+		}
+		return classifyVO;
+	}
+
+	/***
+	 * 鏌ヨ鏍¢獙鍒嗙被淇℃伅
+	 * @param classfyVO
+	 */
+	private  CodeClassifyVO getClassfy(ClassfyBZVO classfyVO,String libray) throws Throwable{
+		CodeClassifyVO classifyVO = new CodeClassifyVO();
+		try {
+			String classCode = classfyVO.getClassCode();
+			String className = classfyVO.getFullclsfNamePath();
+			//鏍规嵁鍒嗙被浠e彿鏌ヨ鍒嗙被淇℃伅
+			if (StringUtils.isNotBlank(classfyVO.getClassCode())) {
+				Map<String, String> conditionMap = new HashMap<>();
+				List<CodeClassify> codeClassifyList = classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getId, classCode));
+				final CodeClassify[] newCodeClassify = {new CodeClassify()};
+				if (!CollectionUtils.isEmpty(codeClassifyList)) {
+					codeClassifyList.stream().forEach(codeClassify -> {
+						CodeClassifyVO codeClassifyVO=  classifyService.getTopClassifyVO(codeClassify.getOid());
+						if(codeClassifyVO.getId().toUpperCase(Locale.ROOT).equals(libray.toUpperCase(Locale.ROOT))){
 							newCodeClassify[0] =codeClassify;
 						}
 					});
@@ -1929,9 +2358,11 @@
 
 	private List<ClientBusinessObject> ChangeMapTOClientBusinessObjects(List<Map<String,String>> oldDataMap){
 		List<ClientBusinessObject> clientBusinessObjectList=new ArrayList<>();
+		DefaultAttrAssimtUtil.mapToLowerCase(oldDataMap,true);
+		final BladeUser user = AuthUtil.getUser();
 		oldDataMap.stream().forEach(dataMap->{
 			ClientBusinessObject clientBusinessObject=new ClientBusinessObject();
-			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject);
+			DefaultAttrAssimtUtil.copplyDefaultAttrAssimt(dataMap,clientBusinessObject,false,user);
 			for (String key:dataMap.keySet()){
 				Object value= dataMap.getOrDefault(key,"");
 				clientBusinessObject.setAttributeValue(key.toLowerCase(Locale.ROOT),value==null?"":value.toString());
@@ -1940,8 +2371,21 @@
 		});
 		return clientBusinessObjectList;
 	}
+
+	private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOsBZ(CodeRuleVO ruleVO,CodeClassifyFullInfoBO classifyFullInfo){
+		List<CodeBasicSecVO>  codeBasicSecVOS= ruleVO.getSecVOList();
+		List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
+		Map<String,String> errorMap=new HashMap<>();
+		for(CodeBasicSecVO codeBasicSecVO: codeBasicSecVOS) {
+			String sectype = codeBasicSecVO.getSecType();
+			String classifySecOid= codeBasicSecVO.getOid();
+			String message="";
+		}
+		return codeOrderSecDTOList;
+	}
+
 	/***
-	 * 鏍规嵁绌垮叆鐨勫弬鏁颁俊鎭牎楠岀爜娈佃鍒�
+	 * 鏍规嵁浼犲叆鐨勫弬鏁颁俊鎭牎楠岀爜娈佃鍒�
 	 */
 	private List<CodeOrderSecDTO> getRuleCodeOrderSecDTOs(List<SectionVO> SectionVOList,CodeRuleVO ruleVO,CodeClassifyFullInfoBO classifyFullInfo) throws Throwable{
 		List<CodeBasicSecVO>  codeBasicSecVOS= ruleVO.getSecVOList();
@@ -1949,11 +2393,12 @@
 		SectionVOList.stream().forEach(SectionVO->{
 			sectionVOMap.put(SectionVO.getName(),SectionVO.getValue());
 		});
-		Map<String,CodeClassifyVO> codeClassifyVOMap= classifyFullInfo.getParentClassifyVOs().stream().collect(Collectors.toMap(s -> s.getId(), t -> t,(o1, o2)->o2));
+		//Map<String,CodeClassifyVO> codeClassifyVOMap= classifyFullInfo.getParentClassifyVOs().stream().collect(Collectors.toMap(s -> s.getId(), t -> t,(o1, o2)->o2));
 		List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>();
 		Map<String,String> errorMap=new HashMap<>();
 		for(CodeBasicSecVO codeBasicSecVO: codeBasicSecVOS) {
 			String sectype = codeBasicSecVO.getSecType();
+			String newSecName=codeBasicSecVO.getName();
 			String classifySecOid= codeBasicSecVO.getOid();
 			String message="";
 			if (!sectype.equals(CodeSecTypeEnum.CODE_SERIAL_SEC.getValue())) {
@@ -1983,14 +2428,14 @@
 							}
 						}
 					}
-					if(StringUtils.isBlank(sectypeValue)){
+					if(StringUtils.isBlank(sectypeValue)&&!newSecName.equals(secName)){
 						message="浼犲叆鐨勫垎绫荤爜娈碉細銆�" + name + " 銆戠殑鍊间笉鍏佽涓虹┖";
 						errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
 					}
 					CodeOrderSecDTO.setSecValue(sectypeValue);
 					codeOrderSecDTOList.add(CodeOrderSecDTO);
 				} else {
-					message="浼犲叆鐨勭爜娈佃鍒欑己灏�" + name + "鐮佹";
+					message="浼犲叆鐨勭爜娈佃鍒欑己灏�" + name;
 					errorMap.put("error",errorMap.getOrDefault("error","")+";"+message);
 				}
 			}
@@ -2001,8 +2446,142 @@
 		}
 		return codeOrderSecDTOList;
 	}
+
 	/***
-	 * 鏍规嵁灞炴�ф槧灏勮浆鎹㈢紪鐮佹墍闇�瀛楁
+	 * 璇诲彇灞炴�ф槧灏勯厤缃俊鎭�
+	 * @param systemId
+	 * @param libray
+	 * @param applyDatasVO
+	 * @param codeClassifyTemplateAttrVOList
+	 * @param dataObjectVO
+	 * @throws Throwable
+	 */
+	public void getConfigDatas(String systemId,String libray, ApplyBZDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
+
+		// LinkedHashMap<String,LinkedHashMap<String,String>> dataKeyValueMap=new LinkedHashMap<>();
+		//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
+		Map<String, String> attrMapConfigMap=new HashMap<>();
+		Map<String, String> propMaps=new HashMap<>();
+		log.info("寮�濮嬭鍙栫郴缁熼厤缃枃浠� start");
+		Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
+		log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
+		//stringStringMap.put("RLM","D:\\RLM.xml");
+		if(!CollectionUtils.isEmpty(stringStringMap)) {
+			List<LibraryClsfDO> libraryClsfDOList=new ArrayList<>();
+			try {
+				log.info("info锛氶渶瑕佽鍙栭厤缃枃浠�");
+				LibraryDO libraryDO = gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId, stringStringMap);
+				libraryClsfDOList = libraryDO.getClsf();
+			} catch (Throwable e) {
+				objerrorCode = "1";
+				e.printStackTrace();
+				throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�" + systemId + "銆戯紝鍒嗙被搴撲负:銆�" + libray + "銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
+			}
+			// String path = stringStringMap.get(systemId);
+			// 蹇界暐key澶у皬鍐欙紝鑾峰彇閰嶇疆鐨勬槧灏勬枃浠惰矾寰�
+			String path = VciBaseUtil.getMapStrValueIgnoreCase(stringStringMap,systemId);
+			if (!CollectionUtils.isEmpty(libraryClsfDOList)) {
+				Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
+				log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
+				if (libPropMaps.containsKey(libray.toUpperCase(Locale.ROOT))) {
+					log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
+					List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray.toUpperCase(Locale.ROOT));
+					propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
+					log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
+				} else {
+					objerrorCode = "1";
+					throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�" + systemId + "銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�" + path + "銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��" + libray + "銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+				}
+			}else{
+				objerrorCode = "1";
+				throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�" + systemId + "銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�" + path + "銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��" + libray + "銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+			}
+		}else{
+			objerrorCode = "1";
+			throw new Throwable("鏈幏鍙栧埌闆嗘垚灞炴�ф槧灏勭郴缁熼厤缃俊鎭�");
+		}
+		log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
+		LinkedList<String> rowNameList=new LinkedList<>();
+		LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
+		//鏍规嵁鍒嗙被妯℃澘缁勭粐鏁版嵁
+		final int[] index = {0};
+		try {
+			codeClassifyTemplateAttrVOList.stream().forEach(codeClassifyTemplateAttrVO -> {
+				String attrName = codeClassifyTemplateAttrVO.getName();
+				String field = codeClassifyTemplateAttrVO.getId();
+				rowNameList.add(attrName);
+				filedIndexMap.put(field, index[0]++);
+			});
+			dataObjectVO.setColName(rowNameList);//鏀惧叆灞炴��
+			attrMapConfigMap.putAll(propMaps);
+			LinkedList<RowDatas> rowDataList = new LinkedList<>();
+			List<ApplyBZDataVO> applyBZDataVOList=new ArrayList<>();
+
+			if(!CollectionUtils.isEmpty(applyDatasVO.getObject())){
+				applyBZDataVOList=applyDatasVO.getObject();
+			}
+			//Map<String, List<ProppertyVO>> dataPropMap = applyDataVOList.stream().collect(Collectors.toMap(ApplyDataVO::getId, ApplyDataVO::getProp, (key1, key2) -> key2));
+			final int[] rowIndex = {0};
+			applyBZDataVOList.stream().forEach(applyDataVO -> {
+				rowIndex[0]++;
+				RowDatas rowDatas = new RowDatas();
+				rowDatas.setOid(applyDataVO.getId());
+				rowDatas.setCreator(applyDataVO.getCreator());
+				rowDatas.setEditor(applyDataVO.getEditor());
+				rowDatas.setCode(applyDataVO.getCode());
+				rowDatas.setOperation("create");
+				rowDatas.setStatus(applyDataVO.getStatus());
+				rowDatas.setRowIndex(rowIndex[0] + "");
+				List<ProppertyVO> proppertyVOList = applyDataVO.getProp();
+
+				LinkedHashMap<Integer, String> integerValueMap = new LinkedHashMap<>();
+				Map<String, String> filedValueMap = new HashMap<>();
+				if (!CollectionUtils.isEmpty(proppertyVOList)) {
+					Map<String, String> sourceKeyValueMap = proppertyVOList.stream().collect(Collectors.toMap(ProppertyVO::getKey,  ProppertyVO::getValue, (key1, key2) -> key2));
+					Map<String, String> keyValueMap = new HashMap<>();
+					//鍒ゆ柇attrMapConfigMap鏄惁鏈夊�硷紝濡傛灉娌℃湁鍒欒鏄庡熀纭�榛樿鐨勬槸缂栫爜绯荤粺瀛楁
+					if (!CollectionUtils.isEmpty(attrMapConfigMap)) {
+						sourceKeyValueMap.keySet().forEach(sourceKey -> {
+							String dataValue = sourceKeyValueMap.get(sourceKey);
+							if (attrMapConfigMap.containsKey(sourceKey)) {
+								String targetKey = attrMapConfigMap.get(sourceKey);
+								keyValueMap.put(targetKey, StringUtils.isBlank(dataValue)?"":dataValue);
+							}
+						});
+					} else {
+						sourceKeyValueMap.forEach((filed,value)->{
+							keyValueMap.put(filed,StringUtils.isBlank(value)?"":value) ;
+						});
+					}
+
+					filedIndexMap.forEach((attrKey, column) -> {
+						String keyValue = "";
+						if (keyValueMap.containsKey(attrKey)) {
+							keyValue =StringUtils.isBlank(keyValueMap.get(attrKey))?"":keyValueMap.get(attrKey);
+						}
+						integerValueMap.put(column, keyValue);
+						filedValueMap.put(attrKey, keyValue);
+					});
+				}
+				rowDatas.setData(integerValueMap);
+				rowDatas.setFiledValue(filedValueMap);
+				rowDataList.add(rowDatas);
+			});
+			dataObjectVO.setRowData(rowDataList);
+		}catch (Throwable e){
+			objerrorCode="1";
+			throw new   Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
+		}
+	}
+
+	/***
+	 * 璇诲彇灞炴�ф槧灏勯厤缃俊鎭�
+	 * @param systemId
+	 * @param libray
+	 * @param applyDatasVO
+	 * @param codeClassifyTemplateAttrVOList
+	 * @param dataObjectVO
+	 * @throws Throwable
 	 */
 	public void getConfigDatas(String systemId,String libray, ApplyDatasVO applyDatasVO,List<CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOList,DataObjectVO dataObjectVO) throws Throwable {
 
@@ -2010,40 +2589,54 @@
 		//濡傛灉灏嗘暟鎹浆鎹㈡垚鎵�闇�瑕佺殑鏁版嵁瀵硅薄
 		Map<String, String> attrMapConfigMap=new HashMap<>();
 		Map<String, String> propMaps=new HashMap<>();
-		try {
-			log.info("寮�濮嬭鍙栫郴缁熼厤缃枃浠� start");
-			Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
-			log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
-			//stringStringMap.put("RLM","D:\\RLM.xml");
-			if(!CollectionUtils.isEmpty(stringStringMap)) {
+		log.info("寮�濮嬭鍙栫郴缁熼厤缃枃浠� start");
+		Map<String, String> stringStringMap=attributeMapConfig.getSystem_attrmap();
+		log.info("闆嗘垚绯荤粺灞炴�ф槧灏勯厤缃枃浠舵潯鐩暟-銆�"+stringStringMap.size());
+		if(!CollectionUtils.isEmpty(stringStringMap)) {
+			List<LibraryClsfDO> libraryClsfDOList=new ArrayList<>();
+			try {
 				log.info("info锛氶渶瑕佽鍙栭厤缃枃浠�");
 				LibraryDO libraryDO = gennerAttrMapUtil.getNewInstance().gennerAttrMapBySystem(systemId, stringStringMap);
-				List<LibraryClsfDO> libraryClsfDOList = libraryDO.getClsf();
-				if(!CollectionUtils.isEmpty(libraryClsfDOList)) {
-					Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
-					log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
-					String path=stringStringMap.get(systemId);
-					if (libPropMaps.containsKey(libray)) {
-						log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
-						List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray);
-						propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
-						log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
-					}else{
-						throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�"+systemId+"銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�"+path+"銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��"+libray+"銆戝睘鎬ф槧灏勪俊鎭厤缃�");
-					}
-				}
+				libraryClsfDOList = libraryDO.getClsf();
+			} catch (Throwable e) {
+				objerrorCode = "1";
+				e.printStackTrace();
+				throw new Throwable("闆嗘垚绯荤粺鏍囪瘑涓猴細銆�" + systemId + "銆戯紝鍒嗙被搴撲负:銆�" + libray + "銆戠殑闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
 			}
-			log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
-		}catch (Throwable e){
-			objerrorCode="1";
-			e.printStackTrace();
-			throw new Throwable("MDM闆嗘垚灞炴�ч厤缃枃浠惰鍙栧け璐�");
+			// String path = stringStringMap.get(systemId);
+			// 蹇界暐key澶у皬鍐欙紝鑾峰彇閰嶇疆鐨勬槧灏勬枃浠惰矾寰�
+			String path = VciBaseUtil.getMapStrValueIgnoreCase(stringStringMap,systemId);
+			if (!CollectionUtils.isEmpty(libraryClsfDOList)) {
+				Map<String, List<ClsfAttrMappingDO>> libPropMaps = libraryClsfDOList.stream().collect(Collectors.toMap(LibraryClsfDO::getLibrary, LibraryClsfDO::getProp, (key1, key2) -> key2));
+				log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃�");
+				if (libPropMaps.containsKey(libray.toUpperCase(Locale.ROOT))) {
+					log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�");
+					List<ClsfAttrMappingDO> clsfAttrMappingDOList = libPropMaps.get(libray.toUpperCase(Locale.ROOT));
+					propMaps = clsfAttrMappingDOList.stream().collect(Collectors.toMap(ClsfAttrMappingDO::getSourceKey, ClsfAttrMappingDO::getTargetKey, (key1, key2) -> key2));
+					log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�" + libray + "鍖归厤鍒扮浉搴旂殑灞炴�ф槧灏勪俊鎭�,灞炴�ф槧灏勬潯鐩暟+" + clsfAttrMappingDOList.size());
+				} else {
+					objerrorCode = "1";
+					throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�" + systemId + "銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�" + path + "銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��" + libray + "銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+				}
+			}else{
+				objerrorCode = "1";
+				throw new Throwable("鏍规嵁绯荤粺鏍囪瘑銆�" + systemId + "銆戞壘鍒板搴旂殑閰嶇疆鏂囦欢:銆�" + path + "銆戯紝浣嗘湭鑾峰彇鍒板搴旂殑搴撱��" + libray + "銆戝睘鎬ф槧灏勪俊鎭厤缃�");
+			}
+		}else{
+			objerrorCode = "1";
+			throw new Throwable("鏈幏鍙栧埌闆嗘垚灞炴�ф槧灏勭郴缁熼厤缃俊鎭�");
 		}
+		log.info("鏍规嵁鍙傛暟锛歭ibray锛�-銆�"+libray+"浠庨厤缃枃浠朵腑鎵惧搴斿睘鎬ф槧灏勯厤缃� end ");
 		LinkedList<String> rowNameList=new LinkedList<>();
 		LinkedHashMap<String,Integer> filedIndexMap=new LinkedHashMap<>();
 		//鏍规嵁鍒嗙被妯℃澘缁勭粐鏁版嵁
 		final int[] index = {0};
 		try {
+			//闄ゅ幓榛樿鐨勫睘鎬�.杩樻湁鍙湁鍏锋湁鍒嗙被娉ㄥ叆鐨勬墠杩囨护鍑烘潵
+			codeClassifyTemplateAttrVOList = codeClassifyTemplateAttrVOList.stream().filter(
+				s ->!DEFAULT_SYNC_ATTR_LIST.contains(s.getId()) &&
+					((Func.isNotEmpty(s.getClassifyInvokeAttr()) || Func.isNotEmpty(s.getClassifyInvokeAttrName())) || VciBaseUtil.getBoolean(s.getFormDisplayFlag()))
+			).collect(Collectors.toList());
 			codeClassifyTemplateAttrVOList.stream().forEach(codeClassifyTemplateAttrVO -> {
 				String attrName = codeClassifyTemplateAttrVO.getName();
 				String field = codeClassifyTemplateAttrVO.getId();
@@ -2111,6 +2704,7 @@
 			throw new   Throwable("缁勭粐鏁版嵁鏄犲皠鍊煎け璐�");
 		}
 	}
+
 	/***
 	 * 璁板綍鏃ュ織淇℃伅
 	 * @param systemId
@@ -2142,7 +2736,7 @@
 			dockingLoge.setInterfaceStatus("false");//鎺ュ彛闆嗘垚鐘舵��
 		}
 		dockingLogeService.save(dockingLoge);
-		log.info("闆嗘垚鎺ㄩ�佹暟鎹垚鍔�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
+		log.info("闆嗘垚鎺ㄩ�佹暟鎹�,systemId:"+systemId+",systemname:"+systemName+",operation:"+operation+",param:"+parmaData);
 	}
 
 	/***
@@ -2224,8 +2818,15 @@
 	 */
 	private DockingSystemConfig  checkIspass(String systemId,String type,String operationType,String classOid){
 		log.info("systemId锛�"+systemId+",type:"+SysIntegrationDataFlowTypeEnum.getTextByValue(type)+",operationType:"+sysIntegrationPushTypeEnum.getTextByValue(operationType)+",classOid:"+classOid);
-		CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
-		classOid=codeClassifyVO.getOid();
+		//CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
+		List<CodeClassify> codeClassifyList=  classifyService.selectAllLevelParentByOid(classOid);
+		List<String> classifyOids=new ArrayList<>();
+		if(!CollectionUtils.isEmpty(codeClassifyList)) {
+			classifyOids = codeClassifyList.stream().map(CodeClassify::getOid).collect(Collectors.toList());
+		}else{
+			return null;
+		}
+		//classOid=codeClassifyVO.getOid();
 		//鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
 		LambdaQueryWrapper<DockingSystemConfig> queryWrapper = Wrappers.<DockingSystemConfig>lambdaQuery();
 		queryWrapper.eq(DockingSystemConfig::getUsedFlag, MdmDuckingConstant.SEND_FLAG_TRUE);
@@ -2233,16 +2834,26 @@
 		queryWrapper.eq(DockingSystemConfig::getDataFlowType,type);
 		queryWrapper.eq(DockingSystemConfig::getPushType,operationType);
 		if(StringUtils.isNotBlank(classOid)){
-			queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid);
+			queryWrapper.in(DockingSystemConfig::getClassifyOid,classifyOids);
 		}
-		List<DockingSystemConfig> dockingSystemConfigList=	dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
+		List<DockingSystemConfig> dockingSystemConfigList=new ArrayList<>();
+		dockingSystemConfigList=	dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
 		if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
+			return	dockingSystemConfigList.get(0);
+		}else{
+			return null;
+		}
+		/*if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
 		 return	dockingSystemConfigList.get(0);
 		}else{
 			if(StringUtils.isNotBlank(codeClassifyVO.getParentCodeClassifyOid())) {
 				return checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid());
 			}
 		}
-		return dockingSystemConfigList.get(0);
+		if(dockingSystemConfigList.size()>0){
+			return dockingSystemConfigList.get(0);
+		}else{
+			return	new DockingSystemConfig();
+		}*/
 	}
 }

--
Gitblit v1.9.3