From c6e281d230d8957625c6a5e00fef83c6122212b8 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Wed, 21 Dec 2022 18:36:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83=EF=BC=9B?= =?UTF-8?q?=20=E5=AD=A6=E7=94=9F=E9=87=8D=E5=A4=8D=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ibeetl/jlw/dao/TeacherDao.java | 4 +-- .../jlw/entity/StudentExtendSchoolInfo.java | 8 +++++ .../jlw/entity/TeacherExtendSchoolInfo.java | 9 +++++ .../api/student/StudentUserCenterData.java | 34 ++++++++++++++++++ ...foData.java => TeacherUserCenterData.java} | 15 +++++--- .../TeacherOpenCourseMergeStudentService.java | 10 ++++++ .../api/student/ApiStudentService.java | 36 ++++++++++++++++--- .../api/teacher/ApiTeacherService.java | 12 +++---- .../web/api/student/ApiStudentController.java | 12 +++++++ .../web/api/teacher/ApiTeacherController.java | 12 +++---- web/src/main/resources/sql/jlw/student.md | 8 +++-- web/src/main/resources/sql/jlw/teacher.md | 8 +++-- 12 files changed, 140 insertions(+), 28 deletions(-) create mode 100644 web/src/main/java/com/ibeetl/jlw/entity/api/student/StudentUserCenterData.java rename web/src/main/java/com/ibeetl/jlw/entity/api/teacher/{TeacherUserInfoData.java => TeacherUserCenterData.java} (89%) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java index 13fdffa3..4dd01ec2 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java @@ -2,7 +2,7 @@ package com.ibeetl.jlw.dao; import com.ibeetl.jlw.entity.Teacher; import com.ibeetl.jlw.entity.TeacherExtendSchoolInfo; -import com.ibeetl.jlw.entity.api.teacher.TeacherUserInfoData; +import com.ibeetl.jlw.entity.api.teacher.TeacherUserCenterData; import com.ibeetl.jlw.web.query.TeacherQuery; import org.beetl.sql.core.engine.PageQuery; import org.beetl.sql.mapper.BaseMapper; @@ -52,5 +52,5 @@ public interface TeacherDao extends BaseMapper{ */ List getTeacherExtendSchoolInfoListByUserIds(String userIds); - List getTeacherUserInfoRuleInfo(Long userId, Long teacherId); + List getTeacherUserInfoRuleInfo(Long userId, Long teacherId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java index 139310ea..f2f9d93c 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java @@ -51,6 +51,14 @@ public class StudentExtendSchoolInfo extends Student implements ExtendSchoolInfo * 院校名称 */ private String universitiesCollegesName; + /** + * 院校所在省份 + */ + private String universitiesCollegesProvince; + /** + * 院校所在市区 + */ + private String universitiesCollegesCity; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherExtendSchoolInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherExtendSchoolInfo.java index 85025a7e..181bed43 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherExtendSchoolInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherExtendSchoolInfo.java @@ -41,4 +41,13 @@ public class TeacherExtendSchoolInfo extends Teacher implements ExtendSchoolInfo * 院校名称 */ private String universitiesCollegesName; + + /** + * 院校所在省份 + */ + private String universitiesCollegesProvince; + /** + * 院校所在市区 + */ + private String universitiesCollegesCity; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/api/student/StudentUserCenterData.java b/web/src/main/java/com/ibeetl/jlw/entity/api/student/StudentUserCenterData.java new file mode 100644 index 00000000..ee4cc84b --- /dev/null +++ b/web/src/main/java/com/ibeetl/jlw/entity/api/student/StudentUserCenterData.java @@ -0,0 +1,34 @@ +package com.ibeetl.jlw.entity.api.student; + +import com.ibeetl.admin.core.entity.CoreUser; +import com.ibeetl.jlw.entity.Student; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +/** + * 教师端-首页实体 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Accessors(chain = true) +public class StudentUserCenterData { + + /** + * 学生信息 + */ + private Student studentInfo; + /** + * 用户信息 + */ + private CoreUser userInfo; + /** + * 活跃度信息 + */ + private StudentActiveInfo activeInfo; + +} diff --git a/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserInfoData.java b/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserCenterData.java similarity index 89% rename from web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserInfoData.java rename to web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserCenterData.java index 63b55dfc..65ba8e3a 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserInfoData.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserCenterData.java @@ -8,7 +8,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.beetl.sql.fetch.annotation.Fetch; /** * 教师端-首页实体 @@ -18,13 +17,19 @@ import org.beetl.sql.fetch.annotation.Fetch; @AllArgsConstructor @Builder @Accessors(chain = true) -@Fetch(level = 2) -public class TeacherUserInfoData { +public class TeacherUserCenterData { + /** + * 教师信息 + */ private Teacher teacherInfo; - + /** + * 用户信息 + */ private CoreUser userInfo; - + /** + * 权限信息 + */ private TeacherRuleInfo ruleInfo; @Data diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java index 4ceeb0af..878c37cf 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java @@ -114,6 +114,16 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService @@ -53,6 +54,8 @@ public class ApiStudentService { @Autowired private UniversitiesCollegesService universitiesCollegesService; @Autowired private PasswordConfig.PasswordEncryptService passwordEncryptService; @Autowired private CoreUserService coreUserService; + @Autowired + private SysLogService sysLogService; /** * 教师端-首页数据 @@ -220,4 +223,29 @@ public class ApiStudentService { Assert.notNull(student, "该接口只能学生查看！"); return studentDao.studentActiveInfo(student.getStudentId()); } + + public StudentUserCenterData userCenter() { + + CoreUser user = getUser(); + Assert.isTrue(user.isStudent(), "该接口只能学生访问！"); + Long userId = user.getId(); + + List extendStudentList = studentDao.getStudentExtendSchoolInfoListByUserIds(userId.toString()); + StudentExtendSchoolInfo studentExtendSchoolInfo = null; + if (ObjectUtil.isNotEmpty(extendStudentList)) { + studentExtendSchoolInfo = extendStudentList.get(0); + } + CoreUser coreUser = coreUserService.getUserById(userId); + + // 设置登录时间和最后登录时间 + sysLogService.setLoginLogInfo(userId, coreUser); + + // 活跃度 + StudentActiveInfo studentActiveInfo = studentActiveInfo(); + + + return StudentUserCenterData.builder().userInfo(coreUser) + .studentInfo(studentExtendSchoolInfo).activeInfo(studentActiveInfo) + .build(); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java index af349790..3d3243eb 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java @@ -10,7 +10,7 @@ import com.ibeetl.jlw.dao.TeacherMergeApplicationDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.api.CurrentUserInfo; import com.ibeetl.jlw.entity.api.teacher.TeacherIndexData; -import com.ibeetl.jlw.entity.api.teacher.TeacherUserInfoData; +import com.ibeetl.jlw.entity.api.teacher.TeacherUserCenterData; import com.ibeetl.jlw.service.*; import com.ibeetl.jlw.service.api.ApiIndexBaseService; import com.ibeetl.jlw.web.query.ResourcesApplicationQuery; @@ -106,11 +106,11 @@ public class ApiTeacherService { * 功能描述:
* 教师端-用户中心 * - * @return {@link TeacherUserInfoData} + * @return {@link TeacherUserCenterData} * @Author: 87966 * @Date: 2022/12/21 14:52 */ - public TeacherUserInfoData userInfo() { + public TeacherUserCenterData userCenter() { CoreUser user = getUser(); Assert.isTrue(user.isTeacher(), "该接口只能教师访问！"); Long userId = user.getId(); @@ -121,14 +121,14 @@ public class ApiTeacherService { // 设置登录时间和最后登录时间 sysLogService.setLoginLogInfo(userId, coreUser); - List ruleInfoList = teacherDao.getTeacherUserInfoRuleInfo(userId, null); + List ruleInfoList = teacherDao.getTeacherUserInfoRuleInfo(userId, null); - TeacherUserInfoData.TeacherRuleInfo teacherRuleInfo = null; + TeacherUserCenterData.TeacherRuleInfo teacherRuleInfo = null; if (ObjectUtil.isNotEmpty(ruleInfoList)) { teacherRuleInfo = ruleInfoList.get(0); } - return TeacherUserInfoData.builder() + return TeacherUserCenterData.builder() .teacherInfo(teacher).userInfo(coreUser).ruleInfo(teacherRuleInfo).build(); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/api/student/ApiStudentController.java b/web/src/main/java/com/ibeetl/jlw/web/api/student/ApiStudentController.java index 6a0c779f..5926b88f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/api/student/ApiStudentController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/api/student/ApiStudentController.java @@ -2,12 +2,14 @@ package com.ibeetl.jlw.web.api.student; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.api.student.StudentIndexData; +import com.ibeetl.jlw.entity.api.student.StudentUserCenterData; import com.ibeetl.jlw.entity.dto.StudentEditPasswordDTO; import com.ibeetl.jlw.entity.dto.StudentRegisterDTO; import com.ibeetl.jlw.service.api.student.ApiStudentService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -62,4 +64,14 @@ public class ApiStudentController { public JsonResult studentActiveInfo() { return JsonResult.success(apiStudentService.studentActiveInfo()); } + + + /** + * 学生端-用户中心 + * @return + */ + @GetMapping("userCenter.do") + public JsonResult userCenter() { + return JsonResult.success(apiStudentService.userCenter()); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherController.java b/web/src/main/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherController.java index da65fe99..f748480d 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherController.java @@ -2,7 +2,7 @@ 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.entity.api.teacher.TeacherUserInfoData; +import com.ibeetl.jlw.entity.api.teacher.TeacherUserCenterData; import com.ibeetl.jlw.service.api.teacher.ApiTeacherService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -36,14 +36,12 @@ public class ApiTeacherController { /** - * 教师端-首页面板 + * 教师端-用户中心 * @return */ - @GetMapping("userInfo.do") - public JsonResult userInfo() { - return JsonResult.success(apiTeacherService.userInfo()); + @GetMapping("userCenter.do") + public JsonResult userCenter() { + return JsonResult.success(apiTeacherService.userCenter()); } - - } diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md index 426bb474..fc641b54 100644 --- a/web/src/main/resources/sql/jlw/student.md +++ b/web/src/main/resources/sql/jlw/student.md @@ -1388,7 +1388,9 @@ getStudentExtendSchoolInfo tc.university_faculty_id, tc.university_faculty_name, td.universities_colleges_id, - td.universities_colleges_name + td.universities_colleges_name, + td.universities_colleges_city, + td.universities_colleges_province FROM student t LEFT JOIN school_class ta ON ta.class_id = t.class_id @@ -1417,7 +1419,9 @@ getStudentExtendSchoolInfoListByUserIds tc.university_faculty_id, tc.university_faculty_name, td.universities_colleges_id, - td.universities_colleges_name + td.universities_colleges_name, + td.universities_colleges_city, + td.universities_colleges_province FROM student t LEFT JOIN school_class ta ON ta.class_id = t.class_id diff --git a/web/src/main/resources/sql/jlw/teacher.md b/web/src/main/resources/sql/jlw/teacher.md index d16fd3c2..07409785 100644 --- a/web/src/main/resources/sql/jlw/teacher.md +++ b/web/src/main/resources/sql/jlw/teacher.md @@ -475,7 +475,9 @@ getTeacherExtendSchoolInfo tc.university_faculty_id, tc.university_faculty_name, td.universities_colleges_id, - td.universities_colleges_name + td.universities_colleges_name, + td.universities_colleges_city, + td.universities_colleges_province FROM teacher t LEFT JOIN university_system tb ON tb.university_system_id = t.university_system_id @@ -499,7 +501,9 @@ getTeacherExtendSchoolInfoListByUserIds tc.university_faculty_id, tc.university_faculty_name, td.universities_colleges_id, - td.universities_colleges_name + td.universities_colleges_name, + td.universities_colleges_city, + td.universities_colleges_province FROM teacher t LEFT JOIN university_system tb ON tb.university_system_id = t.university_system_id