日常更新

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

@@ -638,7 +638,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,
@@ -646,8 +646,8 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         tbSessionService.saveOrUpdate(tbSession);
         redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
 
-        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType);
-//        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, roleType);
+//        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType);
+        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, roleType);
         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/TBExamCourseResult.java

@@ -0,0 +1,17 @@
+package com.qmth.teachcloud.report.business.bean.result;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.teachcloud.report.business.entity.TBExamCourse;
+
+import java.io.Serializable;
+
+/**
+ * @Description: TBExamCourseResult
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/6/15
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TBExamCourseResult extends TBExamCourse implements Serializable {
+}

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TBExamCourseMapper.java

@@ -2,6 +2,7 @@ package com.qmth.teachcloud.report.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherExamCourseResult;
+import com.qmth.teachcloud.report.business.bean.result.TBExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TBExamCourse;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,6 +26,6 @@ public interface TBExamCourseMapper extends BaseMapper<TBExamCourse> {
      * @param inspect
      * @return
      */
-    List<SurveyTeacherExamCourseResult> findCourseList(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("inspect") boolean inspect);
+    List<TBExamCourseResult> findCourseList(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("inspect") boolean inspect);
 
 }

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

@@ -2,6 +2,7 @@ package com.qmth.teachcloud.report.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherExamCourseResult;
+import com.qmth.teachcloud.report.business.bean.result.TBExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TBExamCourse;
 
 import java.util.List;
@@ -35,5 +36,5 @@ public interface TBExamCourseService extends IService<TBExamCourse> {
      * @param inspect
      * @return
      */
-    List<SurveyTeacherExamCourseResult> findCourseList(Long schoolId, Long examId, boolean inspect);
+    List<TBExamCourseResult> findCourseList(Long schoolId, Long examId, boolean inspect);
 }

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.BasicCourseService;
-import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherExamCourseResult;
+import com.qmth.teachcloud.report.business.bean.result.TBExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TBExamCourse;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.TestStatusEnum;
@@ -63,26 +63,26 @@ public class TBExamCourseServiceImpl extends ServiceImpl<TBExamCourseMapper, TBE
     }
 
     @Override
-    public List<String> findEffectiveByExamId(Long examId,String courseCode) {
+    public List<String> findEffectiveByExamId(Long examId, String courseCode) {
         List<PublishStatusEnum> publishStatusEnumList = new ArrayList<>();
         publishStatusEnumList.add(PublishStatusEnum.UN_COMPUTE);
         publishStatusEnumList.add(PublishStatusEnum.UN_PUBLISH);
 
         List<TBExamCourse> effectiveCourseList = this.list(new QueryWrapper<TBExamCourse>().lambda()
-                .eq(TBExamCourse::getExamId,examId)
-                .eq(TBExamCourse::getTestStatus,TestStatusEnum.UN_TEST)
-                .in(TBExamCourse::getPublishStatus,publishStatusEnumList));
+                .eq(TBExamCourse::getExamId, examId)
+                .eq(TBExamCourse::getTestStatus, TestStatusEnum.UN_TEST)
+                .in(TBExamCourse::getPublishStatus, publishStatusEnumList));
 
-        if (effectiveCourseList.size() == 0){
+        if (effectiveCourseList.size() == 0) {
             throw ExceptionResultEnum.ERROR.exception("该考试目前没有任何课程可以分析");
         }
         List<String> effectCourseCodeList = new ArrayList<>();
-        if (courseCode != null && courseCode.length() > 0){
-            if (!effectiveCourseList.stream().map(TBExamCourse::getCourseCode).collect(Collectors.toList()).contains(courseCode)){
+        if (courseCode != null && courseCode.length() > 0) {
+            if (!effectiveCourseList.stream().map(TBExamCourse::getCourseCode).collect(Collectors.toList()).contains(courseCode)) {
                 throw ExceptionResultEnum.ERROR.exception("课程【" + courseCode + "】无法进行分析");
             }
             effectCourseCodeList.add(courseCode);
-        }else {
+        } else {
             effectCourseCodeList = effectiveCourseList.stream().map(TBExamCourse::getCourseCode).collect(Collectors.toList());
         }
         return effectCourseCodeList;
@@ -97,7 +97,7 @@ public class TBExamCourseServiceImpl extends ServiceImpl<TBExamCourseMapper, TBE
      * @return
      */
     @Override
-    public List<SurveyTeacherExamCourseResult> findCourseList(Long schoolId, Long examId, boolean inspect) {
+    public List<TBExamCourseResult> findCourseList(Long schoolId, Long examId, boolean inspect) {
         return tbExamCourseMapper.findCourseList(schoolId, examId, inspect);
     }
 }

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.teachcloud.report.business.mapper.TBExamCourseMapper">
 
-    <select id="findCourseList" resultType="com.qmth.teachcloud.report.business.bean.result.SurveyTeacherExamCourseResult">
+    <select id="findCourseList" resultType="com.qmth.teachcloud.report.business.bean.result.TBExamCourseResult">
         select DISTINCT tbs.course_code,tbs.course_name from t_b_exam_student tbs
         join basic_course bc
         on tbs.course_code = bc.code

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)) {
+//        if (request.getServletPath().contains(endpoint)) {
             return true;
-        } else {
-            return AuthUtil.adminAuthInterceptor(request, response);
-        }
+//        } else {
+//            return AuthUtil.adminAuthInterceptor(request, response);
+//        }
     }
 
     @Override

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

@@ -10,16 +10,19 @@ 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.port=3306
 db.name=teachcloud-report
 db.username=root
+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
@@ -65,7 +68,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=false
+com.qmth.api.global-auth=true
 #com.qmth.api.global-strict=false
 #com.qmth.api.global-rate-limit=1/5s
 
@@ -131,4 +134,4 @@ sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
 sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
 
 yun.mark.url=https://www.markingcloud.com
-yun.mark.studentScoreApi=/api/exam/student/score
+yun.mark.studentScoreApi=/api/exam/student/score