center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 下拉列表选项重复

Browse Source
This commit is contained in:
fit2cloud-chenyw 2021-12-24 17:30:43 +08:00
parent 084ce57a12
commit 58c9a2d8d5
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java
View File

@ -7,12 +7,15 @@ import io.dataease.service.dataset.DataSetFieldService;
import io.dataease.service.dataset.DataSetTableFieldsService; import io.dataease.service.dataset.DataSetTableFieldsService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.TreeSet;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -74,18 +77,27 @@ public class DataSetTableFieldController {
@ApiOperation("值枚举") @ApiOperation("值枚举")
@PostMapping("fieldValues/{fieldId}") @PostMapping("fieldValues/{fieldId}")
public List<Object> fieldValues(@PathVariable String fieldId) throws Exception{ public List<Object> fieldValues(@PathVariable String fieldId) throws Exception {
return dataSetFieldService.fieldValues(fieldId); return dataSetFieldService.fieldValues(fieldId);
} }
@ApiOperation("多字段值枚举") @ApiOperation("多字段值枚举")
@PostMapping("multFieldValues") @PostMapping("multFieldValues")
public List<Object> multFieldValues(@RequestBody List<String> fieldIds) throws Exception{ public List<Object> multFieldValues(@RequestBody List<String> fieldIds) throws Exception {
List<Object> results = new ArrayList<>(); List<Object> results = new ArrayList<>();
for (String fieldId : fieldIds) { for (String fieldId : fieldIds) {
results.addAll(dataSetFieldService.fieldValues(fieldId)); results.addAll(dataSetFieldService.fieldValues(fieldId));
} }
results.stream().distinct().collect(Collectors.toList()); ArrayList<Object> list = results.stream().collect(
return results; Collectors.collectingAndThen(
Collectors.toCollection(
() -> new TreeSet<>(Comparator.comparing(t -> {
if (ObjectUtils.isEmpty(t)) return "";
return t.toString();
}))
), ArrayList::new
)
);
return list;
} }
} }