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/entity/DockingSystemConfig.java |   93 +++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 82 insertions(+), 11 deletions(-)

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 a4b5f02..427ee43 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
@@ -2,15 +2,12 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.vci.ubcs.code.vo.pagemodel.SysIntHeaderVO;
-import com.vci.ubcs.code.vo.pagemodel.SysIntParamVO;
+import com.vci.ubcs.starter.constant.CodeTableNameConstant;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import java.util.List;
 
 /***
  * 闆嗘垚鎺ュ彛-闆嗘垚鎺ュ彛绠$悊瀵硅薄
@@ -18,7 +15,7 @@
  * @date 2023-06-01
  */
 @Data
-@TableName("PL_CODE_SYSINTINFO")
+@TableName(CodeTableNameConstant.PL_CODE_SYSINTINFO)
 @ApiModel(value = "DockingSystemConfig", description = "闆嗘垚鎺ュ彛-闆嗘垚鎺ュ彛绠$悊瀵硅薄")
 @EqualsAndHashCode(callSuper = true)
 public class DockingSystemConfig extends BaseModel{
@@ -104,6 +101,12 @@
 	@ApiModelProperty(value = "鎺ュ彛绫诲瀷鏄剧ず鏂囨湰")
 	@TableField(exist = false)
 	private String interfaceTypeText;
+
+	@Override
+	public String getFirstR() {
+		return super.getFirstR();
+	}
+
 	/**
 	 * 鍙傛暟绫诲瀷
 	 */
@@ -172,6 +175,11 @@
 	@ApiModelProperty(value = "杩斿洖鍊肩被鍨�")
 	private String returnType;
 
+	/**
+	 * 鍐呭绫诲瀷
+	 */
+	@ApiModelProperty(value = "鍐呭绫诲瀷")
+	private String contentType;
 
 	/**
 	 * 杩斿洖鍊肩被鍨嬫樉绀烘枃鏈�
@@ -189,13 +197,15 @@
 	 * 鏉ユ簮绯荤粺鍚嶇О
 	 */
 	@ApiModelProperty(value = "鏉ユ簮绯荤粺鍚嶇О")
-	private String sourceSysName;
+	@TableField(value = "SOURCESYSNAME")
+	private String sourceSystemName;
 
 	/**
 	 * 鏉ユ簮绯荤粺鏍囪瘑
 	 */
 	@ApiModelProperty(value = "鏉ユ簮绯荤粺鏍囪瘑")
-	private String sourceSysId;
+	@TableField(value = "SOURCESYSID")
+	private String sourceSystemId;
 
 	/**
 	 * 鏉ユ簮绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -214,13 +224,15 @@
 	 * 鐩爣绯荤粺鍚嶇О
 	 */
 	@ApiModelProperty(value = "鐩爣绯荤粺鍚嶇О")
-	private String targetSysName;
+	@TableField(value = "TARGETSYSNAME")
+	private String targetSystemName;
 
 	/**
 	 * 鐩爣绯荤粺鏍囪瘑
 	 */
 	@ApiModelProperty(value = "鐩爣绯荤粺鏍囪瘑")
-	private String targetSysId;
+	@TableField(value = "TARGETSYSID")
+	private String targetSystemId;
 
 	/**
 	 * 鐩爣绯荤粺涓婚敭鏄剧ず鏂囨湰
@@ -287,9 +299,9 @@
 
 
 	/***
-	 * 鎺ㄩ�佺被鍨� 1:鏁版嵁鎺ㄩ��/2鍒嗙被鎺ㄩ�侊紝榛樿鏁版嵁鎺ㄩ��
+	 *  鎺ㄩ�佺被鍨� 1:鏁版嵁鎺ㄩ��,2鍒嗙被鎺ㄩ�侊紝榛樿鏁版嵁鎺ㄩ��,3:缂栫爜鐢宠,4:缂栫爜鏇存敼锛堟洿鏀广�佺姸鎬侊紝鍥炴敹锛�,5:鍒嗙被鏌ヨ,6:鍚鍒欎俊鎭殑鍒嗙被鏌ヨ,7:鏁版嵁鏌ヨ
 	 */
-	@ApiModelProperty(value = "鎺ㄩ�佺被鍨� 1:鏁版嵁鎺ㄩ��/2鍒嗙被鎺ㄩ�侊紝榛樿鏁版嵁鎺ㄩ��")
+	@ApiModelProperty(value = "鎺ㄩ�佺被鍨� 1:鏁版嵁鎺ㄩ��,2鍒嗙被鎺ㄩ��,3:缂栫爜鐢宠,4:缂栫爜鏇存敼(鐘舵�侊紝鍥炴敹),5:鍒嗙被鏌ヨ,6:鍚鍒欎俊鎭殑鍒嗙被鏌ヨ,7:鏁版嵁鏌ヨ")
 	private String pushType;
 	/***
 	 * 鎺ㄩ�佺被鍨嬫樉绀哄��
@@ -309,4 +321,63 @@
 	 */
 	@ApiModelProperty(value = "鍒嗙被鍚嶇О")
 	private String classifyName;
+
+	/***
+	 * 闆嗗洟鐮佹槸鍚﹀弬涓庣敵璇�/鏇存柊/鍙戦��
+	 */
+	/**
+	 * 鍒嗙被鍚嶇О
+	 */
+	@ApiModelProperty(value = "闆嗗洟鐮佹槸鍚﹀弬涓庣敵璇�/鏇存柊/鍙戦��")
+	private String isGroupCodeFlag;
+
+	@Override
+	public String toString() {
+		return "DockingSystemConfig{" +
+			"authorityOid='" + authorityOid + '\'' +
+			", authorityOidName='" + authorityOidName + '\'' +
+			", authorityType='" + authorityType + '\'' +
+			", authorityTypeText='" + authorityTypeText + '\'' +
+			", userAccount='" + userAccount + '\'' +
+			", userCode='" + userCode + '\'' +
+			", token='" + token + '\'' +
+			", interfaceFunction='" + interfaceFunction + '\'' +
+			", interfaceType='" + interfaceType + '\'' +
+			", interfaceTypeText='" + interfaceTypeText + '\'' +
+			", paramType='" + paramType + '\'' +
+			", paramTypeText='" + paramTypeText + '\'' +
+			", requestMethod='" + requestMethod + '\'' +
+			", requestMethodText='" + requestMethodText + '\'' +
+			", classifyOid='" + classifyOid + '\'' +
+			", usedFlag='" + usedFlag + '\'' +
+			", sysBaseOid='" + sysBaseOid + '\'' +
+			", sysBaseId='" + sysBaseId + '\'' +
+			", sysBaseName='" + sysBaseName + '\'' +
+			", requestUrl='" + requestUrl + '\'' +
+			", returnType='" + returnType + '\'' +
+			", returnTypeText='" + returnTypeText + '\'' +
+			", sourceSystemOid='" + sourceSystemOid + '\'' +
+			", sourceSystemName='" + sourceSystemName + '\'' +
+			", sourceSystemId='" + sourceSystemId + '\'' +
+			", sourceSystemOidName='" + sourceSystemOidName + '\'' +
+			", targetSystemOid='" + targetSystemOid + '\'' +
+			", targetSystemName='" + targetSystemName + '\'' +
+			", targetSystemId='" + targetSystemId + '\'' +
+			", targetSystemOidName='" + targetSystemOidName + '\'' +
+			", classPath='" + classPath + '\'' +
+			", dataFlowType='" + dataFlowType + '\'' +
+			", dataFlowTypeText='" + dataFlowTypeText + '\'' +
+			", btmTypeId='" + btmTypeId + '\'' +
+			", btmTypeName='" + btmTypeName + '\'' +
+			", namespace='" + namespace + '\'' +
+			", soapAction='" + soapAction + '\'' +
+			", cxfAxis='" + cxfAxis + '\'' +
+			", targetName='" + targetName + '\'' +
+			", pushType='" + pushType + '\'' +
+			", pushTypeText='" + pushTypeText + '\'' +
+			", classifyId='" + classifyId + '\'' +
+			", classifyName='" + classifyName + '\'' +
+			", isGroupCodeFlag='" + isGroupCodeFlag + '\'' +
+			'}';
+	}
 }

--
Gitblit v1.9.3