From 888966732bb9c82f20cc3b4be54a2332d09482fd Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 30 Oct 2018 21:44:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20=E5=A4=8D=E6=9D=82=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E9=A1=B5=EF=BC=8C=E6=8E=92=E5=BA=8F=20=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=AE=A1=E7=90=86=20=20=20=20=20=E5=A4=8D=E6=9D=82?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=88=86=E9=A1=B5=EF=BC=8C=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=20=E7=A1=AC=E4=BB=B6=E7=B1=BB=E5=9E=8B=20=20=20=20=20?= =?UTF-8?q?=E5=A4=8D=E6=9D=82=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=88=86=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E6=8E=92=E5=BA=8F=20=E5=88=86=E9=A1=B5=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=20=20=20=20=20=E5=BC=80=E5=A7=8B=E8=A1=8C=E9=94=99?= =?UTF-8?q?=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/common/Pager.java | 16 +++---- .../estsh/i3plus/pojo/base/common/PagerHelper.java | 2 +- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 6 +-- .../i3plus/pojo/platform/bean/SysDictionary.java | 9 ++-- .../pojo/platform/bean/SysLocaleResource.java | 6 +++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 53 +++++++++++++++++++--- 6 files changed, 71 insertions(+), 21 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 18978da..9a3f932 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 @@ -48,7 +48,7 @@ public class Pager { totalPages++; } currentPage = 1; - startRow = 1; + startRow = 0; resetEndRow(); } @@ -63,7 +63,7 @@ public class Pager { totalPages++; } currentPage = 1; - startRow = 1; + startRow = 0; resetEndRow(); } @@ -125,7 +125,7 @@ public class Pager { public void resetEndRow() { if (startRow + pageSize <= totalRows) { - endRow = startRow + pageSize - 1; + endRow = startRow + pageSize; } else { endRow = totalRows; } @@ -133,7 +133,7 @@ public class Pager { public void first() { currentPage = 1; - startRow = 1; + startRow = 0; resetEndRow(); } @@ -142,7 +142,7 @@ public class Pager { return; } currentPage--; - startRow = (currentPage - 1) * pageSize + 1; + startRow = (currentPage - 1) * pageSize; resetEndRow(); } @@ -150,7 +150,7 @@ public class Pager { if (currentPage < totalPages) { currentPage++; } - startRow = (currentPage - 1) * pageSize + 1; + startRow = (currentPage - 1) * pageSize; resetEndRow(); } @@ -163,7 +163,7 @@ public class Pager { } else { currentPage = totalPages; } - startRow = (currentPage - 1) * pageSize + 1; + startRow = (currentPage - 1) * pageSize; resetEndRow(); } @@ -182,7 +182,7 @@ public class Pager { if (currentPage > totalPages) { last(); } else { - startRow = (currentPage - 1) * pageSize + 1; + startRow = (currentPage - 1) * pageSize; } } 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 1d34abb..8f574cc 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 @@ -58,7 +58,7 @@ public class PagerHelper { } pager.setCurrentPage(currentPage); - int startRow = (currentPage - 1) * pageSize + 1; + int startRow = (currentPage - 1) * pageSize; pager.setStartRow(startRow); int endRow = 0; 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 e1ae4d1..2871dc6 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 @@ -640,7 +640,7 @@ public class ImppEnumUtil { * 1.SYSTEM：系统参数 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SYS_PARAM_TYPE{ + public enum SYS_CONFIG_TYPE{ SYSTEM(1,"系统参数","系统参数"); @@ -648,10 +648,10 @@ public class ImppEnumUtil { private String name; private String description; - SYS_PARAM_TYPE() { + SYS_CONFIG_TYPE() { } - SYS_PARAM_TYPE(int value, String name, String description) { + SYS_CONFIG_TYPE(int value, String name, String description) { this.value = value; this.name = name; this.description = description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index d497c1d..513e748 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -29,7 +29,6 @@ import java.text.DecimalFormat; @Api(value="系统字典",description = "系统字典") public class SysDictionary extends BaseBean { - @Column(name="NAME") @ApiParam(value ="字典名称") private String name; @@ -51,11 +50,15 @@ public class SysDictionary extends BaseBean { return parentId; } } - + @Column(name="RED_PARENT_NAME") @ApiParam(value ="父级节点名称") private String redParentName; - + + @Column(name="RED_PARENT_CODEE") + @ApiParam(value ="父级节点代码") + private String redParentCode; + @Column(name="DICTIONARY_VALUE") @ApiParam(value ="字典值") private String dictionaryValue; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index b66168e..0adf4c4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,6 +29,11 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "资源类型",example = "1",access = "使用枚举：CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE") private Integer resourceType; + private transient String resourceTypeTxt; + public String getResourceTypeTxt(){ + return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType); + } + @Column(name="language_code") @ApiParam(value = "语言编码",example = "浏览器语言编码") private String languageCode; 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 987f5b0..c70f996 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 @@ -1,10 +1,7 @@ package cn.estsh.i3plus.pojo.platform.sqlpack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; -import cn.estsh.i3plus.pojo.platform.bean.Department; -import cn.estsh.i3plus.pojo.platform.bean.Position; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; -import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; +import cn.estsh.i3plus.pojo.platform.bean.*; import java.util.Arrays; @@ -73,7 +70,6 @@ public class CoreHqlPack { return result.toString(); } - /** * In 参数封装 * @param columnName @@ -87,7 +83,6 @@ public class CoreHqlPack { return result.toString(); } - /** * 部门复杂查询 * @param department @@ -107,4 +102,50 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 系统参数复杂查询 + * @param sysConfig + * @return + */ + public static String packHqlSysConfig(SysConfig sysConfig) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(sysConfig.getName(),"name",result); + HqlPack.getStringLikerPack(sysConfig.getConfigCode(),"configCode",result); + HqlPack.getNumEqualPack(sysConfig.getConfigTypeId(),"configTypeId",result); + + return result.toString(); + } + + /** + * 字典信息复杂查询 + * @param sysDictionary + * @return + */ + public static String packHqlSysDictionary(SysDictionary sysDictionary) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(sysDictionary.getName(),"name",result); + HqlPack.getStringLikerPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result); + HqlPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",result); + + return result.toString(); + } + + /** + * 硬件类型复杂查询 + * @param toolType + * @return + */ + public static String packHqlToolType(ToolType toolType) { + StringBuffer result = new StringBuffer(); + + // hql拼接 + HqlPack.getStringLikerPack(toolType.getName(),"name",result); + + return result.toString(); + } }