Merge remote-tracking branch 'origin/master'

edu-common/src/main/java/com/keao/edu/common/dao/SysMessageDao.java

@@ -33,7 +33,7 @@ public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 	 * @param userId
 	 * @return
 	 */
-	public List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId);
+	Integer queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId);
 
 	/**
 	 * 修改用户所有消息阅读状态

edu-common/src/main/java/com/keao/edu/common/service/impl/SysMessageServiceImpl.java

@@ -326,13 +326,13 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	@Override
 	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId) {
-		List<Mapper> mappers = sysMessageDao.queryCountOfUnread(type, userId);
+		Integer num = sysMessageDao.queryCountOfUnread(type, userId);
 
-		Map<String, Integer> map = new HashMap<String, Integer>();
-
-		for (Mapper mapper : mappers) {
+		Map<String, Integer> map = new HashMap<>(1);
+		map.put("num",num);
+		/*for (Mapper mapper : mappers) {
 			map.put(mapper.getKey().toString(), Integer.parseInt(mapper.getValue().toString()));
-		}
+		}*/
 
 		return map;
 	}

edu-common/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -174,17 +174,16 @@
 		INTERVAL #{recentMin} MINUTE) >= date(send_time_)]]>
 	</select>
 
-	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
-		SELECT group_ key_,COUNT(*) value_ FROM sys_message WHERE user_id_ = #{userId} AND read_status_ = 0
-		<if test="type != null">
-		and type_ = #{type,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
-		</if>
-		group by group_
-	</select>
 
 	<select id="queryUserInRecentMinList" resultMap="message" parameterType="map">
 		select *
 		from sys_message where receiver_ = #{mobile} and type_ = #{type,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler} and <![CDATA[DATE_ADD(send_time_,
 		INTERVAL #{recentMin} MINUTE) >= now()]]>
 	</select>
+	<select id="queryCountOfUnread" resultType="java.lang.Integer">
+		SELECT COUNT(id_) FROM sys_message WHERE user_id_ = #{userId} AND read_status_ = 0
+		<if test="type != null">
+			and type_ = #{type,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
+		</if>
+	</select>
 </mapper>

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

@@ -251,7 +251,7 @@ public class IMHelper {
         jsonObject.put("sliceMin",30);
 //        jsonObject.put("renderMode",1);
         jsonObject.put("hostUserId",hostUserId);
-//        jsonObject.put("hostStreamId",hostUserId);
+        jsonObject.put("hostStreamId",hostUserId);
         JSONObject json = new JSONObject();
         json.put("sessionId",roomQuery(roomId));
         json.put("config",jsonObject);

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/ExamReviewDao.java

@@ -46,4 +46,11 @@ public interface ExamReviewDao extends BaseDAO<Long, ExamReview> {
      * @return java.util.List<com.keao.edu.user.entity.ExamReview>
      */
     List<ExamReview> getWithExamRoom(@Param("examRoomId") Long examRoomId);
+
+    /**
+     * 是否有未评审的学员
+     * @param examRoomId
+     * @return
+     */
+    int getCloseFlag(Long examRoomId);
 }

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/entity/StudentExamResult.java

@@ -61,9 +61,20 @@ public class StudentExamResult {
 	@ApiModelProperty(value = "录制开始时间")
 	private Date recordStartTime;
 
+	@ApiModelProperty(value = "录制提交时间")
+	private Date recordEndTime;
+
 	@ApiModelProperty(value = "是否录制")
 	private Integer recordFlag;
 
+	public Date getRecordEndTime() {
+		return recordEndTime;
+	}
+
+	public void setRecordEndTime(Date recordEndTime) {
+		this.recordEndTime = recordEndTime;
+	}
+
 	public Long getExamRoomId() {
 		return examRoomId;
 	}

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

@@ -844,12 +844,13 @@ public class ExamRoomServiceImpl extends BaseServiceImpl<Long, ExamRoom> impleme
 				throw new BizException("操作失败：当前还有学员未考试");
 			}
 			//没有未评审的学员
-			HashMap<String,Object> map = new HashMap();
-			map.put("reviewFlag",0);
-			map.put("teacherId",examRoom.getMainTeacherUserId());
-			int i = examReviewDao.countExamReviewRecordList(map);
+//			HashMap<String,Object> map = new HashMap();
+//			map.put("reviewFlag",0);
+//			map.put("teacherId",examRoom.getMainTeacherUserId());
+//			examReviewDao.countExamReviewRecordList(map);
+			int i = examReviewDao.getCloseFlag(examRoomId);
 			if(i > 0){
-				throw new BizException("操作失败：存在未评审的学员");
+				throw new BizException("操作失败：还有老师没完成评审");
 			}
 //			imFeignService.dismissGroup(sysUser.getId().toString(),examRoomId.toString());
 			studentExamResultService.calculateStudentExamAvgScore(examRoomId);

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

@@ -501,6 +501,7 @@ public class ExamRoomStudentRelationServiceImpl extends BaseServiceImpl<Long, Ex
 		}
 		studentExamResult.setVideoUrl(videoUrl);
 		studentExamResult.setIsFinishedExam(5);
+		studentExamResult.setRecordEndTime(new Date());
 		studentExamResultDao.update(studentExamResult);
 		ExamRoomStudentRelation roomStudentRelation = examRoomStudentRelationDao.getStudentExamRoom(examRegistrationId);
 		publishMessage(roomStudentRelation,MemberChangedMessage.Student_Queue,true,studentExamResult.getStudentId());

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

@@ -231,4 +231,12 @@
     <select id="getWithExamRoom" resultMap="ExamReview">
 		SELECT * FROM exam_review WHERE exam_room_id_=#{examRoomId}
 	</select>
+    <select id="getCloseFlag" resultType="java.lang.Integer">
+		SELECT
+		IF(((SELECT COUNT(id) FROM rongyun_room_member WHERE role != 3 AND rid = #{examRoomId}) *
+		(SELECT COUNT(id_) FROM student_exam_result ser WHERE exam_room_id_ = #{examRoomId} AND ser.is_finished_exam_ = 5)) &lt; COUNT(DISTINCT er.id_),0,1) closeFlag
+		FROM rongyun_room_member rrm
+		LEFT JOIN exam_review er ON er.exam_room_id_ = rrm.rid
+		WHERE rrm.uid = er.teacher_id_ AND rrm.role != 3 AND rrm.rid = #{examRoomId};
+	</select>
 </mapper>

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

@@ -15,6 +15,7 @@
 		<result column="avg_score_" property="avgScore"/>
 		<result column="confirm_status_" property="confirmStatus" />
 		<result column="record_start_time_" property="recordStartTime" />
+		<result column="record_end_time_" property="recordEndTime" />
 		<result column="record_flag_" property="recordFlag" />
 		<result column="is_finished_exam_" property="isFinishedExam" />
 		<result column="memo_" property="memo" />
@@ -69,6 +70,9 @@
 			<if test="recordStartTime != null">
 				record_start_time_ = #{recordStartTime},
 			</if>
+			<if test="recordEndTime != null">
+				record_end_time_ = #{recordEndTime},
+			</if>
 			<if test="recordFlag != null">
 				record_flag_ = #{recordFlag},
 			</if>