From 8d59908907c9877c854e8aaa73fd3bef19d140a9 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 21 May 2024 21:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=80=A5=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/xz/emergency/mapper/XzEmergencyRecordMapper.java   | 2 ++
 .../com/zhgd/xmgl/modules/xz/entity/XzHikvisionVideoFull.java  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/XzEmergencyRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/XzEmergencyRecordMapper.java
index d9450a0cd..4d88a64c6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/XzEmergencyRecordMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/emergency/mapper/XzEmergencyRecordMapper.java
@@ -4,6 +4,7 @@ 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.annotation.DataScope;
 import com.zhgd.xmgl.modules.xz.emergency.entity.vo.StatsDispositionStatusVo;
 import org.apache.ibatis.annotations.Mapper;
 import com.zhgd.xmgl.modules.xz.emergency.entity.XzEmergencyRecord;
@@ -20,6 +21,7 @@ import java.util.Map;
  * @version： V1.0
  */
 @Mapper
+@DataScope(includeTable = "enterprise_info")
 public interface XzEmergencyRecordMapper extends BaseMapper<XzEmergencyRecord> {
 
     IPage<XzEmergencyRecord> queryList(Page<XzEmergencyRecord> page, @Param(Constants.WRAPPER) QueryWrapper<XzEmergencyRecord> queryWrapper);
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzHikvisionVideoFull.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzHikvisionVideoFull.java
index 624bc6c94..407d42995 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzHikvisionVideoFull.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzHikvisionVideoFull.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.xz.entity;
 
 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 io.swagger.annotations.ApiModel;
@@ -47,8 +48,10 @@ public class XzHikvisionVideoFull implements Serializable {
     @ApiModelProperty(value = "巡检结果(31-正常；32-异常；33-巡检失败；34-未配置)")
     private java.lang.Integer type;
     @ApiModelProperty(value = "片段开始时间（单位：秒）")
+    @TableField(value = "`from`")
     private java.lang.Integer from;
     @ApiModelProperty(value = "片段结束时间（单位：秒）")
+    @TableField(value = "`to`")
     private java.lang.Integer to;
     @ApiModelProperty(value = "录像日期（格式：yyyy-MM-dd）")
     private java.lang.String date;