Browse Source

fix:记录预警时间

master
buaixuexideshitongxue 3 weeks ago
parent
commit
a2acf47a43
  1. 8
      src/main/java/com/biutag/supervision/service/Negative/NegativeService.java
  2. 17
      src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java

8
src/main/java/com/biutag/supervision/service/Negative/NegativeService.java

@ -111,6 +111,14 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
negativeDto.setMaxExtensionDuration(dataDistribute.getMaxExtensionDuration()); negativeDto.setMaxExtensionDuration(dataDistribute.getMaxExtensionDuration());
negativeDto.setCaseNumber(vo.getRecord().getId()); negativeDto.setCaseNumber(vo.getRecord().getId());
// 如果 supervisionTime 为空,补充当前时间(预警时间)
WarningRecord record = vo.getRecord();
if (record.getSupervisionTime() == null) {
warningRecordService.update(new LambdaUpdateWrapper<WarningRecord>()
.set(WarningRecord::getSupervisionTime, LocalDateTime.now())
.eq(WarningRecord::getId, record.getId()));
}
//已预警 //已预警
warningRecordService.update(new LambdaUpdateWrapper<WarningRecord>().set( warningRecordService.update(new LambdaUpdateWrapper<WarningRecord>().set(
WarningRecord::getFlowState,DistributionStateEnum.DISTRIBUTED.getValue() WarningRecord::getFlowState,DistributionStateEnum.DISTRIBUTED.getValue()

17
src/main/java/com/biutag/supervision/service/Report/ReportFlowService.java

@ -521,6 +521,23 @@ public class ReportFlowService extends ServiceImpl<ReportFlowMapper,ReportFlow>
// //
endFlow.setType("end"); endFlow.setType("end");
boolean ok2 = baseMapper.insert(endFlow) > 0; boolean ok2 = baseMapper.insert(endFlow) > 0;
// 确保 warning_record 存在且有 supervisionTime(预警时间)
WarningRecord warningRecord = warningRecordMapper.selectOne(
new LambdaQueryWrapper<WarningRecord>()
.eq(WarningRecord::getReportId, queryParam.getReportId())
);
if (warningRecord == null) {
warningRecord = new WarningRecord();
warningRecord.setReportId(queryParam.getReportId());
warningRecord.setSupervisionTime(LocalDateTime.now());
warningRecord.setCreateTime(LocalDateTime.now());
warningRecordMapper.insert(warningRecord);
} else if (warningRecord.getSupervisionTime() == null) {
warningRecord.setSupervisionTime(LocalDateTime.now());
warningRecordMapper.updateById(warningRecord);
}
return Result.success(ok1 && ok2); return Result.success(ok1 && ok2);
} }
} }

Loading…
Cancel
Save