软适配 WebService 功能接口开发

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

@@ -484,14 +484,16 @@ public class BlockSoftSwitchEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SUIT_SERVER_WEB_SERVICE{
-        ACTIVE(40001,"hello"),
-        SCHEDULE(40002,"邮件测试");
+        ACTIVE(40001,"serverWebServiceHello","hello"),
+        SCHEDULE(40002,"serverWebServiceSendEmail","邮件测试");
 
         private int value;
         private String description;
+        private String clazzName;
 
-        SUIT_SERVER_WEB_SERVICE(int value, String description) {
+        SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description) {
             this.value = value;
+            this.clazzName = clazzName;
             this.description = description;
         }
 

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.softswitch;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -17,12 +18,15 @@ import lombok.Data;
 public class BsSuitCaseModel {
 
     @ApiParam(value = "适配器")
-    BsSuitCase bsSuitCase;
+    private BsSuitCase bsSuitCase;
 
     @ApiParam(value = "数据源适配套件")
-    BsSuitCaseDataSource bsDataSourceSuitCase;
+    private BsSuitCaseDataSource bsDataSourceSuitCase;
 
     @ApiParam(value = "socket适配套件")
-    BsSocketSuitCase bsSocketSuitCase;
+    private BsSocketSuitCase bsSocketSuitCase;
+
+    @ApiParam(value = "Web Service 适配套件")
+    private BsSuitCaseWebService webService;
 
 }

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

@@ -49,9 +49,9 @@ public class BsSuitCase extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitTypeId;
 
-    @Column(name = "SUIT_TYPE_NAME")
+    @Column(name = "SUIT_TYPE_NAME_RDD")
     @ApiParam(value = "适配类型名称")
-    private String suitTypeName;
+    private String suitTypeNameRdd;
 
     @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配器代码")
@@ -61,9 +61,9 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "适配模式(枚举,主动，被动)")
     private Integer suitModeId;
 
-    @Column(name = "SUIT_SERVER_ACTION")
+    @Column(name = "SUIT_SERVER_ACTION_ID")
     @ApiParam(value = "Server 适配命令")
-    private String suitServerAction;
+    private Integer suitServerActionId;
 
     @Column(name = "SUIT_CASE_HOST")
     @ApiParam(value = "适配主机")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -47,7 +47,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean);
@@ -65,7 +65,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
@@ -80,12 +80,12 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean);
 
         ddlPackBean.setOrderByStr(bsSuitCase.orderBy());
@@ -99,7 +99,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
@@ -113,7 +113,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
@@ -131,7 +131,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean);
@@ -147,7 +147,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean);
@@ -165,7 +165,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
@@ -180,7 +180,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean);
@@ -196,7 +196,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean);
@@ -210,7 +210,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@@ -226,7 +226,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@@ -240,7 +240,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
@@ -258,7 +258,7 @@ public class SoftSwitchHqlPack {
      * @return
      */
     public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){
-        DdlPackBean ddlPackBean = new DdlPackBean();
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
         DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
@@ -266,4 +266,14 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * WebService 唯一校验
+     * @param webService
+     * @return
+     */
+    public static DdlPackBean packHqlCheckWebService(BsSuitCaseWebService webService){
+        DdlPackBean result = DdlPackBean.getDdlPackBean();
+
+        return result;
+    }
 }