From df07b3bf2a5f6f015305a0abe4ab7fa330e87305 Mon Sep 17 00:00:00 2001 From: 2210088963 <2210088963@qq.com> Date: Wed, 8 Jan 2025 18:07:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E6=88=91=E7=9A=84=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E5=92=8C=E6=96=B0=E5=BB=BA=E7=8E=B0=E5=9C=BA=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E7=BB=99=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8CAPPliveSceneController=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=AD=98=E5=9C=A8=E5=BD=B1=E5=93=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AppLiveSceneController.java | 8 +-- .../live/controller/LiveSceneController.java | 18 ++++--- .../live/service/LiveSceneService.java | 4 +- .../service/impl/LiveSceneServiceImpl.java | 52 ++++++++++++++----- src/main/resources/application-live-zhjj.yml | 2 +- src/main/resources/application.yml | 3 ++ 6 files changed, 62 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/platform/modules/app/controller/AppLiveSceneController.java b/src/main/java/com/platform/modules/app/controller/AppLiveSceneController.java index a026379..0646c9b 100644 --- a/src/main/java/com/platform/modules/app/controller/AppLiveSceneController.java +++ b/src/main/java/com/platform/modules/app/controller/AppLiveSceneController.java @@ -186,19 +186,21 @@ public class AppLiveSceneController extends AppAbstractController { /** * app现场审核列表 */ +// 2025年1月8日修改分页查询接口添加了一个栏目选择，该接口因此也添加了栏目选项 @Login @AppPermission(permision = "app:live:scene:page") @ApiOperation("app现场审核列表") @GetMapping("/check/page") @ApiImplicitParams({@ApiImplicitParam(value = "标题", name = "title", paramType = "query", dataType = "String"), @ApiImplicitParam(value = "现场类型，1:视频现场,2:音频现场,3:图片现场,4:文字现场,5:混合现场,6:精品现场", name = "sceneType", paramType = "query", dataType = "int"), - @ApiImplicitParam(value = "直播状态，0：预告；1：正在直播；2回顾", name = "liveState", paramType = "query", dataType = "Integer"), + @ApiImplicitParam(value = "栏目", name = "channelId",paramType = "query", dataType = "int"), + @ApiImplicitParam(value = "直播状态，0：预告；1：正在直播；2回顾", name = "liveState", paramType = "query", dataType = "Integer"), @ApiImplicitParam(value = "页码", name = "pageNo", defaultValue = "1", paramType = "query", dataType = "int"), @ApiImplicitParam(value = "页面大小", name = "pageSize", defaultValue = "15", paramType = "query", dataType = "int")}) @ApiResponses({ @ApiResponse(code = HttpStatus.SC_OK, message = "success", response = LiveSceneEntity.class, responseContainer = "List")}) - public R checkPage(String title, Integer sceneType, Integer liveState, Integer pageNo, Integer pageSize, Long tenantId) { - Page page = liveSceneService.page(title, sceneType, "check", liveState, null == pageNo ? 1 : pageNo,null == pageSize ? 15 : pageSize, tenantId); + public R checkPage(String title, Integer sceneType,Integer channelId, Integer liveState, Integer pageNo, Integer pageSize, Long tenantId) { + Page page = liveSceneService.page(title, sceneType,channelId, "check", liveState, null == pageNo ? 1 : pageNo,null == pageSize ? 15 : pageSize, tenantId); return R.ok().put("page", page); } 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 607bf9c..b9da0b7 100644 --- a/src/main/java/com/platform/modules/live/controller/LiveSceneController.java +++ b/src/main/java/com/platform/modules/live/controller/LiveSceneController.java @@ -70,16 +70,17 @@ public class LiveSceneController extends AbstractController { @ApiImplicitParams({ @ApiImplicitParam(value = "标题", name = "title", paramType = "query", dataType = "String"), @ApiImplicitParam(value = "现场类型，1:视频现场,2:音频现场,3:图片现场,4:文字现场,5:混合现场,6:精品现场", name = "sceneType", paramType = "query", dataType = "int"), - @ApiImplicitParam(value = "现场状态，draft：草稿；check：待审；prod：成品 cycle：回收站", name = "ltype", paramType = "query", dataType = "String"), + @ApiImplicitParam(value = "栏目", name = "channelId",paramType = "query", dataType = "int"), + @ApiImplicitParam(value = "现场状态，draft：草稿；check：待审；prod：成品 cycle：回收站", name = "ltype", paramType = "query", dataType = "String"), @ApiImplicitParam(value = "直播状态，0：预告；1：正在直播；2回顾",name = "liveState",paramType = "query",dataType = "Integer"), @ApiImplicitParam(value = "页码", name = "pageNo", defaultValue = "1", paramType = "query", dataType = "int"), @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){ + public R page(String title, Integer sceneType,Integer channelId, String ltype,Integer liveState, Integer pageNo, Integer pageSize, Long tenantId){ if(StringUtils.isNotBlank(ltype) && (ltype=="prod" || ltype.equals("prod"))){ - Page page = liveSceneService.pageProd(title, 5, ltype,liveState, null==pageNo?0:pageNo, null==pageSize?15:pageSize, tenantId); + Page page = liveSceneService.pageProd(title, 5, channelId, ltype,liveState, null==pageNo?0:pageNo, null==pageSize?15:pageSize, tenantId); return R.ok().put("page", page); }else{ - Page page = liveSceneService.page(title, 5, ltype,liveState, null==pageNo?0:pageNo, null==pageSize?15:pageSize, tenantId); + Page page = liveSceneService.page(title, 5, channelId, ltype,liveState, null==pageNo?0:pageNo, null==pageSize?15:pageSize, tenantId); return R.ok().put("page", page); } } @@ -101,7 +102,7 @@ public class LiveSceneController extends AbstractController { } @PostMapping("/selectLiveInfoList") - @ApiOperation("现场记者列表数据") + @ApiOperation("现场流列表数据") @ApiImplicitParams({ @ApiImplicitParam(value = "现场id", name = "sceneId", defaultValue = "",paramType = "query", dataType = "int")}) public R selectListBySceneId(Integer sceneId){ @@ -198,7 +199,7 @@ public class LiveSceneController extends AbstractController { } /** - * 删除 + * 删除 现场表和第三方流 */ @SysLog("删除现场信息") @PostMapping("/delete") @@ -219,6 +220,11 @@ public class LiveSceneController extends AbstractController { return R.ok(); } + /** + * 现场开播 仅仅修改了字段并刷新索引 + * @param id + * @return + */ @SysLog("现场开播") @PostMapping("/startLive") @RequiresPermissions("live:livescene:startLive") diff --git a/src/main/java/com/platform/modules/live/service/LiveSceneService.java b/src/main/java/com/platform/modules/live/service/LiveSceneService.java index fb0cda6..9af6b67 100644 --- a/src/main/java/com/platform/modules/live/service/LiveSceneService.java +++ b/src/main/java/com/platform/modules/live/service/LiveSceneService.java @@ -30,7 +30,7 @@ import org.springframework.web.multipart.MultipartFile; */ public interface LiveSceneService extends IService { - Page page(String title, Integer sceneType, String ltype,Integer liveState, Integer pageNo, Integer pageSize, Long tenantId); + Page page(String title, Integer sceneType, Integer channelId, String ltype,Integer liveState, Integer pageNo, Integer pageSize, Long tenantId); PageUtils page(String title, Integer sceneType,Integer userId, String ltype, Integer pageNo, Integer pageSize); @@ -148,7 +148,7 @@ public interface LiveSceneService extends IService { /** * 成品现场【全部】 */ - Page pageProd(String title, Integer sceneType, String ltype,Integer liveState, Integer pageNo, Integer pageSize, Long tenantId); + Page pageProd(String title, Integer sceneType, Integer channelId,String ltype,Integer liveState, Integer pageNo, Integer pageSize, Long tenantId); /** * 根据自动开播设置刷新现场状态 * */ 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 2c9bfdc..255d239 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 @@ -102,7 +102,7 @@ public class LiveSceneServiceImpl extends ServiceImpl(new LiveSceneEntity()); // 标题 @@ -113,6 +113,12 @@ public class LiveSceneServiceImpl extends ServiceImpl liveInfos = liveSceneLiveInfoService.selectLiveInfoByInfoType(sceneEntity.getId(),SceneConstants.InfoTypeEnum.THIRD.getType()); if(liveInfos!=null && liveInfos.size()>0){ for(LiveSceneLiveInfoEntity liveInfo : liveInfos){ @@ -1898,14 +1917,14 @@ public class LiveSceneServiceImpl extends ServiceImpl response = liveClient.liveCaster() .createCasterAndInitCasterConfig(liveSceneEntity.getTitle()); if (response.getResult() == ResponseResult.ERROR) @@ -1948,8 +1968,9 @@ public class LiveSceneServiceImpl extends ServiceImpl pageProd(String title, Integer sceneType, String ltype,Integer liveState, Integer pageNo, Integer pageSize, Long tenantId) { + public Page pageProd(String title, Integer sceneType, Integer channelId,String ltype,Integer liveState, Integer pageNo, Integer pageSize, Long tenantId) { // 检索记录 Page page = new Page(pageNo, pageSize); Map params = new HashMap(); @@ -2639,7 +2660,12 @@ public class LiveSceneServiceImpl extends ServiceImpl