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 324664ec..49e50eaf 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 @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.TimeInterval; import com.beust.jcommander.internal.Sets; import com.google.common.collect.Maps; import lombok.Data; @@ -93,8 +94,11 @@ public class KcZhihuijiaoshiController extends JeecgController queryWrapper) { + TimeInterval timer = DateUtil.timer(); Page page = new Page(pageNo, pageSize); IPage pageList = kcZhihuijiaoshiService.page(page, queryWrapper); + + log.info("01: {}",timer.intervalRestart()); //查询今天的课, DateTime starTime = DateTime.now(); @@ -107,9 +111,11 @@ public class KcZhihuijiaoshiController extends JeecgController jxlqw = new QueryWrapper<>(); List jiaoxuelouInfoList = kcJiaoxuelouInfoService.list(); + log.info("02: {}",timer.intervalRestart()); Map jiaoxuelouInfoMap = jiaoxuelouInfoList.stream().collect(Collectors.toMap(KcJiaoxuelouInfo::getId,a -> a, (a,b) -> a)); + log.info("03: {}",timer.intervalRestart()); //下一节次映射表 Map nextJcMap = Maps.newHashMap(); nextJcMap.put("01、02","03、04"); @@ -140,6 +146,7 @@ public class KcZhihuijiaoshiController extends JeecgController { if(nextJcMap.containsKey(k)){ @@ -149,6 +156,7 @@ public class KcZhihuijiaoshiController extends JeecgController ktqw = new QueryWrapper<>(); ktqw.eq("skrq",nowStr); @@ -158,6 +166,8 @@ public class KcZhihuijiaoshiController extends JeecgController kcKetangbiaoList = kcKetangbiaoService.list(ktqw); + log.info("06: {}",timer.intervalRestart()); + starTime = starTime.offset(DateField.DAY_OF_MONTH,1);//明天 // String nowStr2 = starTime.toString("yyyy-MM-dd"); @@ -165,10 +175,12 @@ public class KcZhihuijiaoshiController extends JeecgController= 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"); + nextDayKtqw.eq("skrq",nowStr); + nextDayKtqw.isNotNull("jsbh"); List nextDayKcKetangbiaoList = kcKetangbiaoService.list(nextDayKtqw); + log.info("07: {}",timer.intervalRestart()); + //根据节次信息包装进Map Map kcKetangbiaoNowSet = Maps.newHashMap(); Map kcKetangbiaoNextSet = Maps.newHashMap(); @@ -191,6 +203,8 @@ public class KcZhihuijiaoshiController extends JeecgController