From f21bdede8546a348e2b16ffc3bbe292df7eeba76 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 12 四月 2024 23:24:21 +0800
Subject: [PATCH] 集成相关代码修改

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java |   66 +++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index 0c617d2..d9689cf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -9,6 +9,7 @@
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
+import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
 import com.vci.ubcs.code.constant.MdmDuckingConstant;
 import com.vci.ubcs.code.dto.CodeOrderDTO;
 import com.vci.ubcs.code.dto.CodeOrderSecDTO;
@@ -51,7 +52,6 @@
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import com.vci.ubcs.starter.web.util.WebUtil;
-import com.xkcoding.http.support.Http;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.map.CaseInsensitiveMap;
 import org.springblade.core.redis.cache.BladeRedis;
@@ -66,7 +66,6 @@
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.DefaultTransactionStatus;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -123,7 +122,6 @@
 
 	@Value("${erp.item.tenant:10000}")
 	private String ERPXHDHTENANT;
-
 
 	/**
 	 * 涓氬姟绫诲瀷鐨勬湇鍔�
@@ -185,8 +183,8 @@
 	@Autowired(required = false)
 	private MdmSearchItemCodeProvider mdmSearchItemCodeProvider;
 
-	@Autowired
-	HttpServletRequest request;
+	@Resource
+	private ICodeAllCodeService codeAllCodeService;
 
 	@Override
 	public void DockingDataSyncScheduing() {
@@ -283,7 +281,6 @@
 			}
 			org.springblade.core.tool.utils.WebUtil.setRequest(new ServletRequestAttributes(request));
 		}
-
 		return request;
 	}
 
@@ -305,26 +302,30 @@
 			calendar.set(Calendar.HOUR_OF_DAY, 0);
 			calendar.set(Calendar.MINUTE, 0);
 			calendar.set(Calendar.SECOND, 0);
-			log.info("鏌ヨ鏃堕棿------->"+calendar.getTime());
+			log.info("鏌ヨ鏃堕棿------->"+dft.format(new Date()));
 			lastchangedon= dft.format(calendar.getTime());
 		}else{
 			lastchangedon=endDate;
 		}
 		searchItemParam.setLastchangedon(lastchangedon);
-		searchItemParam.setStatus(itemStatus);//
-		Map<String,String>searchDataMap=  VciBaseUtil.objectToMapString(searchItemParam);
+		searchItemParam.setIsenabled("");
+		searchItemParam.setStatus(itemStatus);
+		//Map<String,String> searchDataMap = VciBaseUtil.objectToMapString(searchItemParam);
 		try {
-			paramString=JSONObject.toJSON(searchItemParam).toString();
+			String sendParamString=JSONObject.toJSON(searchItemParam).toString();
 			// TODO: 鏀逛负浣跨敤HttpUtils鏂瑰紡杩涜鐢宠锛屽洜涓虹幇鍦ㄧ敵璇风敤涔嬪墠鐨勬柟寮忎細鎶ラ敊
 			LinkedMultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
 			headers.add("Authorization",ERPXHDHAUTH);
 			headers.add("X-ECC-Current-Tenant",ERPXHDHTENANT);
 			headers.add("Accept-Language","zh-CHS");
 			headers.add("Content-Type",MediaType.APPLICATION_JSON.toString());
-			String res = HttpUtils.request(ERPXHDHURL+"/getppModelByElemNew",paramString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
+			String res = HttpUtils.request(ERPXHDHURL+"/getppModelByElemNew",sendParamString,headers, HttpMethod.POST,MediaType.APPLICATION_JSON);
 			// String res= mdmSearchItemCodeProvider.getppModelByElem(searchItemParam);
 			SearchItemVO searchItemVO = JSONObject.toJavaObject(JSONObject.parseObject(res), SearchItemVO.class);
 			if (searchItemVO != null) {
+				if(!"200".equals(searchItemVO.getStatus())){
+					throw new ServiceException(String.format("鎺ュ彛杩斿洖鐘舵�佺爜涓猴細%s锛屽師鍥狅細%s",searchItemVO.getStatus(),searchItemVO.getMessage()));
+				}
 				BladeUser finalUser;
 				paramString = JSONObject.toJSON(searchItemVO).toString();
 				log.info("鍨嬪彿浠e彿鏁版嵁鍊�-------銆�"+paramString);
@@ -358,7 +359,7 @@
 					List<String> itemCodeList = new ArrayList<>();
 					ApplyDatasVO allDatasVO = new ApplyDatasVO();
 					List<ApplyDataVO> allObjectList = new ArrayList<>();
-					if (!CollectionUtils.isEmpty(dataList)) {
+					if (Func.isNotEmpty(dataList)) {
 						dataList.stream().forEach(searchItemDataVO -> {
 							String itemCode = StringUtils.isNotBlank(searchItemDataVO.getPROJECTITEM()) ? searchItemDataVO.getPROJECTITEM() : searchItemDataVO.getMMODELCODE();//椤圭洰浠e彿
 							dataVOMap.put(itemCode, searchItemDataVO);
@@ -464,8 +465,6 @@
 						paramString = Func.isEmpty(paramObject) ? "" : paramObject.toString();
 						Object backObject = JSONObject.toJSON(allResultDataObjectDetailDOS);
 						backString = Func.isEmpty(backObject) ? "" : backObject.toString();
-					}else{
-						throw new Throwable("鎺ュ彛鏈繑鍥炰俊鎭�");
 					}
 				} catch (Throwable e) {
 					e.printStackTrace();
@@ -537,7 +536,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);
 	}
 
 	/***
@@ -950,7 +949,7 @@
 	/***
 	 * 鍙戦�佺紪鐮佷富鏁版嵁
 	 */
