孙永军 1 year ago
parent
commit
99e74f1ff9

+ 3 - 0
src/main/java/com/smcic/api/epg/entity/Program.java

@@ -32,4 +32,7 @@ public class Program {
 
     @TableField(exist = false)
     private Integer status = 0;
+
+    @TableField(exist = false)
+    private Integer configId;
 }

+ 1 - 1
src/main/java/com/smcic/api/epg/service/impl/EpgDisableConfigService.java

@@ -60,7 +60,7 @@ public class EpgDisableConfigService extends ServiceImpl<EpgDisableConfigMapper,
             throw new APIException("不存在的数据记录");
         }
 
-        edc.setStatus(1);
+        edc.setStatus(disableDTO.getStatus());
 
         updateById(edc);
 

+ 3 - 4
src/main/java/com/smcic/api/epg/service/impl/ProgramService.java

@@ -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()));