新增我的考试分析

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.qmth.boot.core.enums.Platform;
+import com.qmth.boot.tools.signature.SignatureType;
+import com.qmth.teachcloud.common.SignatureEntityTest;
 import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.bean.auth.ExpireTimeBean;
 import com.qmth.teachcloud.common.bean.dto.OrgDto;
@@ -637,7 +639,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         Set<RoleTypeEnum> roleType = authBean.getRoleList().stream().map(s -> s.getType()).collect(Collectors.toSet());
         String sessionId = SessionUtil.digest(sysUser.getId(), Math.abs(roleType.toString().hashCode()), platform.name());
         //TODO 测试用
-//        String test = SignatureEntityTest.build(SignatureType.TOKEN, sessionId, token);
+        String test = SignatureEntityTest.build(SignatureType.TOKEN, sessionId, token);
         ExpireTimeBean expireTime = AuthUtil.getExpireTime(platform);
         TBSession tbSession = new TBSession(sessionId, String.valueOf(sysUser.getId()), roleType.toString(),
                 platform.name(), platform.name(), deviceId, ServletUtil.getRequest().getLocalAddr(), token,
@@ -645,8 +647,8 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         tbSessionService.saveOrUpdate(tbSession);
         redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
 
-//        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType, appSource);
-        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, roleType, appSource);
+        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType, appSource);
+//        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, roleType, appSource);
         loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? loginResult.new SchoolNativeBean(authBean.getSchool()) : null);
         loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
         loginResult.setTime(System.currentTimeMillis());

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TeacherMyClassRankResult.java

@@ -1,5 +1,8 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 /**
  * @Date: 2021/6/8.
  */
@@ -14,6 +17,17 @@ public class TeacherMyClassRankResult {
     private Integer teacherCount;
     private Integer rank;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long inspectCollegeId;
+
+    public Long getInspectCollegeId() {
+        return inspectCollegeId;
+    }
+
+    public void setInspectCollegeId(Long inspectCollegeId) {
+        this.inspectCollegeId = inspectCollegeId;
+    }
+
     public String getTeacherName() {
         return teacherName;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TAExamCourseCollegeTeacherServiceImpl.java

@@ -65,11 +65,10 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
 
     @Override
     public IPage<TeacherMyClassRankResult> listMyClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+//        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Page<TeacherMyClassRankResult> page = new Page<>(pageNumber, pageSize);
-        IPage<TeacherMyClassRankResult> listPage = taExamCourseCollegeTeacherMapper.listMyClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, sysUser.getId(), courseCode, inspectCollegeId, column, Objects.nonNull(order) ? order.name() : null);
-        return listPage;
+        return taExamCourseCollegeTeacherMapper.listMyClassRank(page, 2L, Objects.nonNull(semester) ? semester.name() : null, examId, sysUser.getId(), courseCode, inspectCollegeId, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     @Override

teachcloud-report-business/src/main/resources/mapper/TAExamCourseCollegeTeacherMapper.xml

@@ -60,7 +60,8 @@
             a.teach_college_name teachCollegeName,
             round(a.avg_score_assign, 1) avgScore,
             a.teacher_count teacherCount,
-            a.teacher_rank `rank`
+            a.teacher_rank `rank`,
+            a.inspect_college_id as inspectCollegeId
         FROM
             t_a_exam_course_college_teacher a
                 LEFT JOIN

teachcloud-report-business/src/main/resources/mapper/TAExamCourseRecordMapper.xml

@@ -155,6 +155,34 @@
     </select>
 
     <select id="findTeacherInspect" resultType="com.qmth.teachcloud.report.business.bean.result.TeachCourseResult">
-
+        select
+            count(taecr.absent) as absentCount,
+            taecr.absent
+        from
+            t_a_exam_course_record taecr
+        join t_b_exam tbe
+            on
+            tbe.id = taecr.exam_id
+        <where>
+            <if test="inspectCollegeId != null and inspectCollegeId != ''">
+                AND taecr.inspect_college_id = #{examId}
+            </if>
+            <if test="examId != null and examId != ''">
+                AND taecr.exam_id = #{examId}
+            </if>
+            <if test="semester != null and semester != ''">
+                AND tbe.semester = #{semester}
+            </if>
+            <if test="schoolId != null and schoolId != ''">
+                AND tbe.school_id = #{schoolId}
+            </if>
+            <if test="courseCode != null and courseCode != ''">
+                AND taecr.course_code = #{courseCode}
+            </if>
+        </where>
+        group by
+            taecr.absent
+        order by
+            taecr.absent
     </select>
 </mapper>

teachcloud-report/src/main/java/com/qmth/teachcloud/report/interceptor/AuthInterceptor.java

@@ -22,11 +22,11 @@ public class AuthInterceptor extends ExtendInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         log.info("preHandle is come in");
-//        if (request.getServletPath().contains(endpoint)) {
-        return true;
-//        } else {
-//            return AuthUtil.adminAuthInterceptor(request, response);
-//        }
+        if (request.getServletPath().contains(endpoint)) {
+            return true;
+        } else {
+            return AuthUtil.adminAuthInterceptor(request, response);
+        }
     }
 
     @Override

teachcloud-report/src/main/resources/application-dev.properties

@@ -10,20 +10,20 @@ server.tomcat.uri-encoding=UTF-8
 spring.application.name=teachcloud-report
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=192.168.10.136
-#db.host=localhost
+#db.host=192.168.10.136
+db.host=localhost
 db.port=3306
-db.name=teachcloud-report-617
-#db.name=teachcloud-report
+#db.name=teachcloud-report-617
+db.name=teachcloud-report
 db.username=root
-db.password=Qmth87863577!
-#db.password=123456789
+#db.password=Qmth87863577!
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
 com.qmth.redis.port=6379
 com.qmth.redis.db=1
-com.qmth.redis.password=123456
+#com.qmth.redis.password=123456
 
 #mysql\u914D\u7F6E
 com.qmth.mysql.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
@@ -70,7 +70,7 @@ org.center.orgQueryApi=/api/open/org/query
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
-com.qmth.api.global-auth=true
+com.qmth.api.global-auth=false
 #com.qmth.api.global-strict=false
 #com.qmth.api.global-rate-limit=1/5s