From ffe83dbff03a9d2d1159e6516b0bb592aed5af19 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Wed, 8 Nov 2023 02:23:07 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=888=E6=97=A5=20=E5=87=8F?= =?UTF-8?q?=E6=85=A2=E8=AF=B7=E6=B1=82=E9=80=9F=E5=BA=A6=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=94=B9=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E8=AF=BE=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RefreshLiveServer.java | 20 +++++++ .../controller/KcZhihuijiaoshiController.java | 53 ++++++++----------- 2 files changed, 43 insertions(+), 30 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 863f864a..a878983b 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 @@ -8,6 +8,7 @@ import cn.hutool.http.HttpUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.beust.jcommander.internal.Sets; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -28,6 +29,7 @@ import org.springframework.stereotype.Component; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; @Slf4j @@ -69,6 +71,8 @@ public class RefreshLiveServer extends BaseSync { queryWrapper.eq("xm","教师近景"); queryWrapper.eq("changshang","奥威亚"); IPage pageList = kcZhihuijiaoshiController.queryPageListN(jiaoshi, 1,-1,queryWrapper); + Set onList = Sets.newHashSet(); + Set outList = Sets.newHashSet(); if(pageList != null){ List list = pageList.getRecords(); //正在上课的数据 @@ -93,7 +97,9 @@ public class RefreshLiveServer extends BaseSync { log.info("返回内容：" + res);//live_setParam_ret=ok //记录日志 mnitorLog.setLogType(1);//播放成功 + onList.add(x.getJsbh()); } catch (Exception e){ + outList.add(x.getJsbh()); //播放失败 //开启 log.error(e.getMessage(),e); @@ -135,6 +141,20 @@ public class RefreshLiveServer extends BaseSync { }); } + if(!onList.isEmpty()){ + UpdateWrapper onUw = new UpdateWrapper<>(); + onUw.set("sfyx",0); + onUw.in("jsbh",onList); + kcZhihuijiaoshiService.update(onUw); + } + + if(!outList.isEmpty()) { + UpdateWrapper outUw = new UpdateWrapper<>(); + outUw.set("sfyx", 1); + outUw.in("jsbh", outList); + kcZhihuijiaoshiService.update(outUw); + } + } /** 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 cedd6138..324664ec 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 @@ -4,10 +4,8 @@ import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -20,7 +18,6 @@ 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.oConvertUtils; import org.jeecg.modules.kc.grab.SynchronizationService.RefreshLiveServer; import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoxuelouInfo; import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi; @@ -40,19 +37,11 @@ import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; import org.jeecg.modules.quartz.entity.QuartzJob; import org.jeecg.modules.quartz.service.IQuartzJobService; import org.jeecg.modules.tools.DictUtils; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.aspect.annotation.AutoLog; @@ -115,24 +104,6 @@ public class KcZhihuijiaoshiController extends JeecgController ktqw = new QueryWrapper<>(); - ktqw.eq("skrq",nowStr); -// ktqw.apply("skrq >= STR_TO_DATE('"+nowStr+"', '%Y-%m-%d')"); -// ktqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr+"','%Y-%m-%d'),INTERVAL 1 DAY)"); - ktqw.isNotNull("jsbh"); - List kcKetangbiaoList = kcKetangbiaoService.list(ktqw); - - starTime = starTime.offset(DateField.DAY_OF_MONTH,1);//明天 - String nowStr2 = starTime.toString("yyyy-MM-dd"); - - QueryWrapper 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)"); - ktqw.eq("skrq",nowStr); - ktqw.isNotNull("jsbh"); - List nextDayKcKetangbiaoList = kcKetangbiaoService.list(nextDayKtqw); - //查询全部的教学楼 //QueryWrapper jxlqw = new QueryWrapper<>(); List jiaoxuelouInfoList = kcJiaoxuelouInfoService.list(); @@ -148,6 +119,8 @@ public class KcZhihuijiaoshiController extends JeecgController jieci = new AtomicReference<>(); + //查询节次时间 QueryWrapper jcqw = new QueryWrapper<>(); jcqw.like("jieci","、"); @@ -162,6 +135,7 @@ public class KcZhihuijiaoshiController extends JeecgController ktqw = new QueryWrapper<>(); + ktqw.eq("skrq",nowStr); + ktqw.eq(StringUtils.isNotBlank(jieci.get()),"hh",jieci.get()); +// ktqw.apply("skrq >= STR_TO_DATE('"+nowStr+"', '%Y-%m-%d')"); +// ktqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr+"','%Y-%m-%d'),INTERVAL 1 DAY)"); + ktqw.isNotNull("jsbh"); + List kcKetangbiaoList = kcKetangbiaoService.list(ktqw); + + starTime = starTime.offset(DateField.DAY_OF_MONTH,1);//明天 +// String nowStr2 = starTime.toString("yyyy-MM-dd"); + + QueryWrapper 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)"); + ktqw.eq("skrq",nowStr); + ktqw.isNotNull("jsbh"); + List nextDayKcKetangbiaoList = kcKetangbiaoService.list(nextDayKtqw); + //根据节次信息包装进Map Map kcKetangbiaoNowSet = Maps.newHashMap(); Map kcKetangbiaoNextSet = Maps.newHashMap();