From 4edaef6661492be76c4e65913967646d545eadd7 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 14 Aug 2023 11:07:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AB=99=E7=82=B9=E5=9C=B0?= =?UTF-8?q?=E9=94=81=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PileBasicInfoServiceImpl.java | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 6011970b7..971f89722 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -43,6 +43,7 @@ import java.math.RoundingMode; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * 设备管理Service业务层处理 @@ -710,6 +711,22 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { pileBasicInfoMapper.updatePileMerchantBatch(pileIdList, newMerchantId); } + public static void main(String[] args) { + List list = new ArrayList<>(); + list.add("0"); + list.add("1"); + list.add("4"); + list.add("3"); + list.add("2"); + list.add(null); + list.add(""); + + list = list.stream().filter(StringUtils::isNotBlank).collect(Collectors.toList()); + list.sort(Comparator.comparing(Integer::new)); + + System.out.println(list); + } + /** * 获取地锁信息 * @param stationId @@ -722,8 +739,15 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { List lockInfoList; // 根据站点id查出该站点下所有桩（区分单双枪） List connectorInfoVOList = pileConnectorInfoService.selectConnectorListByStationId(Long.parseLong(stationId)); - // 根据pileSn分组 - Map> collect = connectorInfoVOList.stream().collect(Collectors.groupingBy(PileConnectorInfoVO::getPileSn)); + // 过滤掉别名为空的数据 + connectorInfoVOList = connectorInfoVOList.stream() + .filter(x -> StringUtils.isNotBlank(x.getName())) + .collect(Collectors.toList()); + // 然后根据别名排序 + connectorInfoVOList.sort(Comparator.comparing(x -> new Integer(x.getName()))); + // 再根据pileSn分组 + Map> collect = connectorInfoVOList.stream() + .collect(Collectors.groupingBy(PileConnectorInfoVO::getPileSn)); // 根据桩别名分组 // Map> collect = connectorInfoVOList.stream().collect(Collectors.groupingBy(PileConnectorInfoVO::getName));