From 328135990d864d0b064871984ca92211ec685e20 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Fri, 21 Oct 2022 00:01:26 +0800 Subject: [PATCH] 2 --- ...rOpenCourseStudentSigninLogController.java | 2 +- ...nCourseStudentSigninSettingController.java | 6 +++++ ...troller.java => ApiTeacherController.java} | 22 ++++++++++++------- ...est.java => ApiTeacherControllerTest.java} | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) rename web/src/main/java/com/ibeetl/jlw/web/api/teacher/{TeacherIndexController.java => ApiTeacherController.java} (65%) rename web/src/test/java/com/ibeetl/jlw/web/api/teacher/{TeacherIndexControllerTest.java => ApiTeacherControllerTest.java} (95%) diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java index d89bb65e..a83f5e46 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java @@ -208,7 +208,7 @@ public class TeacherOpenCourseStudentSigninLogController{ } /** - * 学生端-教师端-签到统一接口 + * 学生端-签到统一接口 * @param signinDTO 签到DTO * @return */ diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java index c6e05c51..d465f9e8 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java @@ -44,6 +44,12 @@ public class TeacherOpenCourseStudentSigninSettingController{ /* 前端接口 */ + /** + * 教师端-签到配置 + * @param condition + * @param coreUser + * @return + */ @PostMapping(API + "/getPageList.do") public JsonResult getPageList(TeacherOpenCourseStudentSigninSettingQuery condition,@SCoreUser CoreUser coreUser){ if(null == coreUser){ diff --git a/web/src/main/java/com/ibeetl/jlw/web/api/teacher/TeacherIndexController.java b/web/src/main/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherController.java similarity index 65% rename from web/src/main/java/com/ibeetl/jlw/web/api/teacher/TeacherIndexController.java rename to web/src/main/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherController.java index e9265cb6..ff1aeb7b 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/api/teacher/TeacherIndexController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherController.java @@ -3,19 +3,24 @@ package com.ibeetl.jlw.web.api.teacher; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.api.teacher.TeacherIndexData; import com.ibeetl.jlw.service.api.teacher.TeacherIndexService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +/** + * 教师端-接口集合 + * + * @author lx + */ +@Slf4j +@Validated @RestController -public class TeacherIndexController { - - private final Log log = LogFactory.getLog(this.getClass()); - - private static final String API = "/api/teacherIndex"; +@RequestMapping("/api/teacherIndex") +public class ApiTeacherController { @Resource private TeacherIndexService teacherIndexService; @@ -23,8 +28,9 @@ public class TeacherIndexController { * 教师端-首页面板 * @return */ - @PostMapping(API + "/index.do") + @PostMapping("index.do") public JsonResult index() { return JsonResult.success(teacherIndexService.index()); } + } diff --git a/web/src/test/java/com/ibeetl/jlw/web/api/teacher/TeacherIndexControllerTest.java b/web/src/test/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherControllerTest.java similarity index 95% rename from web/src/test/java/com/ibeetl/jlw/web/api/teacher/TeacherIndexControllerTest.java rename to web/src/test/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherControllerTest.java index 85d25997..800fe991 100644 --- a/web/src/test/java/com/ibeetl/jlw/web/api/teacher/TeacherIndexControllerTest.java +++ b/web/src/test/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherControllerTest.java @@ -19,7 +19,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @date 2022/10/20 * @modified */ -class TeacherIndexControllerTest extends BaseTest { +class ApiTeacherControllerTest extends BaseTest { private static final String API = "/api/teacherIndex";