Merge remote-tracking branch 'origin/master'

edu-im/edu-im-server/src/main/java/com/keao/edu/im/mec/im/IMHelper.java

@@ -252,11 +252,14 @@ public class IMHelper {
         jsonObject.put("hostUserId",hostUserId);
         jsonObject.put("hostStreamId",hostUserId);
         JSONObject json = new JSONObject();
-        json.put("sessionId",roomQuery(roomId));
+        String sessionId = redisTemplate.opsForValue().get("sessionId:" + roomId);
+        if(StringUtils.isEmpty(sessionId)){
+            sessionId = roomQuery(roomId);
+            redisTemplate.opsForValue().set("sessionId:" + roomId,sessionId);
+        }
+        json.put("sessionId",sessionId);
         json.put("config",jsonObject);
 
-
-
         /*JSONObject jsonObject = new JSONObject();
         jsonObject.put("mode",3);
         jsonObject.put("videoFormat","mp4");
@@ -293,12 +296,6 @@ public class IMHelper {
         JSONObject jsonObject1 = new JSONObject();
         jsonObject1.put("video",jsonArray);
         jsonObject.put("input",jsonObject1);*/
-
-
-        json.put("sessionId",roomQuery(roomId));
-        json.put("config",jsonObject);
-
-
         String body = json.toJSONString();
 
         Thread.sleep(1000l);
@@ -421,6 +418,7 @@ public class IMHelper {
         if("200".equals(code)){
             return resultObject.get("sessionId").toString();
         }else {
+            log.error("获取sessionId失败 returnResult:{}",returnResult);
             throw new BizException("获取sessionId失败");
         }
     }

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -28,11 +28,10 @@ import com.keao.edu.user.api.client.EduUserFeignService;
 import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
-import com.keao.edu.util.date.DateUtil;
-import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -78,6 +77,9 @@ public class RoomServiceImpl implements RoomService {
     @Autowired
     private EduUserFeignService eduUserFeignService;
 
+    @Autowired
+    private RedisTemplate<String,String> redisTemplate;
+
     @Override
     public void roomQuery(String roomId) throws Exception {
         imHelper.roomQuery(roomId);
@@ -584,6 +586,7 @@ public class RoomServiceImpl implements RoomService {
             });
             roomDao.deleteByRid(roomId.toString());
             imHelper.dismiss(userId,roomId.toString());
+            redisTemplate.delete("sessionId:" + roomId);
         }
     }
 

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dto/StudentExamResultStatisticsDto.java

