diff --git a/src/main/java/com/platform/modules/live/controller/LiveSceneController.java b/src/main/java/com/platform/modules/live/controller/LiveSceneController.java index 0a023da..607bf9c 100644 --- a/src/main/java/com/platform/modules/live/controller/LiveSceneController.java +++ b/src/main/java/com/platform/modules/live/controller/LiveSceneController.java @@ -76,10 +76,10 @@ public class LiveSceneController extends AbstractController { @ApiImplicitParam(value = "页面大小", name = "pageSize", defaultValue = "15",paramType = "query", dataType = "int")}) public R page(String title, Integer sceneType, String ltype,Integer liveState, Integer pageNo, Integer pageSize, Long tenantId){ if(StringUtils.isNotBlank(ltype) && (ltype=="prod" || ltype.equals("prod"))){ - Page page = liveSceneService.pageProd(title, sceneType, ltype,liveState, null==pageNo?0:pageNo, null==pageSize?15:pageSize, tenantId); + Page page = liveSceneService.pageProd(title, 5, ltype,liveState, null==pageNo?0:pageNo, null==pageSize?15:pageSize, tenantId); return R.ok().put("page", page); }else{ - Page page = liveSceneService.page(title, sceneType, ltype,liveState, null==pageNo?0:pageNo, null==pageSize?15:pageSize, tenantId); + Page page = liveSceneService.page(title, 5, ltype,liveState, null==pageNo?0:pageNo, null==pageSize?15:pageSize, tenantId); return R.ok().put("page", page); } } @@ -116,7 +116,6 @@ public class LiveSceneController extends AbstractController { @RequiresPermissions("live:livescene:save") @ApiOperation(value = "现场保存接口", notes = "现场保存接口", produces = MediaType.APPLICATION_JSON_VALUE) public R save(@RequestBody SceneEntityVo liveScene){ - System.out.println(liveScene.toString()); try { liveScene.setCreatorId(null!=getUserId()?getUserId().intValue():null); liveSceneService.save(liveScene); @@ -138,11 +137,13 @@ public class LiveSceneController extends AbstractController { @RequiresPermissions("live:livescene:update") @ApiOperation("现场更新接口") @LiveTenant - public R update(@ModelAttribute SceneEntityVo liveScene){ + public R update(@RequestBody SceneEntityVo liveScene){ String r = null; try { r = liveSceneService.update(liveScene, getUser()); - } catch (Exception e) { + } catch (RRException e) { + return R.error("栏目只能单选"); + } catch (Exception e) { e.printStackTrace(); return R.error("系统内部错误"); } diff --git a/src/main/java/com/platform/modules/live/service/impl/LiveSceneServiceImpl.java b/src/main/java/com/platform/modules/live/service/impl/LiveSceneServiceImpl.java index 76cb84d..2c9bfdc 100644 --- a/src/main/java/com/platform/modules/live/service/impl/LiveSceneServiceImpl.java +++ b/src/main/java/com/platform/modules/live/service/impl/LiveSceneServiceImpl.java @@ -597,6 +597,14 @@ public class LiveSceneServiceImpl extends ServiceImpl1) { + throw new RRException("栏目只能单选"); + } + + //将现场类型设置为5，混合类型 + liveScene.setSceneType(SceneConstants.SceneType.MERGE.getKey()); + // 20190221 TROY 更新校验，只读 LiveSceneEntity dbScene = this.baseMapper.selectById(liveScene.getId()); if (null == dbScene) { @@ -631,7 +639,7 @@ public class LiveSceneServiceImpl extends ServiceImpl infoEntities = liveSceneLiveInfoService - .selectList(new EntityWrapper().eq("scene_id", entity.getId())); - - // 更新现场源地址 - if (infoEntities != null) { - for (LiveSceneLiveInfoEntity infoEntity : infoEntities) { - if(infoEntity==null || infoEntity.getId()==null || infoEntity.getPushState().equals(1)){ - if(StringUtils.isNotBlank(str)){ - str += ","; - } - str += infoEntity.getInfoName(); - continue; - } - LiveStreams streams = liveClient.liveStream().generateStreamUrls(infoEntity.getAppName(), - infoEntity.getStreamName(), entity.getLiveEnd()); - LiveSceneLiveInfoExtEntity extEntity = liveSceneLiveInfoExtService - .selectByInfoId(infoEntity.getId()); - if (extEntity != null) { - extEntity.setPushUrl(streams.getPushStreamUrl()); - extEntity.setPlayUrlRmtp(streams.getLiveStreamUrls()[0]); - extEntity.setPlayUrlFlv(streams.getLiveStreamUrls()[1]); - extEntity.setPlayUrlHls(streams.getLiveStreamUrls()[2]); - liveSceneLiveInfoExtService.updateById(extEntity); - } - - } - } - } - if(StringUtils.isNotBlank(str)){ - str = "现场修改成功，但流名称为："+str + "正在直播中，直播流的有效期不能进行修改"; - }else{ - str = "现场修改成功"; - } +// if (isProduct && SceneConstants.SceneType.isAllowLive(dbScene.getSceneType()) +// && !liveScene.getLiveEnd().equals(dbScene.getLiveEnd())) { +// List infoEntities = liveSceneLiveInfoService +// .selectList(new EntityWrapper().eq("scene_id", entity.getId())); +// +// // 更新现场源地址 +// if (infoEntities != null) { +// for (LiveSceneLiveInfoEntity infoEntity : infoEntities) { +// if(infoEntity==null || infoEntity.getId()==null || infoEntity.getPushState().equals(1)){ +// if(StringUtils.isNotBlank(str)){ +// str += ","; +// } +// str += infoEntity.getInfoName(); +// continue; +// } +// LiveStreams streams = liveClient.liveStream().generateStreamUrls(infoEntity.getAppName(), +// infoEntity.getStreamName(), entity.getLiveEnd()); +// LiveSceneLiveInfoExtEntity extEntity = liveSceneLiveInfoExtService +// .selectByInfoId(infoEntity.getId()); +// if (extEntity != null) { +// extEntity.setPushUrl(streams.getPushStreamUrl()); +// extEntity.setPlayUrlRmtp(streams.getLiveStreamUrls()[0]); +// extEntity.setPlayUrlFlv(streams.getLiveStreamUrls()[1]); +// extEntity.setPlayUrlHls(streams.getLiveStreamUrls()[2]); +// liveSceneLiveInfoExtService.updateById(extEntity); +// } +// +// } +// } +// } +// if(StringUtils.isNotBlank(str)){ +// str = "现场修改成功，但流名称为："+str + "正在直播中，直播流的有效期不能进行修改"; +// }else{ +// str = "现场修改成功"; +// } + str = "现场修改成功"; return str; } @@ -2510,6 +2518,11 @@ public class LiveSceneServiceImpl extends ServiceImpl channelsId) { List entityList = liveSceneChannelService.selectList(new EntityWrapper().eq("scene_id", liveScene.getId())); List oldChannelIdList = new ArrayList<>(); diff --git a/src/main/java/com/platform/modules/live/service/impl/LuceneServiceImpl.java b/src/main/java/com/platform/modules/live/service/impl/LuceneServiceImpl.java index ec8a520..2d0e40e 100644 --- a/src/main/java/com/platform/modules/live/service/impl/LuceneServiceImpl.java +++ b/src/main/java/com/platform/modules/live/service/impl/LuceneServiceImpl.java @@ -382,7 +382,7 @@ public class LuceneServiceImpl implements LuceneService { } } - private void dirCheck(String filePath) { + private void dirCheck(String filePath) { File file = new File(filePath); if (!file.exists()) { file.mkdirs(); diff --git a/src/main/java/com/platform/modules/live/vo/SceneEntityVo.java b/src/main/java/com/platform/modules/live/vo/SceneEntityVo.java index b384286..51e32d5 100644 --- a/src/main/java/com/platform/modules/live/vo/SceneEntityVo.java +++ b/src/main/java/com/platform/modules/live/vo/SceneEntityVo.java @@ -306,6 +306,11 @@ public class SceneEntityVo { this.tenantName = entity.getTenantName(); this.isAutoLive = entity.getIsAutoLive(); + + this.carouselImage = entity.getCarouselImage(); + this.viewerCount = entity.getViewerCount(); + this.likeDisplay = entity.getLikeDisplay(); + this.vrLive = entity.getVrLive(); } public Integer getId() { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cc59b7d..041bde1 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -114,6 +114,7 @@ foreign: wapurl: http://zklive.zhongkedongxin.com dataurl: http://zklive.zhongkedongxin.com # mediaurl: http://test.vod.zhongkedongxin.com + #TitleImage标题图地址、视频地址url拼接，前缀 mediaurl: https://v.livejinan.cn vodmediaurl: http://test.vod.zhongkedongxin.com platform: