lzy 2 months ago
parent
commit
a64c7fadda

+ 0 - 224
Marketplace/src/main/java/com/dt/common/domain/User.java

@@ -1,224 +0,0 @@
-package com.dt.common.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * 用户表
- * @TableName user
- */
-@TableName(value ="user")
-@Data
-public class User {
-    /**
-     * 用户ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 用户名
-     */
-    private String username;
-
-    /**
-     * 密码(BCrypt加密)
-     */
-    private String password;
-
-    /**
-     * 真实姓名
-     */
-    private String realName;
-
-    /**
-     * 手机号
-     */
-    private String phone;
-
-    /**
-     * 邮箱
-     */
-    private String email;
-
-    /**
-     * 头像URL
-     */
-    private String avatar;
-
-    /**
-     * 性别(0-未知,1-男,2-女)
-     */
-    private Integer gender;
-
-    /**
-     * 出生日期
-     */
-    private Date birthDate;
-
-    /**
-     * 状态(0-禁用,1-正常)
-     */
-    private Integer status;
-
-    /**
-     * 最后登录时间
-     */
-    private Date lastLoginTime;
-
-    /**
-     * 最后登录IP
-     */
-    private String lastLoginIp;
-
-    /**
-     * 最后登录设备
-     */
-    private String lastLoginDevice;
-
-    /**
-     * 人脸图片URL
-     */
-    private String faceImageUrl;
-
-    /**
-     * 是否启用人脸登录(0-禁用,1-启用)
-     */
-    private Integer faceLoginEnabled;
-
-    /**
-     * 创建时间
-     */
-    private Date createdAt;
-
-    /**
-     * 更新时间
-     */
-    private Date updatedAt;
-
-    /**
-     * 是否删除(0-未删除,1-已删除)
-     */
-    private Integer deleted;
-
-    /**
-     * 上次签到时间
-     */
-    private Date lastSignInTime;
-
-    /**
-     * 连续签到天数
-     */
-    private Integer continuousSignInDays;
-
-    /**
-     * 累计签到天数
-     */
-    private Integer totalSignInDays;
-
-    /**
-     * 豆豆数量
-     */
-    private Integer beans;
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        User other = (User) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
-            && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
-            && (this.getRealName() == null ? other.getRealName() == null : this.getRealName().equals(other.getRealName()))
-            && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone()))
-            && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
-            && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar()))
-            && (this.getGender() == null ? other.getGender() == null : this.getGender().equals(other.getGender()))
-            && (this.getBirthDate() == null ? other.getBirthDate() == null : this.getBirthDate().equals(other.getBirthDate()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getLastLoginTime() == null ? other.getLastLoginTime() == null : this.getLastLoginTime().equals(other.getLastLoginTime()))
-            && (this.getLastLoginIp() == null ? other.getLastLoginIp() == null : this.getLastLoginIp().equals(other.getLastLoginIp()))
-            && (this.getLastLoginDevice() == null ? other.getLastLoginDevice() == null : this.getLastLoginDevice().equals(other.getLastLoginDevice()))
-            && (this.getFaceImageUrl() == null ? other.getFaceImageUrl() == null : this.getFaceImageUrl().equals(other.getFaceImageUrl()))
-            && (this.getFaceLoginEnabled() == null ? other.getFaceLoginEnabled() == null : this.getFaceLoginEnabled().equals(other.getFaceLoginEnabled()))
-            && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt()))
-            && (this.getUpdatedAt() == null ? other.getUpdatedAt() == null : this.getUpdatedAt().equals(other.getUpdatedAt()))
-            && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted()))
-            && (this.getLastSignInTime() == null ? other.getLastSignInTime() == null : this.getLastSignInTime().equals(other.getLastSignInTime()))
-            && (this.getContinuousSignInDays() == null ? other.getContinuousSignInDays() == null : this.getContinuousSignInDays().equals(other.getContinuousSignInDays()))
-            && (this.getTotalSignInDays() == null ? other.getTotalSignInDays() == null : this.getTotalSignInDays().equals(other.getTotalSignInDays()))
-            && (this.getBeans() == null ? other.getBeans() == null : this.getBeans().equals(other.getBeans()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
-        result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
-        result = prime * result + ((getRealName() == null) ? 0 : getRealName().hashCode());
-        result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode());
-        result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
-        result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode());
-        result = prime * result + ((getGender() == null) ? 0 : getGender().hashCode());
-        result = prime * result + ((getBirthDate() == null) ? 0 : getBirthDate().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getLastLoginTime() == null) ? 0 : getLastLoginTime().hashCode());
-        result = prime * result + ((getLastLoginIp() == null) ? 0 : getLastLoginIp().hashCode());
-        result = prime * result + ((getLastLoginDevice() == null) ? 0 : getLastLoginDevice().hashCode());
-        result = prime * result + ((getFaceImageUrl() == null) ? 0 : getFaceImageUrl().hashCode());
-        result = prime * result + ((getFaceLoginEnabled() == null) ? 0 : getFaceLoginEnabled().hashCode());
-        result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode());
-        result = prime * result + ((getUpdatedAt() == null) ? 0 : getUpdatedAt().hashCode());
-        result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode());
-        result = prime * result + ((getLastSignInTime() == null) ? 0 : getLastSignInTime().hashCode());
-        result = prime * result + ((getContinuousSignInDays() == null) ? 0 : getContinuousSignInDays().hashCode());
-        result = prime * result + ((getTotalSignInDays() == null) ? 0 : getTotalSignInDays().hashCode());
-        result = prime * result + ((getBeans() == null) ? 0 : getBeans().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", username=").append(username);
-        sb.append(", password=").append(password);
-        sb.append(", realName=").append(realName);
-        sb.append(", phone=").append(phone);
-        sb.append(", email=").append(email);
-        sb.append(", avatar=").append(avatar);
-        sb.append(", gender=").append(gender);
-        sb.append(", birthDate=").append(birthDate);
-        sb.append(", status=").append(status);
-        sb.append(", lastLoginTime=").append(lastLoginTime);
-        sb.append(", lastLoginIp=").append(lastLoginIp);
-        sb.append(", lastLoginDevice=").append(lastLoginDevice);
-        sb.append(", faceImageUrl=").append(faceImageUrl);
-        sb.append(", faceLoginEnabled=").append(faceLoginEnabled);
-        sb.append(", createdAt=").append(createdAt);
-        sb.append(", updatedAt=").append(updatedAt);
-        sb.append(", deleted=").append(deleted);
-        sb.append(", lastSignInTime=").append(lastSignInTime);
-        sb.append(", continuousSignInDays=").append(continuousSignInDays);
-        sb.append(", totalSignInDays=").append(totalSignInDays);
-        sb.append(", beans=").append(beans);
-        sb.append("]");
-        return sb.toString();
-    }
-}

