|
...
|
...
|
@@ -300,19 +300,39 @@ public class StopRecordService extends BaseServiceImpl<StopRecord> { |
|
300
|
300
|
.filter(item -> item.getStartTime() != null)
|
|
301
|
301
|
.collect(Collectors.groupingBy(item -> dateFormat.format(item.getStartTime())));
|
|
302
|
302
|
|
|
|
303
|
+ // 确定需要生成汇总记录的日期范围:从当月1号到当前天(若查询月份非当前月则到月末)
|
|
|
304
|
+ Calendar rangeCal = Calendar.getInstance();
|
|
|
305
|
+ rangeCal.set(Calendar.YEAR, targetYear);
|
|
|
306
|
+ rangeCal.set(Calendar.MONTH, targetMonth - 1);
|
|
|
307
|
+ int endDay;
|
|
|
308
|
+ if (targetYear == now.get(Calendar.YEAR) && targetMonth == (now.get(Calendar.MONTH) + 1)) {
|
|
|
309
|
+ // 查询的是当前月,只到当前天
|
|
|
310
|
+ endDay = now.get(Calendar.DAY_OF_MONTH);
|
|
|
311
|
+ } else {
|
|
|
312
|
+ // 查询的是历史月份,到月末
|
|
|
313
|
+ endDay = rangeCal.getActualMaximum(Calendar.DAY_OF_MONTH);
|
|
|
314
|
+ }
|
|
|
315
|
+
|
|
303
|
316
|
List<StopRecordDailySummaryDTO> resultList = new ArrayList<>();
|
|
304
|
|
- for (Map.Entry<String, List<StopRecord>> entry : dailyMap.entrySet()) {
|
|
305
|
|
- List<StopRecord> dailyList = entry.getValue();
|
|
|
317
|
+ for (int day = 1; day <= endDay; day++) {
|
|
|
318
|
+ rangeCal.set(Calendar.DAY_OF_MONTH, day);
|
|
|
319
|
+ String dateKey = dateFormat.format(rangeCal.getTime());
|
|
306
|
320
|
|
|
307
|
321
|
StopRecordDailySummaryDTO dto = new StopRecordDailySummaryDTO();
|
|
308
|
|
- dto.setDate(entry.getKey());
|
|
309
|
|
- dto.setTotalCount(dailyList.size());
|
|
310
|
|
-
|
|
311
|
|
- // 计算当日总停线时长(txsc 为 null 时按 0 计)
|
|
312
|
|
- double totalTxsc = dailyList.stream()
|
|
313
|
|
- .mapToDouble(item -> item.getTxsc() == null ? 0.0 : item.getTxsc())
|
|
314
|
|
- .sum();
|
|
315
|
|
- dto.setTotalTxsc(totalTxsc);
|
|
|
322
|
+ dto.setDate(dateKey);
|
|
|
323
|
+
|
|
|
324
|
+ List<StopRecord> dailyList = dailyMap.get(dateKey);
|
|
|
325
|
+ if (CollectionUtils.isNotEmpty(dailyList)) {
|
|
|
326
|
+ dto.setTotalCount(dailyList.size());
|
|
|
327
|
+ double totalTxsc = dailyList.stream()
|
|
|
328
|
+ .mapToDouble(item -> item.getTxsc() == null ? 0.0 : item.getTxsc())
|
|
|
329
|
+ .sum();
|
|
|
330
|
+ dto.setTotalTxsc(totalTxsc);
|
|
|
331
|
+ } else {
|
|
|
332
|
+ // 无记录的日期自动补0
|
|
|
333
|
+ dto.setTotalCount(0);
|
|
|
334
|
+ dto.setTotalTxsc(0.0);
|
|
|
335
|
+ }
|
|
316
|
336
|
|
|
317
|
337
|
if (block != null) {
|
|
318
|
338
|
dto.setBkbm(block.getBm());
|
|
...
|
...
|
@@ -322,8 +342,6 @@ public class StopRecordService extends BaseServiceImpl<StopRecord> { |
|
322
|
342
|
resultList.add(dto);
|
|
323
|
343
|
}
|
|
324
|
344
|
|
|
325
|
|
- // 按日期升序排列
|
|
326
|
|
- resultList.sort(Comparator.comparing(StopRecordDailySummaryDTO::getDate));
|
|
327
|
345
|
return resultList;
|
|
328
|
346
|
}
|
|
329
|
347
|
|
...
|
...
|
|