Browse Source

修改输出数据格式

tags/v20240126
fans 2 years ago
parent
commit
700260b39f
3 changed files with 18 additions and 7 deletions
  1. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java
  2. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java
  3. +16
    -5
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java

+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java View File

@@ -53,7 +53,7 @@ public class ComponentController {
*/ */
@GetMapping("/components/all") @GetMapping("/components/all")
@ApiOperation("查询全部") @ApiOperation("查询全部")
public ResponseEntity<Map<Integer,List<Component>>> queryAll(){
public ResponseEntity<List> queryAll(){
return ResponseEntity.ok(this.componentService.queryAllGroupedByCategory()); return ResponseEntity.ok(this.componentService.queryAllGroupedByCategory());
} }




+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java View File

@@ -59,6 +59,6 @@ public interface ComponentService {


String removeById(Integer id); String removeById(Integer id);


Map<Integer, List<Component>> queryAllGroupedByCategory();
List<Map> queryAllGroupedByCategory();


} }

+ 16
- 5
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java View File

@@ -1,5 +1,6 @@
package com.ruoyi.platform.service.impl; package com.ruoyi.platform.service.impl;


import com.ruoyi.common.security.utils.DictUtils;
import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.platform.domain.Component; import com.ruoyi.platform.domain.Component;
import com.ruoyi.platform.service.ComponentService; import com.ruoyi.platform.service.ComponentService;
@@ -15,9 +16,7 @@ import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;


import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;


/** /**
@@ -52,10 +51,22 @@ public class ComponentServiceImpl implements ComponentService {
} }


@Override @Override
public Map<Integer, List<Component>> queryAllGroupedByCategory() {
public List<Map> queryAllGroupedByCategory() {
List<Component> componentList = this.componentDao.queryAll(); 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)); 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;
} }


/** /**


Loading…
Cancel
Save