tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用户中心；

Browse Source 
学生重复加入课程，bug修复
beetlsql3-dev
Mlxa0324 2 years ago
parent d27d93f4ae
commit c6e281d230
12 changed files with 140 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java
Unescape Escape View File

@ -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<Teacher>{
*/
List<TeacherExtendSchoolInfo> getTeacherExtendSchoolInfoListByUserIds(String userIds);
List<TeacherUserInfoData.TeacherRuleInfo> getTeacherUserInfoRuleInfo(Long userId, Long teacherId);
List<TeacherUserCenterData.TeacherRuleInfo> getTeacherUserInfoRuleInfo(Long userId, Long teacherId);
}

8
web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java
Unescape Escape View File

@ -51,6 +51,14 @@ public class StudentExtendSchoolInfo extends Student implements ExtendSchoolInfo
* 院校名称
*/
private String universitiesCollegesName;
/**
* 院校所在省份
*/
private String universitiesCollegesProvince;
/**
* 院校所在市区
*/
private String universitiesCollegesCity;
}

9
web/src/main/java/com/ibeetl/jlw/entity/TeacherExtendSchoolInfo.java
Unescape Escape View File

@ -41,4 +41,13 @@ public class TeacherExtendSchoolInfo extends Teacher implements ExtendSchoolInfo
* 院校名称
*/
private String universitiesCollegesName;
/**
* 院校所在省份
*/
private String universitiesCollegesProvince;
/**
* 院校所在市区
*/
private String universitiesCollegesCity;
}

34
web/src/main/java/com/ibeetl/jlw/entity/api/student/StudentUserCenterData.java
Unescape Escape View File

@ -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;
}

15
web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserInfoData.java → web/src/main/java/com/ibeetl/jlw/entity/api/teacher/TeacherUserCenterData.java
Unescape Escape View File

@ -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

10
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java
Unescape Escape View File

@ -114,6 +114,16 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
public JsonResult add(TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
String msg = "";
TeacherOpenCourseMergeStudent teacherOpenCourseMergeStudent = teacherOpenCourseMergeStudentQuery.pojo();
Long studentId = teacherOpenCourseMergeStudent.getStudentId();
Long teacherOpenCourseId = teacherOpenCourseMergeStudent.getTeacherOpenCourseId();
boolean isNotExists = teacherOpenCourseMergeStudentDao.createLambdaQuery().andEq(TeacherOpenCourseMergeStudent::getStudentId, studentId)
.andEq(TeacherOpenCourseMergeStudent::getTeacherOpenCourseId, teacherOpenCourseId)
.andEq(TeacherOpenCourseMergeStudent::getTeacherOpenCourseSchoolClassMergeStudentStatus, 1)
.count() == 0;
Assert.isTrue(isNotExists, "已经加入过该课程，请勿重复操作！");
teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentAddTime(new Date());
teacherOpenCourseMergeStudentDao.insert(teacherOpenCourseMergeStudent);
teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentId(teacherOpenCourseMergeStudent.getTeacherOpenCourseSchoolClassMergeStudentId());

36
web/src/main/java/com/ibeetl/jlw/service/api/student/ApiStudentService.java
Unescape Escape View File

@ -2,7 +2,9 @@ package com.ibeetl.jlw.service.api.student;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import com.ibeetl.admin.core.conf.PasswordConfig;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.service.CoreUserService;
import com.ibeetl.jlw.dao.StudentDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeStudentDao;
@ -10,12 +12,10 @@ import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.api.CurrentUserInfo;
import com.ibeetl.jlw.entity.api.student.StudentActiveInfo;
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.ResourcesApplicationService;
import com.ibeetl.jlw.service.StudentService;
import com.ibeetl.jlw.service.TeacherOpenCourseNoticeService;
import com.ibeetl.jlw.service.UniversitiesCollegesService;
import com.ibeetl.jlw.service.*;
import com.ibeetl.jlw.service.api.ApiIndexBaseService;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseNoticeQuery;
@ -30,6 +30,7 @@ import java.util.List;
import java.util.Map;
import static cn.jlw.util.CacheUserUtil.getStudent;
import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
/**
* <p>
@ -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<StudentExtendSchoolInfo> 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();
}
}

12
web/src/main/java/com/ibeetl/jlw/service/api/teacher/ApiTeacherService.java
Unescape Escape View File

@ -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 {
* 功能描述: <br>
* 教师端-用户中心
*
* @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<TeacherUserInfoData.TeacherRuleInfo> ruleInfoList = teacherDao.getTeacherUserInfoRuleInfo(userId, null);
List<TeacherUserCenterData.TeacherRuleInfo> 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();
}
}

12
web/src/main/java/com/ibeetl/jlw/web/api/student/ApiStudentController.java
Unescape Escape View File

@ -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<StudentUserCenterData> userCenter() {
return JsonResult.success(apiStudentService.userCenter());
}
}

12
web/src/main/java/com/ibeetl/jlw/web/api/teacher/ApiTeacherController.java
Unescape Escape View File

@ -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<TeacherUserInfoData> userInfo() {
return JsonResult.success(apiTeacherService.userInfo());
@GetMapping("userCenter.do")
public JsonResult<TeacherUserCenterData> userCenter() {
return JsonResult.success(apiTeacherService.userCenter());
}
}

8
web/src/main/resources/sql/jlw/student.md
Unescape Escape View File

@ -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

8
web/src/main/resources/sql/jlw/teacher.md
Unescape Escape View File

@ -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

Write Preview
Loading…
Cancel
Save