From 5dd6f4aa2123671e95907ee19f5925a98983cdc8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 25 三月 2024 10:05:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java |  420 ++++--------------------------------------------------------
 1 files changed, 28 insertions(+), 392 deletions(-)

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 5edd5d6..9805f1a 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
@@ -1,9 +1,10 @@
 package com.vci.ubcs.code.dto;
 
 
-import com.vci.ubcs.code.vo.pagemodel.SysIntHeaderVO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntParamVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingSysIntHeaderVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingSysIntParamVO;
 import com.vci.ubcs.starter.revision.model.BaseModel;
+import lombok.Data;
 
 import java.util.List;
 
@@ -13,13 +14,13 @@
  * @author lihang
  * @date 2022-03-07
  */
+@Data
 public class DockingSystemConfigDTO extends BaseModel {
 
 	/**
      * 绂佹淇敼杩欎釜鍊�
      */
 	private static final long serialVersionUID = 4615707120053955466L;
-
 
 	/**
 	 * 璁よ瘉鏂瑰紡
@@ -66,12 +67,10 @@
 	 */
 	private String description;
 
-
 	/**
 	 * 鎺ュ彛绫诲瀷
 	 */
 	private String interfaceType;
-
 
 	/**
 	 * 鎺ュ彛绫诲瀷鏄剧ず鏂囨湰
@@ -82,7 +81,6 @@
 	 */
 	private String paramType;
 
-
 	/**
 	 * 鍙傛暟绫诲瀷鏄剧ず鏂囨湰
 	 */
@@ -91,7 +89,6 @@
 	 * 璇锋眰鏂瑰紡
 	 */
 	private String requestMethod;
-
 
 	/**
 	 * 璇锋眰鏂瑰紡鏄剧ず鏂囨湰
@@ -127,12 +124,15 @@
 	 */
 	private String requestUrl;
 
-
 	/**
 	 * 杩斿洖鍊肩被鍨�
 	 */
 	private String returnType;
 
+	/**
+	 * 鍐呭绫诲瀷
+	 */
+	private String contentType;
 
 	/**
 	 * 杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
@@ -146,12 +146,12 @@
 	/**
 	 * 鏉ユ簮绯荤粺鍚嶇О
 	 */
-	private String sourceSysName;
+	private String sourceSystemName;
 
 	/**
 	 * 鏉ユ簮绯荤粺鏍囪瘑
 	 */
-	private String sourceSysId;
+	private String sourceSystemId;
 
 	/**
 	 * 鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -166,12 +166,12 @@
 	/**
 	 * 鐩爣绯荤粺鍚嶇О
 	 */
-	private String targetSysName;
+	private String targetSystemName;
 
 	/**
 	 * 鐩爣绯荤粺鏍囪瘑
 	 */
-	private String targetSysId;
+	private String targetSystemId;
 
 	/**
 	 * 鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -184,7 +184,7 @@
 	private String classPath;
 
 	/**
-	 * 鏁版嵁娴佸悜鏂瑰紡
+	 * 鏁版嵁娴佸悜鏂瑰紡1:鎺ュ彈2锛氬垎鍙�
 	 */
 	private String dataFlowType;
 
@@ -245,385 +245,19 @@
 	/***
 	 * 鍙傛暟淇℃伅瀵硅薄
 	 */
-	private List<SysIntParamVO> sysIntParamVOs;
+	private List<DockingSysIntParamDTO> sysIntParamDTOS;
 	/***
 	 * header淇℃伅瀵硅薄
 	 */
-	private List<SysIntHeaderVO> sysIntHeaderVOs;
-
-	public String getAuthorityOid() {
-		return authorityOid;
-	}
-
-	public void setAuthorityOid(String authorityOid) {
-		this.authorityOid = authorityOid;
-	}
-
-	public String getAuthorityOidName() {
-		return authorityOidName;
-	}
-
-	public void setAuthorityOidName(String authorityOidName) {
-		this.authorityOidName = authorityOidName;
-	}
-
-	public String getAuthorityType() {
-		return authorityType;
-	}
-
-	public void setAuthorityType(String authorityType) {
-		this.authorityType = authorityType;
-	}
-
-	public String getAuthorityTypeText() {
-		return authorityTypeText;
-	}
-
-	public void setAuthorityTypeText(String authorityTypeText) {
-		this.authorityTypeText = authorityTypeText;
-	}
-
-	public String getUserAccount() {
-		return userAccount;
-	}
-
-	public void setUserAccount(String userAccount) {
-		this.userAccount = userAccount;
-	}
-
-	public String getUserCode() {
-		return userCode;
-	}
-
-	public void setUserCode(String userCode) {
-		this.userCode = userCode;
-	}
-
-	public String getToken() {
-		return token;
-	}
-
-	public void setToken(String token) {
-		this.token = token;
-	}
-
-	public String getInterfaceFunction() {
-		return interfaceFunction;
-	}
-
-	public void setInterfaceFunction(String interfaceFunction) {
-		this.interfaceFunction = interfaceFunction;
-	}
-
-	@Override
-	public String getDescription() {
-		return description;
-	}
-
-	@Override
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getInterfaceType() {
-		return interfaceType;
-	}
-
-	public void setInterfaceType(String interfaceType) {
-		this.interfaceType = interfaceType;
-	}
-
-	public String getInterfaceTypeText() {
-		return interfaceTypeText;
-	}
-
-	public void setInterfaceTypeText(String interfaceTypeText) {
-		this.interfaceTypeText = interfaceTypeText;
-	}
-
-	public String getParamType() {
-		return paramType;
-	}
-
-	public void setParamType(String paramType) {
-		this.paramType = paramType;
-	}
-
-	public String getParamTypeText() {
-		return paramTypeText;
-	}
-
-	public void setParamTypeText(String paramTypeText) {
-		this.paramTypeText = paramTypeText;
-	}
-
-	public String getRequestMethod() {
-		return requestMethod;
-	}
-
-	public void setRequestMethod(String requestMethod) {
-		this.requestMethod = requestMethod;
-	}
-
-	public String getRequestMethodText() {
-		return requestMethodText;
-	}
-
-	public void setRequestMethodText(String requestMethodText) {
-		this.requestMethodText = requestMethodText;
-	}
-
-	public String getClassifyOid() {
-		return classifyOid;
-	}
-
-	public void setClassifyOid(String classifyOid) {
-		this.classifyOid = classifyOid;
-	}
-
-	public String getUsedFlag() {
-		return usedFlag;
-	}
-
-	public void setUsedFlag(String usedFlag) {
-		this.usedFlag = usedFlag;
-	}
-
-	public String getSysBaseOid() {
-		return sysBaseOid;
-	}
-
-	public void setSysBaseOid(String sysBaseOid) {
-		this.sysBaseOid = sysBaseOid;
-	}
-
-	public String getSysBaseId() {
-		return sysBaseId;
-	}
-
-	public void setSysBaseId(String sysBaseId) {
-		this.sysBaseId = sysBaseId;
-	}
-
-	public String getSysBaseName() {
-		return sysBaseName;
-	}
-
-	public void setSysBaseName(String sysBaseName) {
-		this.sysBaseName = sysBaseName;
-	}
-
-	public String getRequestUrl() {
-		return requestUrl;
-	}
-
-	public void setRequestUrl(String requestUrl) {
-		this.requestUrl = requestUrl;
-	}
-
-	public String getReturnType() {
-		return returnType;
-	}
-
-	public void setReturnType(String returnType) {
-		this.returnType = returnType;
-	}
-
-	public String getReturnTypeText() {
-		return returnTypeText;
-	}
-
-	public void setReturnTypeText(String returnTypeText) {
-		this.returnTypeText = returnTypeText;
-	}
-
-	public String getSourceSystemOid() {
-		return sourceSystemOid;
-	}
-
-	public void setSourceSystemOid(String sourceSystemOid) {
-		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;
-	}
-
-	public void setSourceSystemOidName(String sourceSystemOidName) {
-		this.sourceSystemOidName = sourceSystemOidName;
-	}
-
-	public String getTargetSystemOid() {
-		return targetSystemOid;
-	}
-
-	public void setTargetSystemOid(String targetSystemOid) {
-		this.targetSystemOid = targetSystemOid;
-	}
-
-	public String getTargetSysName() {
-		return targetSysName;
-	}
-
-	public void setTargetSysName(String targetSysName) {
-		this.targetSysName = targetSysName;
-	}
-
-	public String getTargetSysId() {
-		return targetSysId;
-	}
-
-	public void setTargetSysId(String targetSysId) {
-		this.targetSysId = targetSysId;
-	}
-
-	public String getTargetSystemOidName() {
-		return targetSystemOidName;
-	}
-
-	public void setTargetSystemOidName(String targetSystemOidName) {
-		this.targetSystemOidName = targetSystemOidName;
-	}
-
-	public String getClassPath() {
-		return classPath;
-	}
-
-	public void setClassPath(String classPath) {
-		this.classPath = classPath;
-	}
-
-	public String getDataFlowType() {
-		return dataFlowType;
-	}
-
-	public void setDataFlowType(String dataFlowType) {
-		this.dataFlowType = dataFlowType;
-	}
-
-	public String getDataFlowTypeText() {
-		return dataFlowTypeText;
-	}
-
-	public void setDataFlowTypeText(String dataFlowTypeText) {
-		this.dataFlowTypeText = dataFlowTypeText;
-	}
-
-	public String getBtmTypeId() {
-		return btmTypeId;
-	}
-
-	public void setBtmTypeId(String btmTypeId) {
-		this.btmTypeId = btmTypeId;
-	}
-
-	public String getBtmTypeName() {
-		return btmTypeName;
-	}
-
-	public void setBtmTypeName(String btmTypeName) {
-		this.btmTypeName = btmTypeName;
-	}
-
-	public String getNamespace() {
-		return namespace;
-	}
-
-	public void setNamespace(String namespace) {
-		this.namespace = namespace;
-	}
-
-	public String getSoapAction() {
-		return soapAction;
-	}
-
-	public void setSoapAction(String soapAction) {
-		this.soapAction = soapAction;
-	}
-
-	public String getCxfAxis() {
-		return cxfAxis;
-	}
-
-	public void setCxfAxis(String cxfAxis) {
-		this.cxfAxis = cxfAxis;
-	}
-
-	public String getTargetName() {
-		return targetName;
-	}
-
-	public void setTargetName(String targetName) {
-		this.targetName = targetName;
-	}
-
-	public String getPushType() {
-		return pushType;
-	}
-
-	public void setPushType(String pushType) {
-		this.pushType = pushType;
-	}
-
-	public String getPushTypeText() {
-		return pushTypeText;
-	}
-
-	public void setPushTypeText(String pushTypeText) {
-		this.pushTypeText = pushTypeText;
-	}
-
-	public String getClassifyId() {
-		return classifyId;
-	}
-
-	public void setClassifyId(String classifyId) {
-		this.classifyId = classifyId;
-	}
-
-	public String getClassifyName() {
-		return classifyName;
-	}
-
-	public void setClassifyName(String classifyName) {
-		this.classifyName = classifyName;
-	}
-
-	public List<SysIntParamVO> getSysIntParamVOs() {
-		return sysIntParamVOs;
-	}
-
-	public void setSysIntParamVOs(List<SysIntParamVO> sysIntParamVOs) {
-		this.sysIntParamVOs = sysIntParamVOs;
-	}
-
-	public List<SysIntHeaderVO> getSysIntHeaderVOs() {
-		return sysIntHeaderVOs;
-	}
-
-	public void setSysIntHeaderVOs(List<SysIntHeaderVO> sysIntHeaderVOs) {
-		this.sysIntHeaderVOs = sysIntHeaderVOs;
-	}
+	private List<DockingSysIntHeaderDTO> sysIntHeaderDTOS;
+	/***
+	 * 闆嗗洟鐮佹槸鍚﹀弬涓庣敵璇�/鏇存柊/鍙戦��
+	 */
+	private String isGroupCodeFlag;
 
 	@Override
 	public String toString() {
-		return "SysIntInfoDTO{" +
+		return "DockingSystemConfigDTO{" +
 			"authorityOid='" + authorityOid + '\'' +
 			", authorityOidName='" + authorityOidName + '\'' +
 			", authorityType='" + authorityType + '\'' +
@@ -648,12 +282,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 + '\'' +
@@ -668,8 +302,10 @@
 			", pushTypeText='" + pushTypeText + '\'' +
 			", classifyId='" + classifyId + '\'' +
 			", classifyName='" + classifyName + '\'' +
-			", sysIntParamVOs=" + sysIntParamVOs +
-			", sysIntHeaderVOs=" + sysIntHeaderVOs +
+			", sysIntParamDTOS=" + sysIntParamDTOS +
+			", sysIntHeaderDTOS=" + sysIntHeaderDTOS +
+			", isGroupCodeFlag='" + isGroupCodeFlag + '\'' +
 			'}';
 	}
+
 }

--
Gitblit v1.9.3