From d38f9ab24ed18c8e17c7114cbe524cda719fe88c Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 09 十一月 2022 16:09:15 +0800
Subject: [PATCH] 更新
---
src/main/java/com/whyc/service/BattRtdataService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattRtdataService.java b/src/main/java/com/whyc/service/BattRtdataService.java
index 43868da..22d4712 100644
--- a/src/main/java/com/whyc/service/BattRtdataService.java
+++ b/src/main/java/com/whyc/service/BattRtdataService.java
@@ -10,9 +10,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@Service
@@ -47,12 +45,19 @@
return new Response().setII(1,list.size()>0?true:false,pageInfo,"");
}
- public Map<Integer, List<BattRtdata>> getByDevId(int devId) {
+ public List<List<BattRtdata>> getByDevId(int devId) {
+ List<List<BattRtdata>> list = new LinkedList<>();
List<BattRtdata> dataList = mapper.getByDevId(devId);
if(dataList!=null && dataList.size()>0) {
- return dataList.stream().collect(Collectors.groupingBy(BattRtdata::getBattGroupId));
- }else{
- return new HashMap<>();
+ Map<Long, List<BattRtdata>> map = dataList.stream().collect(Collectors.groupingBy(BattRtdata::getNum));
+ Set<Long> keySet = map.keySet();
+ Iterator<Long> iterator = keySet.iterator();
+ while (iterator.hasNext()){
+ Long next = iterator.next();
+ List<BattRtdata> battRtdataList = map.get(next);
+ list.add(next.intValue(),battRtdataList);
+ }
}
+ return list;
}
}
--
Gitblit v1.9.1