Merge remote-tracking branch 'origin/master'

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/SysMessageController.java

@@ -90,7 +90,7 @@ public class SysMessageController extends BaseController {
         if(!sysUser.getIsSuperAdmin()){
             queryInfo.setUserId(sysUser.getId());
         }
-        queryInfo.setType(MessageSendMode.SEO.getCode());
+        queryInfo.setType(MessageSendMode.PUSH.getCode());
         PageInfo<SysMessage> pageInfo = sysMessageService.queryPage(queryInfo);
         return succeed(pageInfo);
     }

edu-auth/edu-auth-server/src/main/java/com/keao/edu/auth/web/controller/TokenController.java

@@ -127,7 +127,7 @@ public class TokenController extends BaseController {
 		return succeed(objectMapper.readValue(resp.getBody(), Map.class));
 	}
 
-	@PostMapping(value = "exit",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+	@PostMapping(value = "exit")
 	@ApiOperation(value = "退出登录")
 	public HttpResponseResult logout(@RequestHeader(value = HttpHeaders.AUTHORIZATION) String authHeader) {
 		if (StringUtils.isBlank(authHeader)) {

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

@@ -15,6 +15,7 @@ import com.keao.edu.common.service.SysMessageConfigService;
 import com.keao.edu.common.service.SysMessageService;
 import com.keao.edu.thirdparty.message.MessageSenderPlugin;
 import com.keao.edu.thirdparty.message.MessageSenderPluginContext;
+import com.keao.edu.thirdparty.message.SendMode;
 import com.keao.edu.thirdparty.message.provider.YimeiSmsPlugin;
 import com.keao.edu.util.string.MessageFormatter;
 
@@ -240,9 +241,9 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		}
 		MessageSenderPlugin senderPlugin = messageSenderPluginContext.getMessageSenderPlugin(jpushType);
 		MessageSendMode mode = MessageSendMode.SMS;
-		if (senderPlugin.getSendMode().equals("PUSH")) {
+		if (senderPlugin.getSendMode().name().equals("PUSH")) {
 			mode = MessageSendMode.PUSH;
-		} else if (senderPlugin.getSendMode().equals("EMAIL")) {
+		} else if (senderPlugin.getSendMode().name().equals("EMAIL")) {
 			mode = MessageSendMode.EMAIL;
 		}
 		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,

edu-im/edu-im-api/src/main/java/com/keao/edu/im/api/client/ImFeignService.java

@@ -97,14 +97,6 @@ public interface ImFeignService {
 	Object privateSend(@RequestBody ImPrivateMessage privateMessage);
 
 	/**
-	 * 退出教室
-	 * @param reqUserData
-	 * @return
-	 */
-	@PostMapping(value = "room/leave")
-	void leaveRoom(@RequestBody ReqUserData reqUserData);
-
-	/**
 	 * 踢出教室
 	 * @param reqUserData
 	 * @return

edu-im/edu-im-api/src/main/java/com/keao/edu/im/api/client/callback/ImFeignServiceFallback.java

@@ -1,11 +1,10 @@
 package com.keao.edu.im.api.client.callback;
 
-import java.util.List;
-
+import com.keao.edu.im.api.client.ImFeignService;
 import com.keao.edu.im.api.entity.*;
 import org.springframework.stereotype.Component;
 
-import com.keao.edu.im.api.client.ImFeignService;
+import java.util.List;
 
 @Component
 public class ImFeignServiceFallback implements ImFeignService {
@@ -61,9 +60,6 @@ public class ImFeignServiceFallback implements ImFeignService {
     }
 
     @Override
-    public void leaveRoom(ReqUserData reqUserData) {}
-
-    @Override
     public void kickRoom(ReqUserData reqUserData) {
 
     }

edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/RoomController.java

@@ -75,7 +75,7 @@ public class RoomController{
     @RequestMapping(value = "/leave", method = RequestMethod.POST)
     public Object leaveRoom(@RequestBody ReqUserData data)
             throws ApiException, Exception {
-        boolean result = roomService.leaveRoom(data.getRegistrationId(),data.getUserId(),data.getRoomId());
+        boolean result = roomService.leaveRoom(data.getRegistrationId(),data.getRoomId());
         return new BaseResponse<>(result);
     }
 
@@ -89,20 +89,20 @@ public class RoomController{
     public Object statusSync(@RequestBody String body) throws Exception {
         ChannelStateNotify notify = JSONObject.parseObject(body, ChannelStateNotify.class);
         log.info("statusSyncParam: {}",JSONObject.toJSON(notify));
-        String extra = notify.getExtra();
-//        boolean result = false;
+
         if(notify.getEvent() == 1){
-            /*if(StringUtils.isEmpty(extra)){
-                roomService.configRecord(notify.getChannelId(),notify.getUserId());
-            }else {
-                roomService.startRecord(notify.getChannelId(),notify.getUserId());
-            }*/
+            //同步房间信息
         }else if(notify.getEvent() == 2){
-
+            //房间创建
         }else if(notify.getEvent() == 3){
-
+            //房间销毁
         }else if(notify.getEvent() == 11){
-
+            //成员加入
+        }else if(notify.getEvent() == 12){
+            //成员退出
+            roomService.leaveRoom(null,notify.getChannelId());
+        }else if(notify.getEvent() == 20){
+            //资源发生变动
         }
         return new BaseResponse<>();
     }

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

@@ -238,7 +238,7 @@ public class IMHelper {
      * @throws Exception
      */
     @Async
-    public IMApiResultInfo startRecord(String roomId, Long registrationId, List<RoomMember> roomMembers) throws Exception {
+    public IMApiResultInfo startRecord(String hostUserId, String roomId, Long registrationId, List<RoomMember> roomMembers) throws Exception {
         if (roomId == null) {
             throw new IllegalArgumentException("Paramer 'roomId' is required");
         }
@@ -247,7 +247,21 @@ public class IMHelper {
         jsonObject.put("videoFormat","mp4");
         jsonObject.put("audioFormat","mp3");
         jsonObject.put("videoResolution","640x480");
-        jsonObject.put("mixLayout",1);
+        jsonObject.put("mixLayout",3);
+        jsonObject.put("sliceMin",60);
+        jsonObject.put("hostUserId",hostUserId);
+        JSONObject json = new JSONObject();
+        json.put("sessionId",roomQuery(roomId));
+        json.put("config",jsonObject);
+
+
+
+        /*JSONObject jsonObject = new JSONObject();
+        jsonObject.put("mode",3);
+        jsonObject.put("videoFormat","mp4");
+        jsonObject.put("audioFormat","mp3");
+        jsonObject.put("videoResolution","640x480");
+        jsonObject.put("mixLayout",2);
         jsonObject.put("sliceMin",30);
         jsonObject.put("renderMode",1);
         jsonObject.put("hostUserId","");
@@ -277,7 +291,7 @@ public class IMHelper {
         }
         JSONObject jsonObject1 = new JSONObject();
         jsonObject1.put("video",jsonArray);
-        jsonObject.put("input",jsonObject1);
+        jsonObject.put("input",jsonObject1);*/
 
 
         json.put("sessionId",roomQuery(roomId));
@@ -360,7 +374,7 @@ public class IMHelper {
      * @return
      * @throws Exception
      */
-    public IMApiResultInfo stopRecord(String roomId) throws Exception {
+    public IMApiResultInfo stopRecord(String hostUserId, String roomId) throws Exception {
         if (roomId == null) {
             throw new IllegalArgumentException("Paramer 'roomId' is required");
         }
@@ -368,17 +382,17 @@ public class IMHelper {
 //        if (hostUserId == null) {
 //            throw new IllegalArgumentException("Paramer 'groupId' is required");
 //        }
-        /*JSONObject jsonObject = new JSONObject();
+        JSONObject jsonObject = new JSONObject();
         jsonObject.put("mode",3);
         jsonObject.put("videoFormat","mp4");
         jsonObject.put("audioFormat","mp3");
         jsonObject.put("videoResolution","640x480");
         jsonObject.put("mixLayout",2);
         jsonObject.put("sliceMin",30);
-        jsonObject.put("hostUserId",hostUserId);*/
+        jsonObject.put("hostUserId",hostUserId);
         JSONObject json = new JSONObject();
         json.put("sessionId",roomQuery(roomId));
-//        json.put("config",jsonObject);
+        json.put("config",jsonObject);
 
         String body = json.toJSONString();
 

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

@@ -109,9 +109,9 @@ public class RoomServiceImpl implements RoomService {
     }
 
     @Override
-    public void stopRecord(String roomId) throws Exception {
+    public void stopRecord(String userId,String roomId) throws Exception {
 //        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        imHelper.stopRecord(roomId);
+        imHelper.stopRecord(userId,roomId);
     }
 
     @Override
@@ -368,7 +368,7 @@ public class RoomServiceImpl implements RoomService {
             }
             this.publishMessage(eduUserFeignService.getPublishMessage(registrationId));
             eduUserFeignService.upsetStudentAttendance(registrationId,0);
-//            imHelper.startRecord(roomId, registrationId,roomMembers);
+            imHelper.startRecord(userId,roomId, registrationId,roomMembers);
 //            eduUserFeignService.updateSessionId(registrationId,imApiResultInfo.getSessionId());
         }else {
             eduUserFeignService.upsetTeacherAttendance(examRoom.getId(),sysUser.getId(),0);
@@ -407,7 +407,7 @@ public class RoomServiceImpl implements RoomService {
 
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     @Override
-    public Boolean leaveRoom(Long registrationId,String userId,String roomId) throws Exception {
+    public Boolean leaveRoom(Long registrationId,String roomId) throws Exception {
         if(registrationId != null){
             StudentExamResultApiDto examResult = eduUserFeignService.getExamResult(registrationId);
             /*Integer recordFlag = examResult.getRecordFlag();
@@ -418,7 +418,7 @@ public class RoomServiceImpl implements RoomService {
         }
 
         SysUser user = sysUserFeignService.queryUserInfo();
-        userId = user.getId().toString();
+        String userId = user.getId().toString();
         /*if(StringUtils.isEmpty(userId)){
             user = sysUserFeignService.queryUserInfo();
             userId = user.getId().toString();
@@ -692,7 +692,7 @@ public class RoomServiceImpl implements RoomService {
                 if("3".equals(e.getRid())){
                     try {
                         eduUserFeignService.upsetStudentAttendance(e.getExamRegistrationId(),1);
-                        imHelper.stopRecord(e.getRid());
+                        imHelper.stopRecord(e.getUid(),e.getRid());
                     } catch (Exception e1) {
                         e1.printStackTrace();
                     }
@@ -730,7 +730,7 @@ public class RoomServiceImpl implements RoomService {
             if("recorded".equals(data.getType())){
                 msg.setRoomId("recorded" + roomId);
             }*/
-            imHelper.stopRecord(roomId);
+            imHelper.stopRecord(userId,roomId);
             IMApiResultInfo apiResultInfo = imHelper.publishMessage(userId, roomId, msg, 1);
             if (!apiResultInfo.isSuccess()) {
                 throw new ApiException(ErrorEnum.ERR_MESSAGE_ERROR);

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

@@ -23,9 +23,9 @@ public interface RoomService {
 
     void startRecord(String roomId,String userId) throws Exception;
 
-    void stopRecord(String roomId) throws Exception;
+    void stopRecord(String userId,String roomId) throws Exception;
 
-    public Boolean leaveRoom(Long registrationId,String userId,String roomId) throws ApiException, Exception;
+    public Boolean leaveRoom(Long registrationId,String roomId) throws ApiException, Exception;
 
     //only host
     public Boolean downgrade(String roomId, List<ReqChangeUserRoleData.ChangedUser> users) throws ApiException, Exception;

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

@@ -144,9 +144,9 @@
 		LEFT JOIN exam_certification ec ON ec.exam_registration_id_ = ersr.exam_registration_id_
 		LEFT JOIN examination_basic eb ON eb.id_ = ersr.examination_basic_id_
 		LEFT JOIN student_exam_result ser ON ser.exam_registration_id_ = ersr.exam_registration_id_
-		WHERE eb.status_ NOT IN ('EXAM_END','RESULT_CONFIRM','CLOSE','DELETE') AND ersr.student_id_ = #{studentId}
+		WHERE eb.status_ NOT IN ('EXAM_END','RESULT_CONFIRM','CLOSE','DELETE') AND ersr.student_id_ = #{studentId} AND ser.is_finished_exam_ != 5
 		<if test="examRegistrationId != null">
-			AND ersr.exam_registration_id_ = #{examRegistrationId} AND ser.is_finished_exam_ != 5
+			AND ersr.exam_registration_id_ = #{examRegistrationId}
 		</if>
 		ORDER BY ec.exam_start_time_
 	</select>