From 396cbf5bdb2b6952854c4e018c76e41ddcceeeb3 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Thu, 9 Nov 2023 01:22:27 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=889=E6=97=A5=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RefreshLiveServer.java | 27 ++++++++++++++--- .../controller/KcZhihuijiaoshiController.java | 30 +++++++++++++++++-- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java index a878983b..63b0aea0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/RefreshLiveServer.java @@ -12,6 +12,7 @@ import com.beust.jcommander.internal.Sets; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.kc.grab.SynchronizationService.base.BaseSync; import org.jeecg.modules.kc.jiaoshi.controller.KcZhihuijiaoshiController; import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi; @@ -51,6 +52,10 @@ public class RefreshLiveServer extends BaseSync { @Autowired private IKcZhihuijiaoshiStateLogService kcZhihuijiaoshiStateLogService;//直播状态日志 + @Autowired + private RedisUtil redisUtil; + + /** * 若参数变量名修改 QuartzJobController中也需对应修改 */ @@ -144,6 +149,8 @@ public class RefreshLiveServer extends BaseSync { if(!onList.isEmpty()){ UpdateWrapper onUw = new UpdateWrapper<>(); onUw.set("sfyx",0); + onUw.set("update_by","system"); + onUw.set("update_time",new Date()); onUw.in("jsbh",onList); kcZhihuijiaoshiService.update(onUw); } @@ -151,6 +158,8 @@ public class RefreshLiveServer extends BaseSync { if(!outList.isEmpty()) { UpdateWrapper outUw = new UpdateWrapper<>(); outUw.set("sfyx", 1); + outUw.set("update_by","system"); + outUw.set("update_time",new Date()); outUw.in("jsbh", outList); kcZhihuijiaoshiService.update(outUw); } @@ -161,6 +170,11 @@ public class RefreshLiveServer extends BaseSync { * 刷新日志 */ public void refreshState(String jxlName){ + if(StringUtils.isNotBlank(jxlName)){ + redisUtil.set("zhihuijiaos:" + jxlName + ":btnStatus",true,60); + }else{ + redisUtil.set("zhihuijiaos:all:btnStatus",true,60); + } QueryWrapper qw = new QueryWrapper<>(); //qw.eq("xm","教师近景"); qw.eq(StringUtils.isNotBlank(jxlName),"jxl_name",jxlName); @@ -219,10 +233,15 @@ public class RefreshLiveServer extends BaseSync { } }); kcZhihuijiaoshiStateLogService.saveBatch(stateLogMap.values()); - //更新全部的修改时间 - UpdateWrapper uqw = new UpdateWrapper<>(); - uqw.set("create_time",new Date()); - kcZhihuijiaoshiStateLogService.update(uqw); + //更新全部的修改时间(新规则，分批展示时间) +// UpdateWrapper uqw = new UpdateWrapper<>(); +// uqw.set("create_time",new Date()); +// kcZhihuijiaoshiStateLogService.update(uqw); + if(StringUtils.isNotBlank(jxlName)){ + redisUtil.del("zhihuijiaos:" + jxlName + ":btnStatus"); + }else{ + redisUtil.del("zhihuijiaos:all:btnStatus"); + } } /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java index 49e50eaf..d74817e8 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java @@ -19,6 +19,7 @@ import lombok.Data; import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.kc.grab.SynchronizationService.RefreshLiveServer; import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoxuelouInfo; import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi; @@ -84,6 +85,10 @@ public class KcZhihuijiaoshiController extends JeecgController queryWrapper) { TimeInterval timer = DateUtil.timer(); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = kcZhihuijiaoshiService.page(page, queryWrapper); log.info("01: {}",timer.intervalRestart()); @@ -169,13 +174,13 @@ public class KcZhihuijiaoshiController extends JeecgController nextDayKtqw = new QueryWrapper<>(); nextDayKtqw.eq("hh","01、02");//明天的只查01、02这个节次的 // nextDayKtqw.apply("skrq >= STR_TO_DATE('"+nowStr2+"', '%Y-%m-%d')"); // nextDayKtqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr2+"','%Y-%m-%d'),INTERVAL 1 DAY)"); - nextDayKtqw.eq("skrq",nowStr); + nextDayKtqw.eq("skrq",nowStr2); nextDayKtqw.isNotNull("jsbh"); List nextDayKcKetangbiaoList = kcKetangbiaoService.list(nextDayKtqw); @@ -421,4 +426,23 @@ public class KcZhihuijiaoshiController extends JeecgController getRedisKey(String key){ + return Result.OK(redisUtil.get(key)); + } + + /** + * 查询redis中某key的状态 + * @return + */ + @GetMapping(value = "/resettingRedisKeys") + public Result resettingRedisKey(String key){ + redisUtil.del(StringUtils.split(key,",")); + return Result.OK(); + } + }