Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

@@ -401,6 +401,11 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         if (StringUtils.isEmpty(id)) {
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
         }
+        //获取租户id
+        String tenantId = CurrentUserUtil.getTenantId();
+        if(StringUtils.isEmpty(tenantId)){
+            return JsonResult.error("租户id为空");
+        }
         //根据问题id查询对应的任务
         InspectionFile inspectionFile = inspectionFileMapper.selectById(id);
         if (ObjectUtil.isNull(inspectionFile)) {
@@ -413,7 +418,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         }
         //根据任务id获取任务
         Inspection inspection = inspectionMapper.selectOne(Wrappers.<Inspection>lambdaQuery()
-                .eq(Inspection::getTenantId, 0)
+                .eq(Inspection::getTenantId, tenantId)
                 .eq(Inspection::getMark, 1)
                 .eq(Inspection::getId, inspectionId));
         PlayBackInfoVo vo = new PlayBackInfoVo();

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java

@@ -188,9 +188,14 @@ public class InspectionServiceImpl implements IInspectionService {
         if(StringUtils.isEmpty(id)){
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
         }
+        //获取租户id
+        String tenantId = CurrentUserUtil.getTenantId();
+        if(StringUtils.isEmpty(tenantId)){
+            return JsonResult.error("租户id为空");
+        }
         //根据任务id获取任务
         Inspection inspection = inspectionMapper.selectOne(Wrappers.<Inspection>lambdaQuery()
-                .eq(Inspection::getTenantId, 0)
+                .eq(Inspection::getTenantId, tenantId)
                 .eq(Inspection::getMark, 1)
                 .eq(Inspection::getId, id));
         PlayBackInfoVo vo = new PlayBackInfoVo();

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/InspectionInfoVo.java

@@ -80,6 +80,11 @@ public class InspectionInfoVo {
      */
     private Integer flag;
 
+    /**
+     * ai分析后视频
+     */
+    private String aiVideoUrl;
+
 
 
 }

tuoheng-service/tuoheng-miniprogram/src/main/resources/mapper/InspectionMapper.xml

@@ -72,7 +72,8 @@
         ti.inspection_line as inspectionLine,
         ti.inspection_line_name as inspectionLineName,
         ti.create_user as createUser,
-        ti.execution_start_time as executionStartTime
+        ti.execution_start_time as executionStartTime,
+        ti.ai_video_url as aiVideoUrl
         from
         th_inspection ti
         where ti.mark=1 and ti.tenant_id = #{request.tenantId}