|
@@ -7,15 +7,15 @@ import com.qmth.themis.business.annotation.ApiJsonObject;
|
|
import com.qmth.themis.business.annotation.ApiJsonProperty;
|
|
import com.qmth.themis.business.annotation.ApiJsonProperty;
|
|
import com.qmth.themis.business.base.BasePage;
|
|
import com.qmth.themis.business.base.BasePage;
|
|
import com.qmth.themis.business.constant.SystemConstant;
|
|
import com.qmth.themis.business.constant.SystemConstant;
|
|
|
|
+import com.qmth.themis.business.dto.MqDto;
|
|
import com.qmth.themis.business.dto.request.TEExamDto;
|
|
import com.qmth.themis.business.dto.request.TEExamDto;
|
|
import com.qmth.themis.business.dto.response.TEExamQueryDto;
|
|
import com.qmth.themis.business.dto.response.TEExamQueryDto;
|
|
import com.qmth.themis.business.entity.TBOrg;
|
|
import com.qmth.themis.business.entity.TBOrg;
|
|
import com.qmth.themis.business.entity.TBUser;
|
|
import com.qmth.themis.business.entity.TBUser;
|
|
import com.qmth.themis.business.entity.TEExam;
|
|
import com.qmth.themis.business.entity.TEExam;
|
|
import com.qmth.themis.business.entity.TEExamActivity;
|
|
import com.qmth.themis.business.entity.TEExamActivity;
|
|
-import com.qmth.themis.business.enums.ExamModeEnum;
|
|
|
|
-import com.qmth.themis.business.enums.FieldUniqueEnum;
|
|
|
|
-import com.qmth.themis.business.enums.MqEnum;
|
|
|
|
|
|
+import com.qmth.themis.business.enums.*;
|
|
|
|
+import com.qmth.themis.business.service.MqDtoService;
|
|
import com.qmth.themis.business.service.TEExamActivityService;
|
|
import com.qmth.themis.business.service.TEExamActivityService;
|
|
import com.qmth.themis.business.service.TEExamService;
|
|
import com.qmth.themis.business.service.TEExamService;
|
|
import com.qmth.themis.business.util.JacksonUtil;
|
|
import com.qmth.themis.business.util.JacksonUtil;
|
|
@@ -25,10 +25,6 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
|
|
import com.qmth.themis.common.exception.BusinessException;
|
|
import com.qmth.themis.common.exception.BusinessException;
|
|
import com.qmth.themis.common.util.Result;
|
|
import com.qmth.themis.common.util.Result;
|
|
import com.qmth.themis.common.util.ResultUtil;
|
|
import com.qmth.themis.common.util.ResultUtil;
|
|
-import com.qmth.themis.business.dto.MqDto;
|
|
|
|
-import com.qmth.themis.business.enums.MqTagEnum;
|
|
|
|
-import com.qmth.themis.business.enums.MqTopicEnum;
|
|
|
|
-import com.qmth.themis.business.service.MqDtoService;
|
|
|
|
import io.swagger.annotations.*;
|
|
import io.swagger.annotations.*;
|
|
import org.springframework.dao.DuplicateKeyException;
|
|
import org.springframework.dao.DuplicateKeyException;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -76,6 +72,7 @@ public class TEExamController {
|
|
throw new BusinessException("考试编码不能为空");
|
|
throw new BusinessException("考试编码不能为空");
|
|
}
|
|
}
|
|
TEExam teExam = null;
|
|
TEExam teExam = null;
|
|
|
|
+ Long oldId = null;
|
|
try {
|
|
try {
|
|
TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
|
|
TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
|
|
TBOrg tbOrg = (TBOrg) ServletUtil.getRequestOrg();
|
|
TBOrg tbOrg = (TBOrg) ServletUtil.getRequestOrg();
|
|
@@ -85,7 +82,7 @@ public class TEExamController {
|
|
}
|
|
}
|
|
teExamDto.setOrgId(tbOrg.getId());
|
|
teExamDto.setOrgId(tbOrg.getId());
|
|
}
|
|
}
|
|
- Long oldId = teExamDto.getId();
|
|
|
|
|
|
+ oldId = teExamDto.getId();
|
|
TEExam oldTeExam = null;
|
|
TEExam oldTeExam = null;
|
|
if (Objects.nonNull(oldId)) {
|
|
if (Objects.nonNull(oldId)) {
|
|
teExamDto.setUpdateId(tbUser.getId());
|
|
teExamDto.setUpdateId(tbUser.getId());
|
|
@@ -130,6 +127,9 @@ public class TEExamController {
|
|
//修改数据
|
|
//修改数据
|
|
TEExam finalTeExam = teExam;
|
|
TEExam finalTeExam = teExam;
|
|
teExamActivityList.forEach(s -> {
|
|
teExamActivityList.forEach(s -> {
|
|
|
|
+ s.setPrepareSeconds(finalTeExam.getPrepareSeconds());
|
|
|
|
+ s.setMaxDurationSeconds(finalTeExam.getMaxDurationSeconds());
|
|
|
|
+ s.setOpeningSeconds(finalTeExam.getOpeningSeconds());
|
|
s.setStartTime(finalTeExam.getStartTime());
|
|
s.setStartTime(finalTeExam.getStartTime());
|
|
s.setFinishTime(finalTeExam.getEndTime());
|
|
s.setFinishTime(finalTeExam.getEndTime());
|
|
s.setUpdateId(tbUser.getId());
|
|
s.setUpdateId(tbUser.getId());
|
|
@@ -142,6 +142,9 @@ public class TEExamController {
|
|
MqDto mqDto = new MqDto(MqTopicEnum.themisTopic.getCode(), MqTagEnum.examActivity.name(), JacksonUtil.parseJson(teExamActivityList), MqEnum.QUARTZ_LOG, String.valueOf(teExam.getId()), prop, tbUser.getName());
|
|
MqDto mqDto = new MqDto(MqTopicEnum.themisTopic.getCode(), MqTagEnum.examActivity.name(), JacksonUtil.parseJson(teExamActivityList), MqEnum.QUARTZ_LOG, String.valueOf(teExam.getId()), prop, tbUser.getName());
|
|
mqDtoService.assembleSendOneWayMsg(mqDto);
|
|
mqDtoService.assembleSendOneWayMsg(mqDto);
|
|
//新增quartz任务,发送mq消息end
|
|
//新增quartz任务,发送mq消息end
|
|
|
|
+ teExamActivityList.forEach(s -> {
|
|
|
|
+ teExamActivityService.updateExamActivityCacheBean(s.getId());
|
|
|
|
+ });
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
@@ -156,6 +159,7 @@ public class TEExamController {
|
|
throw new RuntimeException(e);
|
|
throw new RuntimeException(e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ teExamService.updateExamCacheBean(teExam.getId());
|
|
return ResultUtil.ok(JacksonUtil.parseJson(SystemConstant.SUCCESS));
|
|
return ResultUtil.ok(JacksonUtil.parseJson(SystemConstant.SUCCESS));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -216,6 +220,7 @@ public class TEExamController {
|
|
teExam.setEnable(enable);
|
|
teExam.setEnable(enable);
|
|
teExam.setUpdateId(tbUser.getId());
|
|
teExam.setUpdateId(tbUser.getId());
|
|
teExamService.updateById(teExam);
|
|
teExamService.updateById(teExam);
|
|
|
|
+ teExamService.updateExamCacheBean(teExam.getId());
|
|
return ResultUtil.ok(JacksonUtil.parseJson(SystemConstant.SUCCESS));
|
|
return ResultUtil.ok(JacksonUtil.parseJson(SystemConstant.SUCCESS));
|
|
}
|
|
}
|
|
|
|
|