-	private void sendpushDataForService (List<DockingTask> dockingTaskS){
+	private void sendpushDataForService(List<DockingTask> dockingTaskS){
 		//姣忎釜task渚濇鎵ц鎺ㄩ��
 		for (DockingTask dockingTask:dockingTaskS){
 			//姣忎釜task涓�涓簨鍔★紝寮�鍚�
@@ -967,13 +966,31 @@
 				//琛ㄧず鏄富鏁版嵁
 				CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid);
 				R<List<Map<String, String>>> r = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid());
-
 				List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyTemplateVO.getAttributes();
 				Map<String/**鑻辨枃鍚嶇О**/, String/**涓枃鍚嶇О**/> attrIdNameMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t.getName(), (o1, o2) -> o2));
 				Map<String, String> data = new HashMap<>();
-				if (r == null) {
-					JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid);
-					data = (Map) josni;
+				// TODO: 鍥炴敹缂栫爜鐨勬儏鍐碉紝浼氬嚭鐜版暟鎹凡缁忓洖鏀讹紝浣嗘槸浜嬪姟杩樻湭鎵ц鐨勬儏鍐碉紝
+				//  鎵�浠ヨ繖鍎跨紦瀛樺氨寰楁寜鐓у暐鏃跺�欏洖鏀剁殑鎺ㄩ�佹垚鍔熶簡鍟ユ椂鍊欐墠鑳芥竻绌烘寚瀹氱殑缂撳瓨
+				if (!r.isSuccess() || Func.isEmpty(r.getData())) {
+					List<CodeAllCode> codeAllCodes = codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getId, dockingTask.getId()));
+					CodeAllCode codeAllCode = codeAllCodes.get(0);
+					BaseModel baseModel = JSONObject.parseObject(codeAllCode.getBusinessData(), BaseModel.class);
+					Map<String, Object> objectMap = VciBaseUtil.objectToMap(baseModel);
+					for (Map.Entry<String,Object> entry : objectMap.entrySet()){
+						if(entry.getKey().equals("data") && Func.isNotEmpty(entry.getValue())){
+							Map<String, Object> dataMap = ((JSONObject) entry.getValue());
+							for(Map.Entry<String,Object> dataEntry : dataMap.entrySet()){
+								String v = String.valueOf(dataEntry.getValue());
+								data.put(dataEntry.getKey().toLowerCase(Locale.ROOT), v == null ? "" : v);
+							}
+						}else{
+							String key = entry.getKey().toLowerCase(Locale.ROOT);
+							String value = String.valueOf(entry.getValue());
+							data.put(key, value == null ? "":value);
+						}
+					}
+					/*JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid);
+					data = (Map) josni;*/
 				} else {
 					data = r.getData().get(0);
 				}
@@ -1003,8 +1020,10 @@
 				}
 				if(isGroupCodeFlage){
 					code=data.getOrDefault("groupcode","");
-					if(StringUtils.isBlank(code)) {//濡傛灉鏄泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈�
+					if(StringUtils.isBlank(code)) {
+						//濡傛灉鏄帹閫侀泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈�
 						dockingTask.setDescription("绛夊緟闆嗗洟鐢宠闆嗗洟鐮�");
+						// TODO锛氬彲鑳戒細鍑虹幇鏈幏鍙栧埌闆嗗洟鐮侊紝灏辫鐐逛簡鍥炴敹锛岃繖鏃跺��
 						dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE);
 						dockingTask.setLastModifyTime(new Date());
 						dockingTaskService.updateById(dockingTask);
@@ -1206,7 +1225,7 @@
 	/***
 	 * 鏌ヨ闇�瑕侀泦鎴愮殑涓氬姟鏁版嵁浠诲姟
 	 */
-	private void sendpushDataForService (){
+	private void sendpushDataForService(){
 		initSysadmin();
 		//鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
 		//VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
@@ -1226,12 +1245,11 @@
 	 */
 	private void sendpushClsfForService(){
 		initSysadmin();
-	/*	//鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
+		/*	//鏌ヨ鍝簺浠诲姟杩樻病鏈夋墽琛屽畬鎴�
 		VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class);
 		queryWrapper.addQueryMap("sendFlag",MdmDuckingConstant.SEND_FLAG_FALSE);
 		queryWrapper.addQueryMap("btmId",DOCKING_DEFAULT_CLASSIFY.toUpperCase(Locale.ROOT));
 		List<DockingTaskDO> dockingTaskDOS = dockingTaskDaoI.selectByWrapper(queryWrapper);*/
-
 		//鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
 		LambdaQueryWrapper<DockingTask> queryWrapper = Wrappers.<DockingTask>lambdaQuery();
 		queryWrapper.eq(DockingTask::getSendFlag,MdmDuckingConstant.SEND_FLAG_FALSE);

--
Gitblit v1.9.3