From bb717371e5d885c6478830c21e462720eebc2631 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 10 九月 2024 11:20:36 +0800
Subject: [PATCH] 停车场硬件对接添加日志
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 8163aa5..6ec6741 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -4,7 +4,9 @@
import java.util.List;
import javax.validation.constraints.*;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -28,7 +30,7 @@
/** 用户ID */
@Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
- @TableField("user_id")
+ @TableId(value = "user_id", type = IdType.AUTO)
private Long userId;
/** 部门ID */
@@ -62,11 +64,6 @@
/** 用户头像 */
private String avatar;
- /**
- * 登录账号
- */
- @TableField("account")
- private String account;
/** 密码 */
@NotBlank(message = "密码不能为空")
@@ -118,7 +115,7 @@
/**
* 角色类型 1=平台 2=公司 3=门店 4=修理厂
*/
- @ApiModelProperty(value = "角色类型 1=平台 2=公司 3=门店 4=修理厂")
+ @ApiModelProperty(value = "角色类型 1=平台 2=合作商")
private Integer roleType;
@Excel(name = "密码修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
@@ -129,6 +126,24 @@
@ApiModelProperty(value = "备注")
private String remark;
+
+ @ApiModelProperty(value = "禁用账户备注")
+ @TableField("forbidden_remark")
+ private String forbiddenRemark;
+
+ @ApiModelProperty(value = "充电站")
+ @TableField(exist = false)
+ private List<String> siteNames;
+
+ @ApiModelProperty(value = "充电站id", required = true)
+ @TableField(exist = false)
+ private List<Integer> siteIds;
+
+ @ApiModelProperty(value = "角色")
+ @TableField(exist = false)
+ private List<String> roleNames;
+
+
@Override
public String getRemark() {
@@ -271,14 +286,6 @@
this.avatar = avatar;
}
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
public String getPassword()
{
return password;
@@ -378,6 +385,40 @@
{
this.roleId = roleId;
}
+
+
+ public List<String> getSiteNames() {
+ return siteNames;
+ }
+
+ public void setSiteNames(List<String> siteNames) {
+ this.siteNames = siteNames;
+ }
+
+ public List<String> getRoleNames() {
+ return roleNames;
+ }
+
+ public List<Integer> getSiteIds() {
+ return siteIds;
+ }
+
+ public void setSiteIds(List<Integer> siteIds) {
+ this.siteIds = siteIds;
+ }
+
+ public void setRoleNames(List<String> roleNames) {
+ this.roleNames = roleNames;
+ }
+
+ public String getForbiddenRemark() {
+ return forbiddenRemark;
+ }
+
+ public void setForbiddenRemark(String forbiddenRemark) {
+ this.forbiddenRemark = forbiddenRemark;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.7.1