diff --git a/src/main/java/com/zhgd/xmgl/modules/video/entity/ProjectVideoHkVqd.java b/src/main/java/com/zhgd/xmgl/modules/video/entity/ProjectVideoHkVqd.java index 6450d0696..4a8503221 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/entity/ProjectVideoHkVqd.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/entity/ProjectVideoHkVqd.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -176,4 +177,7 @@ public class ProjectVideoHkVqd implements Serializable { @ApiModelProperty(value = "视频设备序列号") private java.lang.String serialNumber; + @TableField(exist = false) + @ApiModelProperty(value = "视频设备名称") + private java.lang.String videoName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/ProjectVideoHkVqdMapper.java b/src/main/java/com/zhgd/xmgl/modules/video/mapper/ProjectVideoHkVqdMapper.java index 39b766276..9e2adfe60 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/ProjectVideoHkVqdMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/ProjectVideoHkVqdMapper.java @@ -1,10 +1,15 @@ package com.zhgd.xmgl.modules.video.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.video.entity.ProjectVideoHkVqd; import com.zhgd.xmgl.modules.video.entity.vo.CountQualityVo; import com.zhgd.xmgl.modules.xz.entity.vo.CountStatusVo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -18,6 +23,10 @@ import java.util.Map; @Mapper public interface ProjectVideoHkVqdMapper extends BaseMapper { + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + CountQualityVo countQuality(Map param); List countStatusTrend(Map param); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/ProjectVideoHkVqdMapper.xml b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/ProjectVideoHkVqdMapper.xml index e60de24ad..9d588d9bc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/ProjectVideoHkVqdMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/xml/ProjectVideoHkVqdMapper.xml @@ -71,6 +71,13 @@ sc_scene_result = -1 or sc_flash_result = -1, 1, 0)), 0) as notDetectNum + +