|
@@ -44,12 +44,12 @@ public class ProgramService extends ServiceImpl<ProgramMapper, Program> implemen
|
|
|
|
|
|
baseMapper.listByChannel(channelId, start, end).stream().peek(program -> {
|
|
|
if(sspDisableConfigMap.containsKey(program.getStartTime())){
|
|
|
- program.setStatus(1);
|
|
|
+ EpgDisableConfig edc = sspDisableConfigMap.get(program.getStartTime());
|
|
|
+ program.setConfigId(edc.getId());
|
|
|
+ program.setStatus(edc.getStatus());
|
|
|
}else{
|
|
|
program.setStatus(0);
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
}).collect(Collectors.groupingBy(Program::getBroadcastDate)).forEach((k, v) -> {
|
|
|
int status = 0;
|
|
|
for(Program program : v){
|
|
@@ -58,7 +58,6 @@ public class ProgramService extends ServiceImpl<ProgramMapper, Program> implemen
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
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()));
|