WebService 调用发送邮件测试

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java

@@ -111,14 +111,15 @@ public class BlockSoftSwitchEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SOFTS_WITCH_ACTION{
         /* WebService */
-        SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"serverWebServiceSendEmail","软适配服务邮件服务"),
+        SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"Server IMPP 服务邮件服务"),
-        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"serverWebServiceSendEmail","软适配服务邮件服务"),
+        SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
+        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
 
         /* 数据源 */
-        CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"),
+        CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
 
         /* Restful */
-        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"imppHttpRestfulClient","Restful Client Impp Test");
+        CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client Impp Test");
 
         private int value;
         private String description;
@@ -126,6 +127,13 @@ public class BlockSoftSwitchEnumUtil {
         private SUIT_MODE mode;
         private CASE_TYPE type;
 
+        SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String description) {
+            this.value = value;
+            this.description = description;
+            this.mode = mode;
+            this.type = type;
+        }
+
         SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String clazzName, String description) {
             this.value = value;
             this.description = description;

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SoftswitchIocModel.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/9/12 下午2:00
+ * @Modify:
+ **/
+@Data
+public class SoftswitchIocModel {
+    private String beanName;
+    private Object obj;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -9,6 +9,8 @@ import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.HashMap;
+
 /**
  * @Description :
  * @Reference :
@@ -17,7 +19,7 @@ import lombok.Data;
  * @Modify:
  **/
 @Data
-@XStreamAlias("model")
+@XStreamAlias("client")
 public class SuitClientModel {
 
     /**
@@ -31,7 +33,7 @@ public class SuitClientModel {
     private Integer caseTypeId;
 
     @ApiParam(value = "适配命令(枚举)")
-    private Integer suitServerActionId;
+    private Integer actionId;
 
     /**
      * 适配器信息
@@ -75,15 +77,12 @@ public class SuitClientModel {
     public SuitClientModel() {
     }
 
-    public SuitClientModel(BlockSoftSwitchEnumUtil.REQUEST_SOURCE source, BsSuitCaseModel suitCaseModel) {
-        new SuitClientModel(source.getValue(),suitCaseModel);
-    }
-
     public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) {
         this.requestSource = requestSource;
 
         this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
-        this.suitServerActionId = suitCaseModel.getBsSuitCase().getSuitServerActionId();
+        this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId();
+        this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode();
         this.suitCaseModel = suitCaseModel;
 
         // 设置默认

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
@@ -14,11 +15,12 @@ import java.util.Map;
  * @Modify:
  **/
 @Data
-@XStreamAlias("model")
+@XStreamAlias("server")
 public class SuitServerModel {
 
     // 执行方法命令
-    private String action;
+    @ApiParam(value = "适配命令(枚举)")
+    private Integer actionId;
     /* 认证使用 以后使用 */
     private String token;
     // 传输单对象
@@ -30,4 +32,13 @@ public class SuitServerModel {
     // 传输 JSON 数据
     private String json;
 
+    /**
+     * 适配结果信息
+     */
+    private String suitMessage;
+    /**
+     * 适配状态码
+     */
+    private String suitCaseStatusCode;
+
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -75,9 +75,9 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "适配模式(枚举,主动，被动)")
     private Integer suitModeId;
 
-    @Column(name = "SUIT_SERVER_ACTION_ID")
+    @Column(name = "SUIT_ACTION_ID")
     @ApiParam(value = "Server 适配命令")
-    private Integer suitServerActionId;
+    private Integer suitActionId;
 
     @Column(name = "SUIT_CASE_HOST")
     @ApiParam(value = "适配主机")