From c4aec98aa943339d836cb04dfd2f7759487bd697 Mon Sep 17 00:00:00 2001
From: chenjinlong <22208488@qq.com>
Date: Thu, 21 Jan 2021 18:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90Dict=E3=80=91=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/controller/DictController.java    | 11 ++++++
 .../dict/modular/service/DictService.java     | 10 ++++++
 .../modular/service/impl/DictServiceImpl.java | 36 +++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java
index 49aa86aa5..590922154 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java
@@ -166,4 +166,15 @@ public class DictController {
         return this.dictService.dictZTree(dictRequest);
     }
 
+    /**
+     * 分页查询字典
+     *
+     * @author chenjinlong
+     * @date 2021/1/13 17:51
+     */
+    @GetResource(name = "分页查询字典", path = "/dict/page")
+    public ResponseData page(DictRequest dictRequest) {
+        return new SuccessResponseData(this.dictService.page(dictRequest));
+    }
+
 }
diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java
index 9a00eaf59..c31a8016b 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java
@@ -122,4 +122,14 @@ public interface DictService extends IService<SysDict>, DictApi {
      */
     List<ZTreeNode> dictZTree(DictRequest dictRequest);
 
+
+    /**
+     * 分页查询
+     *
+     * @param dictRequest 参数
+     * @author chenjinlong
+     * @date 2021/1/13 10:57
+     */
+    PageResult<SysDict> page(DictRequest dictRequest);
+
 }
diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java
index 221b33c7b..a01687a94 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java
@@ -21,6 +21,7 @@ import cn.stylefeng.roses.kernel.rule.constants.RuleConstants;
 import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
 import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
+import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory;
 import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -270,6 +271,13 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, SysDict> implements
         return zTreeNodes;
     }
 
+    @Override
+    public PageResult<SysDict> page(DictRequest dictRequest) {
+        LambdaQueryWrapper<SysDict> wrapper = createWrapper(dictRequest);
+        Page<SysDict> page = this.page(PageFactory.defaultPage(), wrapper);
+        return PageResultFactory.createPageResult(page);
+    }
+
     @Override
     public String getDictNameByDictCode(String dictCode) {
         LambdaQueryWrapper<SysDict> sysDictLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -296,6 +304,7 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, SysDict> implements
             return StrUtil.EMPTY;
         }
     }
+
     @Override
     public String getDictName(String dictTypeCode, String dictCode) {
         LambdaQueryWrapper<SysDict> sysDictLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -371,4 +380,31 @@ public class DictServiceImpl extends ServiceImpl<DictMapper, SysDict> implements
         }
     }
 
+
+    /**
+     * 获取详细信息
+     *
+     * @author chenjinlong
+     * @date 2021/1/13 10:50
+     */
+    private SysDict querySysDict(DictRequest dictRequest) {
+        SysDict sysDict = this.getById(dictRequest.getDictId());
+        if (ObjectUtil.isNull(sysDict)) {
+            throw new ServiceException(DictExceptionEnum.DICT_TYPE_NOT_EXISTED);
+        }
+        return sysDict;
+    }
+
+    /**
+     * 构建wrapper
+     *
+     * @author chenjinlong
+     * @date 2021/1/13 10:50
+     */
+    private LambdaQueryWrapper<SysDict> createWrapper(DictRequest dictRequest) {
+        LambdaQueryWrapper<SysDict> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(StrUtil.isNotBlank(dictRequest.getDictTypeCode()), SysDict::getDictTypeCode, dictRequest.getDictTypeCode());
+        return queryWrapper;
+    }
+
 }