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

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

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysConfigService.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
 
 import java.util.List;
@@ -34,7 +36,7 @@ public interface ISysConfigService {
     /**
      * 查询全部系统参数
      */
-    List<SysConfig> findSysConfigAll();
+    List<SysConfig> ListSysConfig();
 
     /**
      * 根据id查询系统参数
@@ -42,4 +44,11 @@ public interface ISysConfigService {
      */
     SysConfig getSysConfigById(String Id);
 
+    /**
+     *  系统配置复杂查询分页排序
+      * @param sysConfig
+     * @param pager
+     * @return
+     */
+    ListPager querySysConfigByPager(SysConfig sysConfig, Pager pager);
 }

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
 
 import java.util.List;
@@ -45,9 +47,14 @@ public interface ISysDictionaryService {
     SysDictionary getSysDictionaryById(String id);
 
     /**
-     * 根据父级id查询字典信息
+     * 根据父级代码查询字典信息
-     * @param parentId
+     * @param parentCode
      * @return
      */
-    List<SysDictionary> findSysDictionaryByCode(String parentId);
+    List<SysDictionary> findSysDictionaryByParentCode(String parentCode);
+
+    /**
+     * 字典复杂查询，分页，排序
+     */
+    ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager);
 }

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolService.java

@@ -1,6 +1,9 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.Tool;
+import cn.estsh.i3plus.pojo.platform.bean.ToolType;
 
 import java.util.List;
 
@@ -43,4 +46,12 @@ public interface IToolService {
      * @return
      */
     Tool getToolById(String id);
+
+    /**
+     * 硬件复杂查询，分页，排序
+     * @param tool
+     * @param pager
+     * @return
+     */
+    ListPager queryToolByPager(Tool tool, Pager pager);
 }

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/IToolTypeService.java

@@ -1,5 +1,8 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
 import cn.estsh.i3plus.pojo.platform.bean.ToolType;
 
 import java.util.List;
@@ -43,4 +46,12 @@ public interface IToolTypeService {
      * @return
      */
     ToolType getToolTypeById(String id);
+
+    /**
+     * 硬件类型复杂查询，分页，排序
+     * @param toolType
+     * @param pager
+     * @return
+     */
+    ListPager queryToolTypeByPager(ToolType toolType, Pager pager);
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java

@@ -114,11 +114,11 @@ public class EnumController {
                     Arrays.asList(ImppEnumUtil.TOOL_DATA_TYPE.values()));
     }
 
-    @GetMapping("/sys-param-type")
+    @GetMapping("/sys-config-type")
     @ApiOperation(value = "系统参数类型", notes = "系统参数类型")
     public ResultBean getSysParamType(){
         return new ResultBean(true, "操作成功",
-                Arrays.asList(ImppEnumUtil.SYS_PARAM_TYPE.values()));
+                Arrays.asList(ImppEnumUtil.SYS_CONFIG_TYPE.values()));
     }
 
     @GetMapping("/comm-status")

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
@@ -27,7 +29,7 @@ import java.util.List;
  * @Modify :
  **/
 @RestController
-@RequestMapping("/sys_config")
+@RequestMapping("/sys-config")
 @Api(description = "系统参数管理服务")
 public class SysConfigController {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class);
