From 4ef2de7aa7fc24ee19020330e781bae0b51b956c Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 30 十二月 2024 10:23:58 +0800 Subject: [PATCH] 小程序 --- applet/src/main/java/com/jilongda/applet/model/SecUser.java | 84 ++++++++++++++++++++++------------------- 1 files changed, 45 insertions(+), 39 deletions(-) diff --git a/applet/src/main/java/com/jilongda/applet/model/SecUser.java b/applet/src/main/java/com/jilongda/applet/model/SecUser.java index 2e80a63..6b5b0b4 100644 --- a/applet/src/main/java/com/jilongda/applet/model/SecUser.java +++ b/applet/src/main/java/com/jilongda/applet/model/SecUser.java @@ -1,29 +1,34 @@ package com.jilongda.applet.model; -import com.baomidou.mybatisplus.annotation.TableName; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jilongda.common.pojo.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.time.LocalDateTime; /** * <p> - * + * * </p> * - * @author 无关风月 - * @since 2024-12-09 + * @author xiaochen + * @since 2022-06-10 */ @Data -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode(callSuper = true) @TableName("sec_user") -@ApiModel(value="SecUser对象", description="") -public class SecUser implements Serializable { +@ApiModel(value = "SecUser对象", description = "") +public class SecUser extends BaseModel { private static final long serialVersionUID = 1L; @@ -31,19 +36,27 @@ private Long id; @ApiModelProperty(value = "账户") + @Length(max = 18, message = "账户最多输入18个字符") @TableField("account") + @Excel(name = "账号_唯一:中英文1-10个字符:禁止回车、空格等特殊字符", width = 15, orderNum = "1") private String account; + + @ApiModelProperty(value = "密码") + @TableField("password") + @Length(min = 6, max = 16, message = "密码可输入6~16个字符") + @Excel(name = "密码_中英文1-10个字符", width = 15, orderNum = "2") + private String password; @ApiModelProperty(value = "用户描述") @TableField("description") private String description; - @ApiModelProperty(value = "密码") - @TableField("password") - private String password; - @ApiModelProperty(value = "手机号码") @TableField("phone") + @Length(min = 6, max = 11, message = "手机号码可输入6~11位") + @NotNull(message = "手机号不可为空") + @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "手机号格式有误") + @Excel(name = "手机号", width = 15, orderNum = "4") private String phone; @ApiModelProperty(value = "账户状态 是否禁用") @@ -54,31 +67,11 @@ @TableField("last_login_time") private LocalDateTime lastLoginTime; - @ApiModelProperty(value = "创建人") - @TableField("createBy") - private String createBy; - - @ApiModelProperty(value = "创建时间(注册时间)") - @TableField("createTime") - private LocalDateTime createTime; - - @ApiModelProperty(value = "修改人") - @TableField("updateBy") - private String updateBy; - - @ApiModelProperty(value = "修改时间") - @TableField("updateTime") - private LocalDateTime updateTime; - - @ApiModelProperty(value = "是否删除/禁用 1删除 0否(默认)") - @TableField("isDelete") - private Boolean isDelete; - @ApiModelProperty(value = "用户昵称") @TableField("nick_name") private String nickName; - @ApiModelProperty(value = "头像地址") + @ApiModelProperty(value = "微信头像地址") @TableField("avatar_url") private String avatarUrl; @@ -110,21 +103,34 @@ @TableField("deptId") private Long deptId; - @ApiModelProperty(value = "类型1平台管理员2验光师") + @ApiModelProperty(value = "类型1平台管理员2验光师3员工") @TableField("userType") private Integer userType; - + @ApiModelProperty(value = "门店id") + @TableField("storeId") + private Integer storeId; @ApiModelProperty(value = "省code") @TableField("provinceCode") private String provinceCode; - @ApiModelProperty(value = "市code") @TableField("cityCode") private String cityCode; - @ApiModelProperty(value = "区code") @TableField("areaCode") private String areaCode; + @ApiModelProperty(value = "图片") + @TableField("pictures") + private String pictures; + + public boolean isAdmin() + { + return isAdmin(this.id); + } + + public static boolean isAdmin(Long userId) + { + return userId != null && 1L == userId; + } } -- Gitblit v1.7.1