Commit 4f40c498d0a579f4529d994d7e4dab698d86bbb8

Authored by xp.Huang
2 parents 79def66e a0ad4f91

Merge branch '2024-1-8' into 'master_dev'

fix:手动输入视频修改未判断流媒体配置是否为null

See merge request yunteng/thingskit!312
@@ -74,9 +74,11 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid @@ -74,9 +74,11 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
74 videoDTO.getId())); 74 videoDTO.getId()));
75 } 75 }
76 TkVideoPlatformEntity platform = tkVideoPlatformMapper.selectById(videoDTO.getVideoPlatformId()); 76 TkVideoPlatformEntity platform = tkVideoPlatformMapper.selectById(videoDTO.getVideoPlatformId());
77 - String paramKey = videoDTO.getParams()==null?"":(videoDTO.getParams().get("channelNo")==null?"":  
78 - "&channelNo="+videoDTO.getParams().get("channelNo").intValue());  
79 - VideoUrlUtils.clearVideoUrlData(platform.getAppKey()+videoDTO.getSn()+paramKey); 77 + if(platform!=null){
  78 + String paramKey = videoDTO.getParams()==null?"":(videoDTO.getParams().get("channelNo")==null?"":
  79 + "&channelNo="+videoDTO.getParams().get("channelNo").intValue());
  80 + VideoUrlUtils.clearVideoUrlData(platform.getAppKey()+videoDTO.getSn()+paramKey);
  81 + }
80 baseMapper.updateById(videoDTO.getEntity(TkVideoEntity.class)); 82 baseMapper.updateById(videoDTO.getEntity(TkVideoEntity.class));
81 } else { 83 } else {
82 baseMapper.insert(videoDTO.getEntity(TkVideoEntity.class)); 84 baseMapper.insert(videoDTO.getEntity(TkVideoEntity.class));