系统参数管理 复杂查询，分页，排序

字典管理     复杂查询，分页，排序
硬件类型     复杂查询，分页，排序
分页插件     开始行错误bug

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;
         }
     }
 

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;

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;

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;
@@ -56,6 +55,10 @@ public class SysDictionary extends BaseBean {
     @ApiParam(value ="父级节点名称")
     private String redParentName;
 
+    @Column(name="RED_PARENT_CODEE")
+    @ApiParam(value ="父级节点代码")
+    private String redParentCode;
+
     @Column(name="DICTIONARY_VALUE")
     @ApiParam(value ="字典值")
     private String dictionaryValue;

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;

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.*;
-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 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();
+    }
 }