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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java

@@ -138,9 +138,9 @@ public class Pager {
     public int getStartRow() {
         if(pageSize > 0){
             if (currentPage >= 1) {
-                return currentPage * pageSize - pageSize;
+                startRow = currentPage * pageSize - pageSize;
             } else {
-                return 0;
+                startRow = 0;
             }
         }
         return startRow;

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

@@ -1251,7 +1251,7 @@ public class ImppEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOG_STORAGE {
-        MONGO(1, "MongoDB"),
+//        MONGO(1, "MongoDB"),
         ELASTICSEARCH(2, "Elasticsearch");
         private int value;
         private String description;

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

@@ -108,6 +108,15 @@ public class BsSuitCase extends BaseBean {
         return isNeedCertification.intValue();
     }
 
+    @Column(name = "IS_SAVE_EMPTY_MSG")
+    @ApiParam(value = "是否保存空报文")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
+    private Integer isSaveEmptyMsg;
+
+    public int getIsSaveEmptyMsgVal(){
+        return isSaveEmptyMsg == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isSaveEmptyMsg;
+    }
+
     @Column(name = "IS_PUSH_MQ")
     @ApiParam(value = "是否推送MQ")
     private Integer isPushMQ;

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

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 适配记录
@@ -137,6 +138,8 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "脚本结果")
     private String scriptResult;
 
+    /************************************** 临时属性 ***************************************/
+
     @Transient
     @ApiParam(value = "适配记录参数")
     private List<BsSuitRecordParam> bsSuitRecordParamList;
@@ -154,6 +157,10 @@ public class BsSuitRecord extends BaseBean {
     private List<BsSuitFile> bsSuitFileList;
 
     @Transient
+    @ApiParam(value = "日志长文本记录集合<关联类型，记录内容>")
+    private Map<Integer ,BsLongData> bsLongDataMap;
+
+    @Transient
     @ApiParam(value = "适配记录报文-查询条件")
     private String searchMessage;