From befb3cbdfe325baa8ffc70a692ef9597f39a14f7 Mon Sep 17 00:00:00 2001 From: yz <3614508250@qq.com> Date: Thu, 12 Dec 2024 14:44:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98=E7=AD=89=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/core/service/CoreUserService.java | 3 +- .../src/main/resources/sql/core/coreUser.md | 60 ----- .../resources/templates/teacherIndex.html | 64 +++--- .../cn/jlw/Interceptor/InterceptorConfig.java | 1 + .../ibeetl/jlw/conf/KeyExpiredListener.java | 159 ++++++------- .../ibeetl/jlw/dao/GeneralQuestionLogDao.java | 1 + .../com/ibeetl/jlw/enums/SubsystemName.java | 6 +- .../ibeetl/jlw/service/CourseInfoService.java | 17 ++ .../service/GeneralQuestionLogService.java | 7 + .../service/ResourcesApplicationService.java | 2 +- .../service/StatisticalAnalysisService.java | 208 +++++++++++++++++- .../ibeetl/jlw/service/StudentService.java | 17 ++ .../TeacherOpenCourseMergeStudentService.java | 2 +- ...eacherOpenCourseScoreDashboardService.java | 2 +- ...JurisdictionExperimentalSystemService.java | 6 +- .../service/UniversitiesCollegesService.java | 2 +- .../jlw/service/WebPlatformService.java | 28 ++- .../jlw/service/api/ApiIndexBaseService.java | 2 +- .../api/student/ApiStudentService.java | 5 +- .../ibeetl/jlw/util/SubsystemUserUtil.java | 11 + .../ibeetl/jlw/web/AnalysisController.java | 9 +- .../jlw/web/GeneralQuestionLogController.java | 20 +- .../com/ibeetl/jlw/web/IndexController.java | 14 +- .../web/StatisticalAnalysisController.java | 5 +- .../com/ibeetl/jlw/web/StudentController.java | 134 ++++++----- ...TeacherSystemUseLogAnalysisController.java | 39 ++-- .../com/ibeetl/jlw/web/TeacherController.java | 1 + .../jlw/web/api/SonSystemLogoController.java | 21 ++ .../main/resources/application-dev.properties | 8 + .../resources/sql/jlw/generalQuestionLog.md | 12 +- .../jlw/teacher/statisticalReport.html | 4 +- 31 files changed, 595 insertions(+), 275 deletions(-) create mode 100644 web/src/main/java/com/ibeetl/jlw/web/api/SonSystemLogoController.java diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index d583fd2e..3751e723 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -247,8 +247,7 @@ public class CoreUserService extends CoreBaseService { * * @return */ - public Boolean recordLoginInformation(Long userId, String lastLoginTime) { - CoreUser cacheUser = coreUserDao.single(userId); + public Boolean recordLoginInformation(Long userId, String lastLoginTime,CoreUser cacheUser) { if (cacheUser == null) { return false; } diff --git a/admin-core/src/main/resources/sql/core/coreUser.md b/admin-core/src/main/resources/sql/core/coreUser.md index 84664f60..076ebcfc 100644 --- a/admin-core/src/main/resources/sql/core/coreUser.md +++ b/admin-core/src/main/resources/sql/core/coreUser.md @@ -282,66 +282,6 @@ left join core_user_role cur on cu.ID = cur.USER_ID where cu.CODE = #username# and cur.ROLE_ID in (192, 194) -[//]: # () -[//]: # (getUserInfosByUsername) - -[//]: # (===) - -[//]: # (select cu.CODE as username,) - -[//]: # (cu.PASSWORD as password,) - -[//]: # (IF(s.student_name IS NULL, t.teacher_name, s.student_name) as name, ) - -[//]: # (cu.old_id as userId,) - -[//]: # (if(cur.ROLE_ID = 192, 4, 3) as roleId,) - -[//]: # (uc.old_school_id as schoolId,) - -[//]: # (uc.universities_colleges_name as schoolName,) - -[//]: # (sc.old_class_id as classId,) - -[//]: # (sc.class_name as className,) - -[//]: # (IF(s.student_mobile IS NULL, t.teacher_mobile, s.student_mobile) as phone,) - -[//]: # (IF(uf.old_id is null, uf1.old_id, uf.old_id) as collegeId,) - -[//]: # (IF(uf.university_faculty_name is null, uf1.university_faculty_name, uf.university_faculty_name) as collegeName,) - -[//]: # (IF(us.old_id is null, us1.old_id, us.old_id) as majorId,) - -[//]: # (IF(us.university_system_name is null, us1.university_system_name, us.university_system_name) as majorName,) - -[//]: # (s.old_id as studentId,) - -[//]: # (t.old_id as teacherId) - -[//]: # (from core_user cu) - -[//]: # (join universities_colleges uc on cu.ORG_ID = uc.org_id) - -[//]: # (left join student s on cu.ID = s.user_id) - -[//]: # (left join teacher t on cu.ID = t.user_id) - -[//]: # (left join school_class sc on s.class_id = sc.class_id) - -[//]: # (left join university_faculty uf on t.university_faculty_id = uf.university_faculty_id) - -[//]: # (left join university_faculty uf1 on sc.university_faculty_id = uf1.university_faculty_id) - -[//]: # (left join university_system us on t.university_system_id = us.university_system_id) - -[//]: # (left join university_system us1 on sc.university_system_id = us1.university_system_id) - -[//]: # (left join core_user_role cur on cu.ID = cur.USER_ID) - -[//]: # (where cur.ROLE_ID in (192, 194) ) - - getUserInfosByUsername === select cu.CODE as username, diff --git a/admin-core/src/main/resources/templates/teacherIndex.html b/admin-core/src/main/resources/templates/teacherIndex.html index 1bfba741..bec1201d 100644 --- a/admin-core/src/main/resources/templates/teacherIndex.html +++ b/admin-core/src/main/resources/templates/teacherIndex.html @@ -77,6 +77,15 @@