From 700260b39fc97cc0a71cbee1de6282d30e26cc1a Mon Sep 17 00:00:00 2001
From: fans <1141904845@qq.com>
Date: Tue, 9 Jan 2024 09:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=93=E5=87=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/ComponentController.java        |  2 +-
 .../platform/service/ComponentService.java    |  2 +-
 .../service/impl/ComponentServiceImpl.java    | 21 ++++++++++++++-----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java
index abbd3a12..0f5183dc 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java
@@ -53,7 +53,7 @@ public class ComponentController {
      */
      @GetMapping("/components/all")
      @ApiOperation("查询全部")
-     public ResponseEntity<Map<Integer,List<Component>>> queryAll(){
+     public ResponseEntity<List> queryAll(){
          return ResponseEntity.ok(this.componentService.queryAllGroupedByCategory());
      }
 
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java
index df8b5500..49a03333 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java
@@ -59,6 +59,6 @@ public interface ComponentService {
 
     String removeById(Integer id);
 
-    Map<Integer, List<Component>> queryAllGroupedByCategory();
+    List<Map>  queryAllGroupedByCategory();
 
 }
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java
index a1a2638c..06a40fca 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.platform.service.impl;
 
+import com.ruoyi.common.security.utils.DictUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.domain.Component;
 import com.ruoyi.platform.service.ComponentService;
@@ -15,9 +16,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -52,10 +51,22 @@ public class ComponentServiceImpl implements ComponentService {
     }
 
     @Override
-    public Map<Integer, List<Component>> queryAllGroupedByCategory() {
+    public List<Map>  queryAllGroupedByCategory() {
         List<Component> componentList = this.componentDao.queryAll();
+        List<Map> result = new ArrayList<>();
+        if (componentList.size()==0){
+            return result;
+        }
         Map<Integer,List<Component>> groupedComponent = componentList.stream().collect(Collectors.groupingBy(Component::getCategoryId));
-        return groupedComponent;
+        for (Map.Entry <Integer,List<Component>>  entry : groupedComponent.entrySet()) {
+            String name = DictUtils.getCacheKey(String.valueOf(entry.getKey()));
+            Map map = new HashMap();
+            map.put("key", entry.getKey());
+            map.put("name", name);
+            map.put("value", entry.getValue());
+            result.add(map);
+        }
+        return result;
     }
 
     /**