Browse Source

Merge branch 'develop' of gitadmin/tuoheng_freeway into release

tags/v1.0.0^2
chengwang 1 year ago
parent
commit
6f2b44e009
4 changed files with 19 additions and 3 deletions
  1. +6
    -1
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java
  2. +6
    -1
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java
  3. +5
    -0
      tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/InspectionInfoVo.java
  4. +2
    -1
      tuoheng-service/tuoheng-miniprogram/src/main/resources/mapper/InspectionMapper.xml

+ 6
- 1
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java View File

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

+ 6
- 1
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java View File

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

+ 5
- 0
tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/vo/InspectionInfoVo.java View File

*/ */
private Integer flag; private Integer flag;


/**
* ai分析后视频
*/
private String aiVideoUrl;





} }

+ 2
- 1
tuoheng-service/tuoheng-miniprogram/src/main/resources/mapper/InspectionMapper.xml View File

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

Loading…
Cancel
Save