孙永军 il y a 1 an
Parent
commit
822f750f69

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

@@ -59,7 +59,7 @@ public class KeywordDisableConfigService extends ServiceImpl<KeywordDisableConfi
 
     public List<String> disableKeywords(Integer channelId, LocalDateTime startTime, LocalDateTime endTime){
         return lambdaQuery().eq(KeywordDisableConfig::getChannelId, channelId).eq(KeywordDisableConfig::getStatus, 1)
-                .le(KeywordDisableConfig::getEndTime, startTime).ge(KeywordDisableConfig::getStartTime, endTime)
+                .ge(KeywordDisableConfig::getEndTime, startTime).le(KeywordDisableConfig::getStartTime, endTime)
                 .list().stream().map(KeywordDisableConfig::getProgram).distinct().collect(Collectors.toList());
     }
 }

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

@@ -66,7 +66,8 @@ public class ProgramService extends ServiceImpl<ProgramMapper, Program> implemen
     }
 
     public List<Map<String, Object>> cacheEpg(Integer channelId) {
-        return (List<Map<String, Object>>)cache.get(channelId, key -> getDisableProgramList(channelId));
+        return getDisableProgramList(channelId);
+//        return (List<Map<String, Object>>)cache.get(channelId, key -> getDisableProgramList(channelId));
     }
 
     public void setCache(Integer channelId){