From 8c3067dc58a8affe8317c357a2405ff33dc30cd4 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 13 九月 2023 16:29:10 +0800
Subject: [PATCH] 修改参照样式
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 976d92a..775c622 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
@@ -234,7 +234,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
@@ -244,7 +247,7 @@
}
if(dockingTask_insert.size()!=0) {
-// dockingTaskService.saveBatch(dockingTask_insert);
+ dockingTaskService.saveBatch(dockingTask_insert);
}
//dockingTaskDaoI.updateByPrimaryKey鏂规硶鎶ラ敊浜嗭紝鎵�浠ユ墜鍐欎簡杩欎釜
boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
@@ -307,7 +310,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 {
@@ -360,8 +363,10 @@
});
//鏌ヨ鎺ㄩ�佹帴鍙ｅ弬鏁�
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","");
}
@@ -391,7 +396,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 +410,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 +535,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 +549,7 @@
//鍏ㄩ兘鎺ユ敹鎴愬姛鐨勬儏鍐典笅,淇敼dockingtask sendflag涓哄凡鍙戦��
if(isSend) {
dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_TRUE);
+ dockingTask.setLastModifyTime(new Date());
dockingTaskService.updateById(dockingTask);
}
}
--
Gitblit v1.9.3