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-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
index 38974b1..bf0718e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java
@@ -29,7 +29,7 @@
*/
@Aspect
@Component
-@Slf4j(topic = "hikSdk")
+@Slf4j(topic = "sdk")
public class SdkOperateAspect {
@Resource
@@ -100,7 +100,11 @@
} else {
/*褰撳墠鎺у埗鑰呬负鏅�氱敤鎴�*/
SysUser sysUser = sysUserService.selectUserById(currentOperator);
- currentLevel = sysUser.getCameraPriority();
+ if(StringUtils.isNull(sysUser))
+ {
+ return true;
+ }
+ currentLevel = Integer.valueOf(sysUser.getCameraPriority());
}
Integer operatorLevel = 0;//鑾峰彇鐢宠鑰呯殑浼樺厛绾�
String operatorPriority = DictUtils.getDictValue("cameras_priority", operator);
@@ -111,7 +115,7 @@
/*鍚﹀垯鐢宠鎺у埗鑰呬负褰撳墠鐧诲綍鐢ㄦ埛*/
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();//鑾峰彇鐧诲綍鐢ㄦ埛鐨勪俊鎭�
- operatorLevel = user.getCameraPriority();
+ operatorLevel = Integer.valueOf(user.getCameraPriority());
}
/*鐢宠鑰呮湭鎺у垯鍒ゆ柇浼樺厛绾�*/
if (operatorLevel > currentLevel) {
--
Gitblit v1.9.3