From e8d53b7555595df35bd2fe03a5c5cf449c38859c Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期四, 14 十二月 2023 13:30:49 +0800 Subject: [PATCH] 增加PTZ引导优先; 井管理增加可见光和热红外ptz设置; 雷达报警引导只需要引导雷达塔上的光电,通道根据日夜切换自动选择; 引导优先按井配置的ptz进行引导,当未配置时按经纬度进行引导; 相机优先级队列排序取消报警次数num比对,仅由优先级和接收时间作为比较器条件; --- ard-work/src/main/java/com/ruoyi/media/domain/Items.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/media/domain/Items.java b/ard-work/src/main/java/com/ruoyi/media/domain/Items.java index bb933cd..bd4b340 100644 --- a/ard-work/src/main/java/com/ruoyi/media/domain/Items.java +++ b/ard-work/src/main/java/com/ruoyi/media/domain/Items.java @@ -1,8 +1,10 @@ package com.ruoyi.media.domain; +import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; +import java.util.Date; import java.util.List; /** @@ -13,11 +15,13 @@ * @Version: 1.0 **/ @Data +@JsonInclude(value = JsonInclude.Include.NON_NULL) public class Items { private String name; - private String confname; - private Conf conf; + private String confName; private Source source; - private boolean sourceready; + private List<Readers> readers; private List<String> tracks; + private Long bytesReceived; + } -- Gitblit v1.9.3