项目初始化

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/dto/HttpService.java

+package cn.datax.service.data.market.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "http接口Model")
+@Data
+public class HttpService implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "请求地址")
+    private String url;
+    @ApiModelProperty(value = "请求头")
+    private String header;
+    @ApiModelProperty(value = "请求参数")
+    private String param;
+    @ApiModelProperty(value = "请求方式")
+    private String httpMethod;
+}

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/dto/ServiceIntegrationDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -31,22 +32,12 @@ public class ServiceIntegrationDto implements Serializable {
     private String serviceName;
     @ApiModelProperty(value = "服务类型（1http接口，2webservice接口）")
     private String serviceType;
-    @ApiModelProperty(value = "服务请求地址")
-    private String serviceUrl;
-    @ApiModelProperty(value = "服务请求头")
-    private String serviceHeader;
-    @ApiModelProperty(value = "服务请求参数")
-    private String serviceParam;
-    @ApiModelProperty(value = "服务请求方式")
-    private String serviceHttpMethod;
-    @ApiModelProperty(value = "服务wsdl地址")
-    private String serviceWsdl;
-    @ApiModelProperty(value = "服务命名空间")
-    private String serviceTargetNamespace;
-    @ApiModelProperty(value = "服务请求报文")
-    private String serviceSoap;
-    @ApiModelProperty(value = "服务方法")
-    private String serviceMethod;
+    @ApiModelProperty(value = "http接口")
+    @Valid
+    private HttpService httpService;
+    @ApiModelProperty(value = "webservice接口")
+    @Valid
+    private WebService webService;
     @ApiModelProperty(value = "状态")
     @NotNull(message = "状态不能为空", groups = {ValidationGroups.Insert.class, ValidationGroups.Update.class})
     private String status;

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/dto/WebService.java

+package cn.datax.service.data.market.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "webservice接口Model")
+@Data
+public class WebService implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    @ApiModelProperty(value = "wsdl地址")
+    private String wsdl;
+    @ApiModelProperty(value = "命名空间")
+    private String targetNamespace;
+    @ApiModelProperty(value = "请求报文")
+    private String soap;
+    @ApiModelProperty(value = "调用方法")
+    private String method;
+}

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/entity/ServiceIntegrationEntity.java

 package cn.datax.service.data.market.api.entity;
 
 import cn.datax.common.base.DataScopeBaseEntity;
+import cn.datax.service.data.market.api.dto.HttpService;
+import cn.datax.service.data.market.api.dto.WebService;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -17,7 +21,7 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("market_service_integration")
+@TableName(value = "market_service_integration", autoResultMap = true)
 public class ServiceIntegrationEntity extends DataScopeBaseEntity {
 
     private static final long serialVersionUID=1L;
@@ -38,42 +42,14 @@ public class ServiceIntegrationEntity extends DataScopeBaseEntity {
     private String serviceType;
 
     /**
-     * 服务请求地址
+     * http接口
      */
-    private String serviceUrl;
+    @TableField(value = "httpservice_json", typeHandler = JacksonTypeHandler.class)
+    private HttpService httpService;
 
     /**
-     * 服务请求头
+     * webservice接口
      */
-    private String serviceHeader;
-
-    /**
-     * 服务请求参数
-     */
-    private String serviceParam;
-
-    /**
-     * 服务请求方式
-     */
-    private String serviceHttpMethod;
-
-    /**
-     * 服务wsdl地址
-     */
-    private String serviceWsdl;
-
-    /**
-     * 服务命名空间
-     */
-    private String serviceTargetNamespace;
-
-    /**
-     * 服务请求报文
-     */
-    private String serviceSoap;
-
-    /**
-     * 服务方法
-     */
-    private String serviceMethod;
+    @TableField(value = "webservice_json", typeHandler = JacksonTypeHandler.class)
+    private WebService webService;
 }

datax-modules/data-market-service-parent/data-market-service-api/src/main/java/cn/datax/service/data/market/api/vo/ServiceIntegrationVo.java

 package cn.datax.service.data.market.api.vo;
 
+import cn.datax.service.data.market.api.dto.HttpService;
+import cn.datax.service.data.market.api.dto.WebService;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -26,12 +28,6 @@ public class ServiceIntegrationVo implements Serializable {
     private String serviceNo;
     private String serviceName;
     private String serviceType;
-    private String serviceUrl;
-    private String serviceHeader;
-    private String serviceParam;
-    private String serviceHttpMethod;
-    private String serviceWsdl;
-    private String serviceTargetNamespace;
-    private String serviceSoap;
-    private String serviceMethod;
+    private HttpService httpService;
+    private WebService webService;
 }

datax-modules/data-market-service-parent/data-market-service-integration/src/main/resources/mapper/ServiceIntegrationMapper.xml

@@ -16,14 +16,11 @@
         <result column="service_no" property="serviceNo" />
         <result column="service_name" property="serviceName" />
         <result column="service_type" property="serviceType" />
-        <result column="service_url" property="serviceUrl" />
-        <result column="service_header" property="serviceHeader" />
-        <result column="service_param" property="serviceParam" />
-        <result column="service_http_method" property="serviceHttpMethod" />
-        <result column="service_wsdl" property="serviceWsdl" />
-        <result column="service_target_namespace" property="serviceTargetNamespace" />
-        <result column="service_soap" property="serviceSoap" />
-        <result column="service_method" property="serviceMethod" />
+    </resultMap>
+
+    <resultMap id="ExtendResultMap" type="cn.datax.service.data.market.api.entity.ServiceIntegrationEntity" extends="BaseResultMap">
+        <result column="httpservice_json" property="httpService" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+        <result column="webservice_json" property="webService" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -35,7 +32,7 @@
         update_by,
         update_time,
         remark,
-        create_dept, service_no, service_name, service_type, service_url, service_header, service_param, service_http_method, service_wsdl, service_target_namespace, service_soap, service_method
+        create_dept, service_no, service_name, service_type, httpservice_json, webservice_json
     </sql>
 
 </mapper>