+ 0 - 13
Marketplace/src/main/java/com/dt/common/service/UserService.java

@@ -1,13 +0,0 @@
-package com.dt.common.service;
-
-import com.dt.common.domain.User;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
-* @author sunday
-* @description 针对表【user(用户表)】的数据库操作Service
-* @createDate 2025-07-11 14:41:37
-*/
-public interface UserService extends IService<User> {
-
-}

+ 2 - 0
Marketplace/src/main/java/com/dt/common/service/impl/FoodRecordServiceImpl.java

@@ -9,6 +9,8 @@ import com.dt.care.dto.AgesNameDto;
 import com.dt.common.domain.*;
 import com.dt.common.domain.*;
 import com.dt.common.mapper.*;
 import com.dt.common.mapper.*;
 import com.dt.common.service.FoodRecordService;
 import com.dt.common.service.FoodRecordService;
+import com.dt.user.mapper.UserMapper;
+import com.dt.user.pojo.User;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;

+ 0 - 1
Marketplace/src/main/java/com/dt/common/service/impl/HxwVaccinesServiceImpl.java

@@ -8,7 +8,6 @@ import com.dt.common.domain.*;
 import com.dt.common.mapper.*;
 import com.dt.common.mapper.*;
 import com.dt.common.service.HxwVaccinesService;
 import com.dt.common.service.HxwVaccinesService;
 import com.dt.user.mapper.UserMapper;
 import com.dt.user.mapper.UserMapper;
-import com.dt.user.pojo.User;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;

+ 0 - 22
Marketplace/src/main/java/com/dt/common/service/impl/UserServiceImpl.java

@@ -1,22 +0,0 @@
-package com.dt.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dt.common.domain.User;
-import com.dt.common.service.UserService;
-import com.dt.common.mapper.UserMapper;
-import org.springframework.stereotype.Service;
-
-/**
-* @author sunday
-* @description 针对表【user(用户表)】的数据库操作Service实现
-* @createDate 2025-07-11 14:41:37
-*/
-@Service
-public class UserServiceImpl extends ServiceImpl<UserMapper, User>
-    implements UserService{
-
-}
-
-
-
-

+ 1 - 1
Marketplace/src/main/java/com/dt/shequ/service/UserService.java

@@ -1,4 +1,4 @@
-package com.dt.shequ.service;
+//package com.dt.shequ.service;
 
 
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;

