wangliang před 4 roky
rodič
revize
3abb0526ce

+ 0 - 2
themis-business/src/main/java/com/qmth/themis/business/bean/mobile/MobileAuthorizationBean.java

@@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel("登录返回信息")
 public class MobileAuthorizationBean {
 
-	
 	@ApiModelProperty("功能模式")
 	private MobileModeEnum mode;
 	
@@ -21,7 +20,6 @@ public class MobileAuthorizationBean {
 	@ApiModelProperty("考试记录id")
 	private Long recordId;
 	
-	//TODO
 	private String accessToken;
 
 	public MobileModeEnum getMode() {

+ 6 - 5
themis-business/src/main/java/com/qmth/themis/business/service/impl/WarningServiceImpl.java

@@ -166,11 +166,14 @@ public class WarningServiceImpl implements WarningService {
         Long examActivityId = ExamRecordCacheUtil.getExamActivityId(recordId);
         QueryWrapper<TOeFaceVerifyHistory> tOeFaceVerifyHistoryQueryWrapper = new QueryWrapper<>();
         tOeFaceVerifyHistoryQueryWrapper.lambda().eq(TOeFaceVerifyHistory::getExamRecordId, recordId).eq(TOeFaceVerifyHistory::getException, warningEnum.name());
+        ExamStudentCacheBean examStudentCacheBean = teExamStudentService.getExamStudentCacheBean(examStudentId);
         int count = faceVerifyHistoryService.count(tOeFaceVerifyHistoryQueryWrapper);
         if (count > teConfig.getRealnessCount()) {
             TIeInvigilateWarnInfo tIeInvigilateWarnInfo = new TIeInvigilateWarnInfo(examId, examActivityId, recordId, examStudentId, WarningLevelEnum.D15.name(), WarningLevelEnum.D15.getDesc(), warningEnum);
             tIeInvigilateWarnInfoService.saveOrUpdate(tIeInvigilateWarnInfo);
             this.setWarningCount(recordId);
+            TEExamStudentLog teExamStudentLog = new TEExamStudentLog(tIeInvigilateWarnInfo.getType().name(), tIeInvigilateWarnInfo.getType().getCode(), tIeInvigilateWarnInfo.getType().getCode(), examStudentCacheBean.getStudentId(), examStudentCacheBean.getId(), recordId);
+            teExamStudentLogService.saveOrUpdate(teExamStudentLog);
         }
     }
 
@@ -200,12 +203,10 @@ public class WarningServiceImpl implements WarningService {
      * @param recordId
      */
     public void setPhotoUrls(Map<String, Object> map, String photoUrl, TIeInvigilateWarnInfo tIeInvigilateWarnInfo, ExamStudentCacheBean examStudentCacheBean, Long recordId) {
-        List photoUrls = null;
+        List<String> photoUrls = new ArrayList();
         if (Objects.nonNull(map.get("photoUrls")) && !Objects.equals(map.get("photoUrls"), "")) {
-            photoUrls = Arrays.asList(String.valueOf(map.get("photoUrls")).split(","));
-        }
-        if (Objects.isNull(photoUrls)) {
-            photoUrls = new ArrayList();
+            String[] s = String.valueOf(map.get("photoUrls")).split(",");
+            Collections.addAll(photoUrls, s);
         }
         photoUrls.add(photoUrl);
         JSONObject jsonObject = new JSONObject();

+ 6 - 2
themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -494,10 +494,14 @@ public class MqLogicServiceImpl implements MqLogicService {
             //增加异常日志
             Long examId = ExamRecordCacheUtil.getExamId(recordId);
             Long examActivityId = ExamRecordCacheUtil.getExamActivityId(recordId);
-            TIeInvigilateExceptionInfo tIeInvigilateExceptionInfo = new TIeInvigilateExceptionInfo(examId, examActivityId, recordId, examStudentId, String.valueOf(jsonObject.getJSONObject("reason").get("reason")), exceptionEnum, diff);
+            String reason = String.valueOf(jsonObject.getJSONObject("reason").get("reason"));
+            TIeInvigilateExceptionInfo tIeInvigilateExceptionInfo = new TIeInvigilateExceptionInfo(examId, examActivityId, recordId, examStudentId, reason, exceptionEnum, diff);
             tIeInvigilateExceptionInfoService.saveOrUpdate(tIeInvigilateExceptionInfo);
-        } else if (tag.contains(MqTagEnum.WARNING_LOG.name())) {//考试预警日志
 
+            TEExamStudentLog teExamStudentLog = new TEExamStudentLog(exceptionEnum.name(), exceptionEnum.getCode(), reason, examStudentCacheBean.getStudentId(), examStudentCacheBean.getId(), recordId);
+            teExamStudentLogService.saveOrUpdate(teExamStudentLog);
+        } else if (tag.contains(MqTagEnum.WARNING_LOG.name())) {//考试预警日志
+            //todo 预警先预留
         }
         mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
         TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);