From 161b9318e345c8a0c9cdc133b33a1c759495f323 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 09 八月 2023 11:37:36 +0800
Subject: [PATCH] 修改相机操控优先级字段为字符串与字典匹配
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 6 +++---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/SdkOperateAspect.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index e12ef24..e455dca 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -141,7 +141,7 @@
/**
* 鐩告満鎿嶆帶浼樺厛绾�
*/
- private Integer cameraPriority;
+ private String cameraPriority;
/**
* 鐢ㄦ埛铻嶄簯token
@@ -199,11 +199,11 @@
this.rongCloudToken = rongCloudToken;
}
- public Integer getCameraPriority() {
+ public String getCameraPriority() {
return cameraPriority;
}
- public void setCameraPriority(Integer cameraPriority) {
+ public void setCameraPriority(String cameraPriority) {
this.cameraPriority = cameraPriority;
}
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..156446a 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
@@ -100,7 +100,7 @@
} else {
/*褰撳墠鎺у埗鑰呬负鏅�氱敤鎴�*/
SysUser sysUser = sysUserService.selectUserById(currentOperator);
- currentLevel = sysUser.getCameraPriority();
+ currentLevel = Integer.valueOf(sysUser.getCameraPriority());
}
Integer operatorLevel = 0;//鑾峰彇鐢宠鑰呯殑浼樺厛绾�
String operatorPriority = DictUtils.getDictValue("cameras_priority", operator);
@@ -111,7 +111,7 @@
/*鍚﹀垯鐢宠鎺у埗鑰呬负褰撳墠鐧诲綍鐢ㄦ埛*/
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();//鑾峰彇鐧诲綍鐢ㄦ埛鐨勪俊鎭�
- operatorLevel = user.getCameraPriority();
+ operatorLevel = Integer.valueOf(user.getCameraPriority());
}
/*鐢宠鑰呮湭鎺у垯鍒ゆ柇浼樺厛绾�*/
if (operatorLevel > currentLevel) {
--
Gitblit v1.9.3