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比对,仅由优先级和接收时间作为比较器条件; --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java index 866f36e..ba9dea9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -24,8 +24,8 @@ /** 鑿滃崟鍚嶇О */ private String menuName; - /** 鑿滃崟鑻辨枃鍚嶇О */ - private String menuNameEnglish; + /** 鑿滃崟鍚嶇ОI18N */ + private String menuNameI18n; /** 鐖惰彍鍗曞悕绉� */ private String parentName; @@ -86,12 +86,12 @@ return menuName; } - public String getMenuNameEnglish() { - return menuNameEnglish; + public String getMenuNameI18n() { + return menuNameI18n; } - public void setMenuNameEnglish(String menuNameEnglish) { - this.menuNameEnglish = menuNameEnglish; + public void setMenuNameI18n(String menuNameI18n) { + this.menuNameI18n = menuNameI18n; } public void setMenuName(String menuName) -- Gitblit v1.9.3