From 8456b0bbb9d1536ebb0b2dc476be736bdd5fb82c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 13 十月 2023 15:58:20 +0800
Subject: [PATCH] 1. 流媒体增加通过接口配置软硬件解码 2. 流媒体自动同步相机设备。
---
ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
index 379d083..aaec59e 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
@@ -1,5 +1,6 @@
package com.ruoyi.device.camera.domain;
+import com.ruoyi.device.channel.domain.ArdChannel;
import com.sun.jna.Structure;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -8,6 +9,7 @@
import com.ruoyi.common.core.domain.BaseEntity;
import java.util.Date;
+import java.util.List;
/**
* 鐩告満璁惧瀵硅薄 ard_cameras
@@ -20,7 +22,10 @@
@NoArgsConstructor
public class ArdCameras extends BaseEntity {
private static final long serialVersionUID = 1L;
-
+ public ArdCameras(String gdtype)
+ {
+ this.gdtype=gdtype;
+ }
/**
* id
*/
@@ -69,11 +74,7 @@
@Excel(name = "鍏夌數绫诲瀷")
private String gdtype;
- /**
- * 閫氶亾鍙�
- */
- @Excel(name = "閫氶亾鍙�")
- private Integer channel;
+
/**
* 缁忓害
@@ -103,7 +104,7 @@
* 閮ㄩ棬ID
*/
@Excel(name = "閮ㄩ棬ID")
- private Integer deptId;
+ private Long deptId;
/**
* 鏂逛綅瑙�
@@ -158,7 +159,9 @@
*/
@Excel(name = "鏈�澶у彲瑙嗚窛绂�")
private Double camMaxVisibleDistance;
-
+ /** 鐩告満鎶ヨ寮曞寮�鍏� */
+ @Excel(name = "鐩告満鎶ヨ寮曞寮�鍏�")
+ private Integer camAlarmGuideEnable;
/**
* 鎵�灞炲ID
*/
@@ -168,6 +171,27 @@
* 鐧诲綍ID
*/
private Integer loginId;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 0-绂荤嚎 1-鍦ㄧ嚎
+ */
+ private String state;
private String operatorId;
private Date operatorExpired;
+ /**
+ * 閫氶亾鍙�
+ */
+ private Integer chanNo;
+ /**
+ * 璧峰閫氶亾鍙�
+ */
+ private Integer startDChan;
+ /**
+ * 閫氶亾鏁�
+ */
+ @Excel(name = "閫氶亾鏁�")
+ private Integer chanNum;
+ /**
+ * 閫氶亾
+ */
+ private List<ArdChannel> channelList;
}
--
Gitblit v1.9.3