From fac25540991049e73fe7488f83f152fc615aed16 Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Fri, 6 Jul 2018 18:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0getAll?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../simple/BoostDictDefineRepository.java          | 14 ++++++++++++++
 .../dictionary/DictionaryController.java           |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java
index b08782ddb..ac6d074ec 100644
--- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java
+++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java
@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author zhouhao
@@ -41,4 +42,17 @@ public class BoostDictDefineRepository extends DefaultDictDefineRepository {
                 .build();
     }
 
+    @Override
+    public List<DictDefine> getAllDefine() {
+        List<DictDefine> all = dictionaryService.select()
+                .stream()
+                .map(dict -> DefaultDictDefine.builder()
+                        .id(dict.getId())
+                        .comments(dict.getDescribe())
+                        .items((List) new ArrayList<>(dict.getItems()))
+                        .build()).collect(Collectors.toList());
+
+        all.addAll(super.getAllDefine());
+        return all;
+    }
 }
diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/src/main/java/org/hswebframework/web/controller/dictionary/DictionaryController.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/src/main/java/org/hswebframework/web/controller/dictionary/DictionaryController.java
index 4c73b9b7c..d3b9f3a8c 100644
--- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/src/main/java/org/hswebframework/web/controller/dictionary/DictionaryController.java
+++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-web/src/main/java/org/hswebframework/web/controller/dictionary/DictionaryController.java
@@ -63,6 +63,13 @@ public class DictionaryController implements SimpleGenericEntityController<Dicti
         return dictionaryService;
     }
 
+    @GetMapping("/define/all")
+    @Authorize(merge = false)
+    @ApiOperation("获取数据全部字典定义信息")
+    public ResponseMessage<List<DictDefine>> getAllDefineById() {
+        return ok(repository.getAllDefine());
+    }
+
 
     @GetMapping("/define/{id:.+}")
     @Authorize(merge = false)