Commit 281fc482 authored by wujipeng's avatar wujipeng
Browse files

今天课程

parent cd112ea9
Pipeline #347 canceled with stages
package com.platform.business.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
* @Author: wujipeng
* @Description: TODO
* @Date: 2026/8/3 11:30
* @Version: 1.0
*/
@Data
@TableName("class_subject_attendance")
public class ClassSubjectAttendanceEntity {
@TableId(type = IdType.ASSIGN_ID)
private String id;
@TableField("subject_id")
private Integer subjectId;
@TableField("user_id")
private Integer userId;
@TableField("check_in_time")
@JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
private Date checkInTime;
}
...@@ -3,6 +3,7 @@ package com.platform.business.model.entity; ...@@ -3,6 +3,7 @@ package com.platform.business.model.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
...@@ -31,4 +32,7 @@ public class ClassSubjectEntity { ...@@ -31,4 +32,7 @@ public class ClassSubjectEntity {
private String teacherId; private String teacherId;
private String remark; private String remark;
@ApiModelProperty(value = "课程地点")
private String location;
} }
package com.platform.business.model.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* @Author: wujipeng
* @Description: TODO
* @Date: 2026/8/3 10:56
* @Version: 1.0
*/
@Data
@JsonInclude
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class CalendarVO {
@ApiModelProperty(value = "课程时段")
private String courseTimePeriod;
@ApiModelProperty(value = "课程类型")
private String courseType;
@ApiModelProperty(value = "课程id")
private Integer courseId;
@ApiModelProperty(value = "课程名称")
private String courseName;
@ApiModelProperty(value = "教师名称")
private String teacherName;
@ApiModelProperty(value = "课程地点")
private String location;
@ApiModelProperty(value = "是否签到")
private Boolean isSignIn;
@ApiModelProperty(value = "签到时间")
@JsonFormat(pattern = "HH:mm", timezone = "GMT+8")
private Date signInTime;
@ApiModelProperty(value = "数据")
private List<CalendarVO> data;
@ApiModelProperty(value = "课程时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date courseTime;
}
...@@ -21,13 +21,14 @@ public class ClassVO extends ClassEntity { ...@@ -21,13 +21,14 @@ public class ClassVO extends ClassEntity {
private List<ClassStudentVO> classStudentList; private List<ClassStudentVO> classStudentList;
private List<ClassSubjectVO> classSubjectList;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date date; private Date date;
private String dateRange; private String dateRange;
@ApiModelProperty(value = "日历考试列表") @ApiModelProperty(value = "课程列表")
private List<ClassSubjectVO> classSubjectList;
@ApiModelProperty(value = "考试列表")
private List<ExamStudentVO> examStudentList; private List<ExamStudentVO> examStudentList;
} }
package com.platform.business.controller; package com.platform.business.controller;
import com.platform.business.model.dto.ClassDTO; import com.platform.business.model.dto.ClassDTO;
import com.platform.business.model.vo.CalendarVO;
import com.platform.business.service.ClassService; import com.platform.business.service.ClassService;
import com.platform.controller.BaseController; import com.platform.controller.BaseController;
import com.platform.model.resp.Result; import com.platform.model.resp.Result;
...@@ -9,6 +10,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -9,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
@RestController @RestController
@RequestMapping("/class") @RequestMapping("/class")
...@@ -55,4 +57,10 @@ public class ClassController extends BaseController { ...@@ -55,4 +57,10 @@ public class ClassController extends BaseController {
public Result list() { public Result list() {
return Result.data(classService.list()); return Result.data(classService.list());
} }
@ApiOperation("今日课程")
@GetMapping("/today/course/{userId}")
public Result<List<CalendarVO>> todayCourse(@PathVariable String userId) {
return Result.data(classService.todayCourse(userId));
}
} }
...@@ -5,6 +5,7 @@ import com.platform.business.model.entity.ClassStudentEntity; ...@@ -5,6 +5,7 @@ import com.platform.business.model.entity.ClassStudentEntity;
import com.platform.business.model.vo.ClassStudentVO; import com.platform.business.model.vo.ClassStudentVO;
import com.platform.business.model.vo.HomeVO; import com.platform.business.model.vo.HomeVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -16,4 +17,6 @@ public interface ClassStudentMapper extends BaseMapper<ClassStudentEntity> { ...@@ -16,4 +17,6 @@ public interface ClassStudentMapper extends BaseMapper<ClassStudentEntity> {
List<HomeVO> todayCourse(); List<HomeVO> todayCourse();
List<Integer> queryClassIdByUserId(@Param("userId") String userId);
} }
package com.platform.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.platform.business.model.entity.ClassSubjectAttendanceEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* @Author: wujipeng
* @Description: TODO
* @Date: 2026/8/3 11:33
* @Version: 1.0
*/
@Mapper
public interface ClassSubjectAttendanceMapper extends BaseMapper<ClassSubjectAttendanceEntity> {
}
...@@ -3,8 +3,10 @@ package com.platform.business.mapper; ...@@ -3,8 +3,10 @@ package com.platform.business.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.platform.business.model.dto.ClassSubjectDTO; import com.platform.business.model.dto.ClassSubjectDTO;
import com.platform.business.model.entity.ClassSubjectEntity; import com.platform.business.model.entity.ClassSubjectEntity;
import com.platform.business.model.vo.CalendarVO;
import com.platform.business.model.vo.ClassSubjectVO; import com.platform.business.model.vo.ClassSubjectVO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -21,4 +23,6 @@ public interface ClassSubjectMapper extends BaseMapper<ClassSubjectEntity> { ...@@ -21,4 +23,6 @@ public interface ClassSubjectMapper extends BaseMapper<ClassSubjectEntity> {
List<ClassSubjectVO> queryByTeacherId(String id); List<ClassSubjectVO> queryByTeacherId(String id);
List<CalendarVO> todayCourse(@Param("classIds") List<Integer> classIds);
} }
...@@ -3,6 +3,7 @@ package com.platform.business.service; ...@@ -3,6 +3,7 @@ package com.platform.business.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.business.model.dto.ClassDTO; import com.platform.business.model.dto.ClassDTO;
import com.platform.business.model.entity.ClassEntity; import com.platform.business.model.entity.ClassEntity;
import com.platform.business.model.vo.CalendarVO;
import com.platform.business.model.vo.ClassVO; import com.platform.business.model.vo.ClassVO;
import java.util.List; import java.util.List;
...@@ -20,4 +21,6 @@ public interface ClassService extends IService<ClassEntity> { ...@@ -20,4 +21,6 @@ public interface ClassService extends IService<ClassEntity> {
Object scheduleTeacher(ClassDTO classDTO); Object scheduleTeacher(ClassDTO classDTO);
List<CalendarVO> todayCourse(String userId);
} }
...@@ -15,4 +15,7 @@ public interface ClassStudentService extends IService<ClassStudentEntity> { ...@@ -15,4 +15,7 @@ public interface ClassStudentService extends IService<ClassStudentEntity> {
List<HomeVO> selectTraineesNumber(); List<HomeVO> selectTraineesNumber();
List<HomeVO> todayCourse(); List<HomeVO> todayCourse();
List<Integer> queryClassIdByUserId(String userId);
} }
package com.platform.business.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.business.model.entity.ClassSubjectAttendanceEntity;
/**
* @Author: wujipeng
* @Description: TODO
* @Date: 2026/8/3 11:34
* @Version: 1.0
*/
public interface ClassSubjectAttendanceService extends IService<ClassSubjectAttendanceEntity> {
}
...@@ -3,6 +3,7 @@ package com.platform.business.service; ...@@ -3,6 +3,7 @@ package com.platform.business.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.platform.business.model.dto.ClassSubjectDTO; import com.platform.business.model.dto.ClassSubjectDTO;
import com.platform.business.model.entity.ClassSubjectEntity; import com.platform.business.model.entity.ClassSubjectEntity;
import com.platform.business.model.vo.CalendarVO;
import com.platform.business.model.vo.ClassSubjectVO; import com.platform.business.model.vo.ClassSubjectVO;
import com.platform.business.model.vo.ClassVO; import com.platform.business.model.vo.ClassVO;
import com.platform.business.model.vo.SysTeacherCountVO; import com.platform.business.model.vo.SysTeacherCountVO;
...@@ -26,4 +27,7 @@ public interface ClassSubjectService extends IService<ClassSubjectEntity> { ...@@ -26,4 +27,7 @@ public interface ClassSubjectService extends IService<ClassSubjectEntity> {
SysTeacherCountVO queryByTeacherUserName(String userName); SysTeacherCountVO queryByTeacherUserName(String userName);
List<ClassSubjectVO> queryOneself(String userId); List<ClassSubjectVO> queryOneself(String userId);
List<CalendarVO> todayCourse(List<Integer> classIds);
} }
package com.platform.business.service.impl; package com.platform.business.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.platform.business.mapper.ClassMapper; import com.platform.business.mapper.ClassMapper;
import com.platform.business.model.dto.ClassDTO; import com.platform.business.model.dto.ClassDTO;
import com.platform.business.model.entity.ClassEntity; import com.platform.business.model.entity.ClassEntity;
import com.platform.business.model.entity.ClassStudentEntity; import com.platform.business.model.entity.ClassStudentEntity;
import com.platform.business.model.entity.ClassSubjectAttendanceEntity;
import com.platform.business.model.entity.SysLevelEntity; import com.platform.business.model.entity.SysLevelEntity;
import com.platform.business.model.vo.ClassStudentVO; import com.platform.business.model.vo.*;
import com.platform.business.model.vo.ClassSubjectVO;
import com.platform.business.model.vo.ClassVO;
import com.platform.business.model.vo.ExamStudentVO;
import com.platform.business.service.*; import com.platform.business.service.*;
import com.platform.exception.BusinessException; import com.platform.exception.BusinessException;
import com.platform.utils.DozerUtils; import com.platform.utils.DozerUtils;
...@@ -20,10 +19,7 @@ import org.springframework.util.ObjectUtils; ...@@ -20,10 +19,7 @@ import org.springframework.util.ObjectUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
@Service @Service
public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> implements ClassService { public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> implements ClassService {
...@@ -36,6 +32,8 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl ...@@ -36,6 +32,8 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
private SysLevelService sysLevelService; private SysLevelService sysLevelService;
@Resource @Resource
private ExamStudentService examStudentService; private ExamStudentService examStudentService;
@Resource
private ClassSubjectAttendanceService classSubjectAttendanceService;
@Override @Override
public List<ClassVO> queryList(ClassDTO classDTO) { public List<ClassVO> queryList(ClassDTO classDTO) {
...@@ -86,7 +84,6 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl ...@@ -86,7 +84,6 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
public Object schedule(ClassDTO classDTO) { public Object schedule(ClassDTO classDTO) {
//查询考试信息 //查询考试信息
List<ExamStudentVO> examStudentList = examStudentService.queryOneself(classDTO.getUserId()); List<ExamStudentVO> examStudentList = examStudentService.queryOneself(classDTO.getUserId());
//TODO 加上权限
List<ClassSubjectVO> classSubjectList = classSubjectService.queryOneself(classDTO.getUserId()); List<ClassSubjectVO> classSubjectList = classSubjectService.queryOneself(classDTO.getUserId());
List<ClassVO> result = Lists.newArrayList(); List<ClassVO> result = Lists.newArrayList();
List<Date> dateList = getDatesBetweenTwoDate(classDTO.getStartDate(), classDTO.getEndDate()); List<Date> dateList = getDatesBetweenTwoDate(classDTO.getStartDate(), classDTO.getEndDate());
...@@ -142,6 +139,31 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl ...@@ -142,6 +139,31 @@ public class ClassServiceImpl extends ServiceImpl<ClassMapper, ClassEntity> impl
return result; return result;
} }
@Override
public List<CalendarVO> todayCourse(String userId) {
//获取学生的班级id
List<Integer> classIds = classStudentService.queryClassIdByUserId(userId);
//获取今日课程数据
List<CalendarVO> result = classSubjectService.todayCourse(classIds);
//获取签到数据
List<ClassSubjectAttendanceEntity> classSubjectAttendanceList = classSubjectAttendanceService.list(
new LambdaQueryWrapper<ClassSubjectAttendanceEntity>().eq(ClassSubjectAttendanceEntity::getUserId, userId)
);
HashMap<Integer, Date> classSubjectAttendanceMap = new HashMap<>();
for (ClassSubjectAttendanceEntity classSubjectAttendanceEntity : classSubjectAttendanceList) {
classSubjectAttendanceMap.put(classSubjectAttendanceEntity.getSubjectId(), classSubjectAttendanceEntity.getCheckInTime());
}
for (CalendarVO calendarVO : result) {
if(classSubjectAttendanceMap.containsKey(calendarVO.getCourseId())){
calendarVO.setSignInTime(classSubjectAttendanceMap.get(calendarVO.getCourseId()));
calendarVO.setIsSignIn(true);
} else {
calendarVO.setIsSignIn(false);
}
}
return result;
}
/** /**
* 方法2: 使用SimpleDateFormat格式化比较 * 方法2: 使用SimpleDateFormat格式化比较
* 将日期格式化为"yyyyMMdd"后比较字符串 * 将日期格式化为"yyyyMMdd"后比较字符串
......
...@@ -33,4 +33,9 @@ public class ClassStudentServiceImpl extends ServiceImpl<ClassStudentMapper, Cla ...@@ -33,4 +33,9 @@ public class ClassStudentServiceImpl extends ServiceImpl<ClassStudentMapper, Cla
public List<HomeVO> todayCourse() { public List<HomeVO> todayCourse() {
return baseMapper.todayCourse(); return baseMapper.todayCourse();
} }
@Override
public List<Integer> queryClassIdByUserId(String userId) {
return baseMapper.queryClassIdByUserId(userId);
}
} }
package com.platform.business.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.platform.business.mapper.ClassSubjectAttendanceMapper;
import com.platform.business.model.entity.ClassSubjectAttendanceEntity;
import com.platform.business.service.ClassSubjectAttendanceService;
import org.springframework.stereotype.Service;
/**
* @Author: wujipeng
* @Description: TODO
* @Date: 2026/8/3 11:34
* @Version: 1.0
*/
@Service
public class ClassSubjectAttendanceServiceImpl extends ServiceImpl<ClassSubjectAttendanceMapper, ClassSubjectAttendanceEntity> implements ClassSubjectAttendanceService {
}
...@@ -260,5 +260,8 @@ public class ClassSubjectServiceImpl extends ServiceImpl<ClassSubjectMapper, Cla ...@@ -260,5 +260,8 @@ public class ClassSubjectServiceImpl extends ServiceImpl<ClassSubjectMapper, Cla
.build(); .build();
} }
@Override
public List<CalendarVO> todayCourse(List<Integer> classIds) {
return baseMapper.todayCourse(classIds);
}
} }
...@@ -42,4 +42,12 @@ ...@@ -42,4 +42,12 @@
date = current_date date = current_date
</select> </select>
<select id="queryClassIdByUserId" resultType="java.lang.Integer">
select
class_id
from
class_student
where
user_id = #{userId}
</select>
</mapper> </mapper>
...@@ -80,4 +80,25 @@ ...@@ -80,4 +80,25 @@
left join class left join class
on class_subject.class_id = class.id on class_subject.class_id = class.id
</select> </select>
<select id="todayCourse" resultType="com.platform.business.model.vo.CalendarVO">
select
time_frame as courseTimePeriod,
type as courseType,
cs.id as courseId,
subject_name as courseName,
u.nick_name as teacherName,
location,
date as courseTime
from
class_subject cs
left join
user u
on
cs.teacher_id = u.id
where
cs.class_id in
<foreach item="item" index="index" collection="classIds" open="(" separator="," close=")">
#{item}
</foreach>
</select>
</mapper> </mapper>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment