feat(数据字典): 添加详情查询接口 (#221)

---------

Co-authored-by: 老周 <zh.sqy@qq.com>

Author: goten7

hsweb-system/hsweb-system-dictionary/src/main/java/org/hswebframework/web/dictionary/service/CompositeDictDefineRepository.java

@@ -51,7 +51,7 @@ public Flux<DictDefine> getAllDefine() {
         return Flux.concat(super.getAllDefine(), QueryParamEntity
                 .newQuery()
                 .noPaging()
-                .execute(dictionaryService::findAllDetail)
+                .execute(paramEntity -> dictionaryService.findAllDetail(paramEntity,false))
                 .map(DictionaryEntity::toDictDefine));
     }
 

hsweb-system/hsweb-system-dictionary/src/main/java/org/hswebframework/web/dictionary/service/DefaultDictionaryService.java

@@ -1,10 +1,11 @@
 package org.hswebframework.web.dictionary.service;
 
+import org.apache.commons.collections4.CollectionUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveDelete;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.mapping.defaults.SaveResult;
 import org.hswebframework.web.api.crud.entity.QueryParamEntity;
-import org.hswebframework.web.api.crud.entity.SortSupportEntity;
+import org.hswebframework.web.crud.query.QueryHelper;
 import org.hswebframework.web.crud.service.GenericReactiveCrudService;
 import org.hswebframework.web.dictionary.entity.DictionaryEntity;
 import org.hswebframework.web.dictionary.entity.DictionaryItemEntity;
@@ -16,8 +17,6 @@
 import reactor.core.publisher.Mono;
 
 import java.util.Collection;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 public class DefaultDictionaryService extends GenericReactiveCrudService<DictionaryEntity, String> {
 
@@ -83,29 +82,31 @@ public Mono<DictionaryEntity> findDetailById(String id) {
                         });
     }
 
-    public Flux<DictionaryEntity> findAllDetail(QueryParamEntity paramEntity) {
-        /*
-            1. 查询出所有字典并以ID为key转为map
-            2. 查询出所有字段选项并按dicId分组
-            3. 根据分组后的key(dictId)获取字段
-            4. 将2的分组结果放到字典里
-         */
+    public Flux<DictionaryEntity> findAllDetail(QueryParamEntity paramEntity, boolean allowEmptyItem) {
         return createQuery()
                 .setParam(paramEntity)
                 .fetch()
-                .collect(Collectors.toMap(DictionaryEntity::getId, Function.identity())) //.1
-                .flatMapMany(dicMap ->
-                        itemService.createQuery()
-                                .fetch()
-                                .groupBy(DictionaryItemEntity::getDictId)//.2
-                                .flatMap(group -> Mono
-                                        .justOrEmpty(dicMap.get(group.key())) //.3
-                                        .zipWhen(dict -> group.collectList(),
-                                                (dict, items) -> {
-                                                    items.sort(SortSupportEntity::compareTo);
-                                                    dict.setItems(items);  //.4
-                                                    return dict;
-                                                })));
+                .as(flux -> fillDetail(flux, allowEmptyItem));
+    }
+
+    /**
+     * 查询字典详情
+     *
+     * @param dictionary     源数据
+     * @param allowEmptyItem 是否允许item为空
+     */
+    public Flux<DictionaryEntity> fillDetail(Flux<DictionaryEntity> dictionary, boolean allowEmptyItem) {
+        return QueryHelper
+                .combineOneToMany(
+                        dictionary,
+                        DictionaryEntity::getId,
+                        itemService.createQuery(),
+                        DictionaryItemEntity::getDictId,
+                        DictionaryEntity::setItems
+                )
+                //根据条件过滤是否允许返回item为空的
+                .filter(dict -> allowEmptyItem || CollectionUtils.isNotEmpty(dict.getItems()));
     }
 
+
 }

hsweb-system/hsweb-system-dictionary/src/main/java/org/hswebframework/web/dictionary/webflux/WebfluxDictionaryController.java

@@ -2,7 +2,11 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import org.hswebframework.web.api.crud.entity.QueryParamEntity;
+import org.hswebframework.web.api.crud.entity.QueryNoPagingOperation;
 import org.hswebframework.web.authorization.annotation.Authorize;
 import org.hswebframework.web.authorization.annotation.Resource;
 import org.hswebframework.web.crud.service.ReactiveCrudService;
@@ -13,11 +17,9 @@
 import org.hswebframework.web.dictionary.entity.DictionaryEntity;
 import org.hswebframework.web.dictionary.service.DefaultDictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 
 @RestController
@@ -37,11 +39,27 @@ public ReactiveCrudService<DictionaryEntity, String> getService() {
         return dictionaryService;
     }
 
+    @GetMapping("/detail/_query")
+    @QueryNoPagingOperation(summary = "使用GET方式获取数据字典详情")
+    public Flux<DictionaryEntity> getItemDefineById(@Parameter(hidden = true) QueryParamEntity query) {
+        return dictionaryService
+                .findAllDetail(query, true);
+    }
+
+    @PostMapping("/detail/_query")
+    @Operation(summary = "使用POST方式获取数据字典详情")
+    public Flux<DictionaryEntity> getItemDefineById(@RequestBody Mono<QueryParamEntity> query) {
+        return query
+                .flatMapMany(param -> dictionaryService
+                        .findAllDetail(param, true));
+    }
+
     @GetMapping("/{id:.+}/items")
     @Authorize(merge = false)
     @Operation(summary = "获取数据字段的所有选项")
     public Flux<EnumDict<?>> getItemDefineById(@PathVariable String id) {
-        return repository.getDefine(id)
+        return repository
+                .getDefine(id)
                 .flatMapIterable(DictDefine::getItems);
     }