bonus
/
SafetyAlertSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

大屏调试

This commit is contained in:
mashuai 2024-09-29 17:45:50 +08:00
parent fd67709e66
commit 21a98dbbd4
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java
View File

@ -1,12 +1,12 @@
package com.bonus.screen.service.impl; package com.bonus.screen.service.impl;
import com.alibaba.nacos.common.utils.CollectionUtils;
import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.base.entity.DevAttributeVo; import com.bonus.base.entity.DevAttributeVo;
import com.bonus.screen.mapper.TbDeviceDataRecord; import com.bonus.screen.mapper.TbDeviceDataRecord;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -52,9 +52,26 @@ public class ProjectDetailsViewServiceImpl {
} }
} }
Map<String, List<DevAttributeVo>> listMap = records.stream().collect(Collectors.groupingBy(DevAttributeVo::getJcName)); Map<String, List<DevAttributeVo>> listMap = records.stream().collect(Collectors.groupingBy(DevAttributeVo::getJcName));
extractedSort(listMap);
// 返回成功的 AjaxResult，包含分组和排序后的数据
return AjaxResult.success(listMap); return AjaxResult.success(listMap);
} }
/**
* 对每个分组按 XTime 升序排列
* @param listMap
*/
private void extractedSort(Map<String, List<DevAttributeVo>> listMap) {
// 对每个分组按 XTime 升序排列
for (Map.Entry<String, List<DevAttributeVo>> entry : listMap.entrySet()) {
List<DevAttributeVo> sortedList = entry.getValue().stream()
.sorted(Comparator.comparing(DevAttributeVo::getXTime))
.collect(Collectors.toList());
// 更新分组中的列表
entry.setValue(sortedList);
}
}
public AjaxResult getPitDevAttributeRecordByDeviceId(Integer devId) { public AjaxResult getPitDevAttributeRecordByDeviceId(Integer devId) {
List<DevAttributeVo> records = tbDeviceDataRecordMapper.getPitDevAttributeRecordByDeviceId(devId); List<DevAttributeVo> records = tbDeviceDataRecordMapper.getPitDevAttributeRecordByDeviceId(devId);
if (records.isEmpty()) { if (records.isEmpty()) {
@ -68,6 +85,7 @@ public class ProjectDetailsViewServiceImpl {
} }
} }
Map<String, List<DevAttributeVo>> listMap = records.stream().collect(Collectors.groupingBy(DevAttributeVo::getJcName)); Map<String, List<DevAttributeVo>> listMap = records.stream().collect(Collectors.groupingBy(DevAttributeVo::getJcName));
extractedSort(listMap);
return AjaxResult.success(listMap); return AjaxResult.success(listMap);
} }