|
@@ -86,6 +86,9 @@ public class TEExamController {
|
|
|
// @Resource
|
|
|
// MyThreadPool myThreadPool;
|
|
|
|
|
|
+ @Resource
|
|
|
+ TSLogService tsLogService;
|
|
|
+
|
|
|
@ApiOperation(value = "考试批次修改/新增接口")
|
|
|
@RequestMapping(value = "/save", method = RequestMethod.POST)
|
|
|
@Transactional
|
|
@@ -147,6 +150,12 @@ public class TEExamController {
|
|
|
}
|
|
|
teExamDto.setMonitorStatus(Objects.nonNull(oldTeExam) ? oldTeExam.getMonitorStatus() : InvigilateMonitorStatusEnum.NOT_START);
|
|
|
teExam = new TEExam(teExamDto);
|
|
|
+ if (!teExam.equals(oldTeExam)) {//不一样则日志记录
|
|
|
+ tsLogService.save(new TSLog(LogEnum.EXAM, teExam.getName(),
|
|
|
+ JacksonUtil.parseJson(oldTeExam),
|
|
|
+ JacksonUtil.parseJson(teExam),
|
|
|
+ tbUser.getId(), teExam.getId()));
|
|
|
+ }
|
|
|
List<String> monitorRecordList = teExamDto.getMonitorRecord();
|
|
|
if (Objects.nonNull(monitorRecordList) && monitorRecordList.size() > 1) {
|
|
|
if (monitorRecordList.contains(MonitorVideoSourceEnum.CLIENT_CAMERA) && monitorRecordList.contains(MonitorVideoSourceEnum.CLIENT_SCREEN)) {
|
|
@@ -228,6 +237,9 @@ public class TEExamController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+// TEExam teExamDb = teExamService.getById(teExam.getId());
|
|
|
+// log.info("equals:{}", teExam.equals(teExamDb));
|
|
|
+// log.info("equals str:{}", teExam.toString().equals(teExamDb.toString()));
|
|
|
} catch (Exception e) {
|
|
|
log.error(SystemConstant.LOG_ERROR, e);
|
|
|
if (Objects.nonNull(teExam) && Objects.nonNull(teExam.getId()) && Objects.nonNull(activityCode)) {
|