From db5ed49b5473b63bf08c4e0c7ffa752ed35a3a95 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 18:46:02 +0800
Subject: [PATCH] 关于接口配置管理模块更改/统一接口涉及集团码申请功能需求bug修复
---
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java | 65 ++++++------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java | 137 ++++++++++++++------------
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSystemConfigMapper.xml | 8
Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 15 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 12 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java | 18 +-
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingData.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java | 22 ++-
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingTask.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml | 4
16 files changed, 159 insertions(+), 141 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
index 9cedde4..42920c9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
@@ -16,7 +16,7 @@
* @date 2023-05-26
*/
@FeignClient(
- value = "ubcs-code"
+ value = "ubcs-applyjtcodeservice"
)
public interface IMdmInterJtClient {
String API_PREFIX = "/mdmInterService";
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
index 54a243f..0b29d3b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
@@ -148,12 +148,12 @@
/**
* 鏉ユ簮绯荤粺鍚嶇О
*/
- private String sourceSysName;
+ private String sourceSystemName;
/**
* 鏉ユ簮绯荤粺鏍囪瘑
*/
- private String sourceSysId;
+ private String sourceSystemId;
/**
* 鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -168,12 +168,12 @@
/**
* 鐩爣绯荤粺鍚嶇О
*/
- private String targetSysName;
+ private String targetSystemName;
/**
* 鐩爣绯荤粺鏍囪瘑
*/
- private String targetSysId;
+ private String targetSystemId;
/**
* 鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -284,12 +284,12 @@
", returnType='" + returnType + '\'' +
", returnTypeText='" + returnTypeText + '\'' +
", sourceSystemOid='" + sourceSystemOid + '\'' +
- ", sourceSysName='" + sourceSysName + '\'' +
- ", sourceSysId='" + sourceSysId + '\'' +
+ ", sourceSystemName='" + sourceSystemName + '\'' +
+ ", sourceSystemId='" + sourceSystemId + '\'' +
", sourceSystemOidName='" + sourceSystemOidName + '\'' +
", targetSystemOid='" + targetSystemOid + '\'' +
- ", targetSysName='" + targetSysName + '\'' +
- ", targetSysId='" + targetSysId + '\'' +
+ ", targetSystemName='" + targetSystemName + '\'' +
+ ", targetSystemId='" + targetSystemId + '\'' +
", targetSystemOidName='" + targetSystemOidName + '\'' +
", classPath='" + classPath + '\'' +
", dataFlowType='" + dataFlowType + '\'' +
@@ -306,7 +306,7 @@
", classifyName='" + classifyName + '\'' +
", sysIntParamDTOS=" + sysIntParamDTOS +
", sysIntHeaderDTOS=" + sysIntHeaderDTOS +
- ", isGroupCodeFlag=" + isGroupCodeFlag +
+ ", isGroupCodeFlag='" + isGroupCodeFlag + '\'' +
'}';
}
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingData.java
index 8d36382..0950213 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingData.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingData.java
@@ -13,7 +13,7 @@
* 寰呴泦鎴愭暟鎹�
*/
@Data
-@TableName(CodeTableNameConstant.PL_CODE_DOCKINGPADATA)
+@TableName(CodeTableNameConstant.PL_CODE_DOCKINGDATA)
@ApiModel(value = "DockingData", description = "寰呴泦鎴愭暟鎹�")
@EqualsAndHashCode(callSuper = true)
public class DockingData extends BaseModel {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
index 1d2a57c..be995f2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
@@ -192,13 +192,15 @@
* 鏉ユ簮绯荤粺鍚嶇О
*/
@ApiModelProperty(value = "鏉ユ簮绯荤粺鍚嶇О")
- private String sourceSysName;
+ @TableField(value = "SOURCESYSNAME")
+ private String sourceSystemName;
/**
* 鏉ユ簮绯荤粺鏍囪瘑
*/
@ApiModelProperty(value = "鏉ユ簮绯荤粺鏍囪瘑")
- private String sourceSysId;
+ @TableField(value = "SOURCESYSID")
+ private String sourceSystemId;
/**
* 鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -217,13 +219,15 @@
* 鐩爣绯荤粺鍚嶇О
*/
@ApiModelProperty(value = "鐩爣绯荤粺鍚嶇О")
- private String targetSysName;
+ @TableField(value = "TARGETSYSNAME")
+ private String targetSystemName;
/**
* 鐩爣绯荤粺鏍囪瘑
*/
@ApiModelProperty(value = "鐩爣绯荤粺鏍囪瘑")
- private String targetSysId;
+ @TableField(value = "TARGETSYSID")
+ private String targetSystemId;
/**
* 鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -348,12 +352,12 @@
", returnType='" + returnType + '\'' +
", returnTypeText='" + returnTypeText + '\'' +
", sourceSystemOid='" + sourceSystemOid + '\'' +
- ", sourceSysName='" + sourceSysName + '\'' +
- ", sourceSysId='" + sourceSysId + '\'' +
+ ", sourceSystemName='" + sourceSystemName + '\'' +
+ ", sourceSystemId='" + sourceSystemId + '\'' +
", sourceSystemOidName='" + sourceSystemOidName + '\'' +
", targetSystemOid='" + targetSystemOid + '\'' +
- ", targetSysName='" + targetSysName + '\'' +
- ", targetSysId='" + targetSysId + '\'' +
+ ", targetSystemName='" + targetSystemName + '\'' +
+ ", targetSystemId='" + targetSystemId + '\'' +
", targetSystemOidName='" + targetSystemOidName + '\'' +
", classPath='" + classPath + '\'' +
", dataFlowType='" + dataFlowType + '\'' +
@@ -368,7 +372,7 @@
", pushTypeText='" + pushTypeText + '\'' +
", classifyId='" + classifyId + '\'' +
", classifyName='" + classifyName + '\'' +
- ", isGroupCodeFlag=" + isGroupCodeFlag +
+ ", isGroupCodeFlag='" + isGroupCodeFlag + '\'' +
'}';
}
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingTask.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingTask.java
index 67c61d6..ba40497 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingTask.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingTask.java
@@ -93,7 +93,7 @@
* 鍙戦�佺被鍨嬫樉绀烘枃鏈�
*/
@ApiModelProperty(value = "鍙戦�佺被鍨嬫樉绀烘枃鏈�")
- @TableField(exist = true)
+ @TableField(exist = false)
private String sendTypeText;
/**
@@ -107,7 +107,7 @@
* 鏄惁鍙戦�佹垚鍔熸樉绀烘枃鏈�
*/
@ApiModelProperty(value = "鏄惁鍙戦�佹垚鍔熸樉绀烘枃鏈�")
- @TableField(exist = true)
+ @TableField(exist = false)
private String sendFlagText;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
index 2b2b23b..bc8531c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
@@ -142,12 +142,12 @@
/**
* 鏉ユ簮绯荤粺鍚嶇О
*/
- private String sourceSysName;
+ private String sourceSystemName;
/**
* 鏉ユ簮绯荤粺鏍囪瘑
*/
- private String sourceSysId;
+ private String sourceSystemId;
/**
* 鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -162,12 +162,12 @@
/**
* 鐩爣绯荤粺鍚嶇О
*/
- private String targetSysName;
+ private String targetSystemName;
/**
* 鐩爣绯荤粺鏍囪瘑
*/
- private String targetSysId;
+ private String targetSystemId;
/**
* 鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -445,21 +445,6 @@
this.sourceSystemOid = sourceSystemOid;
}
- public String getSourceSysName() {
- return sourceSysName;
- }
-
- public void setSourceSysName(String sourceSysName) {
- this.sourceSysName = sourceSysName;
- }
-
- public String getSourceSysId() {
- return sourceSysId;
- }
-
- public void setSourceSysId(String sourceSysId) {
- this.sourceSysId = sourceSysId;
- }
public String getSourceSystemOidName() {
return sourceSystemOidName;
@@ -477,20 +462,36 @@
this.targetSystemOid = targetSystemOid;
}
- public String getTargetSysName() {
- return targetSysName;
+ public String getSourceSystemName() {
+ return sourceSystemName;
}
- public void setTargetSysName(String targetSysName) {
- this.targetSysName = targetSysName;
+ public void setSourceSystemName(String sourceSystemName) {
+ this.sourceSystemName = sourceSystemName;
}
- public String getTargetSysId() {
- return targetSysId;
+ public String getSourceSystemId() {
+ return sourceSystemId;
}
- public void setTargetSysId(String targetSysId) {
- this.targetSysId = targetSysId;
+ public void setSourceSystemId(String sourceSystemId) {
+ this.sourceSystemId = sourceSystemId;
+ }
+
+ public String getTargetSystemName() {
+ return targetSystemName;
+ }
+
+ public void setTargetSystemName(String targetSystemName) {
+ this.targetSystemName = targetSystemName;
+ }
+
+ public String getTargetSystemId() {
+ return targetSystemId;
+ }
+
+ public void setTargetSystemId(String targetSystemId) {
+ this.targetSystemId = targetSystemId;
}
public String getTargetSystemOidName() {
@@ -656,12 +657,12 @@
", returnType='" + returnType + '\'' +
", returnTypeText='" + returnTypeText + '\'' +
", sourceSystemOid='" + sourceSystemOid + '\'' +
- ", sourceSysName='" + sourceSysName + '\'' +
- ", sourceSysId='" + sourceSysId + '\'' +
+ ", sourceSystemName='" + sourceSystemName + '\'' +
+ ", sourceSystemId='" + sourceSystemId + '\'' +
", sourceSystemOidName='" + sourceSystemOidName + '\'' +
", targetSystemOid='" + targetSystemOid + '\'' +
- ", targetSysName='" + targetSysName + '\'' +
- ", targetSysId='" + targetSysId + '\'' +
+ ", targetSystemName='" + targetSystemName + '\'' +
+ ", targetSystemId='" + targetSystemId + '\'' +
", targetSystemOidName='" + targetSystemOidName + '\'' +
", classPath='" + classPath + '\'' +
", dataFlowType='" + dataFlowType + '\'' +
@@ -676,7 +677,7 @@
", pushTypeText='" + pushTypeText + '\'' +
", classifyId='" + classifyId + '\'' +
", classifyName='" + classifyName + '\'' +
- ", isGroupCodeFlag=" + isGroupCodeFlag +
+ ", isGroupCodeFlag='" + isGroupCodeFlag + '\'' +
", sysIntParamVOs=" + sysIntParamVOs +
", sysIntHeaderVOs=" + sysIntHeaderVOs +
'}';
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
index 94db481..a901b8e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
@@ -134,7 +134,7 @@
/***
* 寰呴泦鎴愭暟鎹�
*/
- public static final String PL_CODE_DOCKINGPADATA = "PL_CODE_DOCKINGPADATA";
+ public static final String PL_CODE_DOCKINGDATA = "PL_CODE_DOCKINGDATA";
/***
* 瀹氭椂鍒嗗彂浠诲姟瀵硅薄
*/
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 20dfef7..93fa594 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -126,7 +126,7 @@
boolean res = dockingSystemConfigService.addSave(systemConfigDTO);
return R.success("淇濆瓨鎴愬姛!");
}catch (Throwable e){
- return R.fail("淇濆瓨澶辫触!");
+ return R.fail("淇濆瓨澶辫触!"+e.getMessage());
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
index 6882ada..cb1190b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
@@ -37,7 +37,7 @@
* @param dockingSystemConfigDTO 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭暟鎹紶杈撳璞�
* @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
*/
- boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO);
+ boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable;
/***
* 鏇存柊鎺ュ彛閰嶇疆淇℃伅鐘舵��
@@ -49,7 +49,7 @@
/***
* 鎵嬪姩鍚屾鎺ュ彛锛屽彧鏈夋帹閫佺殑鎵嶄細
- * @param dockingSystemConfig
+ * @param dockingSystemConfigDTO
* @return
* @throws VciBaseException
*/
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java
index f9ff701..9b561e6 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemService.java
@@ -4,7 +4,6 @@
import com.vci.ubcs.code.dto.DockingSystemDTO;
import com.vci.ubcs.code.entity.DockingSystem;
import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
-import org.springblade.core.tool.api.R;
/***
* 绯荤粺鎺ュ彛绠＄悊-闆嗘垚绯荤粺鏈嶅姟
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 497baef..976d92a 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
@@ -21,6 +21,7 @@
import com.vci.ubcs.code.dto.datapush.result.ResultNodeDataDTO;
import com.vci.ubcs.code.dto.datapush.result.ResultNodeObjectDTO;
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.code.util.WsErpClientUtil;
@@ -158,7 +159,7 @@
List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list(
Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true")
- .eq(DockingSystemConfig::getPushType,type==2?"2":"1"));//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫�
+ .eq(DockingSystemConfig::getPushType,type==2?"2":"1").eq(DockingSystemConfig::getDataFlowType, SysIntegrationDataFlowTypeEnum.PUSH.getValue()));//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫�
if(CollectionUtils.isEmpty(dockingSystemConfigList)){
String title=type==2?"鍒嗙被鎺ㄩ��":"鏁版嵁鎺ㄩ��";
@@ -331,6 +332,7 @@
String classifyoid = dockingTask.getClassifyOid();
//鏌ヨ瑕佹帹閫佺殑鏁版嵁
String btmoid = dockingTask.getBtmOid();//鏁版嵁btmid
+ String code=dockingTask.getId();;
//琛ㄧず鏄富鏁版嵁
CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid);
R<List<Map<String, String>>> r = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid());
@@ -356,12 +358,18 @@
nodeProDTOS.add(nodeProDTO);
}
});
+ //鏌ヨ鎺ㄩ�佹帴鍙ｅ弬鏁�
+ DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);
+ boolean isGroupCodeFlage= dockingSystemConfig.getIsGroupCodeFlag().equals("true")?true:false;
+ if(isGroupCodeFlage){
+ code=data.getOrDefault("groupcode","");
+ }
String[] classCodeLeves = dockingTask.getClassifyId().split(",");
NodeJosnDTO nodeJosnDTO = new NodeJosnDTO();
NodedataDTO nodeDataDTO = new NodedataDTO();
NodeObjectDTO nodeObjectDTO = new NodeObjectDTO();
- nodeObjectDTO.setCode(dockingTask.getId());//璁剧疆缂栫爜
+ nodeObjectDTO.setCode(code);//璁剧疆缂栫爜
nodeObjectDTO.setClassCode(classCodeLeves[0]);
nodeObjectDTO.setStatus(data.get("lcstatus"));
nodeObjectDTO.setLibrary(classCodeLeves[classCodeLeves.length - 1]);
@@ -370,8 +378,7 @@
nodeObjectDTOS.add(nodeObjectDTO);
nodeDataDTO.setObject(nodeObjectDTOS);
nodeJosnDTO.setData(nodeDataDTO);
- //鏌ヨ鎺ㄩ�佹帴鍙ｅ弬鏁�
- DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid);
+
String paramType = dockingSystemConfig.getParamType();//xml/json
if (paramType.equals(DATATYPE_JSON)) {
Object object = JSONObject.toJSON(nodeJosnDTO);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index 21c60ed..9c18cdd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -222,76 +222,85 @@
*/
@Transactional(rollbackFor = Exception.class)
@Override
- public boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO) {
+ public boolean editSave(DockingSystemConfigDTO dockingSystemConfigDTO) throws Throwable {
VciBaseUtil.alertNotNull(dockingSystemConfigDTO,"鏁版嵁瀵硅薄",dockingSystemConfigDTO.getOid(),"绯荤粺闆嗘垚鍩虹淇℃伅涓婚敭");
- String sourcesystemoid = dockingSystemConfigDTO.getSourceSystemOid();//.getSourcesystemoid();
- DockingSystem dockingSystem = dockingSystemMapper.selectById(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseOid(sourcesystemoid);
- dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
- dockingSystemConfigDTO.setBtmname(dockingSystem.getName());
- //灏咲TO杞崲涓篋O
- DockingSystemConfig dockingSystemConfig = dockingSystemConfigMapper.selectById(dockingSystemConfigDTO.getOid());
- revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
- String sysInfoOid=dockingSystemConfigDTO.getOid();
- List<DockingSysIntParamDTO> dockingSysIntParamDTOS= dockingSystemConfigDTO.getSysIntParamDTOS();
- List<DockingSysIntParam> dockingSysIntParamList=new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingSysIntParamDTOS)) {
- dockingSysIntParamDTOS.stream().forEach(dockingSysIntParamDTO -> {
- DockingSysIntParam dockingSysIntParam = new DockingSysIntParam();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntParamDTO, dockingSysIntParam);
- dockingSysIntParamList.add(dockingSysIntParam);
- });
+ String systemOid ="";
+ if(dockingSystemConfigDTO.getDataFlowType().equals(SysIntegrationDataFlowTypeEnum.PUSH.getValue())) {
+ systemOid = dockingSystemConfigDTO.getTargetSystemOid();
+ }else{
+ systemOid = dockingSystemConfigDTO.getSourceSystemOid();
}
- List<DockingSysIntHeaderDTO> dockingSysIntHeaderDTOS= dockingSystemConfigDTO.getSysIntHeaderDTOS();
- List<DockingSysIntHeader> dockingSysIntHeaderList = new ArrayList<>();
- if(!CollectionUtils.isEmpty(dockingSysIntHeaderDTOS)) {
- dockingSysIntHeaderDTOS.stream().forEach(dockingSysIntHeaderDTO -> {
- DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
- BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntHeaderDTO, dockingSysIntHeader);
- dockingSysIntHeaderList.add(dockingSysIntHeader);
- });
- }
+ DockingSystem dockingSystem = dockingSystemMapper.selectById(systemOid);
+ if(dockingSystem!=null) {
+ dockingSystemConfigDTO.setSysBaseOid(dockingSystem.getOid());
+ dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
+ dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
+ //灏咲TO杞崲涓篋O
+ DockingSystemConfig dockingSystemConfig = dockingSystemConfigMapper.selectById(dockingSystemConfigDTO.getOid());
+ revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO, dockingSystemConfig);
+ String sysInfoOid = dockingSystemConfigDTO.getOid();
+ List<DockingSysIntParamDTO> dockingSysIntParamDTOS = dockingSystemConfigDTO.getSysIntParamDTOS();
+ List<DockingSysIntParam> dockingSysIntParamList = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(dockingSysIntParamDTOS)) {
+ dockingSysIntParamDTOS.stream().forEach(dockingSysIntParamDTO -> {
+ DockingSysIntParam dockingSysIntParam = new DockingSysIntParam();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntParamDTO, dockingSysIntParam);
+ dockingSysIntParamList.add(dockingSysIntParam);
+ });
+ }
+ List<DockingSysIntHeaderDTO> dockingSysIntHeaderDTOS = dockingSystemConfigDTO.getSysIntHeaderDTOS();
+ List<DockingSysIntHeader> dockingSysIntHeaderList = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(dockingSysIntHeaderDTOS)) {
+ dockingSysIntHeaderDTOS.stream().forEach(dockingSysIntHeaderDTO -> {
+ DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
+ BeanUtilForVCI.copyPropertiesIgnoreCase(dockingSysIntHeaderDTO, dockingSysIntHeader);
+ dockingSysIntHeaderList.add(dockingSysIntHeader);
+ });
+ }
- //鎵归噺澶勭悊淇濆瓨header瀵硅薄
- if(!CollectionUtils.isEmpty(dockingSysIntHeaderList)) {
- List<String> idList=new ArrayList<>();
- List<DockingSysIntHeader> headers_old =this.dockingSysIntHeaderService.list(Wrappers.<DockingSysIntHeader>query().lambda().eq(DockingSysIntHeader::getInfoOid,sysInfoOid));;
- for (DockingSysIntHeader sysIntHeader:headers_old){
- sysIntHeader.setUsedFlag(FLAG_FAIL);
- idList.add(sysIntHeader.getOid());
- }
- if(idList.size()!=0){
- boolean res=dockingSysIntHeaderService.removeBatchByIds(idList);
- }
- //鍐嶆柊澧瀐eaders
- for(DockingSysIntHeader sysIntHeader:dockingSysIntHeaderList){
- sysIntHeader.setUsedFlag(FLAG_TRUE);
- sysIntHeader.setInfoOid(dockingSystemConfig.getOid());
+ //鎵归噺澶勭悊淇濆瓨header瀵硅薄
+ if (!CollectionUtils.isEmpty(dockingSysIntHeaderList)) {
+ List<String> idList = new ArrayList<>();
+ List<DockingSysIntHeader> headers_old = this.dockingSysIntHeaderService.list(Wrappers.<DockingSysIntHeader>query().lambda().eq(DockingSysIntHeader::getInfoOid, sysInfoOid));
+ ;
+ for (DockingSysIntHeader sysIntHeader : headers_old) {
+ sysIntHeader.setUsedFlag(FLAG_FAIL);
+ idList.add(sysIntHeader.getOid());
+ }
+ if (idList.size() != 0) {
+ boolean res = dockingSysIntHeaderService.removeBatchByIds(idList);
+ }
+ //鍐嶆柊澧瀐eaders
+ for (DockingSysIntHeader sysIntHeader : dockingSysIntHeaderList) {
+ sysIntHeader.setUsedFlag(FLAG_TRUE);
+ sysIntHeader.setInfoOid(dockingSystemConfig.getOid());
+ }
+ boolean res = dockingSysIntHeaderService.saveBatch(dockingSysIntHeaderList);
}
- boolean res= dockingSysIntHeaderService.saveBatch(dockingSysIntHeaderList);
+ //鎵归噺澶勭悊淇濆瓨Param瀵硅薄
+ if (!CollectionUtils.isEmpty(dockingSysIntParamList)) {
+ //鍏堝垹闄arams_old
+ List<String> idList = new ArrayList<>();
+ List<DockingSysIntParam> params_old = this.dockingSysIntParamService.list(Wrappers.<DockingSysIntParam>query().lambda().eq(DockingSysIntParam::getInfoOid, sysInfoOid));
+ for (DockingSysIntParam sysIntParamDO : params_old) {
+ sysIntParamDO.setUsedFlag(FLAG_FAIL);
+ idList.add(sysIntParamDO.getOid());
+ }
+ if (idList.size() != 0) {
+ boolean res = dockingSysIntParamService.removeBatchByIds(idList);
+ }
+ //鍐嶆柊澧瀙arams
+ for (DockingSysIntParam sysIntParamDOi : dockingSysIntParamList) {
+ sysIntParamDOi.setUsedFlag(FLAG_TRUE);
+ sysIntParamDOi.setInfoOid(dockingSystemConfig.getOid());
+ }
+ dockingSysIntParamService.saveBatch(dockingSysIntParamList);
+ }
+ this.dockingSystemConfigMapper.updateById(dockingSystemConfig);
+ }else{
+ throw new Throwable("鏍规嵁閫夋嫨鐨勯泦鎴愮郴缁熸湭鏍￠獙鍒扮郴缁熶腑瀛樺湪姝ら泦鎴愮郴缁燂紝璇锋牳瀵癸紒");
}
- //鎵归噺澶勭悊淇濆瓨Param瀵硅薄
- if(!CollectionUtils.isEmpty(dockingSysIntParamList)) {
- //鍏堝垹闄arams_old
- List<String> idList=new ArrayList<>();
- List<DockingSysIntParam> params_old =this.dockingSysIntParamService.list(Wrappers.<DockingSysIntParam>query().lambda().eq(DockingSysIntParam::getInfoOid,sysInfoOid));
- for (DockingSysIntParam sysIntParamDO:params_old){
- sysIntParamDO.setUsedFlag(FLAG_FAIL);
- idList.add(sysIntParamDO.getOid());
- }
- if(idList.size()!=0){
- boolean res= dockingSysIntParamService.removeBatchByIds(idList);
- }
- //鍐嶆柊澧瀙arams
- for(DockingSysIntParam sysIntParamDOi:dockingSysIntParamList){
- sysIntParamDOi.setUsedFlag(FLAG_TRUE);
- sysIntParamDOi.setInfoOid(dockingSystemConfig.getOid());
- }
- dockingSysIntParamService.saveBatch(dockingSysIntParamList);
- }
- this.dockingSystemConfigMapper.updateById(dockingSystemConfig);
- //return changeoDckingSystemEntityVOs(dockingSystemConfig,dockingSysIntHeaderList,dockingSysIntParamList);
return true;
}
/***
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
index 56cd832..2472e27 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemServiceImpl.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.dto.DockingSystemDTO;
-import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.entity.DockingSystem;
import com.vci.ubcs.code.entity.DockingSystemConfig;
import com.vci.ubcs.code.mapper.DockingSystemConfigMapper;
@@ -18,7 +17,6 @@
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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 3ec3629..e3a1fe8 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
@@ -213,7 +213,8 @@
String operation="";
if(CODE_CHECKCONFIG) {
//鏍￠獙鏄惁閰嶇疆
- DockingSystemConfig dockingSystemConfig= checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
+ DockingSystemConfig dockingSystemConfig=null;
+ dockingSystemConfig=checkIspass(finalSystemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue(),codeClassifyVO.getOid());
if(dockingSystemConfig==null){
errorid[0] ="101";
throw new Throwable("绯荤粺鏍囪瘑涓恒��"+ finalSystemId +"銆戯紝闆嗘垚鍒嗙被涓恒��"+codeClassifyVO.getName()+"銆戜互涓婂垎绫伙紝"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"鎺ュ彛閰嶇疆宸插仠鐢ㄦ垨鑰呮湭閰嶇疆锛岃鑱旂郴缂栫爜绠＄悊鍛橈紒");
@@ -1677,7 +1678,6 @@
*/
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);
- DockingSystemConfig dockingSystemConfig=null;
CodeClassifyVO codeClassifyVO= classifyService.getObjectByOid(classOid);
classOid=codeClassifyVO.getOid();
//鏍规嵁绫诲瀷鍘绘煡璇㈤渶瑕侀泦鎴愮殑鍒嗙被鎴栬�呮暟鎹�
@@ -1687,16 +1687,16 @@
queryWrapper.eq(DockingSystemConfig::getDataFlowType,type);
queryWrapper.eq(DockingSystemConfig::getPushType,operationType);
if(StringUtils.isNotBlank(classOid)){
- queryWrapper.in(DockingSystemConfig::getClassifyId,classOid);
+ queryWrapper.in(DockingSystemConfig::getClassifyOid,classOid);
}
List<DockingSystemConfig> dockingSystemConfigList= dockingSystemConfigList=dockingSystemConfigService.list(queryWrapper);
if(!CollectionUtils.isEmpty(dockingSystemConfigList)){
- dockingSystemConfig=dockingSystemConfigList.get(0);
+ return dockingSystemConfigList.get(0);
}else{
if(StringUtils.isNotBlank(codeClassifyVO.getParentCodeClassifyOid())) {
- checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid());
+ return checkIspass(systemId, type, operationType, codeClassifyVO.getParentCodeClassifyOid());
}
}
- return dockingSystemConfig;
+ return dockingSystemConfigList.get(0);
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml
index ff0ef90..8bd88e1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingDataMapper.xml
@@ -6,7 +6,7 @@
<result column="OID" property="oid"/>
<result column="REVISIONOID" property="revisionOid"/>
<result column="NAMEOID" property="nameOid"/>
- <result column="BTMNAME" property="btmName"/>
+ <result column="BTMNAME" property="btmname"/>
<result column="LASTR" property="lastR"/>
<result column="FIRSTR" property="firstR"/>
<result column="LASTV" property="lastV"/>
@@ -17,7 +17,7 @@
<result column="LASTMODIFYTIME" property="lastModifyTime"/>
<result column="REVISIONRULE" property="revisionRule"/>
<result column="VERSIONRULE" property="versionRule"/>
- <result column="REVISIONSEQ" property="revisionSeg"/>
+ <result column="REVISIONSEQ" property="revisionSeq"/>
<result column="REVISIONVALUE" property="revisionValue"/>
<result column="VERSIONSEQ" property="versionSeq"/>
<result column="VERSIONVALUE" property="versionValue"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSystemConfigMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSystemConfigMapper.xml
index d11ab3f..0aa0ff8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSystemConfigMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSystemConfigMapper.xml
@@ -45,11 +45,11 @@
<result column="RETURNTYPE" property="returnType"/>
<result column="REQUESTURL" property="requestUrl"/>
<result column="SOURCESYSTEMOID" property="sourceSystemOid"/>
- <result column="SOURCESYSNAME" property="sourceSysName"/>
- <result column="SOURCESYSID" property="sourceSysId"/>
+ <result column="SOURCESYSNAME" property="sourceSystemName"/>
+ <result column="SOURCESYSID" property="sourceSystemId"/>
<result column="TARGETSYSTEMOID" property="targetSystemOid"/>
- <result column="TARGETSYSNAME" property="targetSysName"/>
- <result column="TARGETSYSID" property="targetSysId"/>
+ <result column="TARGETSYSNAME" property="targetSystemName"/>
+ <result column="TARGETSYSID" property="targetSystemId"/>
<result column="CLASSPATH" property="classPath"/>
<result column="DATAFLOWTYPE" property="dataFlowType"/>
--
Gitblit v1.9.3