@@ -35,7 +37,7 @@ public class SysConfigController {
     @Autowired
     public ISysConfigService sysConfigService;
 
-    @PutMapping("/insert")
+    @PostMapping("/insert")
     @ApiOperation(value = "添加系统参数",notes = "添加系统参数")
     public ResultBean insertSysConfig(SysConfig sysConfig) {
         try {
@@ -62,9 +64,9 @@ public class SysConfigController {
         }
     }
 
-    @DeleteMapping(value = "/delete")
+    @DeleteMapping(value = "/delete/{id}")
     @ApiOperation(value = "根据id删除系统参数", notes = "根据id删除系统参数")
-    public ResultBean deleteSysConfig(String id) {
+    public ResultBean deleteSysConfig(@PathVariable("id") String id) {
         try {
             sysConfigService.deleteSysConfigById(id);
             return  ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -104,13 +106,13 @@ public class SysConfigController {
         }
     }
 
-    @GetMapping(value = "/find-all")
+    @GetMapping(value = "/list")
     @ApiOperation(value = "查询全部系统参数",notes = "查询全部系统参数")
     public ResultBean findSysConfigAll(){
         try {
-            List<SysConfig> sysConfig = sysConfigService.findSysConfigAll();
+            List<SysConfig> sysConfigList = sysConfigService.ListSysConfig();
             return  ResultBean.success("查询成功")
-                                .setResultList(sysConfig)
+                                .setResultList(sysConfigList)
                                 .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
@@ -121,8 +123,9 @@ public class SysConfigController {
         }
     }
 
-    @GetMapping(value = "/get-by-id")
+    @GetMapping(value = "/get/{id}")
-    public ResultBean getSysConfigById(String id){
+    @ApiOperation(value = "根据id查询系统参数",notes = "根据id查询系统参数")
+    public ResultBean getSysConfigById(@PathVariable("id") String id){
         try {
             SysConfig sysConfig = sysConfigService.getSysConfigById(id);
             return  ResultBean.success("查询成功")
@@ -137,4 +140,21 @@ public class SysConfigController {
         }
     }
 
+    @GetMapping("/query")
+    @ApiOperation(value = "系统参数复杂查询，分页，排序")
+    public ResultBean querySysConfigByPager(SysConfig sysConfig,Pager pager) {
+        try {
+            ListPager sysConfigListPager = sysConfigService.querySysConfigByPager(sysConfig,pager);
+            return  ResultBean.success("查询成功")
+                    .setListPager(sysConfigListPager)
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
+
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java

@@ -2,8 +2,11 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
+import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
 import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@@ -149,10 +152,10 @@ public class SysDictionaryController {
     }
 
     @GetMapping(value = "/find/{code}")
-    @ApiOperation(value = "根据code查询字典项", notes = "根据code查询字典项")
+    @ApiOperation(value = "根据父级code查询字典项", notes = "根据父级code查询字典项")
-    public ResultBean findSysDictionaryByCode(@PathVariable("code") String code) {
+    public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) {
         try {
-            List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryByCode(code);
+            List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryByParentCode(code);
             return ResultBean.success("查询成功").setResultList(sysDictionaryList)
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
@@ -163,4 +166,22 @@ public class SysDictionaryController {
             return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
+
+
+    @GetMapping("/query")
+    @ApiOperation(value = "字典复杂查询，分页，排序",notes = "字典复杂查询，分页，排序")
+    public ResultBean querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) {
+        try {
+            ListPager sysDictionaryListPager = sysDictionaryService.querySysDictionaryByPager(sysDictionary,pager);
+            return  ResultBean.success("查询成功")
+                    .setListPager(sysDictionaryListPager)
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.ToolType;
@@ -140,4 +142,21 @@ public class ToolTypeController {
             return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
         }
     }
+
+    @GetMapping(value = "/query")
+    @ApiOperation(value = "硬件类型复杂查询，分页，排序",notes = "硬件类型复杂查询，分页，排序")
+    public ResultBean queryToolTypeByPager(ToolType toolType, Pager pager){
+        try {
+            ListPager sysDictionaryListPager = toolTypeService.queryToolTypeByPager(toolType,pager);
+            return  ResultBean.success("查询成功")
+                    .setListPager(sysDictionaryListPager)
+                    .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
+            return ResultBean.fail(busExcep.getErrorShow());
+        }catch(Exception e){
+            LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
+            return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigServiceImpl.java

@@ -1,8 +1,12 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
 import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
+import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,8 +47,8 @@ public class SysConfigServiceImpl implements ISysConfigService {
     }
 
     @Override
-    public List<SysConfig> findSysConfigAll() {
+    public List<SysConfig> ListSysConfig() {
-        LOGGER.info("系统参数 SYS_CONFIG find-all");
+        LOGGER.info("系统参数 SYS_CONFIG list");
         return SysConfigRDao.findAll();
     }
 
@@ -53,4 +57,18 @@ public class SysConfigServiceImpl implements ISysConfigService {
         LOGGER.info("系统参数 SYS_CONFIG id:{}",Id);
         return SysConfigRDao.getById(Long.parseLong(Id));
     }
+
+    @Override
+    public ListPager querySysConfigByPager(SysConfig sysConfig, Pager pager) {
+        LOGGER.info("系统参数 SYS_CONFIG SysConfig:{}，Pager:{}",sysConfig,pager);
+        if(sysConfig == null) {
+            pager = PagerHelper.getPager(pager, SysConfigRDao.listCount());
+            return new ListPager(SysConfigRDao.listPager(pager),pager);
+        }else {
+            String hqlPack = CoreHqlPack.packHqlSysConfig(sysConfig);
+            pager = PagerHelper.getPager(pager, SysConfigRDao.findByHqlWhereCount(hqlPack));
+            return new ListPager(SysConfigRDao.findByHqlWherePage(hqlPack + sysConfig.orderBy(),pager),pager);
+        }
+    }
+
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java

@@ -1,9 +1,12 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
-import cn.estsh.i3plus.pojo.platform.bean.Position;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
 import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
+import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,6 +38,7 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService {
             ValidatorBean.checkNotNull(parentSysDictionary);
 
             sysDictionary.setRedParentName(parentSysDictionary.getName());
+            sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode());
         }
 
         LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary);
@@ -56,6 +60,7 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService {
             ValidatorBean.checkNotNull(parentSysDictionary);
 
             sysDictionary.setRedParentName(parentSysDictionary.getName());
+            sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode());
         }
 
         LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary);
@@ -75,8 +80,21 @@ public class SysDictionaryServiceImpl implements ISysDictionaryService {
     }
 
     @Override
-    public List<SysDictionary> findSysDictionaryByCode(String code) {
+    public List<SysDictionary> findSysDictionaryByParentCode(String parentCode) {
-        LOGGER.info("字典 SYS_DICTIONARY code:{}",code);
+        LOGGER.info("字典 SYS_DICTIONARY parentCode:{}",parentCode);
-        return sysDictionaryRDao.findByHql("select child from SysDictionary dic,SysDictionary child where dic.id = child.parentId and dic.dictionaryCode = '" + code + "'");
+        return sysDictionaryRDao.findByProperty("redParentCode",parentCode);
+    }
+
+    @Override
+    public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) {
+        LOGGER.info("字典 SYS_DICTIONARY SysDictionary:{}，Pager:{}",sysDictionary,pager);
+        if(sysDictionary == null) {
+            pager = PagerHelper.getPager(pager, sysDictionaryRDao.listCount());
+            return new ListPager(sysDictionaryRDao.listPager(pager),pager);
+        }else {
+            String hqlPack = CoreHqlPack.packHqlSysDictionary(sysDictionary);
+            pager = PagerHelper.getPager(pager, sysDictionaryRDao.findByHqlWhereCount(hqlPack));
+            return new ListPager(sysDictionaryRDao.findByHqlWherePage(hqlPack + sysDictionary.orderBy(),pager),pager);
+        }
     }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java

@@ -96,7 +96,7 @@ public class SystemResourceService implements ISystemResourceService {
     public ListPager<SysLocaleResource> listSysLocaleResourceByPager(SysLocaleResource res, Pager pager) {
         if(res == null){
             //不传入实体对象，查询所有
-            int count = sysLocaleResourceRDao.listCount();
+            int count = (int)sysLocaleResourceRDao.listCount();
             pager = PagerHelper.getPager(pager,count);
             return new ListPager(sysLocaleResourceRDao.listPager(pager),pager);
         }else {

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolServiceImpl.java

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IToolService;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.Organize;
 import cn.estsh.i3plus.pojo.platform.bean.Tool;
 import cn.estsh.i3plus.pojo.platform.bean.ToolType;
@@ -74,4 +76,9 @@ public class ToolServiceImpl implements IToolService {
         LOGGER.info("硬件 TOOL id:{}",id);
         return toolRDao.getById(Long.parseLong(id));
     }
+
+    @Override
+    public ListPager queryToolByPager(Tool tool, Pager pager) {
+        return null;
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java

@@ -1,10 +1,14 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import cn.estsh.i3plus.pojo.base.common.Pager;
+import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.platform.bean.Organize;
 import cn.estsh.i3plus.pojo.platform.bean.ToolType;
 import cn.estsh.i3plus.pojo.platform.repository.ToolRepository;
 import cn.estsh.i3plus.pojo.platform.repository.ToolTypeRepository;
+import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,4 +61,17 @@ public class ToolTypeServiceImpl implements IToolTypeService {
         LOGGER.info("硬件类型 TOOL_TYPE id:{}",id);
         return toolTypeRDao.getById(Long.parseLong(id));
     }
+
+    @Override
+    public ListPager queryToolTypeByPager(ToolType toolType, Pager pager) {
+        LOGGER.info("硬件类型 TOOL_TYPE ToolType:{}，Pager:{}",toolType,pager);
+        if(toolType == null) {
+            pager = PagerHelper.getPager(pager, toolTypeRDao.listCount());
+            return new ListPager(toolTypeRDao.listPager(pager),pager);
+        }else {
+            String hqlPack = CoreHqlPack.packHqlToolType(toolType);
+            pager = PagerHelper.getPager(pager, toolTypeRDao.findByHqlWhereCount(hqlPack));
+            return new ListPager(toolTypeRDao.findByHqlWherePage(hqlPack + toolType.orderBy(),pager),pager);
+        }
+    }
 }