|
@@ -35,7 +35,7 @@ public class ProgramService extends ServiceImpl<ProgramMapper, Program> implemen
|
|
|
LocalDateTime start = end.minusDays(7).plusSeconds(1);
|
|
|
List<Map<String, Object>> rs = new ArrayList<>();
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
- DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
|
|
+ DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("M月d日");
|
|
|
|
|
|
Map<LocalDateTime, EpgDisableConfig> sspDisableConfigMap = sspDisableConfigService.cfMap(channelId, start, end);
|
|
|
|
|
@@ -54,7 +54,7 @@ public class ProgramService extends ServiceImpl<ProgramMapper, Program> implemen
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- rs.add(ImmutableMap.of("date", k.format(formatter), "epg", v, "status", status));
|
|
|
+ rs.add(ImmutableMap.of("date", k.format(formatter), "status", status, "title", k.format(formatter1), "epg", v));
|
|
|
});
|
|
|
rs.sort(Comparator.comparing((Map<String, Object> o) -> o.get("date").toString()));
|
|
|
return rs;
|