From 0484a33f0550b344382f0d3caac5b26bbba23ca0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 24 五月 2023 14:42:12 +0800
Subject: [PATCH] 增加按坐标控制云台ptz接口
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java | 13 +++----------
1 files changed, 3 insertions(+), 10 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 e0b93c8..6f27a17 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
@@ -1,7 +1,5 @@
package com.ruoyi.framework.aspectj;
-import com.ruoyi.common.annotation.SdkOperate;
-import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
@@ -9,19 +7,13 @@
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.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.stereotype.Component;
-
import javax.annotation.Resource;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
/**
* SDK鎺у埗澶勭悊
@@ -42,7 +34,6 @@
@Around("dsPointCut()")
public Object around(ProceedingJoinPoint point) throws Throwable {
-
Boolean resultMap = dataScopeFilter(point);
if (resultMap) {
return point.proceed();
@@ -57,16 +48,18 @@
* @param joinPoint 鍒囩偣
*/
public Boolean dataScopeFilter(ProceedingJoinPoint joinPoint) {
-
//鑾峰彇璇锋眰鎺у埗鐩告満鐨勪俊鎭�
CameraCmd cmd = (CameraCmd) joinPoint.getArgs()[0];
ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cmd.getCameraId());
if (StringUtils.isNull(ardCameras)) {
return false;
}
+ //浼樺厛绾ф瘮瀵�
Date operatorExpired = ardCameras.getOperatorExpired();
Date now = new Date();
if (now.before(operatorExpired)) {
+ //鏈繃鏈�
+
LoginUser loginUser = SecurityUtils.getLoginUser();
if (StringUtils.isNull(loginUser)) {
return false;//褰撳墠鐧诲綍鐢ㄦ埛涓虹┖涓嶅彲浠ユ帶鍒�
--
Gitblit v1.9.3