From cf8103f1c09fc43f3df643ea8f2a22cc26af74e8 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 20 九月 2023 08:56:48 +0800
Subject: [PATCH] 代码提交

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 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 97f1620..470898d 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
@@ -3,7 +3,6 @@
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.thoughtworks.xstream.XStream;
@@ -23,7 +22,7 @@
 import com.vci.ubcs.code.entity.*;
 import com.vci.ubcs.code.enumpack.SysIntegrationDataFlowTypeEnum;
 import com.vci.ubcs.code.service.*;
-import com.vci.ubcs.code.util.HttpUtils;
+import com.vci.ubcs.starter.util.HttpUtils;
 import com.vci.ubcs.code.util.WsErpClientUtil;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
@@ -156,7 +155,6 @@
 	 */
 	private void initPushDataTaks(int type){
 		initSysadmin();
-
 		List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list(
 			Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true")
 				.eq(DockingSystemConfig::getPushType,type==2?"2":"1").eq(DockingSystemConfig::getDataFlowType, SysIntegrationDataFlowTypeEnum.PUSH.getValue()));//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫�
@@ -234,7 +232,10 @@
 				dockingTask.setClassifyName(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
 				dockingTask.setSendType(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
 				dockingTask.setDataOid(dataoid);
-
+				dockingTask.setCreateTime(new Date());
+				dockingTask.setLastModifyTime(new Date());
+				dockingTask.setCreator("sysAdmin");
+				dockingTask.setLastModifier("sysAdmin");
 				//intinfo
 				dockingTask.setSysInfoOid(sysIntInfoVOi.getOid());//intinfo鐨刼id
 				dockingTask.setSystemOid(sysIntInfoVOi.getSysBaseOid());//绯荤粺oid
@@ -307,7 +308,7 @@
 					sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
 				}
 				//璋冪敤鎺ュ彛
-				callInterface(sendString,dockingSystemConfig,dockingTask);
+				callInterface(sendString,dockingSystemConfig,dockingTask,"pushClassifyData");
 			}catch (Throwable e){
 				e.printStackTrace();
 			}finally {
@@ -319,7 +320,6 @@
 	 * 鍙戦�佺紪鐮佷富鏁版嵁
 	 */
 	private void sendpushDataForService (List<DockingTask> dockingTaskS){
-
 		//姣忎釜task渚濇鎵ц鎺ㄩ��
 		for (DockingTask dockingTask:dockingTaskS){
 			//姣忎釜task涓�涓簨鍔★紝寮�鍚�
@@ -366,6 +366,13 @@
 				}
 				if(isGroupCodeFlage){
 					code=data.getOrDefault("groupcode","");
+					if(StringUtils.isBlank(code)) {//濡傛灉鏄泦鍥㈢爜锛屾病鏈夐鍙栧埌闆嗗洟鐮佸垯浠诲姟涓嶇粨鏉熺瓑寰呴泦鍥㈢爜鐢宠鍚庡啀閫氳繃瀹氭椂鍣ㄨ皟鐢ㄩ泦鍥㈢爜娈�
+						dockingTask.setDescription("绛夊緟闆嗗洟鐢宠闆嗗洟鐮�");
+						dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_FALSE);
+						dockingTask.setLastModifyTime(new Date());
+						dockingTaskService.updateById(dockingTask);
+						continue;
+					}
 				}
 				String[] classCodeLeves = dockingTask.getClassifyId().split(",");
 				NodeJosnDTO nodeJosnDTO = new NodeJosnDTO();
@@ -393,7 +400,7 @@
 					sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
 				}
 				//璋冪敤鎺ュ彛
-				callInterface(sendString,dockingSystemConfig, dockingTask);
+				callInterface(sendString,dockingSystemConfig, dockingTask,"pushData");
 			}catch (Throwable e){
 				e.printStackTrace();
 			}finally {
@@ -407,7 +414,7 @@
 	 * @param dockingTask
 	 * @throws Throwable
 	 */
-	private void callInterface(String  sendString , DockingSystemConfig dockingSystemConfig,DockingTask dockingTask) throws  Throwable{
+	private void callInterface(String  sendString , DockingSystemConfig dockingSystemConfig,DockingTask dockingTask,String operation) throws  Throwable{
 		String paramString = "";
 
 		String backString = "";
@@ -532,12 +539,13 @@
 				dockingLogeDO.setClassifyOid(dockingTask.getClassifyOid());
 				dockingLogeDO.setClassifyId(dockingTask.getClassifyId());
 				dockingLogeDO.setClassifyName(dockingTask.getClassifyName());
+				dockingLogeDO.setCreateTime(new Date());
 				dockingLogeDO.setId(dockingTask.getId());
 				dockingLogeDO.setUniqueCode(dockingTask.getUniqueCode());
 				dockingLogeDO.setParamString(paramString);
 				dockingLogeDO.setReturnString(backString);
 				dockingLogeDO.setInterfaceStatus(isSend?"true":"false");
-				dockingLogeDO.setType(DATA_LOGE_OUT);
+				dockingLogeDO.setType(operation);
 				dockingLogeDO.setMsg(msg);
 				log.error("闆嗘垚鎺ㄩ�佹暟鎹�,systemcode:"+dockingTask.getSystemCode()+",systemname:"+dockingTask.getSystemName()+",url:"+url+",param:"+paramString+",e:"+msg);
 				dockingLogeService.save(dockingLogeDO);
@@ -545,6 +553,7 @@
 			//鍏ㄩ兘鎺ユ敹鎴愬姛鐨勬儏鍐典笅,淇敼dockingtask sendflag涓哄凡鍙戦��
 			if(isSend) {
 				dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_TRUE);
+				dockingTask.setLastModifyTime(new Date());
 				dockingTaskService.updateById(dockingTask);
 			}
 		}

--
Gitblit v1.9.3