@@ -20,6 +20,9 @@ public class StudentExamResultStatisticsDto {
     @ApiModelProperty(value = "不及格人数")
     private int examFailStudentNum;
 
+    @ApiModelProperty(value = "及格人数")
+    private int examNotFailStudentNum;
+
     public int getTotalRegistrationStudentNum() {
         return totalRegistrationStudentNum;
     }
@@ -51,4 +54,12 @@ public class StudentExamResultStatisticsDto {
     public void setExamFailStudentNum(int examFailStudentNum) {
         this.examFailStudentNum = examFailStudentNum;
     }
+
+    public int getExamNotFailStudentNum() {
+        return examNotFailStudentNum;
+    }
+
+    public void setExamNotFailStudentNum(int examNotFailStudentNum) {
+        this.examNotFailStudentNum = examNotFailStudentNum;
+    }
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/ExamRoomStudentRelationServiceImpl.java

@@ -1,6 +1,5 @@
 package com.keao.edu.user.service.impl;
 
-import com.alibaba.fastjson.JSONObject;
 import com.keao.edu.auth.api.client.SysUserFeignService;
 import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.dal.BaseDAO;
@@ -648,14 +647,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 			SysUser sysUser = sysUserFeignService.queryUserInfo();
 			//当前用户是呼叫中或者考试中
 			if(roomStudentListDto.getFinishedExam() == 0 || roomStudentListDto.getFinishedExam() == 1){
-				boolean isPush = true;
-				if(roomStudentListDtos.size() > 1){
-					RoomStudentListDto roomStudentListDto1 = roomStudentListDtos.get(1);
-					if(roomStudentListDto1.getFinishedExam() == 2){
-						isPush = false;
-					}
-				}
-				currentStudent(roomStudentListDto.getExamRoomStudentRelationId(),isPush,examStatus,sysUser.getId());
+				currentStudent(roomStudentListDto.getExamRoomStudentRelationId(),true,examStatus,sysUser.getId());
 				//考试中
 				if(roomStudentListDtos.size() > 1){
 					RoomStudentListDto roomStudentListDto1 = roomStudentListDtos.get(1);
@@ -688,13 +680,12 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 	private void currentStudent(Long examRoomStudentRelationId,Boolean isPush,Integer examStatus,Integer operator){
 		ExamRoomStudentRelation examRoomStudentRelation = examRoomStudentRelationDao.get(examRoomStudentRelationId);
 		//将当前学员退出教室并添加参考状态，如果考试未完成，清除签到时间，重新签到
-//
 		if(examStatus != null && examStatus == 0){
 			//未完成
 			examRoomStudentRelationDao.cleanSignInTime(examRoomStudentRelation.getExamRegistrationId());
 			examRoomStudentRelation.setSignInTime(null);
 			studentExamResultDao.updateFinishedExam(examRoomStudentRelation.getExamRegistrationId(),3);
-			publishMessage(examRoomStudentRelation,MemberChangedMessage.Not_Finish,isPush,operator);
+			publishMessage(examRoomStudentRelation,MemberChangedMessage.Not_Finish,true,operator);
 			HashMap<Integer, String> map = new HashMap<>(1);
 			map.put(examRoomStudentRelation.getStudentId(),examRoomStudentRelation.getStudentId().toString());
 			ExaminationBasic examinationBasic = examinationBasicDao.get(examRoomStudentRelation.getExaminationBasicId());
@@ -719,7 +710,6 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		map.put(examRoomStudentRelation.getStudentId(),examRoomStudentRelation.getStudentId().toString());
 		String url = "3?examRegistrationId=" + examRoomStudentRelation.getExamRegistrationId();
 		sysMessageService.batchSendMessage(MessageTypeEnum.EXAM_STARTED_PUSH,map,null,0,url,JiguangPushPlugin.PLUGIN_NAME);
-
 		//状态变更为呼叫中
 		studentExamResultDao.updateFinishedExam(examRoomStudentRelation.getExamRegistrationId(),1);
 		publishMessage(examRoomStudentRelation,MemberChangedMessage.Student_Queue,isPush,operator);

edu-user/edu-user-biz/src/main/resources/config/mybatis/ExamSongMapper.xml

@@ -27,7 +27,7 @@
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="ExamSong">
-		SELECT * FROM exam_song WHERE tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT * FROM exam_song WHERE tenant_id_ = #{tenantId} ORDER BY id_ DESC
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -103,7 +103,7 @@
 		LEFT JOIN subject s ON FIND_IN_SET(s.id_, es.subject_list_)
 		<include refid="queryCondition"/>
 		GROUP BY es.id_
-		ORDER BY id_
+		ORDER BY id_ DESC
 		<include refid="global.limit"/>
 	</select>
 	

edu-user/edu-user-biz/src/main/resources/config/mybatis/StudentExamResultMapper.xml

@@ -242,8 +242,9 @@
 	<select id="getStudentExamResultStatisticsInfo" resultType="com.keao.edu.user.dto.StudentExamResultStatisticsDto">
 		SELECT
 			COUNT( er.id_ ) totalRegistrationStudentNum,
-			SUM( CASE WHEN ser.is_finished_exam_ = 3 THEN 0 ELSE 1 END ) notExamStudentNum,
+			SUM( CASE WHEN ser.is_finished_exam_ = 3 THEN 1 ELSE 0 END ) notExamStudentNum,
 			SUM( CASE WHEN ser.result_ = 'FAIL' THEN 1 ELSE 0 END ) examFailStudentNum,
+			SUM( CASE WHEN ser.result_ != 'FAIL' THEN 1 ELSE 0 END ) examNotFailStudentNum,
 			SUM( CASE WHEN ser.id_ > 0 THEN 1 ELSE 0 END ) examStudentNum
 		FROM
 			exam_registration er

edu-user/edu-user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -127,9 +127,9 @@
         WHERE es.subject_id_ IN (SELECT s.id_ FROM `subject` s WHERE s.id_ = #{id});
     </select>
 
-    <select id="findExamRegistSubjects" resultType="com.keao.edu.user.entity.Subject">
-        SELECT DISTINCT s.* FROM exam_registration er
-        LEFT JOIN `subject` s ON er.subject_id_=s.id_
-        WHERE er.examination_basic_id_=#{examId}
+    <select id="findExamRegistSubjects" resultMap="Subject">
+        SELECT DISTINCT s.* FROM exam_subject es
+        LEFT JOIN `subject` s ON es.subject_id_=s.id_
+        WHERE es.examination_basic_id_=#{examId}
     </select>
 </mapper>