Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.2.0^2
wanjing 1 year ago
parent
commit
a52db1320f
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/verify/AccidentVerifyService.java
  2. +1
    -1
      tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/verify/AccidentVerifyService.java View File

Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>() Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
.eq(Inspection::getEmergencyDataInspectionId, accident.getInspectionId()) .eq(Inspection::getEmergencyDataInspectionId, accident.getInspectionId())
.eq(Inspection::getMark, MarkEnum.VALID.getCode())); .eq(Inspection::getMark, MarkEnum.VALID.getCode()));
if (ObjectUtil.isNull(inspection)) {
if (ObjectUtil.isNotNull(inspection)) {
throw new ServiceException("该事故关联的任务已被处理,不能在核实"); throw new ServiceException("该事故关联的任务已被处理,不能在核实");
} }
return JsonResult.success(accident); return JsonResult.success(accident);

+ 1
- 1
tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java View File

.eq(Inspection::getId, inspectionId) .eq(Inspection::getId, inspectionId)
.eq(Inspection::getTenantId, business.getTenantId())); .eq(Inspection::getTenantId, business.getTenantId()));
if (ObjectUtil.isNull(inspection)) { if (ObjectUtil.isNull(inspection)) {
log.info("任务不存在");
log.info("任务不存在, inspectionId={}", inspectionId);
throw new ServiceException(0, "巡检任务不存在"); throw new ServiceException(0, "巡检任务不存在");
} }
log.info("巡检任务查询成功,分析状态为:{}", dspCallbackRequest.getAnalyseStatus()); log.info("巡检任务查询成功,分析状态为:{}", dspCallbackRequest.getAnalyseStatus());

Loading…
Cancel
Save