Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/verify/AccidentVerifyService.java

@@ -99,6 +99,13 @@ public class AccidentVerifyService {
         if (AccidentStatusEnum.UNTREATED.getCode() != accident.getStatus()) {
             throw new ServiceException("该事故已处理，不能在核实");
         }
+
+        Inspection inspection = inspectionMapper.selectOne(new LambdaQueryWrapper<Inspection>()
+                .eq(Inspection::getEmergencyDataInspectionId, accident.getInspectionId())
+                .eq(Inspection::getMark, MarkEnum.VALID.getCode()));
+        if (ObjectUtil.isNotNull(inspection)) {
+            throw new ServiceException("该事故关联的任务已被处理，不能在核实");
+        }
         return JsonResult.success(accident);
     }
 

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/dsp/DspCallbackServiceImpl.java

@@ -96,7 +96,7 @@ public class DspCallbackServiceImpl implements IDspCallbackService {
                 .eq(Inspection::getId, inspectionId)
                 .eq(Inspection::getTenantId, business.getTenantId()));
         if (ObjectUtil.isNull(inspection)) {
-            log.info("任务不存在");
+            log.info("任务不存在, inspectionId={}", inspectionId);
             throw new ServiceException(0, "巡检任务不存在");
         }
         log.info("巡检任务查询成功，分析状态为：{}", dspCallbackRequest.getAnalyseStatus());