+ 2 - 2
Marketplace/src/main/java/com/dt/user/mapper/UserMapper.java

@@ -1,7 +1,7 @@
-package com.dt.common.mapper;
+package com.dt.user.mapper;
 
 
-import com.dt.common.domain.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dt.user.pojo.User;
 
 
 /**
 /**
 * @author sunday
 * @author sunday

+ 119 - 0
Marketplace/src/main/java/com/dt/user/pojo/User.java

@@ -110,6 +110,27 @@ public class User implements Serializable {
      * 是否删除(0-未删除,1-已删除)
      * 是否删除(0-未删除,1-已删除)
      */
      */
     private Integer deleted;
     private Integer deleted;
+
+
+    /**
+     * 上次签到时间
+     */
+    private Date lastSignInTime;
+
+    /**
+     * 连续签到天数
+     */
+    private Integer continuousSignInDays;
+
+    /**
+     * 累计签到天数
+     */
+    private Integer totalSignInDays;
+
+    /**
+     * 豆豆数量
+     */
+    private Integer beans;
     @TableField(exist = false)
     @TableField(exist = false)
     private String bio;
     private String bio;
     @TableField(exist = false)
     @TableField(exist = false)
@@ -126,4 +147,102 @@ public class User implements Serializable {
     private String avatares;
     private String avatares;
     @TableField(exist = false)
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
+
+
+//    @Override
+//    public boolean equals(Object that) {
+//        if (this == that) {
+//            return true;
+//        }
+//        if (that == null) {
+//            return false;
+//        }
+//        if (getClass() != that.getClass()) {
+//            return false;
+//        }
+//        com.dt.user other = (com.dt.common.domain.User) that;
+//        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+//                && (this.getUsername() == null ? other.getUsername() == null : this.getUsername().equals(other.getUsername()))
+//                && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword()))
+//                && (this.getRealName() == null ? other.getRealName() == null : this.getRealName().equals(other.getRealName()))
+//                && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone()))
+//                && (this.getEmail() == null ? other.getEmail() == null : this.getEmail().equals(other.getEmail()))
+//                && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar()))
+//                && (this.getGender() == null ? other.getGender() == null : this.getGender().equals(other.getGender()))
+//                && (this.getBirthDate() == null ? other.getBirthDate() == null : this.getBirthDate().equals(other.getBirthDate()))
+//                && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+//                && (this.getLastLoginTime() == null ? other.getLastLoginTime() == null : this.getLastLoginTime().equals(other.getLastLoginTime()))
+//                && (this.getLastLoginIp() == null ? other.getLastLoginIp() == null : this.getLastLoginIp().equals(other.getLastLoginIp()))
+//                && (this.getLastLoginDevice() == null ? other.getLastLoginDevice() == null : this.getLastLoginDevice().equals(other.getLastLoginDevice()))
+//                && (this.getFaceImageUrl() == null ? other.getFaceImageUrl() == null : this.getFaceImageUrl().equals(other.getFaceImageUrl()))
+//                && (this.getFaceLoginEnabled() == null ? other.getFaceLoginEnabled() == null : this.getFaceLoginEnabled().equals(other.getFaceLoginEnabled()))
+//                && (this.getCreatedAt() == null ? other.getCreatedAt() == null : this.getCreatedAt().equals(other.getCreatedAt()))
+//                && (this.getUpdatedAt() == null ? other.getUpdatedAt() == null : this.getUpdatedAt().equals(other.getUpdatedAt()))
+//                && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted()))
+//                && (this.getLastSignInTime() == null ? other.getLastSignInTime() == null : this.getLastSignInTime().equals(other.getLastSignInTime()))
+//                && (this.getContinuousSignInDays() == null ? other.getContinuousSignInDays() == null : this.getContinuousSignInDays().equals(other.getContinuousSignInDays()))
+//                && (this.getTotalSignInDays() == null ? other.getTotalSignInDays() == null : this.getTotalSignInDays().equals(other.getTotalSignInDays()))
+//                && (this.getBeans() == null ? other.getBeans() == null : this.getBeans().equals(other.getBeans()));
+//    }
+//
+//    @Override
+//    public int hashCode() {
+//        final int prime = 31;
+//        int result = 1;
+//        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+//        result = prime * result + ((getUsername() == null) ? 0 : getUsername().hashCode());
+//        result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode());
+//        result = prime * result + ((getRealName() == null) ? 0 : getRealName().hashCode());
+//        result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode());
+//        result = prime * result + ((getEmail() == null) ? 0 : getEmail().hashCode());
+//        result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode());
+//        result = prime * result + ((getGender() == null) ? 0 : getGender().hashCode());
+//        result = prime * result + ((getBirthDate() == null) ? 0 : getBirthDate().hashCode());
+//        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+//        result = prime * result + ((getLastLoginTime() == null) ? 0 : getLastLoginTime().hashCode());
+//        result = prime * result + ((getLastLoginIp() == null) ? 0 : getLastLoginIp().hashCode());
+//        result = prime * result + ((getLastLoginDevice() == null) ? 0 : getLastLoginDevice().hashCode());
+//        result = prime * result + ((getFaceImageUrl() == null) ? 0 : getFaceImageUrl().hashCode());
+//        result = prime * result + ((getFaceLoginEnabled() == null) ? 0 : getFaceLoginEnabled().hashCode());
+//        result = prime * result + ((getCreatedAt() == null) ? 0 : getCreatedAt().hashCode());
+//        result = prime * result + ((getUpdatedAt() == null) ? 0 : getUpdatedAt().hashCode());
+//        result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode());
+//        result = prime * result + ((getLastSignInTime() == null) ? 0 : getLastSignInTime().hashCode());
+//        result = prime * result + ((getContinuousSignInDays() == null) ? 0 : getContinuousSignInDays().hashCode());
+//        result = prime * result + ((getTotalSignInDays() == null) ? 0 : getTotalSignInDays().hashCode());
+//        result = prime * result + ((getBeans() == null) ? 0 : getBeans().hashCode());
+//        return result;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        StringBuilder sb = new StringBuilder();
+//        sb.append(getClass().getSimpleName());
+//        sb.append(" [");
+//        sb.append("Hash = ").append(hashCode());
+//        sb.append(", id=").append(id);
+//        sb.append(", username=").append(username);
+//        sb.append(", password=").append(password);
+//        sb.append(", realName=").append(realName);
+//        sb.append(", phone=").append(phone);
+//        sb.append(", email=").append(email);
+//        sb.append(", avatar=").append(avatar);
+//        sb.append(", gender=").append(gender);
+//        sb.append(", birthDate=").append(birthDate);
+//        sb.append(", status=").append(status);
+//        sb.append(", lastLoginTime=").append(lastLoginTime);
+//        sb.append(", lastLoginIp=").append(lastLoginIp);
+//        sb.append(", lastLoginDevice=").append(lastLoginDevice);
+//        sb.append(", faceImageUrl=").append(faceImageUrl);
+//        sb.append(", faceLoginEnabled=").append(faceLoginEnabled);
+//        sb.append(", createdAt=").append(createdAt);
+//        sb.append(", updatedAt=").append(updatedAt);
+//        sb.append(", deleted=").append(deleted);
+//        sb.append(", lastSignInTime=").append(lastSignInTime);
+//        sb.append(", continuousSignInDays=").append(continuousSignInDays);
+//        sb.append(", totalSignInDays=").append(totalSignInDays);
+//        sb.append(", beans=").append(beans);
+//        sb.append("]");
+//        return sb.toString();
+//    }
 }
 }

