update 小程序作答接口

examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/ExamControlController.java

@@ -299,11 +299,14 @@ public class ExamControlController extends ControllerSupport {
             } else {
                 fileUrl = FssHelper.finalFileUrl(req.getFilePath());
             }
+
             examControlService.sendFileAnswerToWebSocket(req.getExamRecordDataId(), req.getOrder(),
                     fileUrl, req.getTransferFileType(), user.getUserId(), user.getRootOrgId());
+            log.warn("小程序保存文件作答完成，WS消息通知成功！examRecordDataId:{} order:{}", req.getExamRecordDataId(), req.getOrder());
         } catch (Exception e) {
-            examFileAnswerService.deleteFileAnswer(fileAnswerId);
-            throw new StatusException("100009", "消息通知失败", e);
+            log.warn("小程序保存文件作答完成，WS消息通知失败！examRecordDataId:{} order:{} err:{}", req.getExamRecordDataId(), req.getOrder(), e.getMessage());
+            // examFileAnswerService.deleteFileAnswer(fileAnswerId);
+            // throw new StatusException("100009", "消息通知失败", e);
         }
         return fileAnswerId;
     }

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamControlServiceImpl.java

@@ -13,7 +13,6 @@ import cn.com.qmth.examcloud.commons.util.DateUtil.DatePatterns;
 import cn.com.qmth.examcloud.core.basic.api.CryptoConfigCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.CheckCryptoConfigReq;
 import cn.com.qmth.examcloud.core.basic.api.response.CheckCryptoConfigResp;
-import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.SyncExamDataCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamQuestionBean;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamRecordDataBean;
@@ -144,10 +143,7 @@ public class ExamControlServiceImpl implements ExamControlService {
     private WsCloudService wsCloudService;
 
     @Autowired
-    ExamRecordCloudService examRecordCloudService;
-
-    @Autowired
-    SyncExamDataCloudService syncExamDataCloudService;
+    private SyncExamDataCloudService syncExamDataCloudService;
 
     @Autowired
     private ExamContinuedRecordRepo examContinuedRecordRepo;
@@ -992,7 +988,7 @@ public class ExamControlServiceImpl implements ExamControlService {
             throw new StatusException("100005", "无效的二维码");
         }
 
-        int sessionTimeout = PropertyHolder.getInt(SESSION_TIMEOUT, 3600);
+        int sessionTimeout = PropertyHolder.getInt(SESSION_TIMEOUT, 7200);
         User user = redisClient.get(key, User.class, sessionTimeout);
         if (null == user) {
             log.warn("二维码登录信息已失效！key:{} token:{} examRecordDataId:{}", key, token, examRecordDataId);
@@ -1019,8 +1015,10 @@ public class ExamControlServiceImpl implements ExamControlService {
 
             try {
                 this.sendScanQrCodeToWebSocket(clientId, Long.valueOf(examRecordDataId), Integer.valueOf(order), userId, rootOrgId);
+                log.warn("环境检测-小程序扫描二维码校验完成，WS消息通知成功！examRecordDataId:{} order:{}", examRecordDataId, order);
             } catch (Exception e) {
-                throw new StatusException("100011", "消息通知失败", e);
+                log.warn("环境检测-小程序扫描二维码校验完成，WS消息通知失败！examRecordDataId:{} order:{} err:{}", examRecordDataId, order, e.getMessage());
+                // throw new StatusException("100011", "消息通知失败", e);
             }
             return res;
         }
@@ -1069,8 +1067,10 @@ public class ExamControlServiceImpl implements ExamControlService {
 
         try {
             this.sendScanQrCodeToWebSocket(clientId, Long.valueOf(examRecordDataId), Integer.valueOf(order), userId, rootOrgId);
+            log.warn("小程序扫描二维码校验完成，WS消息通知成功！examRecordDataId:{} order:{}", examRecordDataId, order);
         } catch (Exception e) {
-            throw new StatusException("100011", "消息通知失败", e);
+            log.warn("小程序扫描二维码校验完成，WS消息通知失败！examRecordDataId:{} order:{} err:{}", examRecordDataId, order, e.getMessage());
+            // throw new StatusException("100011", "消息通知失败", e);
         }
         return res;
     }