Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/enums/code/inspection/QueryVideoServiceEnum.java

@@ -11,7 +11,7 @@ public enum QueryVideoServiceEnum {
     LIVE_CHANNEL_IS_NOT_EXIST(1230702, "直播通道为空"),
     AIPULL_URL_IS_NOT_NULL(1230703, "直播地址为空"),
     AIVIDEO_URL_IS_NOT_NULL(1230704, "回放地址为空"),
-    INSPECTION_IS_NOT_EXIST(1230705, "任务不存在"),
+    INSPECTION_IS_NOT_EXIST(1230705,"没有正在直播的任务"),
     AIRPORT_ID_IS_NULL(1230706, "机场id为空");
 
     /**

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/accident/query/QueryAccidentDetailsService.java

@@ -124,7 +124,7 @@ public class QueryAccidentDetailsService {
                 vo.setInspectionName(inspection.getName());
             }
             if(inspection.getAiVideoUrl() !=null){
-                vo.setAiVideoUrl(inspection.getAiVideoUrl());
+                vo.setAiVideoUrl(CommonConfig.videoURL + inspection.getAiVideoUrl());
             }
         }
     }

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/road/RoadInformationServiceImpl.java

@@ -213,8 +213,7 @@ public class RoadInformationServiceImpl extends BaseServiceImpl<RoadInformationM
     @Override
     public JsonResult getListByTenantId() {
         //获取当前租户下id
-        //String tenantId = CurrentUserUtil.getTenantId();
-        String tenantId = "1";
+        String tenantId = CurrentUserUtil.getTenantId();
         if(StringUtils.isEmpty(tenantId)){
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
         }