|
@@ -67,7 +67,7 @@ public class PhotovoltaicAnalysisController {
|
|
|
// Page<StateCause> page = new Page<>(pageNum, pageSize);
|
|
|
scWrapper.eq("state_type", "8种状态").in("equipment_id", pageItems)
|
|
|
.ge("start_time", startTime).lt("end_time", endTime)
|
|
|
- .orderByAsc("equipment_id");
|
|
|
+ .orderByAsc("equipment_id,start_time");
|
|
|
List<StateCause> list = stateCauseService.list(scWrapper);
|
|
|
Map<String, List<StateCause>> listMap = list.stream().peek(sc -> sc.setEquipmentId(stringMap.get(sc.getEquipmentId()))).collect(Collectors.groupingBy(StateCause::getEquipmentId,LinkedHashMap::new,Collectors.toList()));
|
|
|
// PageMap<StateCause> stateCauses = (PageMap<StateCause>) stateCauseService.page(page, scWrapper);
|