From 8833fc5a78255384db9f478dc4c88b3da8f5648c Mon Sep 17 00:00:00 2001
From: xudawei <xudawei@axzo.cn>
Date: Mon, 6 May 2024 11:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E5=85=B8=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97-=E8=A1=A8=E5=90=8Daxzo=5Fdictionary=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=88=90nanopart=5Fdictionary?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DictionaryController.java      | 20 +++++++++++++++----
 .../dictionary/server/domain/Dictionary.java  |  4 ++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dictionary/dictionary-server/src/main/java/cn/axzo/nanopart/dictionary/server/controller/DictionaryController.java b/dictionary/dictionary-server/src/main/java/cn/axzo/nanopart/dictionary/server/controller/DictionaryController.java
index c6405082..5052fdb2 100644
--- a/dictionary/dictionary-server/src/main/java/cn/axzo/nanopart/dictionary/server/controller/DictionaryController.java
+++ b/dictionary/dictionary-server/src/main/java/cn/axzo/nanopart/dictionary/server/controller/DictionaryController.java
@@ -16,6 +16,7 @@ import com.google.common.collect.Maps;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -49,13 +50,24 @@ public class DictionaryController implements DictionaryApi {
     @Override
     public Map<String, List<QueryByDictTypeResp>> queryByBatchType(@RequestBody @Valid QueryByBatchDictTypeReq req) {
         List<Dictionary> list = dictionaryService.query(BeanUtil.copyProperties(req, QueryDictReq.class));
+        if (CollectionUtils.isEmpty(list)) {
+            return Maps.newHashMap();
+        }
         Map<String, List<Dictionary>> map = list.stream().collect(Collectors.groupingBy(Dictionary::getDictType, Collectors.toList()));
+        return this.buildDictTypeMap(map);
+    }
 
+    /**
+     * 构建QueryByDictTypeResp集合Map
+     */
+    private Map<String, List<QueryByDictTypeResp>> buildDictTypeMap(Map<String, List<Dictionary>> map) {
         Map<String, List<QueryByDictTypeResp>> resultMap = Maps.newHashMap();
-        map.forEach((dictType, dictList) -> {
-            List<QueryByDictTypeResp> respList = BeanUtil.copyToList(dictList, QueryByDictTypeResp.class);
-            resultMap.put(dictType, respList);
-        });
+        if (!CollectionUtils.isEmpty(map)) {
+            map.forEach((dictType, dictList) -> {
+                List<QueryByDictTypeResp> respList = BeanUtil.copyToList(dictList, QueryByDictTypeResp.class);
+                resultMap.put(dictType, respList);
+            });
+        }
         return resultMap;
     }
 }
diff --git a/dictionary/dictionary-server/src/main/java/cn/axzo/nanopart/dictionary/server/domain/Dictionary.java b/dictionary/dictionary-server/src/main/java/cn/axzo/nanopart/dictionary/server/domain/Dictionary.java
index 8b5ab904..478d5872 100644
--- a/dictionary/dictionary-server/src/main/java/cn/axzo/nanopart/dictionary/server/domain/Dictionary.java
+++ b/dictionary/dictionary-server/src/main/java/cn/axzo/nanopart/dictionary/server/domain/Dictionary.java
@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @NoArgsConstructor
 @AllArgsConstructor
-@TableName(value = "axzo_dictionary", autoResultMap = true)
+@TableName(value = "nanopart_dictionary", autoResultMap = true)
 public class Dictionary  extends BaseEntity<Dictionary> {
 
     /**
@@ -42,7 +42,7 @@ public class Dictionary  extends BaseEntity<Dictionary> {
     private String dictValue;
 
     /**
-     * 排序
+     * 排序:倒序,值越大越靠前
      */
     @TableField(value = "order_by")
     private Integer orderBy;