From f0c31272eac8b62b601c1801d02f4ce5efd014fb Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 21 May 2024 21:01:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=A4=A7=E5=B1=8F=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/video/entity/ProjectVideoHkVqd.java     | 4 ++++
 .../modules/video/mapper/ProjectVideoHkVqdMapper.java    | 9 +++++++++
 .../modules/video/mapper/xml/ProjectVideoHkVqdMapper.xml | 7 +++++++
 .../video/service/impl/ProjectVideoHkVqdServiceImpl.java | 6 +++---
 4 files changed, 23 insertions(+), 3 deletions(-)

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<ProjectVideoHkVqd> {
 
+    List<ProjectVideoHkVqd> queryList(@Param(Constants.WRAPPER) QueryWrapper<ProjectVideoHkVqd> queryWrapper);
+
+    IPage<ProjectVideoHkVqd> queryList(Page<ProjectVideoHkVqd> page, @Param(Constants.WRAPPER) QueryWrapper<ProjectVideoHkVqd> queryWrapper);
+
     CountQualityVo countQuality(Map<String, Object> param);
 
     List<CountStatusVo> countStatusTrend(Map<String, Object> 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
     </sql>
+
+    <select id="queryList" resultType="com.zhgd.xmgl.modules.video.entity.ProjectVideoHkVqd">
+        select t.*,vi.video_name
+        from project_video_hk_vqd t
+        left join video_item vi on t.serial_number = vi.serial_number
+        ${ew.customSqlSegment}
+    </select>
     <select id="countQuality" resultType="com.zhgd.xmgl.modules.video.entity.vo.CountQualityVo">
         select t.*, ifnull(round(t.normalNum / (t.normalNum + t.exceptionNum) * 100, 2), 0) normalNumRatio
         from (select
diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/ProjectVideoHkVqdServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/ProjectVideoHkVqdServiceImpl.java
index 0be7d7ca3..5152853e1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/ProjectVideoHkVqdServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/ProjectVideoHkVqdServiceImpl.java
@@ -37,7 +37,7 @@ public class ProjectVideoHkVqdServiceImpl extends ServiceImpl<ProjectVideoHkVqdM
     public IPage<ProjectVideoHkVqd> queryPageList(HashMap<String, Object> paramMap) {
         QueryWrapper<ProjectVideoHkVqd> queryWrapper = getQueryWrapper(paramMap);
         Page<ProjectVideoHkVqd> page = PageUtil.getPage(paramMap);
-        IPage<ProjectVideoHkVqd> pageList = this.page(page, queryWrapper);
+        IPage<ProjectVideoHkVqd> pageList = baseMapper.queryList(page, queryWrapper);
         pageList.setRecords(dealList(pageList.getRecords()));
         return pageList;
     }
@@ -45,11 +45,11 @@ public class ProjectVideoHkVqdServiceImpl extends ServiceImpl<ProjectVideoHkVqdM
     @Override
     public List<ProjectVideoHkVqd> queryList(HashMap<String, Object> paramMap) {
         QueryWrapper<ProjectVideoHkVqd> queryWrapper = getQueryWrapper(paramMap);
-        return dealList(this.list(queryWrapper));
+        return dealList(baseMapper.queryList(queryWrapper));
     }
 
     private QueryWrapper<ProjectVideoHkVqd> getQueryWrapper(HashMap<String, Object> paramMap) {
-        String alias = "";
+        String alias = "t.";
         QueryWrapper<ProjectVideoHkVqd> queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectVideoHkVqd.class, paramMap, alias);
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(ProjectVideoHkVqd::getId));
         return queryWrapper;