From 7e678e747d03f2e1ce327e024a5ecfda0bdc6c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 17:18:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E7=A7=BB=E9=99=A4mongo=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=8C=81=E4=B9=85=E5=8C=96=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 76f1b9b..699ccde 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/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; From 4dc40c79ddd5e7b124cf97b4a0ee79aaf88ed610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 18:39:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:pager.startRow=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java index a8731c8..2b2895b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/Pager.java @@ -137,10 +137,10 @@ public class Pager { public int getStartRow() { if(pageSize > 0){ - if(currentPage >= 1){ - return currentPage * pageSize - pageSize; - }else { - return 0; + if (currentPage >= 1) { + startRow = currentPage * pageSize - pageSize; + } else { + startRow = 0; } } return startRow; From 6dc0d94085e409ef70d590683e15ac32964c75a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Sat, 29 Aug 2020 18:41:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E9=80=82=E9=85=8D=E5=99=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=A9=BA=E6=8A=A5=E6=96=87=E4=BF=9D=E5=AD=98=E5=BC=80?= =?UTF-8?q?=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java | 9 +++++++++ .../java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index 200ba31..9b21a42 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/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; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index d67c241..a7d0e35 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/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 bsSuitRecordParamList; @@ -154,6 +157,10 @@ public class BsSuitRecord extends BaseBean { private List bsSuitFileList; @Transient + @ApiParam(value = "日志长文本记录集合<关联类型，记录内容>") + private Map bsLongDataMap; + + @Transient @ApiParam(value = "适配记录报文-查询条件") private String searchMessage;