From 8aade0862c734df91bcf2186538ac487572baaa6 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Thu, 8 Jul 2021 14:06:07 +0800 Subject: [PATCH] =?UTF-8?q?add:=E4=BA=A7=E5=93=81=E7=BA=BF=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=8F=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 25 ++++++++++++++++--- .../entity/SarStandProjectLibrary.java | 3 +++ .../entity/SarStandProjectLibraryDto.java | 6 ++++- .../entity/productLineDto.java | 15 +++++++++++ .../SarStandProjectLibraryService.java | 3 +++ .../SarStandProjectLibraryServiceImpl.java | 22 ++++++++++++++++ 6 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java 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 4bd89a81..39cb0fb4 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 @@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -17,9 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import javax.annotation.Resource; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** *

@@ -70,5 +69,25 @@ public class SarStandProjectLibraryController extends BaseController list1 = sarStandProjectLibraryService.queryProjectManager(); + // 创建一个新的list集合，用于存储去重后的元素 + List listTemp = new ArrayList(); + for (SarStandProjectLibrary sarStandProjectLibrary:list1){ + productLineDto p = new productLineDto(); + p.setProductLine(sarStandProjectLibrary.getProductLine()); + p.setProjectManager(sarStandProjectLibrary.getProjectManager()); + List list2 = sarStandProjectLibraryService.queryByProductLine(sarStandProjectLibrary.getProductLine()); + p.setSarStandProjectLibraries(list2); + listTemp.add(p); + } + System.out.println(listTemp); + + return Result.success("200",listTemp); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index e8843c2d..d4e8b803 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -60,6 +60,9 @@ public class SarStandProjectLibrary extends BaseEntity { @ApiModelProperty(value = "项目级别") private String projectLevel; + @ApiModelProperty(value = "产品线") + private String productLine; + private String projectManager; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java index 6f68f8ab..1046c618 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java @@ -3,7 +3,8 @@ package com.adc.da.slrs.sarStandProjectLibrary.entity; import lombok.Data; -import java.util.Date; +import java.util.List; + /** * //TODO @@ -35,4 +36,7 @@ public class SarStandProjectLibraryDto { private String projectLevel; private String projectManager; + + private String productLine; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java new file mode 100644 index 00000000..11a2aed8 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + +import lombok.Data; + +import java.util.List; + +@Data +public class productLineDto { + + private String projectManager; + + private String productLine; + + private List sarStandProjectLibraries; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 49eedc33..8e9dcb06 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.baomidou.mybatisplus.core.metadata.IPage; import java.util.List; @@ -10,4 +11,6 @@ public interface SarStandProjectLibraryService { IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); List queryById(String id); + List queryProjectManager(); + List queryByProductLine(String productLine); } 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 7ec7f63b..04dfe995 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 @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; +import com.adc.da.slrs.sarStandProjectLibrary.entity.productLineDto; import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -43,6 +44,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager() { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.select("product_line","project_manager"); + wrapper.groupBy("product_line"); + List list = sarStandProjectLibraryDao.selectList(wrapper); + return list; + } + + @Override + public List queryByProductLine(String productLine) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("product_line",productLine); + List list = sarStandProjectLibraryDao.selectList(wrapper); + return list; + } + private IPage getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper wrapper) { Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);