From 6aca4d6e20b3106ef073ba035f59ee853405620c Mon Sep 17 00:00:00 2001 From: xuao Date: Sat, 10 Jan 2026 21:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=AF=BE=E6=A8=A1=E5=9D=97=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- course/pom.xml | 1 - .../com/ruoyi/course/common/GradeHelper.java | 0 .../java}/com/ruoyi/course/common/R.java | 0 .../course/common/TeacherScheduleItem.java | 0 .../common/TeacherTimetableResponse.java | 0 .../ruoyi/course/config/OpenApiConfig.java | 0 .../controller/ClassScheduleController.java | 0 .../controller/ClassroomController.java | 0 .../course/controller/ClazzController.java | 0 .../course/controller/CourseController.java | 2 +- .../controller/ElectiveClassController.java | 0 .../ElectiveSelectionController.java | 0 .../course/controller/ScheduleController.java | 0 .../controller/ScheduleItemController.java | 0 .../course/controller/StudentController.java | 65 +++++++++---------- .../controller/StudentScheduleController.java | 0 .../course/controller/TeacherController.java | 35 +++++++++- .../controller/TeacherCourseController.java | 0 .../course/controller/TimeSlotController.java | 0 .../ruoyi/course/domain/ClassSchedule.java | 0 .../com/ruoyi/course/domain/Classroom.java | 0 .../java}/com/ruoyi/course/domain/Clazz.java | 0 .../java}/com/ruoyi/course/domain/Course.java | 0 .../ruoyi/course/domain/CourseAssignment.java | 0 .../ruoyi/course/domain/ElectiveClass.java | 0 .../course/domain/ElectiveSelection.java | 0 .../com/ruoyi/course/domain/ScheduleItem.java | 0 .../com/ruoyi/course/domain/Student.java | 0 .../ruoyi/course/domain/StudentSchedule.java | 0 .../com/ruoyi/course/domain/Teacher.java | 0 .../ruoyi/course/domain/TeacherCourse.java | 0 .../domain/TeacherCourseAssignment.java | 0 .../com/ruoyi/course/domain/TimeSlot.java | 0 .../domain/dto/ClassroomAssignmentDTO.java | 0 .../course/domain/dto/PaikeRequestDTO.java | 0 .../course/domain/dto/PaikeResultDTO.java | 0 .../course/domain/dto/ScheduleRequest.java | 0 .../course/domain/dto/ScheduleResult.java | 0 .../course/domain/dto/ScheduleTaskDTO.java | 0 .../course/domain/dto/ScheduleTimeDTO.java | 0 .../course/domain/dto/SpecialRulesDTO.java | 0 .../course/domain/dto/StudentScheduleDTO.java | 0 .../ruoyi/course/domain/vo/ClassQueryVO.java | 0 .../course/domain/vo/ClassScheduleVO.java | 0 .../course/domain/vo/ClassroomQueryVO.java | 0 .../ruoyi/course/domain/vo/CourseInfoVO.java | 0 .../ruoyi/course/domain/vo/CourseQueryVO.java | 0 .../course/domain/vo/ElectiveClassVO.java | 0 .../course/domain/vo/ScheduleDetailVO.java | 0 .../course/domain/vo/StudentQueryVO.java | 0 .../course/domain/vo/StudentScheduleVO.java | 0 .../course/domain/vo/TeacherQueryVO.java | 0 .../course/domain/vo/TeacherScheduleVO.java | 0 .../com/ruoyi/course/enums/GradeEnum.java | 0 .../course/mapper/ClassScheduleMapper.java | 0 .../ruoyi/course/mapper/ClassroomMapper.java | 0 .../com/ruoyi/course/mapper/ClazzMapper.java | 0 .../course/mapper/CourseAssignmentMapper.java | 0 .../com/ruoyi/course/mapper/CourseMapper.java | 0 .../course/mapper/ElectiveClassMapper.java | 0 .../mapper/ElectiveSelectionMapper.java | 0 .../course/mapper/ScheduleItemMapper.java | 0 .../ruoyi/course/mapper/StudentMapper.java | 0 .../course/mapper/StudentScheduleMapper.java | 0 .../mapper/TeacherCourseAssignmentMapper.java | 0 .../course/mapper/TeacherCourseMapper.java | 0 .../ruoyi/course/mapper/TeacherMapper.java | 0 .../ruoyi/course/mapper/TimeSlotMapper.java | 0 .../course/service/IClassScheduleService.java | 0 .../course/service/IClassroomService.java | 0 .../ruoyi/course/service/IClazzService.java | 0 .../service/ICourseAssignmentService.java | 0 .../ruoyi/course/service/ICourseService.java | 0 .../course/service/IElectiveClassService.java | 0 .../service/IElectiveSelectionService.java | 0 .../course/service/IScheduleItemService.java | 0 .../service/IStudentScheduleService.java | 0 .../ruoyi/course/service/IStudentService.java | 0 .../ITeacherCourseAssignmentService.java | 0 .../course/service/ITeacherCourseService.java | 0 .../ruoyi/course/service/ITeacherService.java | 0 .../course/service/ITimeSlotService.java | 0 .../impl/ClassScheduleServiceImpl.java | 0 .../service/impl/ClassroomServiceImpl.java | 0 .../course/service/impl/ClazzServiceImpl.java | 0 .../impl/CourseAssignmentServiceImpl.java | 0 .../course/service/impl/CourseScheduler.java | 0 .../service/impl/CourseServiceImpl.java | 0 .../impl/ElectiveClassServiceImpl.java | 0 .../impl/ElectiveSelectionServiceImpl.java | 0 .../service/impl/ScheduleItemServiceImpl.java | 0 .../impl/StudentScheduleServiceImpl.java | 0 .../service/impl/StudentServiceImpl.java | 0 .../TeacherCourseAssignmentServiceImpl.java | 0 .../impl/TeacherCourseServiceImpl.java | 0 .../service/impl/TeacherScheduleService.java | 0 .../service/impl/TeacherServiceImpl.java | 0 .../service/impl/TimeSlotServiceImpl.java | 0 .../course/service/impl/TimeTableManager.java | 0 .../com/ruoyi/course/util/GradeConverter.java | 0 .../com/ruoyi/course/util/RyPageAdapter.java | 0 .../com/ruoyi/course/util/ScheduleUtil.java | 0 .../java}/com/ruoyi/course/util/TimeUtil.java | 0 .../resources/mapper/ClassScheduleMapper.xml | 0 .../resources/mapper/ClazzMapper.xml} | 0 .../mapper/CourseAssignmentMapper.xml | 0 .../resources/mapper/CourseMapper.xml | 0 .../resources/mapper/ElectiveClassMapper.xml | 0 .../mapper/ElectiveSelectionMapper.xml | 0 .../resources/mapper/ScheduleItemMapper.xml | 0 .../resources/mapper/StudentMapper.xml | 0 .../mapper/StudentScheduleMapper.xml | 0 .../mapper/TeacherCourseAssignmentMapper.xml | 0 .../resources/mapper/TeacherCourseMapper.xml | 0 .../resources/mapper/TeacherMapper.xml | 0 .../resources/mapper/TimeSlotMapper.xml | 0 .../main/resources/mapper/ClassroomMapper.xml | 21 ------ ruoyi-admin/pom.xml | 3 + .../main/java/com/ruoyi/RuoYiApplication.java | 1 - .../src/main/resources/application-test.yml | 61 +++++++++++++++++ .../src/main/resources/application.yml | 14 ++-- ruoyi-admin/src/main/resources/logback.xml | 2 +- .../main/resources/mybatis/mybatis-config.xml | 6 +- ruoyi-ui/vue.config.js | 2 +- 124 files changed, 142 insertions(+), 71 deletions(-) rename course/src/{ => main/java}/com/ruoyi/course/common/GradeHelper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/common/R.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/common/TeacherScheduleItem.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/common/TeacherTimetableResponse.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/config/OpenApiConfig.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/ClassScheduleController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/ClassroomController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/ClazzController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/CourseController.java (99%) rename course/src/{ => main/java}/com/ruoyi/course/controller/ElectiveClassController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/ElectiveSelectionController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/ScheduleController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/ScheduleItemController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/StudentController.java (85%) rename course/src/{ => main/java}/com/ruoyi/course/controller/StudentScheduleController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/TeacherController.java (89%) rename course/src/{ => main/java}/com/ruoyi/course/controller/TeacherCourseController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/controller/TimeSlotController.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/ClassSchedule.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/Classroom.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/Clazz.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/Course.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/CourseAssignment.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/ElectiveClass.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/ElectiveSelection.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/ScheduleItem.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/Student.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/StudentSchedule.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/Teacher.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/TeacherCourse.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/TeacherCourseAssignment.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/TimeSlot.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/dto/ClassroomAssignmentDTO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/dto/PaikeRequestDTO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/dto/PaikeResultDTO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/dto/ScheduleRequest.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/dto/ScheduleResult.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/dto/ScheduleTaskDTO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/dto/ScheduleTimeDTO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/dto/SpecialRulesDTO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/dto/StudentScheduleDTO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/ClassQueryVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/ClassScheduleVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/ClassroomQueryVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/CourseInfoVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/CourseQueryVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/ElectiveClassVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/ScheduleDetailVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/StudentQueryVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/StudentScheduleVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/TeacherQueryVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/domain/vo/TeacherScheduleVO.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/enums/GradeEnum.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/ClassScheduleMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/ClassroomMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/ClazzMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/CourseAssignmentMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/CourseMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/ElectiveClassMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/ElectiveSelectionMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/ScheduleItemMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/StudentMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/StudentScheduleMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/TeacherCourseAssignmentMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/TeacherCourseMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/TeacherMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/mapper/TimeSlotMapper.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/IClassScheduleService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/IClassroomService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/IClazzService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/ICourseAssignmentService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/ICourseService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/IElectiveClassService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/IElectiveSelectionService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/IScheduleItemService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/IStudentScheduleService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/IStudentService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/ITeacherCourseAssignmentService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/ITeacherCourseService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/ITeacherService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/ITimeSlotService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/ClassScheduleServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/ClassroomServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/ClazzServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/CourseAssignmentServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/CourseScheduler.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/CourseServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/ElectiveClassServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/ElectiveSelectionServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/ScheduleItemServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/StudentScheduleServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/StudentServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/TeacherCourseAssignmentServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/TeacherCourseServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/TeacherScheduleService.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/TeacherServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/TimeSlotServiceImpl.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/service/impl/TimeTableManager.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/util/GradeConverter.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/util/RyPageAdapter.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/util/ScheduleUtil.java (100%) rename course/src/{ => main/java}/com/ruoyi/course/util/TimeUtil.java (100%) rename course/src/main/{ => java}/resources/mapper/ClassScheduleMapper.xml (100%) rename course/src/main/{resources/mapper/ClassMapper.xml => java/resources/mapper/ClazzMapper.xml} (100%) rename course/src/main/{ => java}/resources/mapper/CourseAssignmentMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/CourseMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/ElectiveClassMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/ElectiveSelectionMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/ScheduleItemMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/StudentMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/StudentScheduleMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/TeacherCourseAssignmentMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/TeacherCourseMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/TeacherMapper.xml (100%) rename course/src/main/{ => java}/resources/mapper/TimeSlotMapper.xml (100%) delete mode 100644 course/src/main/resources/mapper/ClassroomMapper.xml create mode 100644 ruoyi-admin/src/main/resources/application-test.yml diff --git a/course/pom.xml b/course/pom.xml index ecaf45b3..fca5e642 100644 --- a/course/pom.xml +++ b/course/pom.xml @@ -61,5 +61,4 @@ - \ No newline at end of file diff --git a/course/src/com/ruoyi/course/common/GradeHelper.java b/course/src/main/java/com/ruoyi/course/common/GradeHelper.java similarity index 100% rename from course/src/com/ruoyi/course/common/GradeHelper.java rename to course/src/main/java/com/ruoyi/course/common/GradeHelper.java diff --git a/course/src/com/ruoyi/course/common/R.java b/course/src/main/java/com/ruoyi/course/common/R.java similarity index 100% rename from course/src/com/ruoyi/course/common/R.java rename to course/src/main/java/com/ruoyi/course/common/R.java diff --git a/course/src/com/ruoyi/course/common/TeacherScheduleItem.java b/course/src/main/java/com/ruoyi/course/common/TeacherScheduleItem.java similarity index 100% rename from course/src/com/ruoyi/course/common/TeacherScheduleItem.java rename to course/src/main/java/com/ruoyi/course/common/TeacherScheduleItem.java diff --git a/course/src/com/ruoyi/course/common/TeacherTimetableResponse.java b/course/src/main/java/com/ruoyi/course/common/TeacherTimetableResponse.java similarity index 100% rename from course/src/com/ruoyi/course/common/TeacherTimetableResponse.java rename to course/src/main/java/com/ruoyi/course/common/TeacherTimetableResponse.java diff --git a/course/src/com/ruoyi/course/config/OpenApiConfig.java b/course/src/main/java/com/ruoyi/course/config/OpenApiConfig.java similarity index 100% rename from course/src/com/ruoyi/course/config/OpenApiConfig.java rename to course/src/main/java/com/ruoyi/course/config/OpenApiConfig.java diff --git a/course/src/com/ruoyi/course/controller/ClassScheduleController.java b/course/src/main/java/com/ruoyi/course/controller/ClassScheduleController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/ClassScheduleController.java rename to course/src/main/java/com/ruoyi/course/controller/ClassScheduleController.java diff --git a/course/src/com/ruoyi/course/controller/ClassroomController.java b/course/src/main/java/com/ruoyi/course/controller/ClassroomController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/ClassroomController.java rename to course/src/main/java/com/ruoyi/course/controller/ClassroomController.java diff --git a/course/src/com/ruoyi/course/controller/ClazzController.java b/course/src/main/java/com/ruoyi/course/controller/ClazzController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/ClazzController.java rename to course/src/main/java/com/ruoyi/course/controller/ClazzController.java diff --git a/course/src/com/ruoyi/course/controller/CourseController.java b/course/src/main/java/com/ruoyi/course/controller/CourseController.java similarity index 99% rename from course/src/com/ruoyi/course/controller/CourseController.java rename to course/src/main/java/com/ruoyi/course/controller/CourseController.java index f7a8f70a..a6c02d90 100644 --- a/course/src/com/ruoyi/course/controller/CourseController.java +++ b/course/src/main/java/com/ruoyi/course/controller/CourseController.java @@ -83,7 +83,7 @@ public class CourseController extends BaseController { @ApiOperation("查询所有课程") @GetMapping("/list") - public TableDataInfo listTeachers() { + public TableDataInfo listCourse(Course course) { startPage(); List list = courseService.list(); return getDataTable(list); diff --git a/course/src/com/ruoyi/course/controller/ElectiveClassController.java b/course/src/main/java/com/ruoyi/course/controller/ElectiveClassController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/ElectiveClassController.java rename to course/src/main/java/com/ruoyi/course/controller/ElectiveClassController.java diff --git a/course/src/com/ruoyi/course/controller/ElectiveSelectionController.java b/course/src/main/java/com/ruoyi/course/controller/ElectiveSelectionController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/ElectiveSelectionController.java rename to course/src/main/java/com/ruoyi/course/controller/ElectiveSelectionController.java diff --git a/course/src/com/ruoyi/course/controller/ScheduleController.java b/course/src/main/java/com/ruoyi/course/controller/ScheduleController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/ScheduleController.java rename to course/src/main/java/com/ruoyi/course/controller/ScheduleController.java diff --git a/course/src/com/ruoyi/course/controller/ScheduleItemController.java b/course/src/main/java/com/ruoyi/course/controller/ScheduleItemController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/ScheduleItemController.java rename to course/src/main/java/com/ruoyi/course/controller/ScheduleItemController.java diff --git a/course/src/com/ruoyi/course/controller/StudentController.java b/course/src/main/java/com/ruoyi/course/controller/StudentController.java similarity index 85% rename from course/src/com/ruoyi/course/controller/StudentController.java rename to course/src/main/java/com/ruoyi/course/controller/StudentController.java index a5f5ae2b..49a57ce8 100644 --- a/course/src/com/ruoyi/course/controller/StudentController.java +++ b/course/src/main/java/com/ruoyi/course/controller/StudentController.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.course.common.R; import com.ruoyi.course.domain.Student; import com.ruoyi.course.domain.vo.StudentQueryVO; @@ -16,10 +15,7 @@ import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; import java.time.LocalDateTime; import java.util.List; @@ -92,39 +88,36 @@ public class StudentController extends BaseController { @GetMapping("/list") public TableDataInfo listStudents(Student student) { - // 1. 从请求获取分页参数 - HttpServletRequest request = ((ServletRequestAttributes) - RequestContextHolder.getRequestAttributes()).getRequest(); - Integer pageNum = ServletUtils.getParameterToInt("pageNum", 1); - Integer pageSize = ServletUtils.getParameterToInt("pageSize", 10); - startPage(); - // 创建查询条件 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - - // 添加查询条件（非空判断） - if (StringUtils.hasText(student.getStudentNo())) { - wrapper.like(Student::getStudentNo, student.getStudentNo()); - } - - if (StringUtils.hasText(student.getName())) { - wrapper.like(Student::getName, student.getName()); - } - - if (student.getClassId() != null) { - wrapper.eq(Student::getClassId, student.getClassId()); - } - - if (StringUtils.hasText(String.valueOf(student.getGrade()))) { - wrapper.eq(Student::getGrade, student.getGrade()); - } - - if (student.getStatus() != null) { - wrapper.eq(Student::getStatus, student.getStatus()); - } - // 按创建时间倒序 - wrapper.orderByDesc(Student::getCreateTime); - List list = studentService.list(wrapper); + startPage(); +// // 创建查询条件 +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// +// // 添加查询条件（非空判断） +// if (StringUtils.hasText(student.getStudentNo())) { +// wrapper.like(Student::getStudentNo, student.getStudentNo()); +// } +// +// if (StringUtils.hasText(student.getName())) { +// wrapper.like(Student::getName, student.getName()); +// } +// +// if (student.getClassId() != null) { +// wrapper.eq(Student::getClassId, student.getClassId()); +// } +// +// if (StringUtils.hasText(String.valueOf(student.getGrade()))) { +// wrapper.eq(Student::getGrade, student.getGrade()); +// } +// +// if (student.getStatus() != null) { +// wrapper.eq(Student::getStatus, student.getStatus()); +// } +// +// // 按创建时间倒序 +// wrapper.orderByDesc(Student::getCreateTime); +// List list = studentService.list(wrapper); + List list = studentService.list(); return getDataTable(list); } diff --git a/course/src/com/ruoyi/course/controller/StudentScheduleController.java b/course/src/main/java/com/ruoyi/course/controller/StudentScheduleController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/StudentScheduleController.java rename to course/src/main/java/com/ruoyi/course/controller/StudentScheduleController.java diff --git a/course/src/com/ruoyi/course/controller/TeacherController.java b/course/src/main/java/com/ruoyi/course/controller/TeacherController.java similarity index 89% rename from course/src/com/ruoyi/course/controller/TeacherController.java rename to course/src/main/java/com/ruoyi/course/controller/TeacherController.java index 729bf368..fd57b238 100644 --- a/course/src/com/ruoyi/course/controller/TeacherController.java +++ b/course/src/main/java/com/ruoyi/course/controller/TeacherController.java @@ -118,9 +118,40 @@ public class TeacherController extends BaseController { @ApiResponse(responseCode = "200", description = "查询成功") }) @GetMapping("/list") - public TableDataInfo listTeachers() { + public TableDataInfo listTeachers(Teacher teacher) { startPage(); - List list = teacherService.list(); + + // 创建查询条件 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + + // 添加查询条件（非空判断） + if (StringUtils.hasText(teacher.getTeacherNo())) { + wrapper.like(Teacher::getTeacherNo, teacher.getTeacherNo()); + } + + if (StringUtils.hasText(teacher.getTeacherName())) { + wrapper.like(Teacher::getTeacherName, teacher.getTeacherName()); + } + + if (StringUtils.hasText(teacher.getTeacherType())) { + wrapper.eq(Teacher::getTeacherType, teacher.getTeacherType()); + } + + if (StringUtils.hasText(teacher.getSubject())) { + wrapper.eq(Teacher::getSubject, teacher.getSubject()); + } + + if (StringUtils.hasText(teacher.getTitle())) { + wrapper.eq(Teacher::getTitle, teacher.getTitle()); + } + + if (teacher.getStatus() != null) { + wrapper.eq(Teacher::getStatus, teacher.getStatus()); + } + + // 按创建时间倒序 + wrapper.orderByDesc(Teacher::getCreateTime); + List list = teacherService.list(wrapper); return getDataTable(list); } diff --git a/course/src/com/ruoyi/course/controller/TeacherCourseController.java b/course/src/main/java/com/ruoyi/course/controller/TeacherCourseController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/TeacherCourseController.java rename to course/src/main/java/com/ruoyi/course/controller/TeacherCourseController.java diff --git a/course/src/com/ruoyi/course/controller/TimeSlotController.java b/course/src/main/java/com/ruoyi/course/controller/TimeSlotController.java similarity index 100% rename from course/src/com/ruoyi/course/controller/TimeSlotController.java rename to course/src/main/java/com/ruoyi/course/controller/TimeSlotController.java diff --git a/course/src/com/ruoyi/course/domain/ClassSchedule.java b/course/src/main/java/com/ruoyi/course/domain/ClassSchedule.java similarity index 100% rename from course/src/com/ruoyi/course/domain/ClassSchedule.java rename to course/src/main/java/com/ruoyi/course/domain/ClassSchedule.java diff --git a/course/src/com/ruoyi/course/domain/Classroom.java b/course/src/main/java/com/ruoyi/course/domain/Classroom.java similarity index 100% rename from course/src/com/ruoyi/course/domain/Classroom.java rename to course/src/main/java/com/ruoyi/course/domain/Classroom.java diff --git a/course/src/com/ruoyi/course/domain/Clazz.java b/course/src/main/java/com/ruoyi/course/domain/Clazz.java similarity index 100% rename from course/src/com/ruoyi/course/domain/Clazz.java rename to course/src/main/java/com/ruoyi/course/domain/Clazz.java diff --git a/course/src/com/ruoyi/course/domain/Course.java b/course/src/main/java/com/ruoyi/course/domain/Course.java similarity index 100% rename from course/src/com/ruoyi/course/domain/Course.java rename to course/src/main/java/com/ruoyi/course/domain/Course.java diff --git a/course/src/com/ruoyi/course/domain/CourseAssignment.java b/course/src/main/java/com/ruoyi/course/domain/CourseAssignment.java similarity index 100% rename from course/src/com/ruoyi/course/domain/CourseAssignment.java rename to course/src/main/java/com/ruoyi/course/domain/CourseAssignment.java diff --git a/course/src/com/ruoyi/course/domain/ElectiveClass.java b/course/src/main/java/com/ruoyi/course/domain/ElectiveClass.java similarity index 100% rename from course/src/com/ruoyi/course/domain/ElectiveClass.java rename to course/src/main/java/com/ruoyi/course/domain/ElectiveClass.java diff --git a/course/src/com/ruoyi/course/domain/ElectiveSelection.java b/course/src/main/java/com/ruoyi/course/domain/ElectiveSelection.java similarity index 100% rename from course/src/com/ruoyi/course/domain/ElectiveSelection.java rename to course/src/main/java/com/ruoyi/course/domain/ElectiveSelection.java diff --git a/course/src/com/ruoyi/course/domain/ScheduleItem.java b/course/src/main/java/com/ruoyi/course/domain/ScheduleItem.java similarity index 100% rename from course/src/com/ruoyi/course/domain/ScheduleItem.java rename to course/src/main/java/com/ruoyi/course/domain/ScheduleItem.java diff --git a/course/src/com/ruoyi/course/domain/Student.java b/course/src/main/java/com/ruoyi/course/domain/Student.java similarity index 100% rename from course/src/com/ruoyi/course/domain/Student.java rename to course/src/main/java/com/ruoyi/course/domain/Student.java diff --git a/course/src/com/ruoyi/course/domain/StudentSchedule.java b/course/src/main/java/com/ruoyi/course/domain/StudentSchedule.java similarity index 100% rename from course/src/com/ruoyi/course/domain/StudentSchedule.java rename to course/src/main/java/com/ruoyi/course/domain/StudentSchedule.java diff --git a/course/src/com/ruoyi/course/domain/Teacher.java b/course/src/main/java/com/ruoyi/course/domain/Teacher.java similarity index 100% rename from course/src/com/ruoyi/course/domain/Teacher.java rename to course/src/main/java/com/ruoyi/course/domain/Teacher.java diff --git a/course/src/com/ruoyi/course/domain/TeacherCourse.java b/course/src/main/java/com/ruoyi/course/domain/TeacherCourse.java similarity index 100% rename from course/src/com/ruoyi/course/domain/TeacherCourse.java rename to course/src/main/java/com/ruoyi/course/domain/TeacherCourse.java diff --git a/course/src/com/ruoyi/course/domain/TeacherCourseAssignment.java b/course/src/main/java/com/ruoyi/course/domain/TeacherCourseAssignment.java similarity index 100% rename from course/src/com/ruoyi/course/domain/TeacherCourseAssignment.java rename to course/src/main/java/com/ruoyi/course/domain/TeacherCourseAssignment.java diff --git a/course/src/com/ruoyi/course/domain/TimeSlot.java b/course/src/main/java/com/ruoyi/course/domain/TimeSlot.java similarity index 100% rename from course/src/com/ruoyi/course/domain/TimeSlot.java rename to course/src/main/java/com/ruoyi/course/domain/TimeSlot.java diff --git a/course/src/com/ruoyi/course/domain/dto/ClassroomAssignmentDTO.java b/course/src/main/java/com/ruoyi/course/domain/dto/ClassroomAssignmentDTO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/dto/ClassroomAssignmentDTO.java rename to course/src/main/java/com/ruoyi/course/domain/dto/ClassroomAssignmentDTO.java diff --git a/course/src/com/ruoyi/course/domain/dto/PaikeRequestDTO.java b/course/src/main/java/com/ruoyi/course/domain/dto/PaikeRequestDTO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/dto/PaikeRequestDTO.java rename to course/src/main/java/com/ruoyi/course/domain/dto/PaikeRequestDTO.java diff --git a/course/src/com/ruoyi/course/domain/dto/PaikeResultDTO.java b/course/src/main/java/com/ruoyi/course/domain/dto/PaikeResultDTO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/dto/PaikeResultDTO.java rename to course/src/main/java/com/ruoyi/course/domain/dto/PaikeResultDTO.java diff --git a/course/src/com/ruoyi/course/domain/dto/ScheduleRequest.java b/course/src/main/java/com/ruoyi/course/domain/dto/ScheduleRequest.java similarity index 100% rename from course/src/com/ruoyi/course/domain/dto/ScheduleRequest.java rename to course/src/main/java/com/ruoyi/course/domain/dto/ScheduleRequest.java diff --git a/course/src/com/ruoyi/course/domain/dto/ScheduleResult.java b/course/src/main/java/com/ruoyi/course/domain/dto/ScheduleResult.java similarity index 100% rename from course/src/com/ruoyi/course/domain/dto/ScheduleResult.java rename to course/src/main/java/com/ruoyi/course/domain/dto/ScheduleResult.java diff --git a/course/src/com/ruoyi/course/domain/dto/ScheduleTaskDTO.java b/course/src/main/java/com/ruoyi/course/domain/dto/ScheduleTaskDTO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/dto/ScheduleTaskDTO.java rename to course/src/main/java/com/ruoyi/course/domain/dto/ScheduleTaskDTO.java diff --git a/course/src/com/ruoyi/course/domain/dto/ScheduleTimeDTO.java b/course/src/main/java/com/ruoyi/course/domain/dto/ScheduleTimeDTO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/dto/ScheduleTimeDTO.java rename to course/src/main/java/com/ruoyi/course/domain/dto/ScheduleTimeDTO.java diff --git a/course/src/com/ruoyi/course/domain/dto/SpecialRulesDTO.java b/course/src/main/java/com/ruoyi/course/domain/dto/SpecialRulesDTO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/dto/SpecialRulesDTO.java rename to course/src/main/java/com/ruoyi/course/domain/dto/SpecialRulesDTO.java diff --git a/course/src/com/ruoyi/course/domain/dto/StudentScheduleDTO.java b/course/src/main/java/com/ruoyi/course/domain/dto/StudentScheduleDTO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/dto/StudentScheduleDTO.java rename to course/src/main/java/com/ruoyi/course/domain/dto/StudentScheduleDTO.java diff --git a/course/src/com/ruoyi/course/domain/vo/ClassQueryVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/ClassQueryVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/ClassQueryVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/ClassQueryVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/ClassScheduleVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/ClassScheduleVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/ClassScheduleVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/ClassScheduleVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/ClassroomQueryVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/ClassroomQueryVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/ClassroomQueryVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/ClassroomQueryVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/CourseInfoVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/CourseInfoVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/CourseInfoVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/CourseInfoVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/CourseQueryVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/CourseQueryVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/CourseQueryVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/CourseQueryVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/ElectiveClassVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/ElectiveClassVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/ElectiveClassVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/ElectiveClassVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/ScheduleDetailVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/ScheduleDetailVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/ScheduleDetailVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/ScheduleDetailVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/StudentQueryVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/StudentQueryVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/StudentQueryVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/StudentQueryVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/StudentScheduleVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/StudentScheduleVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/StudentScheduleVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/StudentScheduleVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/TeacherQueryVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/TeacherQueryVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/TeacherQueryVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/TeacherQueryVO.java diff --git a/course/src/com/ruoyi/course/domain/vo/TeacherScheduleVO.java b/course/src/main/java/com/ruoyi/course/domain/vo/TeacherScheduleVO.java similarity index 100% rename from course/src/com/ruoyi/course/domain/vo/TeacherScheduleVO.java rename to course/src/main/java/com/ruoyi/course/domain/vo/TeacherScheduleVO.java diff --git a/course/src/com/ruoyi/course/enums/GradeEnum.java b/course/src/main/java/com/ruoyi/course/enums/GradeEnum.java similarity index 100% rename from course/src/com/ruoyi/course/enums/GradeEnum.java rename to course/src/main/java/com/ruoyi/course/enums/GradeEnum.java diff --git a/course/src/com/ruoyi/course/mapper/ClassScheduleMapper.java b/course/src/main/java/com/ruoyi/course/mapper/ClassScheduleMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/ClassScheduleMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/ClassScheduleMapper.java diff --git a/course/src/com/ruoyi/course/mapper/ClassroomMapper.java b/course/src/main/java/com/ruoyi/course/mapper/ClassroomMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/ClassroomMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/ClassroomMapper.java diff --git a/course/src/com/ruoyi/course/mapper/ClazzMapper.java b/course/src/main/java/com/ruoyi/course/mapper/ClazzMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/ClazzMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/ClazzMapper.java diff --git a/course/src/com/ruoyi/course/mapper/CourseAssignmentMapper.java b/course/src/main/java/com/ruoyi/course/mapper/CourseAssignmentMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/CourseAssignmentMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/CourseAssignmentMapper.java diff --git a/course/src/com/ruoyi/course/mapper/CourseMapper.java b/course/src/main/java/com/ruoyi/course/mapper/CourseMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/CourseMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/CourseMapper.java diff --git a/course/src/com/ruoyi/course/mapper/ElectiveClassMapper.java b/course/src/main/java/com/ruoyi/course/mapper/ElectiveClassMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/ElectiveClassMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/ElectiveClassMapper.java diff --git a/course/src/com/ruoyi/course/mapper/ElectiveSelectionMapper.java b/course/src/main/java/com/ruoyi/course/mapper/ElectiveSelectionMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/ElectiveSelectionMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/ElectiveSelectionMapper.java diff --git a/course/src/com/ruoyi/course/mapper/ScheduleItemMapper.java b/course/src/main/java/com/ruoyi/course/mapper/ScheduleItemMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/ScheduleItemMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/ScheduleItemMapper.java diff --git a/course/src/com/ruoyi/course/mapper/StudentMapper.java b/course/src/main/java/com/ruoyi/course/mapper/StudentMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/StudentMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/StudentMapper.java diff --git a/course/src/com/ruoyi/course/mapper/StudentScheduleMapper.java b/course/src/main/java/com/ruoyi/course/mapper/StudentScheduleMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/StudentScheduleMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/StudentScheduleMapper.java diff --git a/course/src/com/ruoyi/course/mapper/TeacherCourseAssignmentMapper.java b/course/src/main/java/com/ruoyi/course/mapper/TeacherCourseAssignmentMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/TeacherCourseAssignmentMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/TeacherCourseAssignmentMapper.java diff --git a/course/src/com/ruoyi/course/mapper/TeacherCourseMapper.java b/course/src/main/java/com/ruoyi/course/mapper/TeacherCourseMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/TeacherCourseMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/TeacherCourseMapper.java diff --git a/course/src/com/ruoyi/course/mapper/TeacherMapper.java b/course/src/main/java/com/ruoyi/course/mapper/TeacherMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/TeacherMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/TeacherMapper.java diff --git a/course/src/com/ruoyi/course/mapper/TimeSlotMapper.java b/course/src/main/java/com/ruoyi/course/mapper/TimeSlotMapper.java similarity index 100% rename from course/src/com/ruoyi/course/mapper/TimeSlotMapper.java rename to course/src/main/java/com/ruoyi/course/mapper/TimeSlotMapper.java diff --git a/course/src/com/ruoyi/course/service/IClassScheduleService.java b/course/src/main/java/com/ruoyi/course/service/IClassScheduleService.java similarity index 100% rename from course/src/com/ruoyi/course/service/IClassScheduleService.java rename to course/src/main/java/com/ruoyi/course/service/IClassScheduleService.java diff --git a/course/src/com/ruoyi/course/service/IClassroomService.java b/course/src/main/java/com/ruoyi/course/service/IClassroomService.java similarity index 100% rename from course/src/com/ruoyi/course/service/IClassroomService.java rename to course/src/main/java/com/ruoyi/course/service/IClassroomService.java diff --git a/course/src/com/ruoyi/course/service/IClazzService.java b/course/src/main/java/com/ruoyi/course/service/IClazzService.java similarity index 100% rename from course/src/com/ruoyi/course/service/IClazzService.java rename to course/src/main/java/com/ruoyi/course/service/IClazzService.java diff --git a/course/src/com/ruoyi/course/service/ICourseAssignmentService.java b/course/src/main/java/com/ruoyi/course/service/ICourseAssignmentService.java similarity index 100% rename from course/src/com/ruoyi/course/service/ICourseAssignmentService.java rename to course/src/main/java/com/ruoyi/course/service/ICourseAssignmentService.java diff --git a/course/src/com/ruoyi/course/service/ICourseService.java b/course/src/main/java/com/ruoyi/course/service/ICourseService.java similarity index 100% rename from course/src/com/ruoyi/course/service/ICourseService.java rename to course/src/main/java/com/ruoyi/course/service/ICourseService.java diff --git a/course/src/com/ruoyi/course/service/IElectiveClassService.java b/course/src/main/java/com/ruoyi/course/service/IElectiveClassService.java similarity index 100% rename from course/src/com/ruoyi/course/service/IElectiveClassService.java rename to course/src/main/java/com/ruoyi/course/service/IElectiveClassService.java diff --git a/course/src/com/ruoyi/course/service/IElectiveSelectionService.java b/course/src/main/java/com/ruoyi/course/service/IElectiveSelectionService.java similarity index 100% rename from course/src/com/ruoyi/course/service/IElectiveSelectionService.java rename to course/src/main/java/com/ruoyi/course/service/IElectiveSelectionService.java diff --git a/course/src/com/ruoyi/course/service/IScheduleItemService.java b/course/src/main/java/com/ruoyi/course/service/IScheduleItemService.java similarity index 100% rename from course/src/com/ruoyi/course/service/IScheduleItemService.java rename to course/src/main/java/com/ruoyi/course/service/IScheduleItemService.java diff --git a/course/src/com/ruoyi/course/service/IStudentScheduleService.java b/course/src/main/java/com/ruoyi/course/service/IStudentScheduleService.java similarity index 100% rename from course/src/com/ruoyi/course/service/IStudentScheduleService.java rename to course/src/main/java/com/ruoyi/course/service/IStudentScheduleService.java diff --git a/course/src/com/ruoyi/course/service/IStudentService.java b/course/src/main/java/com/ruoyi/course/service/IStudentService.java similarity index 100% rename from course/src/com/ruoyi/course/service/IStudentService.java rename to course/src/main/java/com/ruoyi/course/service/IStudentService.java diff --git a/course/src/com/ruoyi/course/service/ITeacherCourseAssignmentService.java b/course/src/main/java/com/ruoyi/course/service/ITeacherCourseAssignmentService.java similarity index 100% rename from course/src/com/ruoyi/course/service/ITeacherCourseAssignmentService.java rename to course/src/main/java/com/ruoyi/course/service/ITeacherCourseAssignmentService.java diff --git a/course/src/com/ruoyi/course/service/ITeacherCourseService.java b/course/src/main/java/com/ruoyi/course/service/ITeacherCourseService.java similarity index 100% rename from course/src/com/ruoyi/course/service/ITeacherCourseService.java rename to course/src/main/java/com/ruoyi/course/service/ITeacherCourseService.java diff --git a/course/src/com/ruoyi/course/service/ITeacherService.java b/course/src/main/java/com/ruoyi/course/service/ITeacherService.java similarity index 100% rename from course/src/com/ruoyi/course/service/ITeacherService.java rename to course/src/main/java/com/ruoyi/course/service/ITeacherService.java diff --git a/course/src/com/ruoyi/course/service/ITimeSlotService.java b/course/src/main/java/com/ruoyi/course/service/ITimeSlotService.java similarity index 100% rename from course/src/com/ruoyi/course/service/ITimeSlotService.java rename to course/src/main/java/com/ruoyi/course/service/ITimeSlotService.java diff --git a/course/src/com/ruoyi/course/service/impl/ClassScheduleServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/ClassScheduleServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/ClassScheduleServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/ClassScheduleServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/ClassroomServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/ClassroomServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/ClassroomServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/ClassroomServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/ClazzServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/ClazzServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/ClazzServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/ClazzServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/CourseAssignmentServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/CourseAssignmentServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/CourseAssignmentServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/CourseAssignmentServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/CourseScheduler.java b/course/src/main/java/com/ruoyi/course/service/impl/CourseScheduler.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/CourseScheduler.java rename to course/src/main/java/com/ruoyi/course/service/impl/CourseScheduler.java diff --git a/course/src/com/ruoyi/course/service/impl/CourseServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/CourseServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/CourseServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/CourseServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/ElectiveClassServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/ElectiveClassServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/ElectiveClassServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/ElectiveClassServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/ElectiveSelectionServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/ElectiveSelectionServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/ElectiveSelectionServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/ElectiveSelectionServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/ScheduleItemServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/ScheduleItemServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/ScheduleItemServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/ScheduleItemServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/StudentScheduleServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/StudentScheduleServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/StudentScheduleServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/StudentScheduleServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/StudentServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/StudentServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/StudentServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/StudentServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/TeacherCourseAssignmentServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/TeacherCourseAssignmentServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/TeacherCourseAssignmentServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/TeacherCourseAssignmentServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/TeacherCourseServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/TeacherCourseServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/TeacherCourseServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/TeacherCourseServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/TeacherScheduleService.java b/course/src/main/java/com/ruoyi/course/service/impl/TeacherScheduleService.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/TeacherScheduleService.java rename to course/src/main/java/com/ruoyi/course/service/impl/TeacherScheduleService.java diff --git a/course/src/com/ruoyi/course/service/impl/TeacherServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/TeacherServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/TeacherServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/TeacherServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/TimeSlotServiceImpl.java b/course/src/main/java/com/ruoyi/course/service/impl/TimeSlotServiceImpl.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/TimeSlotServiceImpl.java rename to course/src/main/java/com/ruoyi/course/service/impl/TimeSlotServiceImpl.java diff --git a/course/src/com/ruoyi/course/service/impl/TimeTableManager.java b/course/src/main/java/com/ruoyi/course/service/impl/TimeTableManager.java similarity index 100% rename from course/src/com/ruoyi/course/service/impl/TimeTableManager.java rename to course/src/main/java/com/ruoyi/course/service/impl/TimeTableManager.java diff --git a/course/src/com/ruoyi/course/util/GradeConverter.java b/course/src/main/java/com/ruoyi/course/util/GradeConverter.java similarity index 100% rename from course/src/com/ruoyi/course/util/GradeConverter.java rename to course/src/main/java/com/ruoyi/course/util/GradeConverter.java diff --git a/course/src/com/ruoyi/course/util/RyPageAdapter.java b/course/src/main/java/com/ruoyi/course/util/RyPageAdapter.java similarity index 100% rename from course/src/com/ruoyi/course/util/RyPageAdapter.java rename to course/src/main/java/com/ruoyi/course/util/RyPageAdapter.java diff --git a/course/src/com/ruoyi/course/util/ScheduleUtil.java b/course/src/main/java/com/ruoyi/course/util/ScheduleUtil.java similarity index 100% rename from course/src/com/ruoyi/course/util/ScheduleUtil.java rename to course/src/main/java/com/ruoyi/course/util/ScheduleUtil.java diff --git a/course/src/com/ruoyi/course/util/TimeUtil.java b/course/src/main/java/com/ruoyi/course/util/TimeUtil.java similarity index 100% rename from course/src/com/ruoyi/course/util/TimeUtil.java rename to course/src/main/java/com/ruoyi/course/util/TimeUtil.java diff --git a/course/src/main/resources/mapper/ClassScheduleMapper.xml b/course/src/main/java/resources/mapper/ClassScheduleMapper.xml similarity index 100% rename from course/src/main/resources/mapper/ClassScheduleMapper.xml rename to course/src/main/java/resources/mapper/ClassScheduleMapper.xml diff --git a/course/src/main/resources/mapper/ClassMapper.xml b/course/src/main/java/resources/mapper/ClazzMapper.xml similarity index 100% rename from course/src/main/resources/mapper/ClassMapper.xml rename to course/src/main/java/resources/mapper/ClazzMapper.xml diff --git a/course/src/main/resources/mapper/CourseAssignmentMapper.xml b/course/src/main/java/resources/mapper/CourseAssignmentMapper.xml similarity index 100% rename from course/src/main/resources/mapper/CourseAssignmentMapper.xml rename to course/src/main/java/resources/mapper/CourseAssignmentMapper.xml diff --git a/course/src/main/resources/mapper/CourseMapper.xml b/course/src/main/java/resources/mapper/CourseMapper.xml similarity index 100% rename from course/src/main/resources/mapper/CourseMapper.xml rename to course/src/main/java/resources/mapper/CourseMapper.xml diff --git a/course/src/main/resources/mapper/ElectiveClassMapper.xml b/course/src/main/java/resources/mapper/ElectiveClassMapper.xml similarity index 100% rename from course/src/main/resources/mapper/ElectiveClassMapper.xml rename to course/src/main/java/resources/mapper/ElectiveClassMapper.xml diff --git a/course/src/main/resources/mapper/ElectiveSelectionMapper.xml b/course/src/main/java/resources/mapper/ElectiveSelectionMapper.xml similarity index 100% rename from course/src/main/resources/mapper/ElectiveSelectionMapper.xml rename to course/src/main/java/resources/mapper/ElectiveSelectionMapper.xml diff --git a/course/src/main/resources/mapper/ScheduleItemMapper.xml b/course/src/main/java/resources/mapper/ScheduleItemMapper.xml similarity index 100% rename from course/src/main/resources/mapper/ScheduleItemMapper.xml rename to course/src/main/java/resources/mapper/ScheduleItemMapper.xml diff --git a/course/src/main/resources/mapper/StudentMapper.xml b/course/src/main/java/resources/mapper/StudentMapper.xml similarity index 100% rename from course/src/main/resources/mapper/StudentMapper.xml rename to course/src/main/java/resources/mapper/StudentMapper.xml diff --git a/course/src/main/resources/mapper/StudentScheduleMapper.xml b/course/src/main/java/resources/mapper/StudentScheduleMapper.xml similarity index 100% rename from course/src/main/resources/mapper/StudentScheduleMapper.xml rename to course/src/main/java/resources/mapper/StudentScheduleMapper.xml diff --git a/course/src/main/resources/mapper/TeacherCourseAssignmentMapper.xml b/course/src/main/java/resources/mapper/TeacherCourseAssignmentMapper.xml similarity index 100% rename from course/src/main/resources/mapper/TeacherCourseAssignmentMapper.xml rename to course/src/main/java/resources/mapper/TeacherCourseAssignmentMapper.xml diff --git a/course/src/main/resources/mapper/TeacherCourseMapper.xml b/course/src/main/java/resources/mapper/TeacherCourseMapper.xml similarity index 100% rename from course/src/main/resources/mapper/TeacherCourseMapper.xml rename to course/src/main/java/resources/mapper/TeacherCourseMapper.xml diff --git a/course/src/main/resources/mapper/TeacherMapper.xml b/course/src/main/java/resources/mapper/TeacherMapper.xml similarity index 100% rename from course/src/main/resources/mapper/TeacherMapper.xml rename to course/src/main/java/resources/mapper/TeacherMapper.xml diff --git a/course/src/main/resources/mapper/TimeSlotMapper.xml b/course/src/main/java/resources/mapper/TimeSlotMapper.xml similarity index 100% rename from course/src/main/resources/mapper/TimeSlotMapper.xml rename to course/src/main/java/resources/mapper/TimeSlotMapper.xml diff --git a/course/src/main/resources/mapper/ClassroomMapper.xml b/course/src/main/resources/mapper/ClassroomMapper.xml deleted file mode 100644 index b990d64a..00000000 --- a/course/src/main/resources/mapper/ClassroomMapper.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index b239b8d5..cdaf8d6d 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -55,6 +55,9 @@ ruoyi-quartz + + + com.ruoyi diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 9e8fefbc..e3c56ee5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -3,7 +3,6 @@ package com.ruoyi; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.context.annotation.ComponentScan; /** * 启动程序 diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml new file mode 100644 index 00000000..f9a4826b --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -0,0 +1,61 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://192.168.3.90:3306/course?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: xuao + password: xuao@dev123! + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index f9b1c175..678d2ce8 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -7,7 +7,8 @@ ruoyi: # 版权年份 copyrightYear: 2025 # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath +# profile: D:/ruoyi/uploadPath + profile: /home/xuao/program/course/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -16,7 +17,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 - port: 8080 + port: 8500 servlet: # 应用的访问路径 context-path: / @@ -52,7 +53,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid + active: test # 文件上传 servlet: multipart: @@ -68,13 +69,14 @@ spring: # redis 配置 redis: # 地址 - host: localhost + host: redis.rpk.ipdz.me + # host: localhost # 端口，默认为6379 - port: 6379 + port: 19379 # 数据库索引 database: 0 # 密码 - password: + password: guoguo # 连接超时时间 timeout: 10s lettuce: diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index d69a5720..df580da7 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml index 4b8c4962..97ee8a05 100644 --- a/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml +++ b/ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml @@ -16,5 +16,9 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN" - + + + + + diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js index a6bfb3b8..3e25c3af 100644 --- a/ruoyi-ui/vue.config.js +++ b/ruoyi-ui/vue.config.js @@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin') const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题 -const baseUrl = 'http://localhost:8080' // 后端接口 +const baseUrl = 'http://localhost:8500' // 后端接口 const port = process.env.port || process.env.npm_config_port || 80 // 端口