From 8d66424bf611202271a37d1e5dcd62fa461faaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 5 Nov 2020 13:47:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(form):=E5=88=86=E9=A1=B5=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java index 9f449f4..80a2fb7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/PagerHelper.java @@ -96,7 +96,7 @@ public class PagerHelper { } int startRow = (pager.getCurrentPage() - 1) * pager.getPageSize(); - pager.setStartRow(startRow == 0 ? 1 : startRow); + pager.setStartRow(startRow); int endRow; if (startRow + pager.getPageSize() <= rowCount) { From 26e1b391198f03e631bf0d2cf7c68397cbda8223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 9 Nov 2020 14:39:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(core):=E9=82=AE=E4=BB=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E9=99=84=E4=BB=B6=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 16 +++++++++++++++- .../estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 2 ++ .../estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 394088d..75a8fea 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.ArrayList; import java.util.List; /** @@ -50,10 +51,11 @@ public class SysMessage extends BaseBean { if (this.messageType == null) { return 0; } else { - return this.messageType.intValue(); + return this.messageType; } } + @AnnoOutputColumn(refClass = ImppEnumUtil.MESSAGE_TYPE_CONTENT.class) @Column(name = "MESSAGE_TYPE_CONTENT") @ApiParam(value = "消息内容类型(枚举：ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1") private Integer messageContentType; @@ -154,4 +156,16 @@ public class SysMessage extends BaseBean { @ApiParam(value = "附件集合") private List sysFileAttachList; + @Transient + @ApiParam(value = "附件id集合") + private List fileAttachIdList; + + public void addFileAttachId(Long attachId){ + if(fileAttachIdList == null){ + fileAttachIdList = new ArrayList<>(); + } + + fileAttachIdList.add(attachId); + } + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index a472e9f..694c194 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -476,6 +476,7 @@ public class CoreHqlPack { DdlPreparedPack.getNumEqualPack(message.getSendStatus(), "sendStatus", ddlPackBean); DdlPreparedPack.getOrderDefault(message); + ddlPackBean.setOrderByStr(message.orderBy()); return ddlPackBean; } @@ -487,6 +488,7 @@ public class CoreHqlPack { * @return */ public static DdlPackBean packHqlSysFile(SysFile file) { + DdlPreparedPack.getOrderDefault(file); DdlPackBean result = DdlPackBean.getDdlPackBean(file); // hql拼接 diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index bce2e0d..1945d75 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -10,6 +10,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; @@ -120,6 +121,19 @@ public class BsSuitCaseFTP extends BaseBean { return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(getIsIncrementalWriteVal()); } + @ColumnDefault("2") + @Column(name = "IS_CHECK_FILE") + @ApiParam(value = "是否校验文件") + private Integer isCheckFile; + + public boolean isCheckFile(){ + return isCheckFile != null && CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isCheckFile); + } + + @Column(name = "CHECK_FILE_PATH") + @ApiParam(value = "校验文件路径") + private String checkFilePath; + @Transient @ApiParam(value = "临时适配路径") private String tempSuitFilePath;