From 935fda56e95270493d9e3e46d28b29125d330ca3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期一, 29 七月 2024 16:31:02 +0800
Subject: [PATCH] 修改：流媒体转码使用ffmpeg绝对路径，配置文件中增加ffmpegPath 增加：部门列表查询和部门详情查询无数据权限
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java
index c16c13e..5e187d8 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java
@@ -1,5 +1,6 @@
package com.ruoyi.sy.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
/**
@@ -14,9 +15,21 @@
private String deptName;
private String lng;
private String lat;
- private String time;
- private String intoShipment;
+ private String intoShipmentId;
private String intoShipmentTime;
- private String intoUnload;
+ private String intoUnloadId;
private String intoUnloadTime;
+ private String outShipmentId;
+ private String outShipmentTime;
+ private String lastTime;
+ private Integer isWarning;
+ private String nowWallName;
+ private String alarmLng;
+ private String alarmLat;
+ private String carModel;
+ private Integer drct;
+ @TableField(value = "is_alarm")
+ private Integer isAlarm;
+ @TableField(exist = false)
+ private Boolean isLock;
}
--
Gitblit v1.9.3