From d370c5b1f2c33f8599db7ece89b484613b594f60 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 九月 2023 08:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 30 +++++++++++++++++++++---------
1 files changed, 21 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 ab87e4d..c3c5def 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
@@ -156,7 +156,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 +233,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 +309,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 +321,6 @@
* 鍙戦�佺紪鐮佷富鏁版嵁
*/
private void sendpushDataForService (List<DockingTask> dockingTaskS){
-
//姣忎釜task渚濇鎵ц鎺ㄩ��
for (DockingTask dockingTask:dockingTaskS){
//姣忎釜task涓�涓簨鍔★紝寮�鍚�
@@ -360,10 +361,19 @@
});
//鏌ヨ鎺ㄩ�佹帴鍙ｅ弬鏁�
DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);
-
- boolean isGroupCodeFlage= dockingSystemConfig.getIsGroupCodeFlag().equals("true")?true:false;
+ boolean isGroupCodeFlage=false;
+ if(dockingSystemConfig!=null) {
+ isGroupCodeFlage = StringUtils.isBlank(dockingSystemConfig.getIsGroupCodeFlag())?false: Boolean.getBoolean(dockingSystemConfig.getIsGroupCodeFlag());
+ }
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();
@@ -391,7 +401,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 {
@@ -405,7 +415,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 = "";
@@ -530,12 +540,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);
@@ -543,6 +554,7 @@
//鍏ㄩ兘鎺ユ敹鎴愬姛鐨勬儏鍐典笅,淇敼dockingtask sendflag涓哄凡鍙戦��
if(isSend) {
dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_TRUE);
+ dockingTask.setLastModifyTime(new Date());
dockingTaskService.updateById(dockingTask);
}
}
--
Gitblit v1.9.3