From c4efaf9345da0f7012a277408bef6db24cdaf542 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 25 一月 2024 16:09:50 +0800
Subject: [PATCH] 单兵端查看指挥端位置提交
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 64 +++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 14 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 5675fd8..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
@@ -3,6 +3,8 @@
import java.util.Date;
import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -29,6 +31,7 @@
* 鐢ㄦ埛ID
*/
@Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.STRING, prompt = "鐢ㄦ埛缂栧彿")
+ @TableId
private String userId;
/**
@@ -108,40 +111,84 @@
@Excel(name = "閮ㄩ棬鍚嶇О", targetAttr = "deptName", type = Type.EXPORT),
@Excel(name = "閮ㄩ棬璐熻矗浜�", targetAttr = "leader", type = Type.EXPORT)
})
+ @TableField(exist = false)
private SysDept dept;
/**
* 瑙掕壊瀵硅薄
*/
+ @TableField(exist = false)
private List<SysRole> roles;
/**
* 瑙掕壊缁�
*/
+ @TableField(exist = false)
private Long[] roleIds;
/**
* 宀椾綅缁�
*/
+ @TableField(exist = false)
private Long[] postIds;
/**
* 瑙掕壊ID
*/
+ @TableField(exist = false)
private Long roleId;
/**
* 鐩告満鎿嶆帶浼樺厛绾�
*/
- private Integer cameraPriority;
+ private String cameraPriority;
/**
* 鐢ㄦ埛铻嶄簯token
*/
private String rongCloudToken;
+ /**
+ * app鐢ㄦ埛绫诲瀷
+ * 0-app鎸囨尌绔� 1-app鍗曞叺绔� 绌�-pc绔�
+ */
+ private String appUserType;
+ /**
+ * app鐢ㄦ埛鍦ㄧ嚎鐘舵��
+ * 0-绂荤嚎 1-鍦ㄧ嚎
+ */
+ private String appOnlineState;
+ /**
+ * 鍏宠仈鎶ヨ绫诲瀷缁�
+ */
+ @TableField(exist = false)
+ private List<String> commands;
public SysUser() {
+ }
+
+ public String getAppOnlineState() {
+ return appOnlineState;
+ }
+
+ public void setAppOnlineState(String appOnlineState) {
+ this.appOnlineState = appOnlineState;
+ }
+
+ public String getAppUserType() {
+ return appUserType;
+ }
+
+ public void setAppUserType(String appUserType) {
+ this.appUserType = appUserType;
+ }
+
+ public List<String> getCommands() {
+ return commands;
+ }
+
+ public void setCommands(List<String> commands) {
+ this.commands = commands;
}
public String getRongCloudToken() {
@@ -152,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;
}
@@ -178,17 +225,6 @@
public static boolean isAdmin(String userId) {
return userId != null && userId.equals("1");
- }
-
- /**
- * 鏄惁app鎸囨尌绔�
- */
- public boolean isAppLeader() {
- return isAppLeader(this.userId);
- }
-
- public boolean isAppLeader(String userId) {
- return userId != null && this.getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().contains("appLeader"));
}
public Long getDeptId() {
--
Gitblit v1.9.3