From b7ceba6090dc778f5259674830bcc25409a580d3 Mon Sep 17 00:00:00 2001 From: wgf <121463602@qq.com> Date: Thu, 27 Jul 2023 14:59:43 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AD=A6=E6=A0=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF-=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=92=E8=AF=BE?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TeacherOpenCourseScheduleSessionTag.java | 18 ++++++ ...erOpenCourseScheduleSessionTagService.java | 59 ++++++++++++++++++- ...penCourseScheduleSessionTagController.java | 17 ++++++ ...cherOpenCourseScheduleSessionTagQuery.java | 12 ++++ 4 files changed, 103 insertions(+), 3 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java index e43080b5..29cb83a1 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseScheduleSessionTag.java @@ -50,6 +50,9 @@ public class TeacherOpenCourseScheduleSessionTag extends BaseEntity{ //用户ID private Long userId ; + + //默认模板 + private Integer defaultTemplate; public TeacherOpenCourseScheduleSessionTag(){ } @@ -158,4 +161,19 @@ public class TeacherOpenCourseScheduleSessionTag extends BaseEntity{ this.userId = userId; } + /** + * 默认模板 + * @return + */ + public Integer getDefaultTemplate() { + return defaultTemplate; + } + + /** + * 默认模板 + * @param defaultTemplate + */ + public void setDefaultTemplate(Integer defaultTemplate) { + this.defaultTemplate = defaultTemplate; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java index 9289f15e..ae86219d 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java @@ -1,8 +1,12 @@ package com.ibeetl.jlw.service; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.web.JsonResult; @@ -19,9 +23,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.validation.constraints.NotNull; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** @@ -42,6 +45,56 @@ public class TeacherOpenCourseScheduleSessionTagService extends CoreBaseService< return ret; } + /** + * 课次设置查询-添加默认课程 + * @param query + * @return + */ + public PageQueryqueryByConditionNew(PageQuery query, CoreUser coreUser){ + Map map = new LinkedHashMap<>(); + map.put("第一节",new String[]{"08:00","08:50"}); + map.put("第二节",new String[]{"09:00","09:50"}); + map.put("第三节",new String[]{"10:10","11:00"}); + map.put("第四节",new String[]{"11:10","12:00"}); + map.put("第五节",new String[]{"14:30","15:20"}); + map.put("第六节",new String[]{"15:30","16:20"}); + map.put("第七节",new String[]{"16:40","17:30"}); + map.put("第八节",new String[]{"17:40","18:30"}); + map.put("第九节",new String[]{"19:30","20:20"}); + map.put("第十节",new String[]{"20:30","21:20"}); + + for (Map.Entry entry :map.entrySet()){ + TeacherOpenCourseScheduleSessionTagQuery scheduleSessionTag = new TeacherOpenCourseScheduleSessionTagQuery(); + scheduleSessionTag.setTeacherOpenCourseScheduleSessionTagName(entry.getKey()); + scheduleSessionTag.setDefaultTemplate(1); + scheduleSessionTag.setOrgId(coreUser.getOrgId()); + scheduleSessionTag.setUserId(coreUser.getId()); + List valuesByQuery = teacherOpenCourseScheduleSessionTagDao.getValuesByQuery(scheduleSessionTag); + + if (CollectionUtil.isEmpty(valuesByQuery)){ + TeacherOpenCourseScheduleSessionTag tagQuery = new TeacherOpenCourseScheduleSessionTag(); + tagQuery.setTeacherOpenCourseScheduleSessionTagName(entry.getKey()); + tagQuery.setTeacherOpenCourseScheduleSessionTagEndTime(entry.getValue()[1]); + tagQuery.setTeacherOpenCourseScheduleSessionTagStartTime(entry.getValue()[0]); + tagQuery.setTeacherOpenCourseScheduleSessionTagAddTime(new Date()); + tagQuery.setOrgId(coreUser.getOrgId()); + tagQuery.setUserId(coreUser.getId()); + tagQuery.setDefaultTemplate(0); + Long betweenMinute = DateUtil.between(DateUtil.parse(entry.getValue()[0], "HH:mm"), DateUtil.parse(entry.getValue()[1], "HH:mm"), DateUnit.MINUTE, true); + // 时长（分钟） + tagQuery.setTeacherOpenCourseScheduleSessionTagDuration(betweenMinute.intValue()); + teacherOpenCourseScheduleSessionTagDao.insertTemplate(tagQuery); + } + } + + PageQuery ret = teacherOpenCourseScheduleSessionTagDao.queryByCondition(query); + + List list = (List) ret.getList().stream().sorted(Comparator.comparing(TeacherOpenCourseScheduleSessionTag::getDefaultTemplate)).collect(Collectors.toList()); + ret.setList(list); + queryListAfter(ret.getList()); + return ret; + } + public PageQueryqueryByConditionQuery(PageQuery query){ PageQuery ret = teacherOpenCourseScheduleSessionTagDao.queryByConditionQuery(query); queryListAfter(ret.getList()); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java index a75a10c1..b9586f0d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionTagController.java @@ -158,6 +158,23 @@ public class TeacherOpenCourseScheduleSessionTagController{ return JsonResult.success(page); } + /** + * 课次设置查询-添加默认课程 + * @param condition + * @param coreUser + * @return + */ + @PostMapping(MODEL + "/listNew.json") + @ResponseBody + public JsonResult queryByConditionNew(TeacherOpenCourseScheduleSessionTagQuery condition, @SCoreUser CoreUser coreUser){ + + condition.setOrgId(coreUser.getOrgId()); + condition.setUserId(coreUser.getId()); + PageQuery page = condition.getPageQuery(); + teacherOpenCourseScheduleSessionTagService.queryByConditionNew(page,coreUser); + return JsonResult.success(page); + } + @PostMapping(MODEL + "/addAll.json") @Function("teacherOpenCourseScheduleSessionTag.add") @ResponseBody diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionTagQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionTagQuery.java index b55d497b..64653e4d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionTagQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseScheduleSessionTagQuery.java @@ -32,6 +32,9 @@ public class TeacherOpenCourseScheduleSessionTagQuery extends PageParam { @Query(name = "用户ID", display = false) private Long userId; + @Query(name = "默认模板", display = false) + private Integer defaultTemplate; + private String teacherOpenCourseScheduleSessionTagIdPlural; private String orgIdPlural; private String userIdPlural; @@ -101,6 +104,7 @@ public class TeacherOpenCourseScheduleSessionTagQuery extends PageParam { pojo.setTeacherOpenCourseScheduleSessionTagAddTime(this.getTeacherOpenCourseScheduleSessionTagAddTime()); pojo.setTeacherOpenCourseScheduleSessionTagStartTime(this.getTeacherOpenCourseScheduleSessionTagStartTime()); pojo.setTeacherOpenCourseScheduleSessionTagEndTime(this.getTeacherOpenCourseScheduleSessionTagEndTime()); + pojo.setDefaultTemplate(this.getDefaultTemplate()); pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); return pojo; @@ -136,4 +140,12 @@ public class TeacherOpenCourseScheduleSessionTagQuery extends PageParam { public void set_given(String _given) { this._given = _given; } + + public Integer getDefaultTemplate() { + return defaultTemplate; + } + + public void setDefaultTemplate(Integer defaultTemplate) { + this.defaultTemplate = defaultTemplate; + } }