diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 387b07a1..02888d99 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -6,6 +6,7 @@ import com.adc.da.slrs.sarStandProjectLibrary.entity.*; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; +import com.adc.da.util.utils.StringUtils; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -305,4 +306,41 @@ public class SarStandProjectLibraryController extends BaseController list = sarStandProjectLibraryService.list(qw); + List managementHostList = new ArrayList<>(); + List developmentHostList = new ArrayList<>(); + List categoryList = new ArrayList<>(); + for(SarStandProjectLibrary sarStandProjectLibrary1 : list){ + if(!managementHostList.contains(sarStandProjectLibrary1.getManagementHostName())){ + managementHostList.add(sarStandProjectLibrary1.getManagementHostName()); + } + if(!developmentHostList.contains(sarStandProjectLibrary1.getDevelopmentHostName())){ + developmentHostList.add(sarStandProjectLibrary1.getDevelopmentHostName()); + } + if(!categoryList.contains(sarStandProjectLibrary1.getCategoryName())){ + categoryList.add(sarStandProjectLibrary1.getCategoryName()); + } + } + QuerySelectRspDTO querySelectRspDTO = QuerySelectRspDTO.builder() + .managementHostList(managementHostList) + .developmentHostList(developmentHostList) + .categoryList(categoryList) + .build(); + return Result.success(querySelectRspDTO); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java new file mode 100644 index 00000000..4c9a1e1d --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/QuerySelectRspDTO.java @@ -0,0 +1,17 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Builder; +import lombok.Data; + +import java.util.List; + +@Data +@Builder +public class QuerySelectRspDTO { + + private List managementHostList; + + private List developmentHostList; + + private List categoryList; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 535219fa..293ed9fd 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -82,7 +82,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl