From 12ada3a7e6680d5ab92901410e3cedd9b8077e56 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期六, 16 十二月 2023 17:08:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java index 0600e9c..b5bc79a 100644 --- a/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/video/impl/VideoPointServiceImpl.java @@ -1,5 +1,6 @@ package com.ycl.service.video.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.entity.video.VideoPoint; @@ -9,6 +10,7 @@ import com.ycl.vo.equipment.VideoPointVo; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -23,10 +25,20 @@ public class VideoPointServiceImpl extends ServiceImpl<VideoPointMapper, VideoPoint> implements IVideoPointService { @Override - public IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer current, Integer size) { + public IPage<VideoPointVo> getList(Integer streetId, Integer communityId, Integer type, Integer current, Integer size) { + return baseMapper.search(new Page<>(current, size), streetId, communityId, type); + } - Page<VideoPointVo> page = new Page<>(current, size); - IPage<VideoPointVo> page1 = baseMapper.search(page, streetId, communityId); - return page1; + @Override + public VideoPoint getByCode(String code) { + VideoPoint videoPoint = null; + LambdaQueryWrapper<VideoPoint> queryWrapper = new LambdaQueryWrapper<VideoPoint>() + .eq(VideoPoint::getPlatResourceId, code) + .or().eq(VideoPoint::getCode, code); + List<VideoPoint> pointList = this.list(queryWrapper); + if (pointList.size() > 0) { + videoPoint = pointList.get(0); + } + return videoPoint; } } -- Gitblit v1.8.0