From afae505dae0ac35cd1073f3ed26c5e512fcd7c32 Mon Sep 17 00:00:00 2001 From: 2210088963 <2210088963@qq.com> Date: Fri, 14 Feb 2025 18:13:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=9C=A8appView=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E8=8E=B7=E5=8F=96=E9=A1=B5=E9=9D=A2=E9=A3=8E?= =?UTF-8?q?=E6=A0=BC=202.=E5=A2=9E=E5=8A=A0=E4=BA=86APP=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3=203.=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86APP=E6=90=9C=E7=B4=A2=E6=A1=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LiveForeignController.java | 38 +++++++++++++------ .../modules/live/dao/LiveSceneDao.java | 9 +++++ .../live/service/LiveSceneService.java | 5 +++ .../service/impl/LiveChannelServiceImpl.java | 19 ++++++++++ .../service/impl/LiveSceneServiceImpl.java | 12 +++++- .../modules/sys/dao/SysConfigDao.java | 5 ++- .../resources/mapper/live/LiveSceneDao.xml | 23 +++++++++++ 7 files changed, 98 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/platform/modules/foreign/controller/LiveForeignController.java b/src/main/java/com/platform/modules/foreign/controller/LiveForeignController.java index 4d2331c..c055202 100644 --- a/src/main/java/com/platform/modules/foreign/controller/LiveForeignController.java +++ b/src/main/java/com/platform/modules/foreign/controller/LiveForeignController.java @@ -5,10 +5,11 @@ package com.platform.modules.foreign.controller;/** import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; + +import com.baomidou.mybatisplus.plugins.Page; +import com.platform.modules.foreign.dto.AppSearchDto; +import com.platform.modules.live.dto.LiveSceneDTO; import com.platform.modules.sys.controller.AbstractController; import javax.servlet.http.HttpServletRequest; @@ -17,12 +18,7 @@ import com.platform.modules.sys.service.SysTenantService; import com.platform.modules.sys.vo.SysTenantVo; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import com.platform.common.annotation.SysLog; @@ -151,8 +147,9 @@ public class LiveForeignController { redisUtils.hset(setKey, ip, appCommentIpCount, 60); } else { Integer appCommentIpCountAlready = Integer.valueOf(value.toString()); - if(appCommentIpCountAlready >= 5) + if(appCommentIpCountAlready >= 5) { return R.error("当前用户评论过多，请稍后重试"); + } appCommentIpCount += appCommentIpCountAlready; redisUtils.hset(setKey, ip, appCommentIpCount); } @@ -269,4 +266,23 @@ public class LiveForeignController { } return R.ok("success").put("data", object); } + + + /** + * 按照直播中、预告、回顾的顺序（播放时间倒序排序）展示 + * @param page 当前页数 + * @param size 页面大小 + * @return 封装后的现场集合 + */ + @GetMapping("/getAppAllScene") + public R getAppAllScene(@RequestParam Integer page, @RequestParam Integer size) { + page = (page - 1) * size; + return R.ok().put("AppAllScene",liveSceneService.getAppAllScene(page,size)); + } + + + @GetMapping("/appSearch") + public R appSearch(@RequestBody AppSearchDto appSearchDto) { + return R.ok().put("appSearch",liveSceneService.appSearch(appSearchDto)); + } } diff --git a/src/main/java/com/platform/modules/live/dao/LiveSceneDao.java b/src/main/java/com/platform/modules/live/dao/LiveSceneDao.java index b50f6be..80f4a9b 100644 --- a/src/main/java/com/platform/modules/live/dao/LiveSceneDao.java +++ b/src/main/java/com/platform/modules/live/dao/LiveSceneDao.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; import com.baomidou.mybatisplus.plugins.pagination.Pagination; +import com.platform.modules.foreign.dto.AppSearchDto; +import com.platform.modules.live.dto.LiveSceneDTO; import com.platform.modules.live.dto.SceneDTO; import com.platform.modules.live.vo.SceneCommentCountVo; import com.platform.modules.live.vo.SceneSortEntityVo; @@ -52,4 +54,11 @@ public interface LiveSceneDao extends BaseMapper { @Update("update live_scene set hot_spot = 1 where id = #{id}") void updateHotSpot(Long id); + + @Select("select * from live_scene where scene_state = 2 order by field(live_state,1,0,2) asc,live_start desc limit #{page},#{size};") + List getAppAllScene(@Param("page") Integer page, @Param("size") Integer size); + + + + List appSearch(@Param("appSearchDto") AppSearchDto appSearchDto, Page page); } 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 18a1056..ef164cf 100644 --- a/src/main/java/com/platform/modules/live/service/LiveSceneService.java +++ b/src/main/java/com/platform/modules/live/service/LiveSceneService.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; import com.platform.common.utils.R; import com.platform.common.utils.PageUtils; +import com.platform.modules.foreign.dto.AppSearchDto; import com.platform.modules.foreign.entity.SceneForeignEntity; +import com.platform.modules.live.dto.LiveSceneDTO; import com.platform.modules.live.dto.SceneDTO; import com.platform.modules.live.entity.LiveSceneEntity; import com.platform.modules.live.entity.LiveSceneLiveInfoEntity; @@ -174,4 +176,7 @@ public interface LiveSceneService extends IService { List hotList(Integer count); + List getAppAllScene(Integer page,Integer size); + + List appSearch(AppSearchDto appSearchDto); } diff --git a/src/main/java/com/platform/modules/live/service/impl/LiveChannelServiceImpl.java b/src/main/java/com/platform/modules/live/service/impl/LiveChannelServiceImpl.java index 4f614d5..bf84265 100644 --- a/src/main/java/com/platform/modules/live/service/impl/LiveChannelServiceImpl.java +++ b/src/main/java/com/platform/modules/live/service/impl/LiveChannelServiceImpl.java @@ -11,9 +11,14 @@ import com.platform.modules.live.entity.LiveChannelComponentEntity; import com.platform.modules.live.entity.LiveSceneChannelEntity; import com.platform.modules.live.entity.LiveSceneEntity; import com.platform.modules.live.service.LiveSceneService; +import com.platform.modules.sys.dao.SysConfigDao; +import com.platform.modules.sys.entity.SysConfigEntity; +import com.platform.modules.sys.service.impl.SysConfigServiceImpl; import io.swagger.models.auth.In; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanInfoFactory; +import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,6 +51,9 @@ public class LiveChannelServiceImpl extends ServiceImpl getAppAllScene(Integer page,Integer size) { + return liveSceneDao.getAppAllScene(page,size); + } - + @Override + public List appSearch(AppSearchDto appSearchDto) { + Page page = new Page<>(appSearchDto.getPage(), appSearchDto.getSize()); + return liveSceneDao.appSearch(appSearchDto, page); + } } diff --git a/src/main/java/com/platform/modules/sys/dao/SysConfigDao.java b/src/main/java/com/platform/modules/sys/dao/SysConfigDao.java index 105c557..286294b 100644 --- a/src/main/java/com/platform/modules/sys/dao/SysConfigDao.java +++ b/src/main/java/com/platform/modules/sys/dao/SysConfigDao.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper; import com.platform.modules.sys.entity.SysConfigEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * 系统配置信息 @@ -21,5 +22,7 @@ public interface SysConfigDao extends BaseMapper { * 根据key，更新value */ int updateValueByKey(@Param("key") String key, @Param("value") String value); - + + @Select("select * from sys_config where `key` = #{pageStyle};") + SysConfigEntity getPageStyle(@Param("pageStyle") String pageStyle); } diff --git a/src/main/resources/mapper/live/LiveSceneDao.xml b/src/main/resources/mapper/live/LiveSceneDao.xml index 2594b86..7a0aeae 100644 --- a/src/main/resources/mapper/live/LiveSceneDao.xml +++ b/src/main/resources/mapper/live/LiveSceneDao.xml @@ -140,4 +140,27 @@ WHERE id = #{entity.id} + +