From 63bb3a1a798aae2efc8268330b9f3c476686c792 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Fri, 9 Jun 2023 02:11:20 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=889=E6=97=A5=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=BB=BB=E6=95=99=E8=AF=BE=E7=A8=8B=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SyncTFwdtBkjxtkpj.java | 1 - .../impl/TFwdtBkjxtkpjServiceImpl.java | 3 - .../controller/KcKetangbiaoController.java | 167 +++++++++ .../kc/ktgl/mapper/KcKetangbiaoMapper.java | 20 +- .../kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml | 321 ++++++++++++++++++ .../kc/ktgl/service/IKcKetangbiaoService.java | 10 + .../service/impl/KcKetangbiaoServiceImpl.java | 25 ++ 7 files changed, 537 insertions(+), 10 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java index 223e9e2c..6ed0e5e2 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncTFwdtBkjxtkpj.java @@ -15,7 +15,6 @@ import org.jeecg.modules.kc.ktgl.service.IKcKetangbiaoService; import org.jeecg.modules.kc.qa.service.IKcEvaluationService; import org.jeecg.modules.kc.qa.service.IKcEvaluationsService; import org.jeecg.modules.quartz.entity.QuartzJob; -import org.jeecg.modules.quartz.mapper.QuartzJobMapper; import org.jeecg.modules.quartz.service.IQuartzJobService; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtBkjxtkpjServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtBkjxtkpjServiceImpl.java index a4c93569..3652384d 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtBkjxtkpjServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/service/impl/TFwdtBkjxtkpjServiceImpl.java @@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.kc.grab.exports.entity.TFwdtBkjxtkpj; import org.jeecg.modules.kc.grab.exports.mapper.TFwdtBkjxtkpjMapper; import org.jeecg.modules.kc.grab.exports.service.ITFwdtBkjxtkpjService; -import org.jeecg.modules.kc.grab.imports.entity.Xxhbbkjxtkpj; -import org.jeecg.modules.kc.grab.imports.mapper.XxhbbkjxtkpjMapper; -import org.jeecg.modules.kc.grab.imports.service.IXxhbbkjxtkpjService; import org.springframework.stereotype.Service; /** diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java index 65bc0393..436bd47c 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.kc.ktgl.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -10,6 +11,9 @@ import java.net.URLDecoder; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.CommonAPI; @@ -425,5 +429,168 @@ public class KcKetangbiaoController extends JeecgController= 745) { + $str = "kt.hh in ('01、02','01','02')"; + } else if ($time <= 1000 && $time >= 945) { + $str = "kt.hh in ('03、04','03','04')"; + } else if ($time <= 1330 && $time >= 1315) { + $str = "kt.hh in ('05、06','05','06')"; + } else if ($time <= 1530 && $time >= 1515) { + $str = "kt.hh in ('07、08','07','08')"; + } else if ($time <= 1730 && $time >= 1715) { + $str = "kt.hh in ('09、10','09','10')"; + } else if ($time <= 1930 && $time >= 1915) { + $str = "kt.hh in ('11、12','11','12')"; + } else { + $str = "1<>1 "; + } + return $str; + } + //按照时间取得正在上课信息节次条件，大于上课开始时间，小于课程结束时间 + //统计用 + public String getJieciBytimezzsk(String time) { + int $time = Integer.parseInt(time); + String $str; + if ($time <= 930 && $time >= 800) { + $str = "kt.hh in ('01、02','01','02')"; + } else if ($time <= 1130 && $time >= 1000) { + $str = "kt.hh in ('03、04','03','04')"; + } else if ($time <= 1500 && $time >= 1330) { + $str = "kt.hh in ('05、06','05','06')"; + } else if ($time <= 1700 && $time >= 1530) { + $str = "kt.hh in ('07、08','07','08')"; + } else if ($time <= 1900 && $time >= 1730) { + $str = "kt.hh in ('09、10','09','10')"; + } else if ($time <= 2100 && $time >= 1930) { + $str = "kt.hh in ('11、12','11','12')"; + } else { + $str = "1<>1 "; + } + + return $str; + } + + //按照时间取得正在上课节次条件，大于课前30分钟，小于课程结束时间 + public String getJieciBytime(String time) { + int $time = Integer.parseInt(time); + String $str; + if ($time <= 930 && $time >= 730) { + $str = "kt.hh in ('01、02','01','02')"; + } else if ($time <= 1130 && $time >= 930) { + $str = "kt.hh in ('03、04','03','04')"; + } else if ($time <= 1500 && $time >= 1300) { + $str = "kt.hh in ('05、06','05','06')"; + } else if ($time <= 1700 && $time >= 1500) { + $str = "kt.hh in ('07、08','07','08')"; + } else if ($time <= 1900 && $time >= 1700) { + $str = "kt.hh in ('09、10','09','20')"; + } else if ($time <= 2100 && $time >= 1900) { + $str = "kt.hh in ('11、12','11','12')"; + } else { + $str = "1<>1 "; + } + + return $str; + } + + //按照时间取得下一节课节次，大于上课开始30分钟，小于上课结束时间30分钟 + public String getNextJieciBytime(String time) { + int $time = Integer.parseInt(time); + String $str; + //根据时间获得下一课节次 + if ($time <= 730 && $time >= 0) { + $str = "kt.hh in ('01、02','01')"; + } else if ($time <= 900 && $time >= 730) { + $str = "kt.hh in ('03、04','03')"; + } else if ($time <= 1300 && $time >= 900) { + $str = "kt.hh in ('05、06','05')"; + } else if ($time <= 1500 && $time >= 1300) { + $str = "kt.hh in ('07、08','07')"; + } else if ($time <= 1700 && $time >= 1500) { + $str = "kt.hh in ('09、10','09')"; + } else if ($time <= 1830 && $time > 1700) { + $str = "kt.hh in ('11、12','11')"; + } else if ($time > 1900) { + $str = "kt.hh in ('01、02','01')"; + } else { + $str = "true "; + } + return $str; + } + + @ApiOperation(value="首页任教课程-即将上课", notes="首页任教课程-即将上课") + @GetMapping(value = "/getTeacherjjsk") + public Result>> getTeacherjjsk(KcKetangbiao kcKetangbiao){ + Date now = new Date(); + String currDate = DateUtil.format(now,"yyyy-MM-dd"); + String currTime = DateUtil.format(now,"HHmm"); + Map queryMap = Maps.newHashMap(); + queryMap.put("jieciSql",getJieciBytimejjsk(currTime)); + queryMap.put("currDate",currDate); + queryMap.put("userid",kcKetangbiao.getUserid()); + return Result.OK(kcKetangbiaoService.getTeacherjjsk(queryMap)); + } + + @ApiOperation(value="首页任教课程-正在上课", notes="首页任教课程-正在上课") + @GetMapping(value = "/getTeacherzzsk") + public Result>> getTeacherzzsk(KcKetangbiao kcKetangbiao){ + Date now = new Date(); + String currDate = DateUtil.format(now,"yyyy-MM-dd"); + String currTime = DateUtil.format(now,"HHmm"); + Map queryMap = Maps.newHashMap(); + queryMap.put("jieciSql",getJieciBytimezzsk(currTime)); + queryMap.put("currDate",currDate); + queryMap.put("userid",kcKetangbiao.getUserid()); + return Result.OK(kcKetangbiaoService.getTeacherzzsk(queryMap)); + } + @ApiOperation(value="首页任教课程-待上课程", notes="首页任教课程-待上课程") + @GetMapping(value = "/getTeacherdskc") + public Result>> getTeacherdskc(KcKetangbiao kcKetangbiao){ + Date now = new Date(); + String currDate = DateUtil.format(now,"yyyy-MM-dd"); + String currTime = DateUtil.format(now,"HH:mm"); + Map queryMap = Maps.newHashMap(); + queryMap.put("currDate",currDate); + queryMap.put("currTime",currTime); + queryMap.put("userid",kcKetangbiao.getUserid()); + return Result.OK(kcKetangbiaoService.getTeacherdskc(queryMap)); + } + @ApiOperation(value="首页任教课程-已上课程", notes="首页任教课程-已上课程") + @GetMapping(value = "/getTeacheryskc") + public Result>> getTeacheryskc(KcKetangbiao kcKetangbiao){ + Date now = new Date(); + String currDate = DateUtil.format(now,"yyyy-MM-dd"); + String currTime = DateUtil.format(now,"HH:mm"); + Map queryMap = Maps.newHashMap(); + queryMap.put("currDate",currDate); + queryMap.put("currTime",currTime); + queryMap.put("userid",kcKetangbiao.getUserid()); + return Result.OK(kcKetangbiaoService.getTeacheryskc(queryMap)); + } + @ApiOperation(value="首页任教课程-近6日课程表", notes="首页任教课程-近6日课程表") + @GetMapping(value = "/getTeacherjlrkcb") + public Result>> getTeacherjlrkcb(KcKetangbiao kcKetangbiao){ + Date now = new Date(); + String currDate = DateUtil.format(now,"yyyy-MM-dd"); + String currTime = DateUtil.format(now,"HHmm"); + + DateTime currDate7d = DateUtil.offset(now, DateField.DAY_OF_MONTH, 7); + + String currDate7 = DateUtil.format(currDate7d,"yyyy-MM-dd"); + + Map queryMap = Maps.newHashMap(); +// queryMap.put("jieciSql",getJieciBytimejjsk(currTime)); + queryMap.put("currDate",currDate); + queryMap.put("currDate7",currDate7); + queryMap.put("userid",kcKetangbiao.getUserid()); + + return Result.OK(kcKetangbiaoService.getTeacherjlrkcb(queryMap)); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java index 15e9ff15..b20acead 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/KcKetangbiaoMapper.java @@ -1,16 +1,14 @@ package org.jeecg.modules.kc.ktgl.mapper; -import java.util.List; -import java.util.Map; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.kc.ktgl.entity.KcKetangbiao; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import java.util.Map; /** * @Description: 课堂管理-子表 @@ -39,4 +37,14 @@ public interface KcKetangbiaoMapper extends BaseMapper { List> selectJrTkJrtkktsList(Page> page, @Param("skrq") String skrq); List> selectJrTkJrtktkrcList(Page> page, @Param("skrq") String skrq); + + List> getTeacherjjsk(Map queryMap); + + List> getTeacherzzsk(Map queryMap); + + List> getTeacherdskc(Map queryMap); + + List> getTeacheryskc(Map queryMap); + + List> getTeacherjlrkcb(Map queryMap); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml index a6caec23..f8b2d245 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/mapper/xml/KcKetangbiaoMapper.xml @@ -191,4 +191,325 @@ insert into kc_ketangbiao_his select *,#{ts} from kc_ketangbiao + + + + + + + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java index a962ce55..44801aa7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/IKcKetangbiaoService.java @@ -40,4 +40,14 @@ public interface IKcKetangbiaoService extends IService { IPage> selectJrTkJrtkktsList(Page> page,String skrq); IPage> selectJrTkJrtktkrcList(Page> page,String skrq); + + List> getTeacherjjsk(Map queryMap); + + List> getTeacherzzsk(Map queryMap); + + List> getTeacherdskc(Map queryMap); + + List> getTeacheryskc(Map queryMap); + + List> getTeacherjlrkcb(Map queryMap); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java index a6cbe413..7d8099f7 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/service/impl/KcKetangbiaoServiceImpl.java @@ -71,4 +71,29 @@ public class KcKetangbiaoServiceImpl extends ServiceImpl> selectJrTkJrtktkrcList(Page> page, String skrq) { return page.setRecords(baseMapper.selectJrTkJrtktkrcList(page, skrq)); } + + @Override + public List> getTeacherjjsk(Map queryMap) { + return baseMapper.getTeacherjjsk(queryMap); + } + + @Override + public List> getTeacherzzsk(Map queryMap) { + return baseMapper.getTeacherzzsk(queryMap); + } + + @Override + public List> getTeacherdskc(Map queryMap) { + return baseMapper.getTeacherdskc(queryMap); + } + + @Override + public List> getTeacheryskc(Map queryMap) { + return baseMapper.getTeacheryskc(queryMap); + } + + @Override + public List> getTeacherjlrkcb(Map queryMap) { + return baseMapper.getTeacherjlrkcb(queryMap); + } }