Commit fb7938d6801976b43053e073e1f64c1be1431d95

Authored by xp.Huang
2 parents 73e9ece2 c0733eff

Merge branch '2023-12-28' into 'master_dev'

fix:视频配置修改协议时清空缓存的视频url

See merge request yunteng/thingskit!303
... ... @@ -17,12 +17,10 @@ import org.thingsboard.server.common.data.yunteng.dto.*;
17 17 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
18 18 import org.thingsboard.server.common.data.yunteng.utils.tools.*;
19 19 import org.thingsboard.server.dao.yunteng.entities.TkVideoEntity;
20   -import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
  20 +import org.thingsboard.server.dao.yunteng.entities.TkVideoPlatformEntity;
21 21 import org.thingsboard.server.dao.yunteng.mapper.TkVideoMapper;
22   -import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
23   -import org.thingsboard.server.dao.yunteng.service.TkOrganizationService;
24   -import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
25   -import org.thingsboard.server.dao.yunteng.service.TkVideoService;
  22 +import org.thingsboard.server.dao.yunteng.mapper.TkVideoPlatformMapper;
  23 +import org.thingsboard.server.dao.yunteng.service.*;
26 24
27 25 import java.io.IOException;
28 26 import java.util.ArrayList;
... ... @@ -38,6 +36,7 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
38 36
39 37 private final UserOrganizationMappingService userOrganizationMappingService;
40 38 private final TkOrganizationService organizationService;
  39 + private final TkVideoPlatformMapper tkVideoPlatformMapper;
41 40 @Override
42 41 public TkPageData<TkVideoDTO> pageDatas(IPage<TkVideoEntity> pageInfrom,
43 42 boolean isPtTenantAdmin, String tenantId, String currentUserId,
... ... @@ -73,6 +72,10 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
73 72 if (null == oldVideo) {
74 73 throw new TkDataValidationException(String.format(ErrorMessage.NOT_EXITED_OR_PERMISSION.getMessage(), videoDTO.getId()));
75 74 }
  75 + if(!oldVideo.getPlayProtocol().equals(videoDTO.getPlayProtocol())){
  76 + TkVideoPlatformEntity platform = tkVideoPlatformMapper.selectById(videoDTO.getVideoPlatformId());
  77 + VideoUrlUtils.clearVideoUrlData(platform.getAppKey()+videoDTO.getSn());
  78 + }
76 79 baseMapper.updateById(videoDTO.getEntity(TkVideoEntity.class));
77 80 } else {
78 81 baseMapper.insert(videoDTO.getEntity(TkVideoEntity.class));
... ...