From 4ebe2458dc784bbf1f6a93a91d40dea28d280d5f Mon Sep 17 00:00:00 2001 From: chenyuan <907037276@qq.com> Date: Fri, 29 Mar 2024 18:32:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=90=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibeetl/admin/core/dao/CoreUserDao.java | 2 ++ .../admin/core/service/CoreUserService.java | 5 ++++ .../src/main/resources/sql/core/coreUser.md | 29 +++++++++++++++++-- .../resources/application-prod.properties | 5 +++- 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java index 422987be..9f774b7c 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreUserDao.java @@ -87,4 +87,6 @@ public interface CoreUserDao extends BaseMapper { List> getUsersBySchoolId(Long schoolId); + + MapgetUserInfoByUsername(String username); } 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 ee308b2e..351dba5b 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 @@ -412,4 +412,9 @@ public class CoreUserService extends CoreBaseService { public List> getUsersBySchoolId(Long schoolId){ return coreUserDao.getUsersBySchoolId(schoolId); } + + //根据用户名查询用户相关信息 + public Map getUserInfoByUsername(String username) { + return coreUserDao.getUserInfoByUsername(username); + } } diff --git a/admin-core/src/main/resources/sql/core/coreUser.md b/admin-core/src/main/resources/sql/core/coreUser.md index b3b7c78d..e95ccb82 100644 --- a/admin-core/src/main/resources/sql/core/coreUser.md +++ b/admin-core/src/main/resources/sql/core/coreUser.md @@ -251,6 +251,31 @@ deleteById1 === delete from core_user where ID = #userId# -getUsersBySchoolId +getUserInfoByUsername === - select \ No newline at end of file +select cu.CODE as username, +cu.PASSWORD as password, +cu.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 +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 cu.CODE = #username# +and cur.ROLE_ID in (192, 194) \ No newline at end of file diff --git a/web/src/main/resources/application-prod.properties b/web/src/main/resources/application-prod.properties index 24c8f53a..7bc2bdbe 100644 --- a/web/src/main/resources/application-prod.properties +++ b/web/src/main/resources/application-prod.properties @@ -19,6 +19,9 @@ spring.datasource.dynamic.p6spy = false spring.datasource.dynamic.strict = false spring.datasource.dynamic.hikari.max-pool-size=30 spring.datasource.dynamic.hikari.connection-test-query=SELECT 1 +spring.datasource.dynamic.hikari.idle-timeout=60000 +spring.datasource.dynamic.hikari.max-lifetime=600000 +spring.datasource.dynamic.hikari.min-idle=5 # master spring.datasource.dynamic.datasource.master.driverClassName=com.mysql.cj.jdbc.Driver @@ -28,7 +31,7 @@ spring.datasource.dynamic.datasource.master.password=xYR3A4EXCWxkHmNX spring.datasource.dynamic.datasource.master.hikari.max-lifetime=60000 # ds2 -#spring.datasource.dynamic.datasource.ds2.driverClassName=com.mysql.cj.jdbc.Driver +#spring.datasource.dynamic.datasource.ds2.driverClassName=com.myqitsql.cj.jdbc.Driver #spring.datasource.dynamic.datasource.ds2.url=jdbc:mysql://localhost:3306/tzcj?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true #spring.datasource.dynamic.datasource.ds2.username=root #spring.datasource.dynamic.datasource.ds2.password=root