From f041323a2bce037843fcb163b017427baa556da3 Mon Sep 17 00:00:00 2001 From: liusuyi <1951119284@qq.com> Date: 星期三, 24 七月 2024 16:41:16 +0800 Subject: [PATCH] 优化:修改未读消息入库前判断不存在则插入 取消:程序自动拉起redis/mediamtx/minio,中间件全部服务化 增加:流媒体vtdu详情接口 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 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 86d8cab..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,7 @@ 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; @@ -110,32 +111,37 @@ @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 @@ -154,6 +160,7 @@ /** * 鍏宠仈鎶ヨ绫诲瀷缁� */ + @TableField(exist = false) private List<String> commands; public SysUser() { @@ -192,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; } -- Gitblit v1.9.3