+ 0 - 3
Marketplace/src/main/java/com/dt/user/service/impl/UserServiceImpl.java

@@ -3,7 +3,6 @@ package com.dt.user.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dt.config.ApiException;
 import com.dt.config.ApiException;
-import com.dt.config.CommonContants;
 import com.dt.oss.OSSService;
 import com.dt.oss.OSSService;
 import com.dt.user.dto.UserLoginDTO;
 import com.dt.user.dto.UserLoginDTO;
 import com.dt.user.dto.UserRegisterDTO;
 import com.dt.user.dto.UserRegisterDTO;
@@ -16,8 +15,6 @@ import com.dt.util.BCryptPasswordEncoder;
 import com.dt.util.FaceEngineUtil;
 import com.dt.util.FaceEngineUtil;
 import com.dt.util.Result;
 import com.dt.util.Result;
 import com.dt.util.TokenUtils;
 import com.dt.util.TokenUtils;
-import org.apache.coyote.Request;
-import org.apache.http.HttpRequest;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;

+ 0 - 39
Marketplace/src/main/resources/com/dt/common/mapper/UserMapper.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dt.common.mapper.UserMapper">
-
-    <resultMap id="BaseResultMap" type="com.dt.common.domain.User">
-            <id property="id" column="id" />
-            <result property="username" column="username" />
-            <result property="password" column="password" />
-            <result property="realName" column="real_name" />
-            <result property="phone" column="phone" />
-            <result property="email" column="email" />
-            <result property="avatar" column="avatar" />
-            <result property="gender" column="gender" />
-            <result property="birthDate" column="birth_date" />
-            <result property="status" column="status" />
-            <result property="lastLoginTime" column="last_login_time" />
-            <result property="lastLoginIp" column="last_login_ip" />
-            <result property="lastLoginDevice" column="last_login_device" />
-            <result property="faceImageUrl" column="face_image_url" />
-            <result property="faceLoginEnabled" column="face_login_enabled" />
-            <result property="createdAt" column="created_at" />
-            <result property="updatedAt" column="updated_at" />
-            <result property="deleted" column="deleted" />
-            <result property="lastSignInTime" column="last_sign_in_time" />
-            <result property="continuousSignInDays" column="continuous_sign_in_days" />
-            <result property="totalSignInDays" column="total_sign_in_days" />
-            <result property="beans" column="beans" />
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,username,password,real_name,phone,email,
-        avatar,gender,birth_date,status,last_login_time,
-        last_login_ip,last_login_device,face_image_url,face_login_enabled,created_at,
-        updated_at,deleted,last_sign_in_time,continuous_sign_in_days,total_sign_in_days,
-        beans
-    </sql>
-</mapper>

