Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -6,8 +6,8 @@
     <modelVersion>4.0.0</modelVersion>
     <modules>
         <module>gateway</module>
-<!--        <module>service/his-service</module>-->
-        <module>service/his-proxy</module>
+        <module>service/his-service</module>
+<!--        <module>service/his-proxy</module>-->
     </modules>
 
     <parent>
@@ -173,14 +173,14 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <configuration>
-					<configLocation>/checkstyle/checkstyle.xml</configLocation>
-                    <suppressionsLocation>/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
-                </configuration>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-checkstyle-plugin</artifactId>-->
+<!--                <configuration>-->
+<!--					<configLocation>/checkstyle/checkstyle.xml</configLocation>-->
+<!--                    <suppressionsLocation>/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
 
         </plugins>
 

service/his-service/src/main/java/com/purui/ghip/model/MapInterface.java

@@ -1,5 +1,7 @@
 package com.purui.ghip.model;
 
+import com.sun.xml.internal.ws.developer.MemberSubmissionEndpointReference;
+
 public class MapInterface {
 	private String ID;
 	private String Code;
@@ -8,11 +10,12 @@ public class MapInterface {
 	private String MethodName;
 	private String ServiceIP;
 	private String SessionFlag;
+	private String ServiceType;
 	private String TokenFlag;
 	private String StartDate;
 	private String StopDate;
 
-	public MapInterface(String ID, String code, String descripts, String className, String methodName, String serviceIP, String sessionFlag, String tokenFlag, String startDate, String stopDate) {
+	public MapInterface(String ID, String code, String descripts, String className, String methodName, String serviceIP, String sessionFlag, String serviceType, String tokenFlag, String startDate, String stopDate) {
 		this.ID = ID;
 		Code = code;
 		Descripts = descripts;
@@ -20,6 +23,7 @@ public class MapInterface {
 		MethodName = methodName;
 		ServiceIP = serviceIP;
 		SessionFlag = sessionFlag;
+		ServiceType = serviceType;
 		TokenFlag = tokenFlag;
 		StartDate = startDate;
 		StopDate = stopDate;
@@ -77,6 +81,14 @@ public class MapInterface {
 		return SessionFlag;
 	}
 
+	public String getServiceType() {
+		return ServiceType;
+	}
+
+	public void setServiceType(String serviceType) {
+		ServiceType = serviceType;
+	}
+
 	public void setSessionFlag(String sessionFlag) {
 		SessionFlag = sessionFlag;
 	}
@@ -104,4 +116,21 @@ public class MapInterface {
 	public void setStopDate(String stopDate) {
 		StopDate = stopDate;
 	}
+
+	@Override
+	public String toString() {
+		return "MapInterface{" +
+				"ID='" + ID + '\'' +
+				", Code='" + Code + '\'' +
+				", Descripts='" + Descripts + '\'' +
+				", ClassName='" + ClassName + '\'' +
+				", MethodName='" + MethodName + '\'' +
+				", ServiceIP='" + ServiceIP + '\'' +
+				", SessionFlag='" + SessionFlag + '\'' +
+				", ServiceType='" + ServiceType + '\'' +
+				", TokenFlag='" + TokenFlag + '\'' +
+				", StartDate='" + StartDate + '\'' +
+				", StopDate='" + StopDate + '\'' +
+				'}';
+	}
 }

service/his-service/src/main/java/com/purui/ghip/model/XYSHisPlatformMaintain.java

@@ -181,4 +181,25 @@ public class XYSHisPlatformMaintain {
 		this.createdUserID = createdUserID;
 	}
 
+	@Override
+	public String toString() {
+		return "XYSHisPlatformMaintain{" +
+				"id='" + id + '\'' +
+				", externalID='" + externalID + '\'' +
+				", externalDesc='" + externalDesc + '\'' +
+				", hospCode='" + hospCode + '\'' +
+				", hospDBCode='" + hospDBCode + '\'' +
+				", productIP='" + productIP + '\'' +
+				", productPort='" + productPort + '\'' +
+				", productAuthorization='" + productAuthorization + '\'' +
+				", queryIP='" + queryIP + '\'' +
+				", queryPort='" + queryPort + '\'' +
+				", queryAuthorization='" + queryAuthorization + '\'' +
+				", copyHISMapInterface='" + copyHISMapInterface + '\'' +
+				", bSChangedTableDataDesc='" + bSChangedTableDataDesc + '\'' +
+				", createdDate='" + createdDate + '\'' +
+				", createdTime='" + createdTime + '\'' +
+				", createdUserID='" + createdUserID + '\'' +
+				'}';
+	}
 }