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/alarm/global/service/IGlobalAlarmService.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java b/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java
index c4b6d45..aade189 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/service/IGlobalAlarmService.java
@@ -19,5 +19,6 @@
Object updateAlarmViewTime(GlobalAlarmCondition condition);
public void receiveAlarm(String topic,String message);
public Map<String,Object> selectAlarmLogsCount();
- Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize);
+ Object selectAlarmList(String name,Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize);
+ public List<GlobalAlarmData> selectThermalMap(GlobalAlarmCondition condition);
}
--
Gitblit v1.9.3