2023年11月6日 提升智慧教室速度,修改课程提前30分钟逻辑
This commit is contained in:
parent
7ed459c734
commit
ca219f7c92
|
@ -109,14 +109,17 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
|
||||||
//查询今天的课,
|
//查询今天的课,
|
||||||
DateTime starTime = DateTime.now();
|
DateTime starTime = DateTime.now();
|
||||||
|
|
||||||
String nowTimeStr = starTime.toString("HHmm");
|
DateTime nowPlus30Time = DateUtil.offset(starTime,DateField.MINUTE,30);//提前30分钟
|
||||||
|
String nowTimeStr = nowPlus30Time.toString("HHmm");
|
||||||
int nowTimeNum = Integer.parseInt(nowTimeStr);
|
int nowTimeNum = Integer.parseInt(nowTimeStr);
|
||||||
starTime = DateUtil.endOfDay(starTime);//校正为今天末尾
|
starTime = DateUtil.endOfDay(starTime);//校正为今天末尾
|
||||||
String nowStr = starTime.toString("yyyy-MM-dd");
|
String nowStr = starTime.toString("yyyy-MM-dd");
|
||||||
|
|
||||||
QueryWrapper<KcKetangbiao> ktqw = new QueryWrapper<>();
|
QueryWrapper<KcKetangbiao> ktqw = new QueryWrapper<>();
|
||||||
ktqw.apply("skrq >= STR_TO_DATE('"+nowStr+"', '%Y-%m-%d')");
|
ktqw.eq("skrq",nowStr);
|
||||||
ktqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr+"','%Y-%m-%d'),INTERVAL 1 DAY)");
|
// 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<KcKetangbiao> kcKetangbiaoList = kcKetangbiaoService.list(ktqw);
|
List<KcKetangbiao> kcKetangbiaoList = kcKetangbiaoService.list(ktqw);
|
||||||
|
|
||||||
starTime = starTime.offset(DateField.DAY_OF_MONTH,1);//明天
|
starTime = starTime.offset(DateField.DAY_OF_MONTH,1);//明天
|
||||||
|
@ -124,8 +127,10 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
|
||||||
|
|
||||||
QueryWrapper<KcKetangbiao> nextDayKtqw = new QueryWrapper<>();
|
QueryWrapper<KcKetangbiao> nextDayKtqw = new QueryWrapper<>();
|
||||||
nextDayKtqw.eq("hh","01、02");//明天的只查01、02这个节次的
|
nextDayKtqw.eq("hh","01、02");//明天的只查01、02这个节次的
|
||||||
nextDayKtqw.apply("skrq >= STR_TO_DATE('"+nowStr2+"', '%Y-%m-%d')");
|
// 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.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr2+"','%Y-%m-%d'),INTERVAL 1 DAY)");
|
||||||
|
ktqw.eq("skrq",nowStr);
|
||||||
|
ktqw.isNotNull("jsbh");
|
||||||
List<KcKetangbiao> nextDayKcKetangbiaoList = kcKetangbiaoService.list(nextDayKtqw);
|
List<KcKetangbiao> nextDayKcKetangbiaoList = kcKetangbiaoService.list(nextDayKtqw);
|
||||||
|
|
||||||
//查询全部的教学楼
|
//查询全部的教学楼
|
||||||
|
@ -151,7 +156,7 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
|
||||||
Set<String> nextKcJieciSet = Sets.newHashSet();
|
Set<String> nextKcJieciSet = Sets.newHashSet();
|
||||||
kcJieciList.forEach(x -> {
|
kcJieciList.forEach(x -> {
|
||||||
JieciIntTime jieciIntTime = new JieciIntTime();
|
JieciIntTime jieciIntTime = new JieciIntTime();
|
||||||
jieciIntTime.setKsTime(Integer.parseInt(x.getHhks())-30);//提前30分钟
|
jieciIntTime.setKsTime(Integer.parseInt(x.getHhks()));
|
||||||
jieciIntTime.setJsTime(Integer.parseInt(x.getHhjs()));
|
jieciIntTime.setJsTime(Integer.parseInt(x.getHhjs()));
|
||||||
|
|
||||||
if(jieciIntTime.getKsTime() <= nowTimeNum && nowTimeNum <= jieciIntTime.getJsTime()){
|
if(jieciIntTime.getKsTime() <= nowTimeNum && nowTimeNum <= jieciIntTime.getJsTime()){
|
||||||
|
|
Loading…
Reference in New Issue