From af42e2ebd39fafffd4732c152c33e0285bfaadaf Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Wed, 9 Nov 2022 00:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=AF=BE=E5=A2=9E=E5=8A=A0=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jlw/dao/UniversitiesCollegesDao.java      |  6 +++---
 .../entity/UniversitiesCollegesRuleInfo.java  |  2 +-
 .../TeacherOpenCourseMergeTeacherService.java |  8 ++++++--
 .../service/UniversitiesCollegesService.java  | 16 +++++++++++----
 .../jlw/service/WebPlatformService.java       |  3 ++-
 .../resources/sql/jlw/universitiesColleges.md | 20 +++++++++++++++++++
 6 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java
index c2a82b78..525edf98 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/UniversitiesCollegesDao.java
@@ -32,9 +32,9 @@ public interface UniversitiesCollegesDao extends BaseMapper<UniversitiesColleges
     UniversitiesColleges getByUserId(Long userId);
 
     /**
-     * 获取用户
-     * @param userId
+     * 院校管理-用户中心的权限信息
+     * @param orgId
      * @return
      */
-    UniversitiesCollegesRuleInfo getUniversitiesCollegesRuleInfoByUserId(Long userId);
+    UniversitiesCollegesRuleInfo getUniversitiesCollegesRuleInfoByOrgId(Long orgId);
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesRuleInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesRuleInfo.java
index c8c19cb9..78622ef0 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesRuleInfo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitiesCollegesRuleInfo.java
@@ -10,7 +10,7 @@ import lombok.Data;
 public class UniversitiesCollegesRuleInfo {
 
     /**
-     * 课程数量
+     * 课程数量（院校这里，只能看到开课课程）
      */
     private Integer courseInfoCount;
     /**
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java
index a1ffc640..54d62c13 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeTeacherService.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.RandomUtil;
 import cn.jlw.util.ToolUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.service.CoreBaseService;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
@@ -28,6 +29,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import static com.ibeetl.admin.core.util.user.CacheUserUtil.getUser;
+
 
 /**
  * 课程开课关联教师 Service
@@ -252,6 +255,7 @@ public class TeacherOpenCourseMergeTeacherService extends CoreBaseService<Teache
                                 @NotNull(message = "教师ID不能为空！")  Long teacherId) {
         // 新建排序值，则默认是1
         Long newOrderIndex = 1L;
+        CoreUser user = getUser();
         TeacherOpenCourseMergeTeacher courseMergeTeacherList = teacherOpenCourseMergeTeacherDao.getOneByTeacherId(teacherId);
 
         // 如果没有查询到这个老师创建的开课信息, 则不会递增
@@ -270,8 +274,8 @@ public class TeacherOpenCourseMergeTeacherService extends CoreBaseService<Teache
         String tempCode = generateCodeWithVerify(RandomUtil.randomString(6));
         // 开课授权码：新增开课记录时，则创建授权码
         teacherOpenCourseMergeTeacher.setTeacherOpenCourseMergeTeacherAuthCode(tempCode);
-//        teacherOpenCourseMergeTeacher.setOrgId(teacherOpenCourseQuery.getOrgId());
-//        teacherOpenCourseMergeTeacher.setUserId(teacherOpenCourseQuery.getUserId());
+        teacherOpenCourseMergeTeacher.setOrgId(user.getOrgId());
+        teacherOpenCourseMergeTeacher.setUserId(user.getId());
         teacherOpenCourseMergeTeacherDao.insert(teacherOpenCourseMergeTeacher);
     }
 
diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java
index c45c1f1b..67ad6a09 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java
@@ -13,6 +13,7 @@ import com.ibeetl.admin.core.service.CoreUserService;
 import com.ibeetl.jlw.dao.UniversitiesCollegesDao;
 import com.ibeetl.jlw.entity.SchoolClass;
 import com.ibeetl.jlw.entity.UniversitiesColleges;
+import com.ibeetl.jlw.entity.UniversitiesCollegesRuleInfo;
 import com.ibeetl.jlw.entity.UniversitiesCollegesUserInfo;
 import com.ibeetl.jlw.entity.dto.CreateUserDTO;
 import com.ibeetl.jlw.web.query.SchoolClassQuery;
@@ -195,13 +196,20 @@ public class UniversitiesCollegesService extends CoreBaseService<UniversitiesCol
     public UniversitiesCollegesUserInfo info() {
         CoreUser user = getUser();
         Assert.isTrue(user.isUniAdmin(), "该接口只有学校管理管理员可以使用！");
-        UniversitiesColleges universitiesColleges = (UniversitiesColleges) webPlatformService.getUserInfoFromSessionByIdentity(user);
+
+        // 构建返回实体
         UniversitiesCollegesUserInfo universitiesCollegesUserInfo = new UniversitiesCollegesUserInfo();
+        // 当前的登录的学校管理员登录信息
+        // TODO 需要增加 登录次数和登录天数信息和最后登录时间。
         universitiesCollegesUserInfo.setCoreUser(user);
+
+        // 院校信息
+        UniversitiesColleges universitiesColleges = (UniversitiesColleges) webPlatformService.getUserInfoFromSessionByIdentity(user);
         universitiesCollegesUserInfo.setUniversitiesColleges(universitiesColleges);
-        return universitiesCollegesUserInfo;
 
-//        UniversitiesCollegesRuleInfo
-//        universitiesCollegesUserInfo.setUniversitiesCollegesRuleInfo();
+        // 院校权限信息
+        UniversitiesCollegesRuleInfo ruleInfo = universitiesCollegesDao.getUniversitiesCollegesRuleInfoByOrgId(user.getOrgId());
+        universitiesCollegesUserInfo.setUniversitiesCollegesRuleInfo(ruleInfo);
+        return universitiesCollegesUserInfo;
     }
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java
index 8483dec1..e973bd67 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/WebPlatformService.java
@@ -30,6 +30,7 @@ public class WebPlatformService {
      */
     public void setUserInfoToSessionByIdentity(@NotNull(message = "登录用户不能为空！") CoreUser user) {
         Long userId = user.getId();
+        Long orgId = user.getOrgId();
 
         switch (EnumUtil.fromString(MenuEnums.class, user.getJobType1())) {
             case JT_S_01: {
@@ -43,7 +44,7 @@ public class WebPlatformService {
                 httpRequestLocal.setSessionValue(T_STUDENT, studentService.getByUserId(userId));
             }break;
             case JT_S_04: {
-                httpRequestLocal.setSessionValue(T_COLLEGES_ADMIN, universitiesCollegesService.getByUserId(userId));
+                httpRequestLocal.setSessionValue(T_COLLEGES_ADMIN, universitiesCollegesService.getByOrgId(orgId));
             }break;
             default: {
                 httpRequestLocal.setSessionValue(ACCESS_CURRENT_USER, user);
diff --git a/web/src/main/resources/sql/jlw/universitiesColleges.md b/web/src/main/resources/sql/jlw/universitiesColleges.md
index 0b9a5e67..54ca45c9 100644
--- a/web/src/main/resources/sql/jlw/universitiesColleges.md
+++ b/web/src/main/resources/sql/jlw/universitiesColleges.md
@@ -230,3 +230,23 @@ refreshUniversitiesCollegesAuthCode
       @if(isNotEmpty(isOnlyUpdateAuthCodeNullValue) && isOnlyUpdateAuthCodeNullValue){
         AND t.universities_colleges_auth_code is null
       @}
+
+
+getUniversitiesCollegesRuleInfoByOrgId
+===
+
+* 通过用户组织ID获取院校的的权限信息
+
+  SELECT
+  ( SELECT count( 1 ) FROM teacher_open_course t WHERE t.teacher_open_course_status = 1 AND t.org_id = #orgId# ) AS course_info_count,
+  (
+  SELECT
+  count( 1 )
+  FROM
+  universities_colleges_jurisdiction_experimental_system t
+  WHERE
+  t.type = 1
+  AND t.org_id IN ( SELECT max( universities_colleges_id ) FROM universities_colleges WHERE org_id = #orgId# )) AS application_count,
+  ( SELECT count( 1 ) FROM teacher_open_course_merge_teacher t WHERE t.teacher_open_course_merge_teacher_status = 1 AND t.org_id = #orgId# ) AS teacher_count,
+  ( SELECT count( 1 ) FROM teacher_open_course_merge_student t WHERE t.teacher_open_course_school_class_merge_student_status = 1 AND t.org_id = #orgId# ) AS student_count
+