Эх сурвалжийг харах

批次,场次定时任务和时间校验

wangliang 2 жил өмнө
parent
commit
754a8b6983

+ 1 - 0
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamActivityController.java

@@ -100,6 +100,7 @@ public class TEExamActivityController {
                         JSONObject jsonObject = JSONObject.parseObject(tbAttachment.getRemark());
                         t.setAttachmentPath(ossUtil.getAliYunOssPublicDomain().getPublicUrl() + File.separator + jsonObject.getString(SystemConstant.PATH));
                     }
+                    t.setAttachmentName(tbAttachment.getName() + tbAttachment.getType());
                 }
             }
         }

+ 1 - 0
themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamController.java

@@ -176,6 +176,7 @@ public class TEExamController {
                             //删除quartz任务,发送mq消息start
                             Map<String, Object> prop = new HashMap<>();
                             prop.put("oper", "delete");
+                            prop.put("exam", teExam);
                             MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                                     JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
                                     String.valueOf(teExam.getId()), prop, tbUser.getName());

+ 12 - 0
themis-business/src/main/java/com/qmth/themis/business/entity/TEAudio.java

@@ -64,6 +64,10 @@ public class TEAudio extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "设置时长(单位:秒)")
     private Integer playTime;
 
+    @ApiModelProperty(value = "附件路径")
+    @TableField(exist = false)
+    private String attachmentName;
+
     public TEAudio() {
 
     }
@@ -91,6 +95,14 @@ public class TEAudio extends BaseEntity implements Serializable {
         setUpdateTime(System.currentTimeMillis());
     }
 
+    public String getAttachmentName() {
+        return attachmentName;
+    }
+
+    public void setAttachmentName(String attachmentName) {
+        this.attachmentName = attachmentName;
+    }
+
     public Integer getPlayTime() {
         return playTime;
     }

+ 1 - 0
themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamActivityServiceImpl.java

@@ -374,6 +374,7 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                                 //删除quartz任务,发送mq消息start
                                 Map<String, Object> prop = new HashMap<>();
                                 prop.put("oper", "delete");
+                                prop.put("exam", teExam);
                                 MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                                         JacksonUtil.parseJson(Arrays.asList(s)), MqTagEnum.EXAM_ACTIVITY,
                                         String.valueOf(teExam.getId()), prop, tbUser.getName());

+ 0 - 14
themis-business/src/main/java/com/qmth/themis/business/templete/service/impl/TempleteLogicServiceImpl.java

@@ -223,14 +223,10 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                     map.put("dataRemark", "编码:" + strs[1] + ",名称:" + strs[2]);
                     TBExamInvigilateUserTemp tbExamInvigilateUserTemp = tbExamInvigilateUserTempService.getOne(tbExamInvigilateUserTempQueryWrapper);
                     tbExamInvigilateUserTemp = Objects.isNull(tbExamInvigilateUserTemp) ? new TBExamInvigilateUserTemp(Long.parseLong(strs[0]), orgId, strs[1], strs[2]) : tbExamInvigilateUserTemp;
-//                    tbExamInvigilateUserTempList.add(tbExamInvigilateUserTemp);
                     tbExamInvigilateUserTempService.saveOrUpdate(tbExamInvigilateUserTemp);
                     count.getAndIncrement();
                 }
             });
-//            if (!CollectionUtils.isEmpty(tbExamInvigilateUserTempList)) {
-//                tbExamInvigilateUserTempService.saveOrUpdateBatch(tbExamInvigilateUserTempList);
-//            }
             if (!CollectionUtils.isEmpty(tbExamInvigilateUserList)) {
                 tbExamInvigilateUserService.saveOrUpdateBatch(tbExamInvigilateUserList);
             }
@@ -416,16 +412,6 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
         TBExamInvigilateUserTemp tbExamInvigilateUserTemp = tbExamInvigilateUserTempService.getOne(tbExamInvigilateUserTempQueryWrapper);
         tbExamInvigilateUserTemp = Objects.isNull(tbExamInvigilateUserTemp) ? new TBExamInvigilateUserTemp(orgId, examId, roomCode, roomName) : tbExamInvigilateUserTemp;
         return tbExamInvigilateUserTempService.saveOrUpdate(tbExamInvigilateUserTemp);
-//        QueryWrapper<TBExamInvigilateUser> tbExamInvigilateUserQueryWrapper = new QueryWrapper<>();
-//        tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getOrgId, orgId)
-//                .eq(TBExamInvigilateUser::getRoomCode, roomCode)
-//                .eq(TBExamInvigilateUser::getExamId, examId);
-//        int c = tbExamInvigilateUserService.count(tbExamInvigilateUserQueryWrapper);
-//        if (c == 0) {
-//            return true;
-//        } else {
-//            return false;
-//        }
     }
 
     /**