From 3089fbc788d1dbd638d1cfd9c2f9b7f2011d0af0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 30 六月 2023 16:21:48 +0800
Subject: [PATCH] 优化sdk控制
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 868981f..dd79534 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
@@ -4,12 +4,12 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.constant.sdkPriority;
+import com.ruoyi.constant.CamPriority;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.system.service.ISysUserService;
-import org.apache.ibatis.jdbc.Null;
+import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -19,6 +19,8 @@
import javax.annotation.Resource;
import java.util.Date;
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
/**
* SDK鎺у埗澶勭悊
*
@@ -26,6 +28,7 @@
*/
@Aspect
@Component
+@Slf4j(topic = "hikSdk")
public class SdkOperateAspect {
@Resource
@@ -40,10 +43,12 @@
@Around("dsPointCut()")
public Object around(ProceedingJoinPoint point) throws Throwable {
- Boolean resultMap = dataScopeFilter(point);
- if (resultMap) {
+ Boolean result = controlScopeFilter(point);
+ if (result) {
+ log.debug("宸茶幏鍙栫浉鏈烘帶鍒舵潈");
return point.proceed();
} else {
+ log.debug("鏈幏鍙栫浉鏈烘帶鍒舵潈");
return false;//浠ｆ浛鐩爣鏂规硶鐨勮繑鍥炲��
}
}
@@ -53,7 +58,7 @@
*
* @param joinPoint 鍒囩偣
*/
- public Boolean dataScopeFilter(ProceedingJoinPoint joinPoint) {
+ public Boolean controlScopeFilter(ProceedingJoinPoint joinPoint) {
//鑾峰彇璇锋眰鎺у埗鐩告満鐨勫懡浠や俊鎭�
CameraCmd cmd = (CameraCmd) joinPoint.getArgs()[0];
String operator = cmd.getOperator();//鐢宠鑰�
@@ -84,18 +89,18 @@
} else {
/*褰撳墠鐩告満鏈変汉鎺у埗骞朵笖閰嶇疆浜嗚繃鏈熸椂闂达紝鍏堝垽鏂紭鍏堢骇锛屼紭鍏堢骇楂樺厑璁告帶鍒�*/
Integer currentLevel = 0;//褰撳墠鐩告満鐨勬搷浣滆�呯殑浼樺厛绾�
- if (sdkPriority.priorityMap.containsKey(currentOperator)) {
+ if (CamPriority.priorityMap.containsKey(currentOperator)) {
/*褰撳墠鎺у埗鑰呬负绯荤粺鎶ヨ鐢ㄦ埛*/
- currentLevel = (Integer) sdkPriority.priorityMap.get(currentOperator);
+ currentLevel = (Integer) CamPriority.priorityMap.get(currentOperator);
} else {
/*褰撳墠鎺у埗鑰呬负鏅�氱敤鎴�*/
SysUser sysUser = sysUserService.selectUserById(currentOperator);
currentLevel = sysUser.getCameraPriority();
}
Integer operatorLevel = 0;//鑾峰彇鐢宠鑰呯殑浼樺厛绾�
- if (sdkPriority.priorityMap.containsKey(operator)) {
+ if (CamPriority.priorityMap.containsKey(operator)) {
/*鍖呭惈璇存槑褰撳墠鐢宠鎺у埗鑰呬负绯荤粺鎶ヨ鐢ㄦ埛*/
- operatorLevel = (Integer) sdkPriority.priorityMap.get(operator);
+ operatorLevel = (Integer) CamPriority.priorityMap.get(operator);
} else {
/*鍚﹀垯鐢宠鎺у埗鑰呬负褰撳墠鐧诲綍鐢ㄦ埛*/
LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -111,7 +116,6 @@
return true;
} else {
/*濡傛灉鐢宠鑰呬紭鍏堢骇浣庯紝鍒欏垽鏂繃鏈熸椂闂�*/
- Date now = new Date();
if (currentExpired == null) {
/*褰撳墠鐩告満鏈厤缃繃鏈熸椂闂达紝鍙帶*/
ardCameras.setOperatorId(operator);
@@ -119,7 +123,7 @@
ardCamerasService.updateArdCameras(ardCameras);//鏇存柊鐩告満褰撳墠鎺у埗鑰�
return true;
} else {
- if (now.before(currentExpired)) {
+ if (new Date().before(currentExpired)) {
/*鏃堕棿鏈繃鏈燂紝涓嶅彲鎺�*/
return false;
} else {
--
Gitblit v1.9.3