update

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

@@ -28,6 +28,7 @@ import com.keao.edu.im.whiteboard.WhiteBoardHelper;
 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.StudentExamApiDto;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -98,7 +99,7 @@ public class RoomServiceImpl implements RoomService {
     }
 
     public void joinRoomSuccess(RoomMember roomMember) throws Exception {
-        StudentExamResultApiDto examResult = null;
+        StudentExamApiDto examResult = null;
         String roomId = roomMember.getRid();
         String userId = roomMember.getUid();
         Long registrationId = roomMember.getExamRegistrationId();
@@ -176,7 +177,7 @@ public class RoomServiceImpl implements RoomService {
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.SERIALIZABLE)
     public BaseResponse joinRoom(Long registrationId, String roomId){
-        StudentExamResultApiDto examResult = null;
+        StudentExamApiDto examResult = null;
         log.info("joinRoom: roomId={}, registrationId={}", roomId,registrationId);
 
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -470,7 +471,7 @@ public class RoomServiceImpl implements RoomService {
     @Override
     @Transactional(rollbackFor = Exception.class,isolation = Isolation.SERIALIZABLE)
     public Boolean kickMember(ReqUserData data) throws Exception {
-        StudentExamResultApiDto examResult = eduUserFeignService.getExamResult(data.getRegistrationId());
+        StudentExamApiDto examResult = eduUserFeignService.getExamResult(data.getRegistrationId());
         String roomId = examResult.getRoomId();
 
         SysUser authUser = sysUserFeignService.queryUserInfo();

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

@@ -1,6 +1,7 @@
 package com.keao.edu.user.dao;
 
 import com.keao.edu.common.dal.BaseDAO;
+import com.keao.edu.user.api.enums.StudentExamApiDto;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import com.keao.edu.user.dto.StudentExamResultDto;
 import com.keao.edu.user.dto.StudentExamResultStatisticsDto;
@@ -156,4 +157,15 @@ public interface StudentExamResultDao extends BaseDAO<Long, StudentExamResult> {
      * @return java.util.List<java.lang.Integer>
      */
     List<Integer> queryStudentByOrganId(Integer organId);
+
+    /**
+     * @describe 获取im房间信息
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/8/31
+     * @time 18:07
+     * @param id:
+     * @return com.keao.edu.user.api.enums.StudentExamApiDto
+     */
+    StudentExamApiDto getStudentFinished(Long id);
 }

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

@@ -2,6 +2,7 @@ package com.keao.edu.user.service;
 
 import com.keao.edu.common.page.PageInfo;
 import com.keao.edu.common.service.BaseService;
+import com.keao.edu.user.api.enums.StudentExamApiDto;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import com.keao.edu.user.dto.RecordNotify;
 import com.keao.edu.user.dto.StudentExamResultDto;
@@ -54,7 +55,7 @@ public interface StudentExamResultService extends BaseService<Long, StudentExamR
      * @param id
      * @return
      */
-    StudentExamResultApiDto getStudentExamResultApiDto(Long id);
+    StudentExamApiDto getStudentExamResultApiDto(Long id);
 
     /**
      * 确认考生

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

@@ -22,6 +22,7 @@ import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
 import com.keao.edu.user.api.entity.Student;
 import com.keao.edu.user.api.enums.ExamEvaluationResultEnum;
 import com.keao.edu.user.api.enums.ExamModeEnum;
+import com.keao.edu.user.api.enums.StudentExamApiDto;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import com.keao.edu.user.dao.ExamReviewDao;
 import com.keao.edu.user.dao.ExaminationBasicDao;
@@ -263,11 +264,8 @@ public class StudentExamResultServiceImpl extends BaseServiceImpl<Long, StudentE
 	}
 
 	@Override
-	public StudentExamResultApiDto getStudentExamResultApiDto(Long id) {
-		StudentExamResultApiDto resultApiDto = studentExamResultDao.getStudentExamResultApiDto(id);
-		ExamRoomStudentRelation studentExamRoom = examRoomStudentRelationService.getStudentExamRoom(id);
-		resultApiDto.setRoomId(studentExamRoom.getExamRoomId().toString());
-		return resultApiDto;
+	public StudentExamApiDto getStudentExamResultApiDto(Long id) {
+		return studentExamResultDao.getStudentFinished(id);
 	}
 
 	@Override

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

@@ -328,4 +328,11 @@
 		SELECT DISTINCT(er.student_id_) FROM exam_registration er
 		WHERE organ_id_ = #{organId}
 	</select>
+	<resultMap type="com.keao.edu.user.api.enums.StudentExamApiDto" id="StudentExamApiDto">
+		<result column="is_finished_exam_" property="isFinishedExam" />
+		<result column="exam_room_id_" property="roomId" />
+	</resultMap>
+	<select id="getStudentFinished" resultMap="StudentExamApiDto">
+		SELECT exam_room_id_,is_finished_exam_ FROM student_exam_result WHERE exam_registration_id_ = #{id}
+	</select>
 </mapper>

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/EduUserFeignService.java

@@ -7,6 +7,7 @@ import com.keao.edu.im.api.entity.PublishMessageDto;
 import com.keao.edu.user.api.client.fallback.EduUserFeignServiceFallback;
 import com.keao.edu.user.api.entity.ExamRoom;
 import com.keao.edu.user.api.entity.ExamRoomStudentRelation;
+import com.keao.edu.user.api.enums.StudentExamApiDto;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -45,7 +46,7 @@ public interface EduUserFeignService {
 	 * @return
 	 */
 	@PostMapping(value = "studentExamResult/api/get")
-	StudentExamResultApiDto getExamResult(@RequestParam("id") Long id);
+	StudentExamApiDto getExamResult(@RequestParam("id") Long id);
 
 	/**
 	 * 学生报名

edu-user/edu-user-client-api/src/main/java/com/keao/edu/user/api/client/fallback/EduUserFeignServiceFallback.java

@@ -5,6 +5,7 @@ import com.keao.edu.im.api.entity.PublishMessageDto;
 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.StudentExamApiDto;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import org.springframework.stereotype.Component;
 
@@ -27,7 +28,7 @@ public class EduUserFeignServiceFallback implements EduUserFeignService {
 	}
 
 	@Override
-	public StudentExamResultApiDto getExamResult(Long id) {
+	public StudentExamApiDto getExamResult(Long id) {
 		return null;
 	}
 

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/StudentExamResultController.java

@@ -6,6 +6,7 @@ import com.keao.edu.auth.api.entity.SysUser;
 import com.keao.edu.common.controller.BaseController;
 import com.keao.edu.common.entity.HttpResponseResult;
 import com.keao.edu.common.page.PageInfo;
+import com.keao.edu.user.api.enums.StudentExamApiDto;
 import com.keao.edu.user.api.enums.StudentExamResultApiDto;
 import com.keao.edu.user.dto.RecordNotify;
 import com.keao.edu.user.dto.StudentExamResultDto;
@@ -77,7 +78,7 @@ public class StudentExamResultController extends BaseController {
 
     @ApiOperation("获取考试结果")
     @PostMapping(value = "/api/get")
-    public StudentExamResultApiDto get(Long id){
+    public StudentExamApiDto get(Long id){
         return studentExamResultService.getStudentExamResultApiDto(id);
     }