Jenkins自动合并

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
 import com.thoughtworks.xstream.annotations.XStreamOmitField;
@@ -90,6 +91,7 @@ public class SuitClientModel {
     /**
      * 适配报文
      */
+    @JsonIgnore
     @XStreamCDATA
     private Object suitResultMessage;
 

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

@@ -4,19 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
-import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule;
-import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase;
+import cn.estsh.i3plus.pojo.softswitch.bean.*;
 
 /**
  * @Description :
@@ -415,7 +403,6 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
-
     public static DdlPackBean packHqlSuitDataDetailBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
@@ -426,4 +413,12 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlBsSuitRecordParam(BsSuitRecordParam bsSuitRecordParam){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitRecordParam.getSuitRecordId(),"suitRecordId",ddlPackBean);
+
+        return ddlPackBean;
+    }
 }