+ 27 - 24
Marketplace/src/main/resources/mapper/UserMapper.xml

@@ -5,32 +5,35 @@
 <mapper namespace="com.dt.user.mapper.UserMapper">
 <mapper namespace="com.dt.user.mapper.UserMapper">
 
 
     <resultMap id="BaseResultMap" type="com.dt.user.pojo.User">
     <resultMap id="BaseResultMap" type="com.dt.user.pojo.User">
-            <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="username" column="username" jdbcType="VARCHAR"/>
-            <result property="password" column="password" jdbcType="VARCHAR"/>
-            <result property="realName" column="real_name" jdbcType="VARCHAR"/>
-            <result property="phone" column="phone" jdbcType="VARCHAR"/>
-            <result property="email" column="email" jdbcType="VARCHAR"/>
-            <result property="avatar" column="avatar" jdbcType="VARCHAR"/>
-            <result property="gender" column="gender" jdbcType="TINYINT"/>
-            <result property="birthDate" column="birth_date" jdbcType="DATE"/>
-            <result property="status" column="status" jdbcType="TINYINT"/>
-            <result property="lastLoginTime" column="last_login_time" jdbcType="TIMESTAMP"/>
-            <result property="lastLoginIp" column="last_login_ip" jdbcType="VARCHAR"/>
-            <result property="lastLoginDevice" column="last_login_device" jdbcType="VARCHAR"/>
-            <result property="faceImageUrl" column="face_image_url" jdbcType="VARCHAR"/>
-            <result property="faceLoginEnabled" column="face_login_enabled" jdbcType="TINYINT"/>
-            <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
-            <result property="updatedAt" column="updated_at" jdbcType="TIMESTAMP"/>
-            <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+        <id property="id" column="id" />
+        <result property="username" column="username" />
+        <result property="password" column="password" />
+        <result property="realName" column="real_name" />
+        <result property="phone" column="phone" />
+        <result property="email" column="email" />
+        <result property="avatar" column="avatar" />
+        <result property="gender" column="gender" />
+        <result property="birthDate" column="birth_date" />
+        <result property="status" column="status" />
+        <result property="lastLoginTime" column="last_login_time" />
+        <result property="lastLoginIp" column="last_login_ip" />
+        <result property="lastLoginDevice" column="last_login_device" />
+        <result property="faceImageUrl" column="face_image_url" />
+        <result property="faceLoginEnabled" column="face_login_enabled" />
+        <result property="createdAt" column="created_at" />
+        <result property="updatedAt" column="updated_at" />
+        <result property="deleted" column="deleted" />
+        <result property="lastSignInTime" column="last_sign_in_time" />
+        <result property="continuousSignInDays" column="continuous_sign_in_days" />
+        <result property="totalSignInDays" column="total_sign_in_days" />
+        <result property="beans" column="beans" />
     </resultMap>
     </resultMap>
 
 
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
-        id,username,password,
-        real_name,phone,email,
-        avatar,gender,birth_date,
-        status,last_login_time,last_login_ip,
-        last_login_device,face_image_url,face_login_enabled,
-        created_at,updated_at,deleted
+        id,username,password,real_name,phone,email,
+        avatar,gender,birth_date,status,last_login_time,
+        last_login_ip,last_login_device,face_image_url,face_login_enabled,created_at,
+        updated_at,deleted,last_sign_in_time,continuous_sign_in_days,total_sign_in_days,
+        beans
     </sql>
     </sql>
 </mapper>
 </mapper>