diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java index 776edf31d..96811167d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; -import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.project.entity.ProjectVideoConfig; import com.zhgd.xmgl.modules.project.mapper.ProjectVideoConfigMapper; @@ -23,7 +22,6 @@ import com.zhgd.xmgl.modules.rt.mapper.*; import com.zhgd.xmgl.modules.rt.service.IRtWorkTicketService; import com.zhgd.xmgl.modules.video.entity.VideoItem; import com.zhgd.xmgl.modules.video.mapper.VideoItemMapper; -import com.zhgd.xmgl.modules.video.service.IVideoItemService; import com.zhgd.xmgl.modules.video.service.impl.VideoItemServiceImpl; import com.zhgd.xmgl.util.HikVideoUtil; import com.zhgd.xmgl.util.PageUtil; @@ -31,12 +29,10 @@ import com.zhgd.xmgl.util.RefUtil; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.AsyncResult; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; -import java.util.concurrent.Future; import java.util.function.Function; import java.util.stream.Collectors; @@ -72,14 +68,14 @@ public class RtWorkTicketServiceImpl extends ServiceImpl queryWrapper = getQueryWrapper(paramMap); Page page = PageUtil.getPage(paramMap); IPage pageList = baseMapper.queryList(page, queryWrapper); - pageList.setRecords(dealList(pageList.getRecords())); + pageList.setRecords(dealList(pageList.getRecords(), paramMap)); return pageList; } @Override public List queryList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); - return dealList(baseMapper.queryList(queryWrapper)); + return dealList(baseMapper.queryList(queryWrapper), paramMap); } private QueryWrapper getQueryWrapper(HashMap paramMap) { @@ -92,13 +88,27 @@ public class RtWorkTicketServiceImpl extends ServiceImpl dealList(List list) { + private List dealList(List list, HashMap paramMap) { List ids = list.stream().map(RtWorkTicket::getId).collect(Collectors.toList()); + ProjectVideoConfig videoConfig = videoItemService.getEnableProjectVideoConfigByProjectSn(paramMap); if (CollUtil.isNotEmpty(ids)) { List toVideoItems = rtWorkTicketToVideoItemMapper.queryVideoItemList(ids); Map ticketMap = toVideoItems.stream().collect(Collectors.toMap(RtWorkTicketToVideoItem::getRtWorkTicketId, Function.identity())); for (RtWorkTicket rtWorkTicket : list) { rtWorkTicket.setVideoList(Optional.ofNullable(ticketMap.get(rtWorkTicket.getId())).map(RtWorkTicketToVideoItem::getVideoItems).orElse(null)); + if (videoConfig != null && Objects.equals(videoConfig.getVideoType(), 3)) { + List videoList = rtWorkTicket.getVideoList(); + if (CollUtil.isNotEmpty(videoList)) { + for (VideoItem videoItem : videoList) { + //设置视频 + if (StringUtils.isNotEmpty(videoItem.getSerialNumber())) { + String url = HikVideoUtil.callPostApiGetPreviewURL(videoItem.getSerialNumber(), "hls", null, videoConfig.getAccount(), + videoConfig.getPassword(), videoConfig.getAppId(), videoConfig.getAppSecret()); + videoItem.setPlayUrl(url); + } + } + } + } } } return list;