流水鱼登陆合并整理

@@ -16,7 +16,6 @@
         <dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
             <artifactId>swagger-annotations</artifactId>
-            <version>1.6.2</version>
             <scope>compile</scope>
             <scope>compile</scope>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>

+package com.zhonglai.luhui.domain.user;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户账户信息对象 user_account_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-18
+ */
+@ApiModel("用户账户信息")
+public class UserAccountInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /** 积分 */
+        @ApiModelProperty(value="积分")
+    private Integer integral;
+
+    /** 余额 */
+        @ApiModelProperty(value="余额")
+    private Integer balance;
+
+    /** 级别 */
+        @ApiModelProperty(value="级别")
+    private Integer level;
+
+    /** 货币 */
+        @ApiModelProperty(value="货币")
+    private Integer currency;
+
+    /** 经验 */
+        @ApiModelProperty(value="经验")
+    private Integer experience;
+
+    /** 年度服务费 */
+        @ApiModelProperty(value="年度服务费")
+    private Integer annualServiceCharge;
+
+    /** 点苗器到期时间 */
+        @ApiModelProperty(value="点苗器到期时间")
+    private Integer dianmiaoEndTime;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setIntegral(Integer integral) 
+    {
+        this.integral = integral;
+    }
+
+    public Integer getIntegral() 
+    {
+        return integral;
+    }
+    public void setBalance(Integer balance) 
+    {
+        this.balance = balance;
+    }
+
+    public Integer getBalance() 
+    {
+        return balance;
+    }
+    public void setLevel(Integer level) 
+    {
+        this.level = level;
+    }
+
+    public Integer getLevel() 
+    {
+        return level;
+    }
+    public void setCurrency(Integer currency) 
+    {
+        this.currency = currency;
+    }
+
+    public Integer getCurrency() 
+    {
+        return currency;
+    }
+    public void setExperience(Integer experience) 
+    {
+        this.experience = experience;
+    }
+
+    public Integer getExperience() 
+    {
+        return experience;
+    }
+    public void setAnnualServiceCharge(Integer annualServiceCharge) 
+    {
+        this.annualServiceCharge = annualServiceCharge;
+    }
+
+    public Integer getAnnualServiceCharge() 
+    {
+        return annualServiceCharge;
+    }
+    public void setDianmiaoEndTime(Integer dianmiaoEndTime) 
+    {
+        this.dianmiaoEndTime = dianmiaoEndTime;
+    }
+
+    public Integer getDianmiaoEndTime() 
+    {
+        return dianmiaoEndTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("integral", getIntegral())
+            .append("balance", getBalance())
+            .append("level", getLevel())
+            .append("currency", getCurrency())
+            .append("experience", getExperience())
+            .append("annualServiceCharge", getAnnualServiceCharge())
+            .append("dianmiaoEndTime", getDianmiaoEndTime())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.domain.user;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户地理信息对象 user_address_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-18
+ */
+@ApiModel("用户地理信息")
+public class UserAddressInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /**  */
+        @ApiModelProperty(value="")
+    private String provinceId;
+
+    /**  */
+        @ApiModelProperty(value="")
+    private String cityId;
+
+    /**  */
+        @ApiModelProperty(value="")
+    private String countyId;
+
+    /**  */
+        @ApiModelProperty(value="")
+    private String provinceName;
+
+    /**  */
+        @ApiModelProperty(value="")
+    private String cityName;
+
+    /**  */
+        @ApiModelProperty(value="")
+    private String countyName;
+
+    /**  */
+        @ApiModelProperty(value="")
+    private String address;
+
+    /** 常用搜索 */
+        @ApiModelProperty(value="常用搜索")
+    private String search;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setProvinceId(String provinceId) 
+    {
+        this.provinceId = provinceId;
+    }
+
+    public String getProvinceId() 
+    {
+        return provinceId;
+    }
+    public void setCityId(String cityId) 
+    {
+        this.cityId = cityId;
+    }
+
+    public String getCityId() 
+    {
+        return cityId;
+    }
+    public void setCountyId(String countyId) 
+    {
+        this.countyId = countyId;
+    }
+
+    public String getCountyId() 
+    {
+        return countyId;
+    }
+    public void setProvinceName(String provinceName) 
+    {
+        this.provinceName = provinceName;
+    }
+
+    public String getProvinceName() 
+    {
+        return provinceName;
+    }
+    public void setCityName(String cityName) 
+    {
+        this.cityName = cityName;
+    }
+
+    public String getCityName() 
+    {
+        return cityName;
+    }
+    public void setCountyName(String countyName) 
+    {
+        this.countyName = countyName;
+    }
+
+    public String getCountyName() 
+    {
+        return countyName;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setSearch(String search) 
+    {
+        this.search = search;
+    }
+
+    public String getSearch() 
+    {
+        return search;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("provinceId", getProvinceId())
+            .append("cityId", getCityId())
+            .append("countyId", getCountyId())
+            .append("provinceName", getProvinceName())
+            .append("cityName", getCityName())
+            .append("countyName", getCountyName())
+            .append("address", getAddress())
+            .append("search", getSearch())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.domain.user;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户认证信息对象 user_auth_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-18
+ */
+@ApiModel("用户认证信息")
+public class UserAuthInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /** 是否实名认证(0否,1是) */
+        @ApiModelProperty(value="是否实名认证(0否,1是)")
+    private Integer nameAuthentication;
+
+    /** 个人审核状态 */
+        @ApiModelProperty(value="个人审核状态")
+    private Integer personalAuthenticationState;
+
+    /** 企业审核状态 */
+        @ApiModelProperty(value="企业审核状态")
+    private Integer enterpriseAuthenticationState;
+
+    /** 个人审核描述 */
+        @ApiModelProperty(value="个人审核描述")
+    private String personalAuthenticationDescribe;
+
+    /** 企业审核描述 */
+        @ApiModelProperty(value="企业审核描述")
+    private String enterpriseAuthenticationDescribe;
+
+    /** 个人审核更新时间 */
+        @ApiModelProperty(value="个人审核更新时间")
+    private Integer personalAuthenticationTime;
+
+    /** 企业审核更新时间 */
+        @ApiModelProperty(value="企业审核更新时间")
+    private Integer enterpriseAuthenticationTime;
+
+    /** 身份证号 */
+        @ApiModelProperty(value="身份证号")
+    private String identificationCard;
+
+    /** 营业执照号 */
+        @ApiModelProperty(value="营业执照号")
+    private String businessLicenseNo;
+
+    /** 企业名称 */
+        @ApiModelProperty(value="企业名称")
+    private String enterpriseName;
+
+    /** 企业营业执照 */
+        @ApiModelProperty(value="企业营业执照")
+    private String businessLicenseUrl;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setNameAuthentication(Integer nameAuthentication) 
+    {
+        this.nameAuthentication = nameAuthentication;
+    }
+
+    public Integer getNameAuthentication() 
+    {
+        return nameAuthentication;
+    }
+    public void setPersonalAuthenticationState(Integer personalAuthenticationState) 
+    {
+        this.personalAuthenticationState = personalAuthenticationState;
+    }
+
+    public Integer getPersonalAuthenticationState() 
+    {
+        return personalAuthenticationState;
+    }
+    public void setEnterpriseAuthenticationState(Integer enterpriseAuthenticationState) 
+    {
+        this.enterpriseAuthenticationState = enterpriseAuthenticationState;
+    }
+
+    public Integer getEnterpriseAuthenticationState() 
+    {
+        return enterpriseAuthenticationState;
+    }
+    public void setPersonalAuthenticationDescribe(String personalAuthenticationDescribe) 
+    {
+        this.personalAuthenticationDescribe = personalAuthenticationDescribe;
+    }
+
+    public String getPersonalAuthenticationDescribe() 
+    {
+        return personalAuthenticationDescribe;
+    }
+    public void setEnterpriseAuthenticationDescribe(String enterpriseAuthenticationDescribe) 
+    {
+        this.enterpriseAuthenticationDescribe = enterpriseAuthenticationDescribe;
+    }
+
+    public String getEnterpriseAuthenticationDescribe() 
+    {
+        return enterpriseAuthenticationDescribe;
+    }
+    public void setPersonalAuthenticationTime(Integer personalAuthenticationTime) 
+    {
+        this.personalAuthenticationTime = personalAuthenticationTime;
+    }
+
+    public Integer getPersonalAuthenticationTime() 
+    {
+        return personalAuthenticationTime;
+    }
+    public void setEnterpriseAuthenticationTime(Integer enterpriseAuthenticationTime) 
+    {
+        this.enterpriseAuthenticationTime = enterpriseAuthenticationTime;
+    }
+
+    public Integer getEnterpriseAuthenticationTime() 
+    {
+        return enterpriseAuthenticationTime;
+    }
+    public void setIdentificationCard(String identificationCard) 
+    {
+        this.identificationCard = identificationCard;
+    }
+
+    public String getIdentificationCard() 
+    {
+        return identificationCard;
+    }
+    public void setBusinessLicenseNo(String businessLicenseNo) 
+    {
+        this.businessLicenseNo = businessLicenseNo;
+    }
+
+    public String getBusinessLicenseNo() 
+    {
+        return businessLicenseNo;
+    }
+    public void setEnterpriseName(String enterpriseName) 
+    {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseName() 
+    {
+        return enterpriseName;
+    }
+    public void setBusinessLicenseUrl(String businessLicenseUrl) 
+    {
+        this.businessLicenseUrl = businessLicenseUrl;
+    }
+
+    public String getBusinessLicenseUrl() 
+    {
+        return businessLicenseUrl;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("nameAuthentication", getNameAuthentication())
+            .append("personalAuthenticationState", getPersonalAuthenticationState())
+            .append("enterpriseAuthenticationState", getEnterpriseAuthenticationState())
+            .append("personalAuthenticationDescribe", getPersonalAuthenticationDescribe())
+            .append("enterpriseAuthenticationDescribe", getEnterpriseAuthenticationDescribe())
+            .append("personalAuthenticationTime", getPersonalAuthenticationTime())
+            .append("enterpriseAuthenticationTime", getEnterpriseAuthenticationTime())
+            .append("identificationCard", getIdentificationCard())
+            .append("businessLicenseNo", getBusinessLicenseNo())
+            .append("enterpriseName", getEnterpriseName())
+            .append("businessLicenseUrl", getBusinessLicenseUrl())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.domain.user;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 基础用户信息对象 user_base_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-18
+ */
+@ApiModel("基础用户信息")
+public class UserBaseInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /** 登录名 */
+        @ApiModelProperty(value="登录名")
+    private String loginName;
+
+    /** 真实姓名 */
+        @ApiModelProperty(value="真实姓名")
+    private String name;
+
+    /** 昵称 */
+        @ApiModelProperty(value="昵称")
+    private String nickname;
+
+    /** 性别(0男,1女) */
+        @ApiModelProperty(value="性别(0男,1女)")
+    private Integer gender;
+
+    /** 手机号 */
+        @ApiModelProperty(value="手机号")
+    private String phone;
+
+    /** 电子邮箱 */
+        @ApiModelProperty(value="电子邮箱")
+    private String email;
+
+    /** 头像地址 */
+        @ApiModelProperty(value="头像地址")
+    private String imgUrl;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setLoginName(String loginName) 
+    {
+        this.loginName = loginName;
+    }
+
+    public String getLoginName() 
+    {
+        return loginName;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setNickname(String nickname) 
+    {
+        this.nickname = nickname;
+    }
+
+    public String getNickname() 
+    {
+        return nickname;
+    }
+    public void setGender(Integer gender) 
+    {
+        this.gender = gender;
+    }
+
+    public Integer getGender() 
+    {
+        return gender;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setEmail(String email) 
+    {
+        this.email = email;
+    }
+
+    public String getEmail() 
+    {
+        return email;
+    }
+    public void setImgUrl(String imgUrl) 
+    {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getImgUrl() 
+    {
+        return imgUrl;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("loginName", getLoginName())
+            .append("name", getName())
+            .append("nickname", getNickname())
+            .append("gender", getGender())
+            .append("phone", getPhone())
+            .append("email", getEmail())
+            .append("imgUrl", getImgUrl())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.domain.user;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户其他信息对象 user_extra_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-18
+ */
+@ApiModel("用户其他信息")
+public class UserExtraInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /** 描述图片地址 */
+        @ApiModelProperty(value="描述图片地址")
+    private String describeImgUrl;
+
+    /** 描述 */
+        @ApiModelProperty(value="描述")
+    private String describe;
+
+    /** 用户类型（0普通用户,1管理员,2客服） */
+        @ApiModelProperty(value="用户类型",allowableValues="0=普通用户,1管理员,2客服")
+    private Integer userType;
+
+    /** 是否失效 */
+        @ApiModelProperty(value="是否失效")
+    private Integer isInvalid;
+
+    /** 是否参与活动 */
+        @ApiModelProperty(value="是否参与活动")
+    private Integer isParticipateIn;
+
+    /** 公司ID */
+        @ApiModelProperty(value="公司ID")
+    private Integer companyId;
+
+    /** 分享次数 */
+        @ApiModelProperty(value="分享次数")
+    private Integer shareNumber;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setDescribeImgUrl(String describeImgUrl) 
+    {
+        this.describeImgUrl = describeImgUrl;
+    }
+
+    public String getDescribeImgUrl() 
+    {
+        return describeImgUrl;
+    }
+    public void setDescribe(String describe) 
+    {
+        this.describe = describe;
+    }
+
+    public String getDescribe() 
+    {
+        return describe;
+    }
+    public void setUserType(Integer userType) 
+    {
+        this.userType = userType;
+    }
+
+    public Integer getUserType() 
+    {
+        return userType;
+    }
+    public void setIsInvalid(Integer isInvalid) 
+    {
+        this.isInvalid = isInvalid;
+    }
+
+    public Integer getIsInvalid() 
+    {
+        return isInvalid;
+    }
+    public void setIsParticipateIn(Integer isParticipateIn) 
+    {
+        this.isParticipateIn = isParticipateIn;
+    }
+
+    public Integer getIsParticipateIn() 
+    {
+        return isParticipateIn;
+    }
+    public void setCompanyId(Integer companyId) 
+    {
+        this.companyId = companyId;
+    }
+
+    public Integer getCompanyId() 
+    {
+        return companyId;
+    }
+    public void setShareNumber(Integer shareNumber) 
+    {
+        this.shareNumber = shareNumber;
+    }
+
+    public Integer getShareNumber() 
+    {
+        return shareNumber;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("describeImgUrl", getDescribeImgUrl())
+            .append("describe", getDescribe())
+            .append("userType", getUserType())
+            .append("isInvalid", getIsInvalid())
+            .append("isParticipateIn", getIsParticipateIn())
+            .append("companyId", getCompanyId())
+            .append("shareNumber", getShareNumber())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.domain.user;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户登录对象 user_login
+ * 
+ * @author zhonglai
+ * @date 2025-10-18
+ */
+@ApiModel("用户登录")
+public class UserLogin extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户登录主键主键 */
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /** 用户主键id */
+        @ApiModelProperty(value="用户主键id")
+    private Integer userId;
+
+    /** 用户登录名 */
+        @ApiModelProperty(value="用户登录名")
+    private String loginName;
+
+    /** 用户密码 */
+        @ApiModelProperty(value="用户密码")
+    private String loginPass;
+
+    /** 用户登录密码key */
+        @ApiModelProperty(value="用户登录密码key")
+    private String userLoginPassKey;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setUserId(Integer userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Integer getUserId() 
+    {
+        return userId;
+    }
+    public void setLoginName(String loginName) 
+    {
+        this.loginName = loginName;
+    }
+
+    public String getLoginName() 
+    {
+        return loginName;
+    }
+    public void setLoginPass(String loginPass) 
+    {
+        this.loginPass = loginPass;
+    }
+
+    public String getLoginPass() 
+    {
+        return loginPass;
+    }
+    public void setUserLoginPassKey(String userLoginPassKey) 
+    {
+        this.userLoginPassKey = userLoginPassKey;
+    }
+
+    public String getUserLoginPassKey() 
+    {
+        return userLoginPassKey;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userId", getUserId())
+            .append("loginName", getLoginName())
+            .append("loginPass", getLoginPass())
+            .append("userLoginPassKey", getUserLoginPassKey())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.domain.user;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户登录信息对象 user_login_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-18
+ */
+@ApiModel("用户登录信息")
+public class UserLoginInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /** 在线状态(0离线,1在线) */
+        @ApiModelProperty(value="在线状态(0离线,1在线)")
+    private Integer onlineState;
+
+    /** 最后登陆时间 */
+        @ApiModelProperty(value="最后登陆时间")
+    private Integer lastLoginTime;
+
+    /** 最后登陆IP */
+        @ApiModelProperty(value="最后登陆IP")
+    private String lastLoginIp;
+
+    /** 最后登陆地点 */
+        @ApiModelProperty(value="最后登陆地点")
+    private String lastAddress;
+
+    /** 最后登陆经度 */
+        @ApiModelProperty(value="最后登陆经度")
+    private String lastLoginLongitude;
+
+    /** 最后登陆纬度 */
+        @ApiModelProperty(value="最后登陆纬度")
+    private String lastLoginLatitude;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setOnlineState(Integer onlineState) 
+    {
+        this.onlineState = onlineState;
+    }
+
+    public Integer getOnlineState() 
+    {
+        return onlineState;
+    }
+    public void setLastLoginTime(Integer lastLoginTime) 
+    {
+        this.lastLoginTime = lastLoginTime;
+    }
+
+    public Integer getLastLoginTime() 
+    {
+        return lastLoginTime;
+    }
+    public void setLastLoginIp(String lastLoginIp) 
+    {
+        this.lastLoginIp = lastLoginIp;
+    }
+
+    public String getLastLoginIp() 
+    {
+        return lastLoginIp;
+    }
+    public void setLastAddress(String lastAddress) 
+    {
+        this.lastAddress = lastAddress;
+    }
+
+    public String getLastAddress() 
+    {
+        return lastAddress;
+    }
+    public void setLastLoginLongitude(String lastLoginLongitude) 
+    {
+        this.lastLoginLongitude = lastLoginLongitude;
+    }
+
+    public String getLastLoginLongitude() 
+    {
+        return lastLoginLongitude;
+    }
+    public void setLastLoginLatitude(String lastLoginLatitude) 
+    {
+        this.lastLoginLatitude = lastLoginLatitude;
+    }
+
+    public String getLastLoginLatitude() 
+    {
+        return lastLoginLatitude;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("onlineState", getOnlineState())
+            .append("lastLoginTime", getLastLoginTime())
+            .append("lastLoginIp", getLastLoginIp())
+            .append("lastAddress", getLastAddress())
+            .append("lastLoginLongitude", getLastLoginLongitude())
+            .append("lastLoginLatitude", getLastLoginLatitude())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.domain.user;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户官方及告警信息对象 user_official_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-18
+ */
+@ApiModel("用户官方及告警信息")
+public class UserOfficialInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /** 官方担保状态 */
+        @ApiModelProperty(value="官方担保状态")
+    private Integer guarantee;
+
+    /** 官方担保描述 */
+        @ApiModelProperty(value="官方担保描述")
+    private String guaranteeDescribe;
+
+    /** 告警协议 */
+        @ApiModelProperty(value="告警协议")
+    private Integer alarmAgreement;
+
+    /** 告警通知电话 */
+        @ApiModelProperty(value="告警通知电话")
+    private String alarmNoticePhone;
+
+    /** 告警通知openid */
+        @ApiModelProperty(value="告警通知openid")
+    private String alarmNoticeOpenid;
+
+    /** 告警通知开关 */
+        @ApiModelProperty(value="告警通知开关")
+    private Integer alarmNoticeWxopen;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setGuarantee(Integer guarantee) 
+    {
+        this.guarantee = guarantee;
+    }
+
+    public Integer getGuarantee() 
+    {
+        return guarantee;
+    }
+    public void setGuaranteeDescribe(String guaranteeDescribe) 
+    {
+        this.guaranteeDescribe = guaranteeDescribe;
+    }
+
+    public String getGuaranteeDescribe() 
+    {
+        return guaranteeDescribe;
+    }
+    public void setAlarmAgreement(Integer alarmAgreement) 
+    {
+        this.alarmAgreement = alarmAgreement;
+    }
+
+    public Integer getAlarmAgreement() 
+    {
+        return alarmAgreement;
+    }
+    public void setAlarmNoticePhone(String alarmNoticePhone) 
+    {
+        this.alarmNoticePhone = alarmNoticePhone;
+    }
+
+    public String getAlarmNoticePhone() 
+    {
+        return alarmNoticePhone;
+    }
+    public void setAlarmNoticeOpenid(String alarmNoticeOpenid) 
+    {
+        this.alarmNoticeOpenid = alarmNoticeOpenid;
+    }
+
+    public String getAlarmNoticeOpenid() 
+    {
+        return alarmNoticeOpenid;
+    }
+    public void setAlarmNoticeWxopen(Integer alarmNoticeWxopen) 
+    {
+        this.alarmNoticeWxopen = alarmNoticeWxopen;
+    }
+
+    public Integer getAlarmNoticeWxopen() 
+    {
+        return alarmNoticeWxopen;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("guarantee", getGuarantee())
+            .append("guaranteeDescribe", getGuaranteeDescribe())
+            .append("alarmAgreement", getAlarmAgreement())
+            .append("alarmNoticePhone", getAlarmNoticePhone())
+            .append("alarmNoticeOpenid", getAlarmNoticeOpenid())
+            .append("alarmNoticeWxopen", getAlarmNoticeWxopen())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.domain.user;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户社交信息对象 user_social_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-18
+ */
+@ApiModel("用户社交信息")
+public class UserSocialInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    @ApiModelProperty(value="主键id")
+    private Integer id;
+
+    /** QQ账号 */
+        @ApiModelProperty(value="QQ账号")
+    private String qq;
+
+    /** 微信账号 */
+        @ApiModelProperty(value="微信账号")
+    private String weixin;
+
+    /** 开放平台ID */
+        @ApiModelProperty(value="开放平台ID")
+    private Integer openId;
+
+    /** 萤石子账号ID */
+        @ApiModelProperty(value="萤石子账号ID")
+    private String ysChildrenId;
+
+    /** 萤石子子账号密码 */
+        @ApiModelProperty(value="萤石子子账号密码")
+    private String ysChildrenPass;
+
+    /** 极光消息密码 */
+        @ApiModelProperty(value="极光消息密码")
+    private String messagePassWord;
+
+    /** 极光账号是否活跃 */
+        @ApiModelProperty(value="极光账号是否活跃")
+    private Integer isMessageAction;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setQq(String qq) 
+    {
+        this.qq = qq;
+    }
+
+    public String getQq() 
+    {
+        return qq;
+    }
+    public void setWeixin(String weixin) 
+    {
+        this.weixin = weixin;
+    }
+
+    public String getWeixin() 
+    {
+        return weixin;
+    }
+    public void setOpenId(Integer openId) 
+    {
+        this.openId = openId;
+    }
+
+    public Integer getOpenId() 
+    {
+        return openId;
+    }
+    public void setYsChildrenId(String ysChildrenId) 
+    {
+        this.ysChildrenId = ysChildrenId;
+    }
+
+    public String getYsChildrenId() 
+    {
+        return ysChildrenId;
+    }
+    public void setYsChildrenPass(String ysChildrenPass) 
+    {
+        this.ysChildrenPass = ysChildrenPass;
+    }
+
+    public String getYsChildrenPass() 
+    {
+        return ysChildrenPass;
+    }
+    public void setMessagePassWord(String messagePassWord) 
+    {
+        this.messagePassWord = messagePassWord;
+    }
+
+    public String getMessagePassWord() 
+    {
+        return messagePassWord;
+    }
+    public void setIsMessageAction(Integer isMessageAction) 
+    {
+        this.isMessageAction = isMessageAction;
+    }
+
+    public Integer getIsMessageAction() 
+    {
+        return isMessageAction;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("qq", getQq())
+            .append("weixin", getWeixin())
+            .append("openId", getOpenId())
+            .append("ysChildrenId", getYsChildrenId())
+            .append("ysChildrenPass", getYsChildrenPass())
+            .append("messagePassWord", getMessagePassWord())
+            .append("isMessageAction", getIsMessageAction())
+            .toString();
+    }
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.zhonglai.luhui</groupId>
+        <artifactId>lh-common</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>lh-user</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.zhonglai.luhui</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.zhonglai.luhui</groupId>
+            <artifactId>lh-jar-action</artifactId>
+        </dependency>
+    </dependencies>
+</project>

+package com.zhonglai.luhui.user.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户账户信息对象 user_account_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@ApiModel("用户账户信息")
+public class UserAccountInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    private Integer id;
+
+    /** 积分 */
+        @ApiModelProperty(value="积分")
+    private Integer integral;
+
+    /** 余额 */
+        @ApiModelProperty(value="余额")
+    private Integer balance;
+
+    /** 级别 */
+        @ApiModelProperty(value="级别")
+    private Integer level;
+
+    /** 货币 */
+        @ApiModelProperty(value="货币")
+    private Integer currency;
+
+    /** 经验 */
+        @ApiModelProperty(value="经验")
+    private Integer experience;
+
+    /** 年度服务费 */
+        @ApiModelProperty(value="年度服务费")
+    private Integer annualServiceCharge;
+
+    /** 点苗器到期时间 */
+        @ApiModelProperty(value="点苗器到期时间")
+    private Integer dianmiaoEndTime;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setIntegral(Integer integral) 
+    {
+        this.integral = integral;
+    }
+
+    public Integer getIntegral() 
+    {
+        return integral;
+    }
+    public void setBalance(Integer balance) 
+    {
+        this.balance = balance;
+    }
+
+    public Integer getBalance() 
+    {
+        return balance;
+    }
+    public void setLevel(Integer level) 
+    {
+        this.level = level;
+    }
+
+    public Integer getLevel() 
+    {
+        return level;
+    }
+    public void setCurrency(Integer currency) 
+    {
+        this.currency = currency;
+    }
+
+    public Integer getCurrency() 
+    {
+        return currency;
+    }
+    public void setExperience(Integer experience) 
+    {
+        this.experience = experience;
+    }
+
+    public Integer getExperience() 
+    {
+        return experience;
+    }
+    public void setAnnualServiceCharge(Integer annualServiceCharge) 
+    {
+        this.annualServiceCharge = annualServiceCharge;
+    }
+
+    public Integer getAnnualServiceCharge() 
+    {
+        return annualServiceCharge;
+    }
+    public void setDianmiaoEndTime(Integer dianmiaoEndTime) 
+    {
+        this.dianmiaoEndTime = dianmiaoEndTime;
+    }
+
+    public Integer getDianmiaoEndTime() 
+    {
+        return dianmiaoEndTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("integral", getIntegral())
+            .append("balance", getBalance())
+            .append("level", getLevel())
+            .append("currency", getCurrency())
+            .append("experience", getExperience())
+            .append("annualServiceCharge", getAnnualServiceCharge())
+            .append("dianmiaoEndTime", getDianmiaoEndTime())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.user.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户地理信息对象 user_address_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@ApiModel("用户地理信息")
+public class UserAddressInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    private Integer id;
+
+    /** 省编号 */
+        @ApiModelProperty(value="省编号")
+    private String provinceId;
+
+    /** 市编号 */
+        @ApiModelProperty(value="市编号")
+    private String cityId;
+
+    /** 县编号 */
+        @ApiModelProperty(value="县编号")
+    private String countyId;
+
+    /** 省名称 */
+        @ApiModelProperty(value="省名称")
+    private String provinceName;
+
+    /** 市名称 */
+        @ApiModelProperty(value="市名称")
+    private String cityName;
+
+    /** 县名称 */
+        @ApiModelProperty(value="县名称")
+    private String countyName;
+
+    /** 地址 */
+        @ApiModelProperty(value="地址")
+    private String address;
+
+    /** 常用搜索 */
+        @ApiModelProperty(value="常用搜索")
+    private String search;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setProvinceId(String provinceId) 
+    {
+        this.provinceId = provinceId;
+    }
+
+    public String getProvinceId() 
+    {
+        return provinceId;
+    }
+    public void setCityId(String cityId) 
+    {
+        this.cityId = cityId;
+    }
+
+    public String getCityId() 
+    {
+        return cityId;
+    }
+    public void setCountyId(String countyId) 
+    {
+        this.countyId = countyId;
+    }
+
+    public String getCountyId() 
+    {
+        return countyId;
+    }
+    public void setProvinceName(String provinceName) 
+    {
+        this.provinceName = provinceName;
+    }
+
+    public String getProvinceName() 
+    {
+        return provinceName;
+    }
+    public void setCityName(String cityName) 
+    {
+        this.cityName = cityName;
+    }
+
+    public String getCityName() 
+    {
+        return cityName;
+    }
+    public void setCountyName(String countyName) 
+    {
+        this.countyName = countyName;
+    }
+
+    public String getCountyName() 
+    {
+        return countyName;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setSearch(String search) 
+    {
+        this.search = search;
+    }
+
+    public String getSearch() 
+    {
+        return search;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("provinceId", getProvinceId())
+            .append("cityId", getCityId())
+            .append("countyId", getCountyId())
+            .append("provinceName", getProvinceName())
+            .append("cityName", getCityName())
+            .append("countyName", getCountyName())
+            .append("address", getAddress())
+            .append("search", getSearch())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.user.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户认证信息对象 user_auth_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@ApiModel("用户认证信息")
+public class UserAuthInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    private Integer id;
+
+    /** 是否实名认证(0否,1是) */
+        @ApiModelProperty(value="是否实名认证(0否,1是)")
+    private Integer nameAuthentication;
+
+    /** 个人审核状态 */
+        @ApiModelProperty(value="个人审核状态")
+    private Integer personalAuthenticationState;
+
+    /** 企业审核状态 */
+        @ApiModelProperty(value="企业审核状态")
+    private Integer enterpriseAuthenticationState;
+
+    /** 个人审核描述 */
+        @ApiModelProperty(value="个人审核描述")
+    private String personalAuthenticationDescribe;
+
+    /** 企业审核描述 */
+        @ApiModelProperty(value="企业审核描述")
+    private String enterpriseAuthenticationDescribe;
+
+    /** 个人审核更新时间 */
+        @ApiModelProperty(value="个人审核更新时间")
+    private Integer personalAuthenticationTime;
+
+    /** 企业审核更新时间 */
+        @ApiModelProperty(value="企业审核更新时间")
+    private Integer enterpriseAuthenticationTime;
+
+    /** 身份证号 */
+        @ApiModelProperty(value="身份证号")
+    private String identificationCard;
+
+    /** 营业执照号 */
+        @ApiModelProperty(value="营业执照号")
+    private String businessLicenseNo;
+
+    /** 企业名称 */
+        @ApiModelProperty(value="企业名称")
+    private String enterpriseName;
+
+    /** 企业营业执照 */
+        @ApiModelProperty(value="企业营业执照")
+    private String businessLicenseUrl;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setNameAuthentication(Integer nameAuthentication) 
+    {
+        this.nameAuthentication = nameAuthentication;
+    }
+
+    public Integer getNameAuthentication() 
+    {
+        return nameAuthentication;
+    }
+    public void setPersonalAuthenticationState(Integer personalAuthenticationState) 
+    {
+        this.personalAuthenticationState = personalAuthenticationState;
+    }
+
+    public Integer getPersonalAuthenticationState() 
+    {
+        return personalAuthenticationState;
+    }
+    public void setEnterpriseAuthenticationState(Integer enterpriseAuthenticationState) 
+    {
+        this.enterpriseAuthenticationState = enterpriseAuthenticationState;
+    }
+
+    public Integer getEnterpriseAuthenticationState() 
+    {
+        return enterpriseAuthenticationState;
+    }
+    public void setPersonalAuthenticationDescribe(String personalAuthenticationDescribe) 
+    {
+        this.personalAuthenticationDescribe = personalAuthenticationDescribe;
+    }
+
+    public String getPersonalAuthenticationDescribe() 
+    {
+        return personalAuthenticationDescribe;
+    }
+    public void setEnterpriseAuthenticationDescribe(String enterpriseAuthenticationDescribe) 
+    {
+        this.enterpriseAuthenticationDescribe = enterpriseAuthenticationDescribe;
+    }
+
+    public String getEnterpriseAuthenticationDescribe() 
+    {
+        return enterpriseAuthenticationDescribe;
+    }
+    public void setPersonalAuthenticationTime(Integer personalAuthenticationTime) 
+    {
+        this.personalAuthenticationTime = personalAuthenticationTime;
+    }
+
+    public Integer getPersonalAuthenticationTime() 
+    {
+        return personalAuthenticationTime;
+    }
+    public void setEnterpriseAuthenticationTime(Integer enterpriseAuthenticationTime) 
+    {
+        this.enterpriseAuthenticationTime = enterpriseAuthenticationTime;
+    }
+
+    public Integer getEnterpriseAuthenticationTime() 
+    {
+        return enterpriseAuthenticationTime;
+    }
+    public void setIdentificationCard(String identificationCard) 
+    {
+        this.identificationCard = identificationCard;
+    }
+
+    public String getIdentificationCard() 
+    {
+        return identificationCard;
+    }
+    public void setBusinessLicenseNo(String businessLicenseNo) 
+    {
+        this.businessLicenseNo = businessLicenseNo;
+    }
+
+    public String getBusinessLicenseNo() 
+    {
+        return businessLicenseNo;
+    }
+    public void setEnterpriseName(String enterpriseName) 
+    {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseName() 
+    {
+        return enterpriseName;
+    }
+    public void setBusinessLicenseUrl(String businessLicenseUrl) 
+    {
+        this.businessLicenseUrl = businessLicenseUrl;
+    }
+
+    public String getBusinessLicenseUrl() 
+    {
+        return businessLicenseUrl;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("nameAuthentication", getNameAuthentication())
+            .append("personalAuthenticationState", getPersonalAuthenticationState())
+            .append("enterpriseAuthenticationState", getEnterpriseAuthenticationState())
+            .append("personalAuthenticationDescribe", getPersonalAuthenticationDescribe())
+            .append("enterpriseAuthenticationDescribe", getEnterpriseAuthenticationDescribe())
+            .append("personalAuthenticationTime", getPersonalAuthenticationTime())
+            .append("enterpriseAuthenticationTime", getEnterpriseAuthenticationTime())
+            .append("identificationCard", getIdentificationCard())
+            .append("businessLicenseNo", getBusinessLicenseNo())
+            .append("enterpriseName", getEnterpriseName())
+            .append("businessLicenseUrl", getBusinessLicenseUrl())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.user.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 基础用户信息对象 user_base_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@ApiModel("基础用户信息")
+public class UserBaseInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    private Integer id;
+
+    /** 登录名 */
+        @ApiModelProperty(value="登录名")
+    private String loginName;
+
+    /** 真实姓名 */
+        @ApiModelProperty(value="真实姓名")
+    private String name;
+
+    /** 昵称 */
+        @ApiModelProperty(value="昵称")
+    private String nickname;
+
+    /** 性别(0男,1女) */
+        @ApiModelProperty(value="性别(0男,1女)")
+    private Integer gender;
+
+    /** 手机号 */
+        @ApiModelProperty(value="手机号")
+    private String phone;
+
+    /** 电子邮箱 */
+        @ApiModelProperty(value="电子邮箱")
+    private String email;
+
+    /** 头像地址 */
+        @ApiModelProperty(value="头像地址")
+    private String imgUrl;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setLoginName(String loginName) 
+    {
+        this.loginName = loginName;
+    }
+
+    public String getLoginName() 
+    {
+        return loginName;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setNickname(String nickname) 
+    {
+        this.nickname = nickname;
+    }
+
+    public String getNickname() 
+    {
+        return nickname;
+    }
+    public void setGender(Integer gender) 
+    {
+        this.gender = gender;
+    }
+
+    public Integer getGender() 
+    {
+        return gender;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setEmail(String email) 
+    {
+        this.email = email;
+    }
+
+    public String getEmail() 
+    {
+        return email;
+    }
+    public void setImgUrl(String imgUrl) 
+    {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getImgUrl() 
+    {
+        return imgUrl;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("loginName", getLoginName())
+            .append("name", getName())
+            .append("nickname", getNickname())
+            .append("gender", getGender())
+            .append("phone", getPhone())
+            .append("email", getEmail())
+            .append("imgUrl", getImgUrl())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.user.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户其他信息对象 user_extra_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@ApiModel("用户其他信息")
+public class UserExtraInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    private Integer id;
+
+    /** 描述图片地址 */
+        @ApiModelProperty(value="描述图片地址")
+    private String describeImgUrl;
+
+    /** 描述 */
+        @ApiModelProperty(value="描述")
+    private String describe;
+
+    /** 用户类型（0普通用户,1管理员,2客服） */
+        @ApiModelProperty(value="用户类型",allowableValues="0=普通用户,1管理员,2客服")
+    private Integer userType;
+
+    /** 是否失效 */
+        @ApiModelProperty(value="是否失效")
+    private Integer isInvalid;
+
+    /** 是否参与活动 */
+        @ApiModelProperty(value="是否参与活动")
+    private Integer isParticipateIn;
+
+    /** 公司ID */
+        @ApiModelProperty(value="公司ID")
+    private Integer companyId;
+
+    /** 分享次数 */
+        @ApiModelProperty(value="分享次数")
+    private Integer shareNumber;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setDescribeImgUrl(String describeImgUrl) 
+    {
+        this.describeImgUrl = describeImgUrl;
+    }
+
+    public String getDescribeImgUrl() 
+    {
+        return describeImgUrl;
+    }
+    public void setDescribe(String describe) 
+    {
+        this.describe = describe;
+    }
+
+    public String getDescribe() 
+    {
+        return describe;
+    }
+    public void setUserType(Integer userType) 
+    {
+        this.userType = userType;
+    }
+
+    public Integer getUserType() 
+    {
+        return userType;
+    }
+    public void setIsInvalid(Integer isInvalid) 
+    {
+        this.isInvalid = isInvalid;
+    }
+
+    public Integer getIsInvalid() 
+    {
+        return isInvalid;
+    }
+    public void setIsParticipateIn(Integer isParticipateIn) 
+    {
+        this.isParticipateIn = isParticipateIn;
+    }
+
+    public Integer getIsParticipateIn() 
+    {
+        return isParticipateIn;
+    }
+    public void setCompanyId(Integer companyId) 
+    {
+        this.companyId = companyId;
+    }
+
+    public Integer getCompanyId() 
+    {
+        return companyId;
+    }
+    public void setShareNumber(Integer shareNumber) 
+    {
+        this.shareNumber = shareNumber;
+    }
+
+    public Integer getShareNumber() 
+    {
+        return shareNumber;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("describeImgUrl", getDescribeImgUrl())
+            .append("describe", getDescribe())
+            .append("userType", getUserType())
+            .append("isInvalid", getIsInvalid())
+            .append("isParticipateIn", getIsParticipateIn())
+            .append("companyId", getCompanyId())
+            .append("shareNumber", getShareNumber())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.user.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户登录对象 user_login
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@ApiModel("用户登录")
+public class UserLogin extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户登录主键主键 */
+    private Integer id;
+
+    /** 用户主键id */
+        @ApiModelProperty(value="用户主键id")
+    private Integer userId;
+
+    /** 用户登录名 */
+        @ApiModelProperty(value="用户登录名")
+    private String loginName;
+
+    /** 用户密码 */
+        @ApiModelProperty(value="用户密码")
+    private String loginPass;
+
+    /** 用户登录密码key */
+        @ApiModelProperty(value="用户登录密码key")
+    private String userLoginPassKey;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setUserId(Integer userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Integer getUserId() 
+    {
+        return userId;
+    }
+    public void setLoginName(String loginName) 
+    {
+        this.loginName = loginName;
+    }
+
+    public String getLoginName() 
+    {
+        return loginName;
+    }
+    public void setLoginPass(String loginPass) 
+    {
+        this.loginPass = loginPass;
+    }
+
+    public String getLoginPass() 
+    {
+        return loginPass;
+    }
+    public void setUserLoginPassKey(String userLoginPassKey) 
+    {
+        this.userLoginPassKey = userLoginPassKey;
+    }
+
+    public String getUserLoginPassKey() 
+    {
+        return userLoginPassKey;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userId", getUserId())
+            .append("loginName", getLoginName())
+            .append("loginPass", getLoginPass())
+            .append("userLoginPassKey", getUserLoginPassKey())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.user.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户登录信息对象 user_login_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@ApiModel("用户登录信息")
+public class UserLoginInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    private Integer id;
+
+    /** 在线状态(0离线,1在线) */
+        @ApiModelProperty(value="在线状态(0离线,1在线)")
+    private Integer onlineState;
+
+    /** 最后登陆时间 */
+        @ApiModelProperty(value="最后登陆时间")
+    private Integer lastLoginTime;
+
+    /** 最后登陆IP */
+        @ApiModelProperty(value="最后登陆IP")
+    private String lastLoginIp;
+
+    /** 最后登陆地点 */
+        @ApiModelProperty(value="最后登陆地点")
+    private String lastAddress;
+
+    /** 最后登陆经度 */
+        @ApiModelProperty(value="最后登陆经度")
+    private String lastLoginLongitude;
+
+    /** 最后登陆纬度 */
+        @ApiModelProperty(value="最后登陆纬度")
+    private String lastLoginLatitude;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setOnlineState(Integer onlineState) 
+    {
+        this.onlineState = onlineState;
+    }
+
+    public Integer getOnlineState() 
+    {
+        return onlineState;
+    }
+    public void setLastLoginTime(Integer lastLoginTime) 
+    {
+        this.lastLoginTime = lastLoginTime;
+    }
+
+    public Integer getLastLoginTime() 
+    {
+        return lastLoginTime;
+    }
+    public void setLastLoginIp(String lastLoginIp) 
+    {
+        this.lastLoginIp = lastLoginIp;
+    }
+
+    public String getLastLoginIp() 
+    {
+        return lastLoginIp;
+    }
+    public void setLastAddress(String lastAddress) 
+    {
+        this.lastAddress = lastAddress;
+    }
+
+    public String getLastAddress() 
+    {
+        return lastAddress;
+    }
+    public void setLastLoginLongitude(String lastLoginLongitude) 
+    {
+        this.lastLoginLongitude = lastLoginLongitude;
+    }
+
+    public String getLastLoginLongitude() 
+    {
+        return lastLoginLongitude;
+    }
+    public void setLastLoginLatitude(String lastLoginLatitude) 
+    {
+        this.lastLoginLatitude = lastLoginLatitude;
+    }
+
+    public String getLastLoginLatitude() 
+    {
+        return lastLoginLatitude;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("onlineState", getOnlineState())
+            .append("lastLoginTime", getLastLoginTime())
+            .append("lastLoginIp", getLastLoginIp())
+            .append("lastAddress", getLastAddress())
+            .append("lastLoginLongitude", getLastLoginLongitude())
+            .append("lastLoginLatitude", getLastLoginLatitude())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.user.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户官方及告警信息对象 user_official_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@ApiModel("用户官方及告警信息")
+public class UserOfficialInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    private Integer id;
+
+    /** 官方担保状态 */
+        @ApiModelProperty(value="官方担保状态")
+    private Integer guarantee;
+
+    /** 官方担保描述 */
+        @ApiModelProperty(value="官方担保描述")
+    private String guaranteeDescribe;
+
+    /** 告警协议 */
+        @ApiModelProperty(value="告警协议")
+    private Integer alarmAgreement;
+
+    /** 告警通知电话 */
+        @ApiModelProperty(value="告警通知电话")
+    private String alarmNoticePhone;
+
+    /** 告警通知openid */
+        @ApiModelProperty(value="告警通知openid")
+    private String alarmNoticeOpenid;
+
+    /** 告警通知开关 */
+        @ApiModelProperty(value="告警通知开关")
+    private Integer alarmNoticeWxopen;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setGuarantee(Integer guarantee) 
+    {
+        this.guarantee = guarantee;
+    }
+
+    public Integer getGuarantee() 
+    {
+        return guarantee;
+    }
+    public void setGuaranteeDescribe(String guaranteeDescribe) 
+    {
+        this.guaranteeDescribe = guaranteeDescribe;
+    }
+
+    public String getGuaranteeDescribe() 
+    {
+        return guaranteeDescribe;
+    }
+    public void setAlarmAgreement(Integer alarmAgreement) 
+    {
+        this.alarmAgreement = alarmAgreement;
+    }
+
+    public Integer getAlarmAgreement() 
+    {
+        return alarmAgreement;
+    }
+    public void setAlarmNoticePhone(String alarmNoticePhone) 
+    {
+        this.alarmNoticePhone = alarmNoticePhone;
+    }
+
+    public String getAlarmNoticePhone() 
+    {
+        return alarmNoticePhone;
+    }
+    public void setAlarmNoticeOpenid(String alarmNoticeOpenid) 
+    {
+        this.alarmNoticeOpenid = alarmNoticeOpenid;
+    }
+
+    public String getAlarmNoticeOpenid() 
+    {
+        return alarmNoticeOpenid;
+    }
+    public void setAlarmNoticeWxopen(Integer alarmNoticeWxopen) 
+    {
+        this.alarmNoticeWxopen = alarmNoticeWxopen;
+    }
+
+    public Integer getAlarmNoticeWxopen() 
+    {
+        return alarmNoticeWxopen;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("guarantee", getGuarantee())
+            .append("guaranteeDescribe", getGuaranteeDescribe())
+            .append("alarmAgreement", getAlarmAgreement())
+            .append("alarmNoticePhone", getAlarmNoticePhone())
+            .append("alarmNoticeOpenid", getAlarmNoticeOpenid())
+            .append("alarmNoticeWxopen", getAlarmNoticeWxopen())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.user.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.common.tool.BaseEntity;
+
+/**
+ * 用户社交信息对象 user_social_info
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@ApiModel("用户社交信息")
+public class UserSocialInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID，主键关联 */
+    private Integer id;
+
+    /** QQ账号 */
+        @ApiModelProperty(value="QQ账号")
+    private String qq;
+
+    /** 微信账号 */
+        @ApiModelProperty(value="微信账号")
+    private String weixin;
+
+    /** 开放平台ID */
+        @ApiModelProperty(value="开放平台ID")
+    private Integer openId;
+
+    /** 萤石子账号ID */
+        @ApiModelProperty(value="萤石子账号ID")
+    private String ysChildrenId;
+
+    /** 萤石子子账号密码 */
+        @ApiModelProperty(value="萤石子子账号密码")
+    private String ysChildrenPass;
+
+    /** 极光消息密码 */
+        @ApiModelProperty(value="极光消息密码")
+    private String messagePassWord;
+
+    /** 极光账号是否活跃 */
+        @ApiModelProperty(value="极光账号是否活跃")
+    private Integer isMessageAction;
+
+    public void setId(Integer id) 
+    {
+        this.id = id;
+    }
+
+    public Integer getId() 
+    {
+        return id;
+    }
+    public void setQq(String qq) 
+    {
+        this.qq = qq;
+    }
+
+    public String getQq() 
+    {
+        return qq;
+    }
+    public void setWeixin(String weixin) 
+    {
+        this.weixin = weixin;
+    }
+
+    public String getWeixin() 
+    {
+        return weixin;
+    }
+    public void setOpenId(Integer openId) 
+    {
+        this.openId = openId;
+    }
+
+    public Integer getOpenId() 
+    {
+        return openId;
+    }
+    public void setYsChildrenId(String ysChildrenId) 
+    {
+        this.ysChildrenId = ysChildrenId;
+    }
+
+    public String getYsChildrenId() 
+    {
+        return ysChildrenId;
+    }
+    public void setYsChildrenPass(String ysChildrenPass) 
+    {
+        this.ysChildrenPass = ysChildrenPass;
+    }
+
+    public String getYsChildrenPass() 
+    {
+        return ysChildrenPass;
+    }
+    public void setMessagePassWord(String messagePassWord) 
+    {
+        this.messagePassWord = messagePassWord;
+    }
+
+    public String getMessagePassWord() 
+    {
+        return messagePassWord;
+    }
+    public void setIsMessageAction(Integer isMessageAction) 
+    {
+        this.isMessageAction = isMessageAction;
+    }
+
+    public Integer getIsMessageAction() 
+    {
+        return isMessageAction;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("qq", getQq())
+            .append("weixin", getWeixin())
+            .append("openId", getOpenId())
+            .append("ysChildrenId", getYsChildrenId())
+            .append("ysChildrenPass", getYsChildrenPass())
+            .append("messagePassWord", getMessagePassWord())
+            .append("isMessageAction", getIsMessageAction())
+            .toString();
+    }
+}

+package com.zhonglai.luhui.user.mapper;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserAccountInfo;
+
+/**
+ * 用户账户信息Mapper接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface UserAccountInfoMapper 
+{
+    /**
+     * 查询用户账户信息
+     * 
+     * @param id 用户账户信息主键
+     * @return 用户账户信息
+     */
+    public UserAccountInfo selectUserAccountInfoById(Integer id);
+
+    /**
+     * 查询用户账户信息列表
+     * 
+     * @param userAccountInfo 用户账户信息
+     * @return 用户账户信息集合
+     */
+    public List<UserAccountInfo> selectUserAccountInfoList(UserAccountInfo userAccountInfo);
+
+    /**
+     * 新增用户账户信息
+     * 
+     * @param userAccountInfo 用户账户信息
+     * @return 结果
+     */
+    public int insertUserAccountInfo(UserAccountInfo userAccountInfo);
+
+    /**
+     * 修改用户账户信息
+     * 
+     * @param userAccountInfo 用户账户信息
+     * @return 结果
+     */
+    public int updateUserAccountInfo(UserAccountInfo userAccountInfo);
+
+    /**
+     * 删除用户账户信息
+     * 
+     * @param id 用户账户信息主键
+     * @return 结果
+     */
+    public int deleteUserAccountInfoById(Integer id);
+
+    /**
+     * 批量删除用户账户信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserAccountInfoByIds(Integer[] ids);
+}

+package com.zhonglai.luhui.user.mapper;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserAddressInfo;
+
+/**
+ * 用户地理信息Mapper接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface UserAddressInfoMapper 
+{
+    /**
+     * 查询用户地理信息
+     * 
+     * @param id 用户地理信息主键
+     * @return 用户地理信息
+     */
+    public UserAddressInfo selectUserAddressInfoById(Integer id);
+
+    /**
+     * 查询用户地理信息列表
+     * 
+     * @param userAddressInfo 用户地理信息
+     * @return 用户地理信息集合
+     */
+    public List<UserAddressInfo> selectUserAddressInfoList(UserAddressInfo userAddressInfo);
+
+    /**
+     * 新增用户地理信息
+     * 
+     * @param userAddressInfo 用户地理信息
+     * @return 结果
+     */
+    public int insertUserAddressInfo(UserAddressInfo userAddressInfo);
+
+    /**
+     * 修改用户地理信息
+     * 
+     * @param userAddressInfo 用户地理信息
+     * @return 结果
+     */
+    public int updateUserAddressInfo(UserAddressInfo userAddressInfo);
+
+    /**
+     * 删除用户地理信息
+     * 
+     * @param id 用户地理信息主键
+     * @return 结果
+     */
+    public int deleteUserAddressInfoById(Integer id);
+
+    /**
+     * 批量删除用户地理信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserAddressInfoByIds(Integer[] ids);
+}

+package com.zhonglai.luhui.user.mapper;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserAuthInfo;
+
+/**
+ * 用户认证信息Mapper接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface UserAuthInfoMapper 
+{
+    /**
+     * 查询用户认证信息
+     * 
+     * @param id 用户认证信息主键
+     * @return 用户认证信息
+     */
+    public UserAuthInfo selectUserAuthInfoById(Integer id);
+
+    /**
+     * 查询用户认证信息列表
+     * 
+     * @param userAuthInfo 用户认证信息
+     * @return 用户认证信息集合
+     */
+    public List<UserAuthInfo> selectUserAuthInfoList(UserAuthInfo userAuthInfo);
+
+    /**
+     * 新增用户认证信息
+     * 
+     * @param userAuthInfo 用户认证信息
+     * @return 结果
+     */
+    public int insertUserAuthInfo(UserAuthInfo userAuthInfo);
+
+    /**
+     * 修改用户认证信息
+     * 
+     * @param userAuthInfo 用户认证信息
+     * @return 结果
+     */
+    public int updateUserAuthInfo(UserAuthInfo userAuthInfo);
+
+    /**
+     * 删除用户认证信息
+     * 
+     * @param id 用户认证信息主键
+     * @return 结果
+     */
+    public int deleteUserAuthInfoById(Integer id);
+
+    /**
+     * 批量删除用户认证信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserAuthInfoByIds(Integer[] ids);
+}

+package com.zhonglai.luhui.user.mapper;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserBaseInfo;
+
+/**
+ * 基础用户信息Mapper接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface UserBaseInfoMapper 
+{
+    /**
+     * 查询基础用户信息
+     * 
+     * @param id 基础用户信息主键
+     * @return 基础用户信息
+     */
+    public UserBaseInfo selectUserBaseInfoById(Integer id);
+
+    /**
+     * 查询基础用户信息列表
+     * 
+     * @param userBaseInfo 基础用户信息
+     * @return 基础用户信息集合
+     */
+    public List<UserBaseInfo> selectUserBaseInfoList(UserBaseInfo userBaseInfo);
+
+    /**
+     * 新增基础用户信息
+     * 
+     * @param userBaseInfo 基础用户信息
+     * @return 结果
+     */
+    public int insertUserBaseInfo(UserBaseInfo userBaseInfo);
+
+    /**
+     * 修改基础用户信息
+     * 
+     * @param userBaseInfo 基础用户信息
+     * @return 结果
+     */
+    public int updateUserBaseInfo(UserBaseInfo userBaseInfo);
+
+    /**
+     * 删除基础用户信息
+     * 
+     * @param id 基础用户信息主键
+     * @return 结果
+     */
+    public int deleteUserBaseInfoById(Integer id);
+
+    /**
+     * 批量删除基础用户信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserBaseInfoByIds(Integer[] ids);
+}

+package com.zhonglai.luhui.user.mapper;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserExtraInfo;
+
+/**
+ * 用户其他信息Mapper接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface UserExtraInfoMapper 
+{
+    /**
+     * 查询用户其他信息
+     * 
+     * @param id 用户其他信息主键
+     * @return 用户其他信息
+     */
+    public UserExtraInfo selectUserExtraInfoById(Integer id);
+
+    /**
+     * 查询用户其他信息列表
+     * 
+     * @param userExtraInfo 用户其他信息
+     * @return 用户其他信息集合
+     */
+    public List<UserExtraInfo> selectUserExtraInfoList(UserExtraInfo userExtraInfo);
+
+    /**
+     * 新增用户其他信息
+     * 
+     * @param userExtraInfo 用户其他信息
+     * @return 结果
+     */
+    public int insertUserExtraInfo(UserExtraInfo userExtraInfo);
+
+    /**
+     * 修改用户其他信息
+     * 
+     * @param userExtraInfo 用户其他信息
+     * @return 结果
+     */
+    public int updateUserExtraInfo(UserExtraInfo userExtraInfo);
+
+    /**
+     * 删除用户其他信息
+     * 
+     * @param id 用户其他信息主键
+     * @return 结果
+     */
+    public int deleteUserExtraInfoById(Integer id);
+
+    /**
+     * 批量删除用户其他信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserExtraInfoByIds(Integer[] ids);
+}

+package com.zhonglai.luhui.user.mapper;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserLoginInfo;
+
+/**
+ * 用户登录信息Mapper接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface UserLoginInfoMapper 
+{
+    /**
+     * 查询用户登录信息
+     * 
+     * @param id 用户登录信息主键
+     * @return 用户登录信息
+     */
+    public UserLoginInfo selectUserLoginInfoById(Integer id);
+
+    /**
+     * 查询用户登录信息列表
+     * 
+     * @param userLoginInfo 用户登录信息
+     * @return 用户登录信息集合
+     */
+    public List<UserLoginInfo> selectUserLoginInfoList(UserLoginInfo userLoginInfo);
+
+    /**
+     * 新增用户登录信息
+     * 
+     * @param userLoginInfo 用户登录信息
+     * @return 结果
+     */
+    public int insertUserLoginInfo(UserLoginInfo userLoginInfo);
+
+    /**
+     * 修改用户登录信息
+     * 
+     * @param userLoginInfo 用户登录信息
+     * @return 结果
+     */
+    public int updateUserLoginInfo(UserLoginInfo userLoginInfo);
+
+    /**
+     * 删除用户登录信息
+     * 
+     * @param id 用户登录信息主键
+     * @return 结果
+     */
+    public int deleteUserLoginInfoById(Integer id);
+
+    /**
+     * 批量删除用户登录信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserLoginInfoByIds(Integer[] ids);
+}

+package com.zhonglai.luhui.user.mapper;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserLogin;
+
+/**
+ * 用户登录Mapper接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface UserLoginMapper 
+{
+    /**
+     * 查询用户登录
+     * 
+     * @param id 用户登录主键
+     * @return 用户登录
+     */
+    public UserLogin selectUserLoginById(Integer id);
+
+    /**
+     * 查询用户登录列表
+     * 
+     * @param userLogin 用户登录
+     * @return 用户登录集合
+     */
+    public List<UserLogin> selectUserLoginList(UserLogin userLogin);
+
+    /**
+     * 新增用户登录
+     * 
+     * @param userLogin 用户登录
+     * @return 结果
+     */
+    public int insertUserLogin(UserLogin userLogin);
+
+    /**
+     * 修改用户登录
+     * 
+     * @param userLogin 用户登录
+     * @return 结果
+     */
+    public int updateUserLogin(UserLogin userLogin);
+
+    /**
+     * 删除用户登录
+     * 
+     * @param id 用户登录主键
+     * @return 结果
+     */
+    public int deleteUserLoginById(Integer id);
+
+    /**
+     * 批量删除用户登录
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserLoginByIds(Integer[] ids);
+}

+package com.zhonglai.luhui.user.mapper;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserOfficialInfo;
+
+/**
+ * 用户官方及告警信息Mapper接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface UserOfficialInfoMapper 
+{
+    /**
+     * 查询用户官方及告警信息
+     * 
+     * @param id 用户官方及告警信息主键
+     * @return 用户官方及告警信息
+     */
+    public UserOfficialInfo selectUserOfficialInfoById(Integer id);
+
+    /**
+     * 查询用户官方及告警信息列表
+     * 
+     * @param userOfficialInfo 用户官方及告警信息
+     * @return 用户官方及告警信息集合
+     */
+    public List<UserOfficialInfo> selectUserOfficialInfoList(UserOfficialInfo userOfficialInfo);
+
+    /**
+     * 新增用户官方及告警信息
+     * 
+     * @param userOfficialInfo 用户官方及告警信息
+     * @return 结果
+     */
+    public int insertUserOfficialInfo(UserOfficialInfo userOfficialInfo);
+
+    /**
+     * 修改用户官方及告警信息
+     * 
+     * @param userOfficialInfo 用户官方及告警信息
+     * @return 结果
+     */
+    public int updateUserOfficialInfo(UserOfficialInfo userOfficialInfo);
+
+    /**
+     * 删除用户官方及告警信息
+     * 
+     * @param id 用户官方及告警信息主键
+     * @return 结果
+     */
+    public int deleteUserOfficialInfoById(Integer id);
+
+    /**
+     * 批量删除用户官方及告警信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserOfficialInfoByIds(Integer[] ids);
+}

+package com.zhonglai.luhui.user.mapper;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserSocialInfo;
+
+/**
+ * 用户社交信息Mapper接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface UserSocialInfoMapper 
+{
+    /**
+     * 查询用户社交信息
+     * 
+     * @param id 用户社交信息主键
+     * @return 用户社交信息
+     */
+    public UserSocialInfo selectUserSocialInfoById(Integer id);
+
+    /**
+     * 查询用户社交信息列表
+     * 
+     * @param userSocialInfo 用户社交信息
+     * @return 用户社交信息集合
+     */
+    public List<UserSocialInfo> selectUserSocialInfoList(UserSocialInfo userSocialInfo);
+
+    /**
+     * 新增用户社交信息
+     * 
+     * @param userSocialInfo 用户社交信息
+     * @return 结果
+     */
+    public int insertUserSocialInfo(UserSocialInfo userSocialInfo);
+
+    /**
+     * 修改用户社交信息
+     * 
+     * @param userSocialInfo 用户社交信息
+     * @return 结果
+     */
+    public int updateUserSocialInfo(UserSocialInfo userSocialInfo);
+
+    /**
+     * 删除用户社交信息
+     * 
+     * @param id 用户社交信息主键
+     * @return 结果
+     */
+    public int deleteUserSocialInfoById(Integer id);
+
+    /**
+     * 批量删除用户社交信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteUserSocialInfoByIds(Integer[] ids);
+}

+package com.zhonglai.luhui.user.service;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserAccountInfo;
+
+/**
+ * 用户账户信息Service接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface IUserAccountInfoService 
+{
+    /**
+     * 查询用户账户信息
+     * 
+     * @param id 用户账户信息主键
+     * @return 用户账户信息
+     */
+    public UserAccountInfo selectUserAccountInfoById(Integer id);
+
+    /**
+     * 查询用户账户信息列表
+     * 
+     * @param userAccountInfo 用户账户信息
+     * @return 用户账户信息集合
+     */
+    public List<UserAccountInfo> selectUserAccountInfoList(UserAccountInfo userAccountInfo);
+
+    /**
+     * 新增用户账户信息
+     * 
+     * @param userAccountInfo 用户账户信息
+     * @return 结果
+     */
+    public int insertUserAccountInfo(UserAccountInfo userAccountInfo);
+
+    /**
+     * 修改用户账户信息
+     * 
+     * @param userAccountInfo 用户账户信息
+     * @return 结果
+     */
+    public int updateUserAccountInfo(UserAccountInfo userAccountInfo);
+
+    /**
+     * 批量删除用户账户信息
+     * 
+     * @param ids 需要删除的用户账户信息主键集合
+     * @return 结果
+     */
+    public int deleteUserAccountInfoByIds(Integer[] ids);
+
+    /**
+     * 删除用户账户信息信息
+     * 
+     * @param id 用户账户信息主键
+     * @return 结果
+     */
+    public int deleteUserAccountInfoById(Integer id);
+}

+package com.zhonglai.luhui.user.service;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserAddressInfo;
+
+/**
+ * 用户地理信息Service接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface IUserAddressInfoService 
+{
+    /**
+     * 查询用户地理信息
+     * 
+     * @param id 用户地理信息主键
+     * @return 用户地理信息
+     */
+    public UserAddressInfo selectUserAddressInfoById(Integer id);
+
+    /**
+     * 查询用户地理信息列表
+     * 
+     * @param userAddressInfo 用户地理信息
+     * @return 用户地理信息集合
+     */
+    public List<UserAddressInfo> selectUserAddressInfoList(UserAddressInfo userAddressInfo);
+
+    /**
+     * 新增用户地理信息
+     * 
+     * @param userAddressInfo 用户地理信息
+     * @return 结果
+     */
+    public int insertUserAddressInfo(UserAddressInfo userAddressInfo);
+
+    /**
+     * 修改用户地理信息
+     * 
+     * @param userAddressInfo 用户地理信息
+     * @return 结果
+     */
+    public int updateUserAddressInfo(UserAddressInfo userAddressInfo);
+
+    /**
+     * 批量删除用户地理信息
+     * 
+     * @param ids 需要删除的用户地理信息主键集合
+     * @return 结果
+     */
+    public int deleteUserAddressInfoByIds(Integer[] ids);
+
+    /**
+     * 删除用户地理信息信息
+     * 
+     * @param id 用户地理信息主键
+     * @return 结果
+     */
+    public int deleteUserAddressInfoById(Integer id);
+}

+package com.zhonglai.luhui.user.service;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserAuthInfo;
+
+/**
+ * 用户认证信息Service接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface IUserAuthInfoService 
+{
+    /**
+     * 查询用户认证信息
+     * 
+     * @param id 用户认证信息主键
+     * @return 用户认证信息
+     */
+    public UserAuthInfo selectUserAuthInfoById(Integer id);
+
+    /**
+     * 查询用户认证信息列表
+     * 
+     * @param userAuthInfo 用户认证信息
+     * @return 用户认证信息集合
+     */
+    public List<UserAuthInfo> selectUserAuthInfoList(UserAuthInfo userAuthInfo);
+
+    /**
+     * 新增用户认证信息
+     * 
+     * @param userAuthInfo 用户认证信息
+     * @return 结果
+     */
+    public int insertUserAuthInfo(UserAuthInfo userAuthInfo);
+
+    /**
+     * 修改用户认证信息
+     * 
+     * @param userAuthInfo 用户认证信息
+     * @return 结果
+     */
+    public int updateUserAuthInfo(UserAuthInfo userAuthInfo);
+
+    /**
+     * 批量删除用户认证信息
+     * 
+     * @param ids 需要删除的用户认证信息主键集合
+     * @return 结果
+     */
+    public int deleteUserAuthInfoByIds(Integer[] ids);
+
+    /**
+     * 删除用户认证信息信息
+     * 
+     * @param id 用户认证信息主键
+     * @return 结果
+     */
+    public int deleteUserAuthInfoById(Integer id);
+}

+package com.zhonglai.luhui.user.service;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserBaseInfo;
+
+/**
+ * 基础用户信息Service接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface IUserBaseInfoService 
+{
+    /**
+     * 查询基础用户信息
+     * 
+     * @param id 基础用户信息主键
+     * @return 基础用户信息
+     */
+    public UserBaseInfo selectUserBaseInfoById(Integer id);
+
+    /**
+     * 查询基础用户信息列表
+     * 
+     * @param userBaseInfo 基础用户信息
+     * @return 基础用户信息集合
+     */
+    public List<UserBaseInfo> selectUserBaseInfoList(UserBaseInfo userBaseInfo);
+
+    /**
+     * 新增基础用户信息
+     * 
+     * @param userBaseInfo 基础用户信息
+     * @return 结果
+     */
+    public int insertUserBaseInfo(UserBaseInfo userBaseInfo);
+
+    /**
+     * 修改基础用户信息
+     * 
+     * @param userBaseInfo 基础用户信息
+     * @return 结果
+     */
+    public int updateUserBaseInfo(UserBaseInfo userBaseInfo);
+
+    /**
+     * 批量删除基础用户信息
+     * 
+     * @param ids 需要删除的基础用户信息主键集合
+     * @return 结果
+     */
+    public int deleteUserBaseInfoByIds(Integer[] ids);
+
+    /**
+     * 删除基础用户信息信息
+     * 
+     * @param id 基础用户信息主键
+     * @return 结果
+     */
+    public int deleteUserBaseInfoById(Integer id);
+}

+package com.zhonglai.luhui.user.service;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserExtraInfo;
+
+/**
+ * 用户其他信息Service接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface IUserExtraInfoService 
+{
+    /**
+     * 查询用户其他信息
+     * 
+     * @param id 用户其他信息主键
+     * @return 用户其他信息
+     */
+    public UserExtraInfo selectUserExtraInfoById(Integer id);
+
+    /**
+     * 查询用户其他信息列表
+     * 
+     * @param userExtraInfo 用户其他信息
+     * @return 用户其他信息集合
+     */
+    public List<UserExtraInfo> selectUserExtraInfoList(UserExtraInfo userExtraInfo);
+
+    /**
+     * 新增用户其他信息
+     * 
+     * @param userExtraInfo 用户其他信息
+     * @return 结果
+     */
+    public int insertUserExtraInfo(UserExtraInfo userExtraInfo);
+
+    /**
+     * 修改用户其他信息
+     * 
+     * @param userExtraInfo 用户其他信息
+     * @return 结果
+     */
+    public int updateUserExtraInfo(UserExtraInfo userExtraInfo);
+
+    /**
+     * 批量删除用户其他信息
+     * 
+     * @param ids 需要删除的用户其他信息主键集合
+     * @return 结果
+     */
+    public int deleteUserExtraInfoByIds(Integer[] ids);
+
+    /**
+     * 删除用户其他信息信息
+     * 
+     * @param id 用户其他信息主键
+     * @return 结果
+     */
+    public int deleteUserExtraInfoById(Integer id);
+}

+package com.zhonglai.luhui.user.service;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserLoginInfo;
+
+/**
+ * 用户登录信息Service接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface IUserLoginInfoService 
+{
+    /**
+     * 查询用户登录信息
+     * 
+     * @param id 用户登录信息主键
+     * @return 用户登录信息
+     */
+    public UserLoginInfo selectUserLoginInfoById(Integer id);
+
+    /**
+     * 查询用户登录信息列表
+     * 
+     * @param userLoginInfo 用户登录信息
+     * @return 用户登录信息集合
+     */
+    public List<UserLoginInfo> selectUserLoginInfoList(UserLoginInfo userLoginInfo);
+
+    /**
+     * 新增用户登录信息
+     * 
+     * @param userLoginInfo 用户登录信息
+     * @return 结果
+     */
+    public int insertUserLoginInfo(UserLoginInfo userLoginInfo);
+
+    /**
+     * 修改用户登录信息
+     * 
+     * @param userLoginInfo 用户登录信息
+     * @return 结果
+     */
+    public int updateUserLoginInfo(UserLoginInfo userLoginInfo);
+
+    /**
+     * 批量删除用户登录信息
+     * 
+     * @param ids 需要删除的用户登录信息主键集合
+     * @return 结果
+     */
+    public int deleteUserLoginInfoByIds(Integer[] ids);
+
+    /**
+     * 删除用户登录信息信息
+     * 
+     * @param id 用户登录信息主键
+     * @return 结果
+     */
+    public int deleteUserLoginInfoById(Integer id);
+}

+package com.zhonglai.luhui.user.service;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserLogin;
+
+/**
+ * 用户登录Service接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface IUserLoginService 
+{
+    /**
+     * 查询用户登录
+     * 
+     * @param id 用户登录主键
+     * @return 用户登录
+     */
+    public UserLogin selectUserLoginById(Integer id);
+
+    /**
+     * 查询用户登录列表
+     * 
+     * @param userLogin 用户登录
+     * @return 用户登录集合
+     */
+    public List<UserLogin> selectUserLoginList(UserLogin userLogin);
+
+    /**
+     * 新增用户登录
+     * 
+     * @param userLogin 用户登录
+     * @return 结果
+     */
+    public int insertUserLogin(UserLogin userLogin);
+
+    /**
+     * 修改用户登录
+     * 
+     * @param userLogin 用户登录
+     * @return 结果
+     */
+    public int updateUserLogin(UserLogin userLogin);
+
+    /**
+     * 批量删除用户登录
+     * 
+     * @param ids 需要删除的用户登录主键集合
+     * @return 结果
+     */
+    public int deleteUserLoginByIds(Integer[] ids);
+
+    /**
+     * 删除用户登录信息
+     * 
+     * @param id 用户登录主键
+     * @return 结果
+     */
+    public int deleteUserLoginById(Integer id);
+
+    String apiLoginByPass(String user, String pass);
+}

+package com.zhonglai.luhui.user.service;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserOfficialInfo;
+
+/**
+ * 用户官方及告警信息Service接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface IUserOfficialInfoService 
+{
+    /**
+     * 查询用户官方及告警信息
+     * 
+     * @param id 用户官方及告警信息主键
+     * @return 用户官方及告警信息
+     */
+    public UserOfficialInfo selectUserOfficialInfoById(Integer id);
+
+    /**
+     * 查询用户官方及告警信息列表
+     * 
+     * @param userOfficialInfo 用户官方及告警信息
+     * @return 用户官方及告警信息集合
+     */
+    public List<UserOfficialInfo> selectUserOfficialInfoList(UserOfficialInfo userOfficialInfo);
+
+    /**
+     * 新增用户官方及告警信息
+     * 
+     * @param userOfficialInfo 用户官方及告警信息
+     * @return 结果
+     */
+    public int insertUserOfficialInfo(UserOfficialInfo userOfficialInfo);
+
+    /**
+     * 修改用户官方及告警信息
+     * 
+     * @param userOfficialInfo 用户官方及告警信息
+     * @return 结果
+     */
+    public int updateUserOfficialInfo(UserOfficialInfo userOfficialInfo);
+
+    /**
+     * 批量删除用户官方及告警信息
+     * 
+     * @param ids 需要删除的用户官方及告警信息主键集合
+     * @return 结果
+     */
+    public int deleteUserOfficialInfoByIds(Integer[] ids);
+
+    /**
+     * 删除用户官方及告警信息信息
+     * 
+     * @param id 用户官方及告警信息主键
+     * @return 结果
+     */
+    public int deleteUserOfficialInfoById(Integer id);
+}

+package com.zhonglai.luhui.user.service;
+
+import java.util.List;
+import com.zhonglai.luhui.user.domain.UserSocialInfo;
+
+/**
+ * 用户社交信息Service接口
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+public interface IUserSocialInfoService 
+{
+    /**
+     * 查询用户社交信息
+     * 
+     * @param id 用户社交信息主键
+     * @return 用户社交信息
+     */
+    public UserSocialInfo selectUserSocialInfoById(Integer id);
+
+    /**
+     * 查询用户社交信息列表
+     * 
+     * @param userSocialInfo 用户社交信息
+     * @return 用户社交信息集合
+     */
+    public List<UserSocialInfo> selectUserSocialInfoList(UserSocialInfo userSocialInfo);
+
+    /**
+     * 新增用户社交信息
+     * 
+     * @param userSocialInfo 用户社交信息
+     * @return 结果
+     */
+    public int insertUserSocialInfo(UserSocialInfo userSocialInfo);
+
+    /**
+     * 修改用户社交信息
+     * 
+     * @param userSocialInfo 用户社交信息
+     * @return 结果
+     */
+    public int updateUserSocialInfo(UserSocialInfo userSocialInfo);
+
+    /**
+     * 批量删除用户社交信息
+     * 
+     * @param ids 需要删除的用户社交信息主键集合
+     * @return 结果
+     */
+    public int deleteUserSocialInfoByIds(Integer[] ids);
+
+    /**
+     * 删除用户社交信息信息
+     * 
+     * @param id 用户社交信息主键
+     * @return 结果
+     */
+    public int deleteUserSocialInfoById(Integer id);
+}

+package com.zhonglai.luhui.user.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhonglai.luhui.user.mapper.UserAccountInfoMapper;
+import com.zhonglai.luhui.user.domain.UserAccountInfo;
+import com.zhonglai.luhui.user.service.IUserAccountInfoService;
+
+/**
+ * 用户账户信息Service业务层处理
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Service
+public class UserAccountInfoServiceImpl implements IUserAccountInfoService 
+{
+    @Autowired
+    private UserAccountInfoMapper userAccountInfoMapper;
+
+    /**
+     * 查询用户账户信息
+     * 
+     * @param id 用户账户信息主键
+     * @return 用户账户信息
+     */
+    @Override
+    public UserAccountInfo selectUserAccountInfoById(Integer id)
+    {
+        return userAccountInfoMapper.selectUserAccountInfoById(id);
+    }
+
+    /**
+     * 查询用户账户信息列表
+     * 
+     * @param userAccountInfo 用户账户信息
+     * @return 用户账户信息
+     */
+    @Override
+    public List<UserAccountInfo> selectUserAccountInfoList(UserAccountInfo userAccountInfo)
+    {
+        return userAccountInfoMapper.selectUserAccountInfoList(userAccountInfo);
+    }
+
+    /**
+     * 新增用户账户信息
+     * 
+     * @param userAccountInfo 用户账户信息
+     * @return 结果
+     */
+    @Override
+    public int insertUserAccountInfo(UserAccountInfo userAccountInfo)
+    {
+        return userAccountInfoMapper.insertUserAccountInfo(userAccountInfo);
+    }
+
+    /**
+     * 修改用户账户信息
+     * 
+     * @param userAccountInfo 用户账户信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserAccountInfo(UserAccountInfo userAccountInfo)
+    {
+        return userAccountInfoMapper.updateUserAccountInfo(userAccountInfo);
+    }
+
+    /**
+     * 批量删除用户账户信息
+     * 
+     * @param ids 需要删除的用户账户信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserAccountInfoByIds(Integer[] ids)
+    {
+        return userAccountInfoMapper.deleteUserAccountInfoByIds(ids);
+    }
+
+    /**
+     * 删除用户账户信息信息
+     * 
+     * @param id 用户账户信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserAccountInfoById(Integer id)
+    {
+        return userAccountInfoMapper.deleteUserAccountInfoById(id);
+    }
+}

+package com.zhonglai.luhui.user.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhonglai.luhui.user.mapper.UserAddressInfoMapper;
+import com.zhonglai.luhui.user.domain.UserAddressInfo;
+import com.zhonglai.luhui.user.service.IUserAddressInfoService;
+
+/**
+ * 用户地理信息Service业务层处理
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Service
+public class UserAddressInfoServiceImpl implements IUserAddressInfoService 
+{
+    @Autowired
+    private UserAddressInfoMapper userAddressInfoMapper;
+
+    /**
+     * 查询用户地理信息
+     * 
+     * @param id 用户地理信息主键
+     * @return 用户地理信息
+     */
+    @Override
+    public UserAddressInfo selectUserAddressInfoById(Integer id)
+    {
+        return userAddressInfoMapper.selectUserAddressInfoById(id);
+    }
+
+    /**
+     * 查询用户地理信息列表
+     * 
+     * @param userAddressInfo 用户地理信息
+     * @return 用户地理信息
+     */
+    @Override
+    public List<UserAddressInfo> selectUserAddressInfoList(UserAddressInfo userAddressInfo)
+    {
+        return userAddressInfoMapper.selectUserAddressInfoList(userAddressInfo);
+    }
+
+    /**
+     * 新增用户地理信息
+     * 
+     * @param userAddressInfo 用户地理信息
+     * @return 结果
+     */
+    @Override
+    public int insertUserAddressInfo(UserAddressInfo userAddressInfo)
+    {
+        return userAddressInfoMapper.insertUserAddressInfo(userAddressInfo);
+    }
+
+    /**
+     * 修改用户地理信息
+     * 
+     * @param userAddressInfo 用户地理信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserAddressInfo(UserAddressInfo userAddressInfo)
+    {
+        return userAddressInfoMapper.updateUserAddressInfo(userAddressInfo);
+    }
+
+    /**
+     * 批量删除用户地理信息
+     * 
+     * @param ids 需要删除的用户地理信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserAddressInfoByIds(Integer[] ids)
+    {
+        return userAddressInfoMapper.deleteUserAddressInfoByIds(ids);
+    }
+
+    /**
+     * 删除用户地理信息信息
+     * 
+     * @param id 用户地理信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserAddressInfoById(Integer id)
+    {
+        return userAddressInfoMapper.deleteUserAddressInfoById(id);
+    }
+}

+package com.zhonglai.luhui.user.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhonglai.luhui.user.mapper.UserAuthInfoMapper;
+import com.zhonglai.luhui.user.domain.UserAuthInfo;
+import com.zhonglai.luhui.user.service.IUserAuthInfoService;
+
+/**
+ * 用户认证信息Service业务层处理
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Service
+public class UserAuthInfoServiceImpl implements IUserAuthInfoService 
+{
+    @Autowired
+    private UserAuthInfoMapper userAuthInfoMapper;
+
+    /**
+     * 查询用户认证信息
+     * 
+     * @param id 用户认证信息主键
+     * @return 用户认证信息
+     */
+    @Override
+    public UserAuthInfo selectUserAuthInfoById(Integer id)
+    {
+        return userAuthInfoMapper.selectUserAuthInfoById(id);
+    }
+
+    /**
+     * 查询用户认证信息列表
+     * 
+     * @param userAuthInfo 用户认证信息
+     * @return 用户认证信息
+     */
+    @Override
+    public List<UserAuthInfo> selectUserAuthInfoList(UserAuthInfo userAuthInfo)
+    {
+        return userAuthInfoMapper.selectUserAuthInfoList(userAuthInfo);
+    }
+
+    /**
+     * 新增用户认证信息
+     * 
+     * @param userAuthInfo 用户认证信息
+     * @return 结果
+     */
+    @Override
+    public int insertUserAuthInfo(UserAuthInfo userAuthInfo)
+    {
+        return userAuthInfoMapper.insertUserAuthInfo(userAuthInfo);
+    }
+
+    /**
+     * 修改用户认证信息
+     * 
+     * @param userAuthInfo 用户认证信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserAuthInfo(UserAuthInfo userAuthInfo)
+    {
+        return userAuthInfoMapper.updateUserAuthInfo(userAuthInfo);
+    }
+
+    /**
+     * 批量删除用户认证信息
+     * 
+     * @param ids 需要删除的用户认证信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserAuthInfoByIds(Integer[] ids)
+    {
+        return userAuthInfoMapper.deleteUserAuthInfoByIds(ids);
+    }
+
+    /**
+     * 删除用户认证信息信息
+     * 
+     * @param id 用户认证信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserAuthInfoById(Integer id)
+    {
+        return userAuthInfoMapper.deleteUserAuthInfoById(id);
+    }
+}

+package com.zhonglai.luhui.user.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhonglai.luhui.user.mapper.UserBaseInfoMapper;
+import com.zhonglai.luhui.user.domain.UserBaseInfo;
+import com.zhonglai.luhui.user.service.IUserBaseInfoService;
+
+/**
+ * 基础用户信息Service业务层处理
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Service
+public class UserBaseInfoServiceImpl implements IUserBaseInfoService 
+{
+    @Autowired
+    private UserBaseInfoMapper userBaseInfoMapper;
+
+    /**
+     * 查询基础用户信息
+     * 
+     * @param id 基础用户信息主键
+     * @return 基础用户信息
+     */
+    @Override
+    public UserBaseInfo selectUserBaseInfoById(Integer id)
+    {
+        return userBaseInfoMapper.selectUserBaseInfoById(id);
+    }
+
+    /**
+     * 查询基础用户信息列表
+     * 
+     * @param userBaseInfo 基础用户信息
+     * @return 基础用户信息
+     */
+    @Override
+    public List<UserBaseInfo> selectUserBaseInfoList(UserBaseInfo userBaseInfo)
+    {
+        return userBaseInfoMapper.selectUserBaseInfoList(userBaseInfo);
+    }
+
+    /**
+     * 新增基础用户信息
+     * 
+     * @param userBaseInfo 基础用户信息
+     * @return 结果
+     */
+    @Override
+    public int insertUserBaseInfo(UserBaseInfo userBaseInfo)
+    {
+        userBaseInfo.setCreateTime(DateUtils.getNowDate());
+        return userBaseInfoMapper.insertUserBaseInfo(userBaseInfo);
+    }
+
+    /**
+     * 修改基础用户信息
+     * 
+     * @param userBaseInfo 基础用户信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserBaseInfo(UserBaseInfo userBaseInfo)
+    {
+        return userBaseInfoMapper.updateUserBaseInfo(userBaseInfo);
+    }
+
+    /**
+     * 批量删除基础用户信息
+     * 
+     * @param ids 需要删除的基础用户信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserBaseInfoByIds(Integer[] ids)
+    {
+        return userBaseInfoMapper.deleteUserBaseInfoByIds(ids);
+    }
+
+    /**
+     * 删除基础用户信息信息
+     * 
+     * @param id 基础用户信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserBaseInfoById(Integer id)
+    {
+        return userBaseInfoMapper.deleteUserBaseInfoById(id);
+    }
+}

+package com.zhonglai.luhui.user.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhonglai.luhui.user.mapper.UserExtraInfoMapper;
+import com.zhonglai.luhui.user.domain.UserExtraInfo;
+import com.zhonglai.luhui.user.service.IUserExtraInfoService;
+
+/**
+ * 用户其他信息Service业务层处理
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Service
+public class UserExtraInfoServiceImpl implements IUserExtraInfoService 
+{
+    @Autowired
+    private UserExtraInfoMapper userExtraInfoMapper;
+
+    /**
+     * 查询用户其他信息
+     * 
+     * @param id 用户其他信息主键
+     * @return 用户其他信息
+     */
+    @Override
+    public UserExtraInfo selectUserExtraInfoById(Integer id)
+    {
+        return userExtraInfoMapper.selectUserExtraInfoById(id);
+    }
+
+    /**
+     * 查询用户其他信息列表
+     * 
+     * @param userExtraInfo 用户其他信息
+     * @return 用户其他信息
+     */
+    @Override
+    public List<UserExtraInfo> selectUserExtraInfoList(UserExtraInfo userExtraInfo)
+    {
+        return userExtraInfoMapper.selectUserExtraInfoList(userExtraInfo);
+    }
+
+    /**
+     * 新增用户其他信息
+     * 
+     * @param userExtraInfo 用户其他信息
+     * @return 结果
+     */
+    @Override
+    public int insertUserExtraInfo(UserExtraInfo userExtraInfo)
+    {
+        return userExtraInfoMapper.insertUserExtraInfo(userExtraInfo);
+    }
+
+    /**
+     * 修改用户其他信息
+     * 
+     * @param userExtraInfo 用户其他信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserExtraInfo(UserExtraInfo userExtraInfo)
+    {
+        return userExtraInfoMapper.updateUserExtraInfo(userExtraInfo);
+    }
+
+    /**
+     * 批量删除用户其他信息
+     * 
+     * @param ids 需要删除的用户其他信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserExtraInfoByIds(Integer[] ids)
+    {
+        return userExtraInfoMapper.deleteUserExtraInfoByIds(ids);
+    }
+
+    /**
+     * 删除用户其他信息信息
+     * 
+     * @param id 用户其他信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserExtraInfoById(Integer id)
+    {
+        return userExtraInfoMapper.deleteUserExtraInfoById(id);
+    }
+}

+package com.zhonglai.luhui.user.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhonglai.luhui.user.mapper.UserLoginInfoMapper;
+import com.zhonglai.luhui.user.domain.UserLoginInfo;
+import com.zhonglai.luhui.user.service.IUserLoginInfoService;
+
+/**
+ * 用户登录信息Service业务层处理
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Service
+public class UserLoginInfoServiceImpl implements IUserLoginInfoService 
+{
+    @Autowired
+    private UserLoginInfoMapper userLoginInfoMapper;
+
+    /**
+     * 查询用户登录信息
+     * 
+     * @param id 用户登录信息主键
+     * @return 用户登录信息
+     */
+    @Override
+    public UserLoginInfo selectUserLoginInfoById(Integer id)
+    {
+        return userLoginInfoMapper.selectUserLoginInfoById(id);
+    }
+
+    /**
+     * 查询用户登录信息列表
+     * 
+     * @param userLoginInfo 用户登录信息
+     * @return 用户登录信息
+     */
+    @Override
+    public List<UserLoginInfo> selectUserLoginInfoList(UserLoginInfo userLoginInfo)
+    {
+        return userLoginInfoMapper.selectUserLoginInfoList(userLoginInfo);
+    }
+
+    /**
+     * 新增用户登录信息
+     * 
+     * @param userLoginInfo 用户登录信息
+     * @return 结果
+     */
+    @Override
+    public int insertUserLoginInfo(UserLoginInfo userLoginInfo)
+    {
+        return userLoginInfoMapper.insertUserLoginInfo(userLoginInfo);
+    }
+
+    /**
+     * 修改用户登录信息
+     * 
+     * @param userLoginInfo 用户登录信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserLoginInfo(UserLoginInfo userLoginInfo)
+    {
+        return userLoginInfoMapper.updateUserLoginInfo(userLoginInfo);
+    }
+
+    /**
+     * 批量删除用户登录信息
+     * 
+     * @param ids 需要删除的用户登录信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserLoginInfoByIds(Integer[] ids)
+    {
+        return userLoginInfoMapper.deleteUserLoginInfoByIds(ids);
+    }
+
+    /**
+     * 删除用户登录信息信息
+     * 
+     * @param id 用户登录信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserLoginInfoById(Integer id)
+    {
+        return userLoginInfoMapper.deleteUserLoginInfoById(id);
+    }
+}

+package com.zhonglai.luhui.user.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhonglai.luhui.user.mapper.UserLoginMapper;
+import com.zhonglai.luhui.user.domain.UserLogin;
+import com.zhonglai.luhui.user.service.IUserLoginService;
+
+/**
+ * 用户登录Service业务层处理
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Service
+public class UserLoginServiceImpl implements IUserLoginService 
+{
+    @Autowired
+    private UserLoginMapper userLoginMapper;
+
+    /**
+     * 查询用户登录
+     * 
+     * @param id 用户登录主键
+     * @return 用户登录
+     */
+    @Override
+    public UserLogin selectUserLoginById(Integer id)
+    {
+        return userLoginMapper.selectUserLoginById(id);
+    }
+
+    /**
+     * 查询用户登录列表
+     * 
+     * @param userLogin 用户登录
+     * @return 用户登录
+     */
+    @Override
+    public List<UserLogin> selectUserLoginList(UserLogin userLogin)
+    {
+        return userLoginMapper.selectUserLoginList(userLogin);
+    }
+
+    /**
+     * 新增用户登录
+     * 
+     * @param userLogin 用户登录
+     * @return 结果
+     */
+    @Override
+    public int insertUserLogin(UserLogin userLogin)
+    {
+        return userLoginMapper.insertUserLogin(userLogin);
+    }
+
+    /**
+     * 修改用户登录
+     * 
+     * @param userLogin 用户登录
+     * @return 结果
+     */
+    @Override
+    public int updateUserLogin(UserLogin userLogin)
+    {
+        return userLoginMapper.updateUserLogin(userLogin);
+    }
+
+    /**
+     * 批量删除用户登录
+     * 
+     * @param ids 需要删除的用户登录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserLoginByIds(Integer[] ids)
+    {
+        return userLoginMapper.deleteUserLoginByIds(ids);
+    }
+
+    /**
+     * 删除用户登录信息
+     * 
+     * @param id 用户登录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserLoginById(Integer id)
+    {
+        return userLoginMapper.deleteUserLoginById(id);
+    }
+
+    @Override
+    public String apiLoginByPass(String user, String pass) {
+
+        return null;
+    }
+}

+package com.zhonglai.luhui.user.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhonglai.luhui.user.mapper.UserOfficialInfoMapper;
+import com.zhonglai.luhui.user.domain.UserOfficialInfo;
+import com.zhonglai.luhui.user.service.IUserOfficialInfoService;
+
+/**
+ * 用户官方及告警信息Service业务层处理
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Service
+public class UserOfficialInfoServiceImpl implements IUserOfficialInfoService 
+{
+    @Autowired
+    private UserOfficialInfoMapper userOfficialInfoMapper;
+
+    /**
+     * 查询用户官方及告警信息
+     * 
+     * @param id 用户官方及告警信息主键
+     * @return 用户官方及告警信息
+     */
+    @Override
+    public UserOfficialInfo selectUserOfficialInfoById(Integer id)
+    {
+        return userOfficialInfoMapper.selectUserOfficialInfoById(id);
+    }
+
+    /**
+     * 查询用户官方及告警信息列表
+     * 
+     * @param userOfficialInfo 用户官方及告警信息
+     * @return 用户官方及告警信息
+     */
+    @Override
+    public List<UserOfficialInfo> selectUserOfficialInfoList(UserOfficialInfo userOfficialInfo)
+    {
+        return userOfficialInfoMapper.selectUserOfficialInfoList(userOfficialInfo);
+    }
+
+    /**
+     * 新增用户官方及告警信息
+     * 
+     * @param userOfficialInfo 用户官方及告警信息
+     * @return 结果
+     */
+    @Override
+    public int insertUserOfficialInfo(UserOfficialInfo userOfficialInfo)
+    {
+        return userOfficialInfoMapper.insertUserOfficialInfo(userOfficialInfo);
+    }
+
+    /**
+     * 修改用户官方及告警信息
+     * 
+     * @param userOfficialInfo 用户官方及告警信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserOfficialInfo(UserOfficialInfo userOfficialInfo)
+    {
+        return userOfficialInfoMapper.updateUserOfficialInfo(userOfficialInfo);
+    }
+
+    /**
+     * 批量删除用户官方及告警信息
+     * 
+     * @param ids 需要删除的用户官方及告警信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserOfficialInfoByIds(Integer[] ids)
+    {
+        return userOfficialInfoMapper.deleteUserOfficialInfoByIds(ids);
+    }
+
+    /**
+     * 删除用户官方及告警信息信息
+     * 
+     * @param id 用户官方及告警信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserOfficialInfoById(Integer id)
+    {
+        return userOfficialInfoMapper.deleteUserOfficialInfoById(id);
+    }
+}

+package com.zhonglai.luhui.user.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zhonglai.luhui.user.mapper.UserSocialInfoMapper;
+import com.zhonglai.luhui.user.domain.UserSocialInfo;
+import com.zhonglai.luhui.user.service.IUserSocialInfoService;
+
+/**
+ * 用户社交信息Service业务层处理
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Service
+public class UserSocialInfoServiceImpl implements IUserSocialInfoService 
+{
+    @Autowired
+    private UserSocialInfoMapper userSocialInfoMapper;
+
+    /**
+     * 查询用户社交信息
+     * 
+     * @param id 用户社交信息主键
+     * @return 用户社交信息
+     */
+    @Override
+    public UserSocialInfo selectUserSocialInfoById(Integer id)
+    {
+        return userSocialInfoMapper.selectUserSocialInfoById(id);
+    }
+
+    /**
+     * 查询用户社交信息列表
+     * 
+     * @param userSocialInfo 用户社交信息
+     * @return 用户社交信息
+     */
+    @Override
+    public List<UserSocialInfo> selectUserSocialInfoList(UserSocialInfo userSocialInfo)
+    {
+        return userSocialInfoMapper.selectUserSocialInfoList(userSocialInfo);
+    }
+
+    /**
+     * 新增用户社交信息
+     * 
+     * @param userSocialInfo 用户社交信息
+     * @return 结果
+     */
+    @Override
+    public int insertUserSocialInfo(UserSocialInfo userSocialInfo)
+    {
+        return userSocialInfoMapper.insertUserSocialInfo(userSocialInfo);
+    }
+
+    /**
+     * 修改用户社交信息
+     * 
+     * @param userSocialInfo 用户社交信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserSocialInfo(UserSocialInfo userSocialInfo)
+    {
+        return userSocialInfoMapper.updateUserSocialInfo(userSocialInfo);
+    }
+
+    /**
+     * 批量删除用户社交信息
+     * 
+     * @param ids 需要删除的用户社交信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserSocialInfoByIds(Integer[] ids)
+    {
+        return userSocialInfoMapper.deleteUserSocialInfoByIds(ids);
+    }
+
+    /**
+     * 删除用户社交信息信息
+     * 
+     * @param id 用户社交信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteUserSocialInfoById(Integer id)
+    {
+        return userSocialInfoMapper.deleteUserSocialInfoById(id);
+    }
+}

+<?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.zhonglai.luhui.user.mapper.UserAccountInfoMapper">
+    
+    <resultMap type="UserAccountInfo" id="UserAccountInfoResult">
+        <result property="id"    column="id"    />
+        <result property="integral"    column="integral"    />
+        <result property="balance"    column="balance"    />
+        <result property="level"    column="level"    />
+        <result property="currency"    column="currency"    />
+        <result property="experience"    column="experience"    />
+        <result property="annualServiceCharge"    column="annual_service_charge"    />
+        <result property="dianmiaoEndTime"    column="dianmiao_end_time"    />
+    </resultMap>
+
+    <sql id="selectUserAccountInfoVo">
+        select id, integral, balance, level, currency, experience, annual_service_charge, dianmiao_end_time from user_account_info
+    </sql>
+
+    <select id="selectUserAccountInfoList" parameterType="UserAccountInfo" resultMap="UserAccountInfoResult">
+        <include refid="selectUserAccountInfoVo"/>
+        <where>  
+            <if test="integral != null "> and integral = #{integral}</if>
+            <if test="balance != null "> and balance = #{balance}</if>
+            <if test="level != null "> and level = #{level}</if>
+            <if test="currency != null "> and currency = #{currency}</if>
+            <if test="experience != null "> and experience = #{experience}</if>
+            <if test="annualServiceCharge != null "> and annual_service_charge = #{annualServiceCharge}</if>
+            <if test="dianmiaoEndTime != null "> and dianmiao_end_time = #{dianmiaoEndTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserAccountInfoById" parameterType="Integer" resultMap="UserAccountInfoResult">
+        <include refid="selectUserAccountInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserAccountInfo" parameterType="UserAccountInfo">
+        insert into user_account_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="integral != null">integral,</if>
+            <if test="balance != null">balance,</if>
+            <if test="level != null">level,</if>
+            <if test="currency != null">currency,</if>
+            <if test="experience != null">experience,</if>
+            <if test="annualServiceCharge != null">annual_service_charge,</if>
+            <if test="dianmiaoEndTime != null">dianmiao_end_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="integral != null">#{integral},</if>
+            <if test="balance != null">#{balance},</if>
+            <if test="level != null">#{level},</if>
+            <if test="currency != null">#{currency},</if>
+            <if test="experience != null">#{experience},</if>
+            <if test="annualServiceCharge != null">#{annualServiceCharge},</if>
+            <if test="dianmiaoEndTime != null">#{dianmiaoEndTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserAccountInfo" parameterType="UserAccountInfo">
+        update user_account_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="integral != null">integral = #{integral},</if>
+            <if test="balance != null">balance = #{balance},</if>
+            <if test="level != null">level = #{level},</if>
+            <if test="currency != null">currency = #{currency},</if>
+            <if test="experience != null">experience = #{experience},</if>
+            <if test="annualServiceCharge != null">annual_service_charge = #{annualServiceCharge},</if>
+            <if test="dianmiaoEndTime != null">dianmiao_end_time = #{dianmiaoEndTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserAccountInfoById" parameterType="Integer">
+        delete from user_account_info where id = #{id}
+    </delete>
+
+    <delete id="deleteUserAccountInfoByIds" parameterType="String">
+        delete from user_account_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+<?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.zhonglai.luhui.user.mapper.UserAddressInfoMapper">
+    
+    <resultMap type="UserAddressInfo" id="UserAddressInfoResult">
+        <result property="id"    column="id"    />
+        <result property="provinceId"    column="province_id"    />
+        <result property="cityId"    column="city_id"    />
+        <result property="countyId"    column="county_id"    />
+        <result property="provinceName"    column="province_name"    />
+        <result property="cityName"    column="city_name"    />
+        <result property="countyName"    column="county_name"    />
+        <result property="address"    column="address"    />
+        <result property="search"    column="search"    />
+    </resultMap>
+
+    <sql id="selectUserAddressInfoVo">
+        select id, province_id, city_id, county_id, province_name, city_name, county_name, address, search from user_address_info
+    </sql>
+
+    <select id="selectUserAddressInfoList" parameterType="UserAddressInfo" resultMap="UserAddressInfoResult">
+        <include refid="selectUserAddressInfoVo"/>
+        <where>  
+            <if test="provinceId != null  and provinceId != ''"> and province_id = #{provinceId}</if>
+            <if test="cityId != null  and cityId != ''"> and city_id = #{cityId}</if>
+            <if test="countyId != null  and countyId != ''"> and county_id = #{countyId}</if>
+            <if test="provinceName != null  and provinceName != ''"> and province_name = #{provinceName}</if>
+            <if test="cityName != null  and cityName != ''"> and city_name like concat('%', #{cityName}, '%')</if>
+            <if test="countyName != null  and countyName != ''"> and county_name like concat('%', #{countyName}, '%')</if>
+            <if test="address != null  and address != ''"> and address like concat('%', #{address}, '%')</if>
+            <if test="search != null  and search != ''"> and search = #{search}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserAddressInfoById" parameterType="Integer" resultMap="UserAddressInfoResult">
+        <include refid="selectUserAddressInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserAddressInfo" parameterType="UserAddressInfo">
+        insert into user_address_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="provinceId != null">province_id,</if>
+            <if test="cityId != null">city_id,</if>
+            <if test="countyId != null">county_id,</if>
+            <if test="provinceName != null">province_name,</if>
+            <if test="cityName != null">city_name,</if>
+            <if test="countyName != null">county_name,</if>
+            <if test="address != null">address,</if>
+            <if test="search != null">search,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="provinceId != null">#{provinceId},</if>
+            <if test="cityId != null">#{cityId},</if>
+            <if test="countyId != null">#{countyId},</if>
+            <if test="provinceName != null">#{provinceName},</if>
+            <if test="cityName != null">#{cityName},</if>
+            <if test="countyName != null">#{countyName},</if>
+            <if test="address != null">#{address},</if>
+            <if test="search != null">#{search},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserAddressInfo" parameterType="UserAddressInfo">
+        update user_address_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="countyId != null">county_id = #{countyId},</if>
+            <if test="provinceName != null">province_name = #{provinceName},</if>
+            <if test="cityName != null">city_name = #{cityName},</if>
+            <if test="countyName != null">county_name = #{countyName},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="search != null">search = #{search},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserAddressInfoById" parameterType="Integer">
+        delete from user_address_info where id = #{id}
+    </delete>
+
+    <delete id="deleteUserAddressInfoByIds" parameterType="String">
+        delete from user_address_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+<?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.zhonglai.luhui.user.mapper.UserAuthInfoMapper">
+    
+    <resultMap type="UserAuthInfo" id="UserAuthInfoResult">
+        <result property="id"    column="id"    />
+        <result property="nameAuthentication"    column="name_authentication"    />
+        <result property="personalAuthenticationState"    column="personal_authentication_state"    />
+        <result property="enterpriseAuthenticationState"    column="enterprise_authentication_state"    />
+        <result property="personalAuthenticationDescribe"    column="personal_authentication_describe"    />
+        <result property="enterpriseAuthenticationDescribe"    column="enterprise_authentication_describe"    />
+        <result property="personalAuthenticationTime"    column="personal_authentication_time"    />
+        <result property="enterpriseAuthenticationTime"    column="enterprise_authentication_time"    />
+        <result property="identificationCard"    column="identification_card"    />
+        <result property="businessLicenseNo"    column="business_license_no"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="businessLicenseUrl"    column="business_license_url"    />
+    </resultMap>
+
+    <sql id="selectUserAuthInfoVo">
+        select id, name_authentication, personal_authentication_state, enterprise_authentication_state, personal_authentication_describe, enterprise_authentication_describe, personal_authentication_time, enterprise_authentication_time, identification_card, business_license_no, enterprise_name, business_license_url from user_auth_info
+    </sql>
+
+    <select id="selectUserAuthInfoList" parameterType="UserAuthInfo" resultMap="UserAuthInfoResult">
+        <include refid="selectUserAuthInfoVo"/>
+        <where>  
+            <if test="nameAuthentication != null "> and name_authentication = #{nameAuthentication}</if>
+            <if test="personalAuthenticationState != null "> and personal_authentication_state = #{personalAuthenticationState}</if>
+            <if test="enterpriseAuthenticationState != null "> and enterprise_authentication_state = #{enterpriseAuthenticationState}</if>
+            <if test="personalAuthenticationDescribe != null  and personalAuthenticationDescribe != ''"> and personal_authentication_describe = #{personalAuthenticationDescribe}</if>
+            <if test="enterpriseAuthenticationDescribe != null  and enterpriseAuthenticationDescribe != ''"> and enterprise_authentication_describe = #{enterpriseAuthenticationDescribe}</if>
+            <if test="personalAuthenticationTime != null "> and personal_authentication_time = #{personalAuthenticationTime}</if>
+            <if test="enterpriseAuthenticationTime != null "> and enterprise_authentication_time = #{enterpriseAuthenticationTime}</if>
+            <if test="identificationCard != null  and identificationCard != ''"> and identification_card = #{identificationCard}</if>
+            <if test="businessLicenseNo != null  and businessLicenseNo != ''"> and business_license_no like concat('%', #{businessLicenseNo}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="businessLicenseUrl != null  and businessLicenseUrl != ''"> and business_license_url = #{businessLicenseUrl}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserAuthInfoById" parameterType="Integer" resultMap="UserAuthInfoResult">
+        <include refid="selectUserAuthInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserAuthInfo" parameterType="UserAuthInfo">
+        insert into user_auth_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="nameAuthentication != null">name_authentication,</if>
+            <if test="personalAuthenticationState != null">personal_authentication_state,</if>
+            <if test="enterpriseAuthenticationState != null">enterprise_authentication_state,</if>
+            <if test="personalAuthenticationDescribe != null">personal_authentication_describe,</if>
+            <if test="enterpriseAuthenticationDescribe != null">enterprise_authentication_describe,</if>
+            <if test="personalAuthenticationTime != null">personal_authentication_time,</if>
+            <if test="enterpriseAuthenticationTime != null">enterprise_authentication_time,</if>
+            <if test="identificationCard != null">identification_card,</if>
+            <if test="businessLicenseNo != null">business_license_no,</if>
+            <if test="enterpriseName != null">enterprise_name,</if>
+            <if test="businessLicenseUrl != null">business_license_url,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="nameAuthentication != null">#{nameAuthentication},</if>
+            <if test="personalAuthenticationState != null">#{personalAuthenticationState},</if>
+            <if test="enterpriseAuthenticationState != null">#{enterpriseAuthenticationState},</if>
+            <if test="personalAuthenticationDescribe != null">#{personalAuthenticationDescribe},</if>
+            <if test="enterpriseAuthenticationDescribe != null">#{enterpriseAuthenticationDescribe},</if>
+            <if test="personalAuthenticationTime != null">#{personalAuthenticationTime},</if>
+            <if test="enterpriseAuthenticationTime != null">#{enterpriseAuthenticationTime},</if>
+            <if test="identificationCard != null">#{identificationCard},</if>
+            <if test="businessLicenseNo != null">#{businessLicenseNo},</if>
+            <if test="enterpriseName != null">#{enterpriseName},</if>
+            <if test="businessLicenseUrl != null">#{businessLicenseUrl},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserAuthInfo" parameterType="UserAuthInfo">
+        update user_auth_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="nameAuthentication != null">name_authentication = #{nameAuthentication},</if>
+            <if test="personalAuthenticationState != null">personal_authentication_state = #{personalAuthenticationState},</if>
+            <if test="enterpriseAuthenticationState != null">enterprise_authentication_state = #{enterpriseAuthenticationState},</if>
+            <if test="personalAuthenticationDescribe != null">personal_authentication_describe = #{personalAuthenticationDescribe},</if>
+            <if test="enterpriseAuthenticationDescribe != null">enterprise_authentication_describe = #{enterpriseAuthenticationDescribe},</if>
+            <if test="personalAuthenticationTime != null">personal_authentication_time = #{personalAuthenticationTime},</if>
+            <if test="enterpriseAuthenticationTime != null">enterprise_authentication_time = #{enterpriseAuthenticationTime},</if>
+            <if test="identificationCard != null">identification_card = #{identificationCard},</if>
+            <if test="businessLicenseNo != null">business_license_no = #{businessLicenseNo},</if>
+            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
+            <if test="businessLicenseUrl != null">business_license_url = #{businessLicenseUrl},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserAuthInfoById" parameterType="Integer">
+        delete from user_auth_info where id = #{id}
+    </delete>
+
+    <delete id="deleteUserAuthInfoByIds" parameterType="String">
+        delete from user_auth_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+<?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.zhonglai.luhui.user.mapper.UserBaseInfoMapper">
+    
+    <resultMap type="UserBaseInfo" id="UserBaseInfoResult">
+        <result property="id"    column="id"    />
+        <result property="loginName"    column="login_name"    />
+        <result property="name"    column="name"    />
+        <result property="nickname"    column="nickname"    />
+        <result property="gender"    column="gender"    />
+        <result property="phone"    column="phone"    />
+        <result property="email"    column="email"    />
+        <result property="imgUrl"    column="img_url"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectUserBaseInfoVo">
+        select id, login_name, name, nickname, gender, phone, email, img_url, create_time from user_base_info
+    </sql>
+
+    <select id="selectUserBaseInfoList" parameterType="UserBaseInfo" resultMap="UserBaseInfoResult">
+        <include refid="selectUserBaseInfoVo"/>
+        <where>  
+            <if test="loginName != null  and loginName != ''"> and login_name like concat('%', #{loginName}, '%')</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="nickname != null  and nickname != ''"> and nickname like concat('%', #{nickname}, '%')</if>
+            <if test="gender != null "> and gender = #{gender}</if>
+            <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
+            <if test="email != null  and email != ''"> and email like concat('%', #{email}, '%')</if>
+            <if test="imgUrl != null  and imgUrl != ''"> and img_url = #{imgUrl}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserBaseInfoById" parameterType="Integer" resultMap="UserBaseInfoResult">
+        <include refid="selectUserBaseInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserBaseInfo" parameterType="UserBaseInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into user_base_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="loginName != null and loginName != ''">login_name,</if>
+            <if test="name != null">name,</if>
+            <if test="nickname != null">nickname,</if>
+            <if test="gender != null">gender,</if>
+            <if test="phone != null">phone,</if>
+            <if test="email != null">email,</if>
+            <if test="imgUrl != null">img_url,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="loginName != null and loginName != ''">#{loginName},</if>
+            <if test="name != null">#{name},</if>
+            <if test="nickname != null">#{nickname},</if>
+            <if test="gender != null">#{gender},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="email != null">#{email},</if>
+            <if test="imgUrl != null">#{imgUrl},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserBaseInfo" parameterType="UserBaseInfo">
+        update user_base_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="loginName != null and loginName != ''">login_name = #{loginName},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="nickname != null">nickname = #{nickname},</if>
+            <if test="gender != null">gender = #{gender},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="email != null">email = #{email},</if>
+            <if test="imgUrl != null">img_url = #{imgUrl},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserBaseInfoById" parameterType="Integer">
+        delete from user_base_info where id = #{id}
+    </delete>
+
+    <delete id="deleteUserBaseInfoByIds" parameterType="String">
+        delete from user_base_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+<?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.zhonglai.luhui.user.mapper.UserExtraInfoMapper">
+    
+    <resultMap type="UserExtraInfo" id="UserExtraInfoResult">
+        <result property="id"    column="id"    />
+        <result property="describeImgUrl"    column="describe_img_url"    />
+        <result property="describe"    column="describe"    />
+        <result property="userType"    column="user_type"    />
+        <result property="isInvalid"    column="is_invalid"    />
+        <result property="isParticipateIn"    column="is_participate_in"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="shareNumber"    column="share_number"    />
+    </resultMap>
+
+    <sql id="selectUserExtraInfoVo">
+        select id, describe_img_url, describe, user_type, is_invalid, is_participate_in, company_id, share_number from user_extra_info
+    </sql>
+
+    <select id="selectUserExtraInfoList" parameterType="UserExtraInfo" resultMap="UserExtraInfoResult">
+        <include refid="selectUserExtraInfoVo"/>
+        <where>  
+            <if test="describeImgUrl != null  and describeImgUrl != ''"> and describe_img_url = #{describeImgUrl}</if>
+            <if test="describe != null  and describe != ''"> and describe = #{describe}</if>
+            <if test="userType != null "> and user_type = #{userType}</if>
+            <if test="isInvalid != null "> and is_invalid = #{isInvalid}</if>
+            <if test="isParticipateIn != null "> and is_participate_in = #{isParticipateIn}</if>
+            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="shareNumber != null "> and share_number = #{shareNumber}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserExtraInfoById" parameterType="Integer" resultMap="UserExtraInfoResult">
+        <include refid="selectUserExtraInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserExtraInfo" parameterType="UserExtraInfo">
+        insert into user_extra_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="describeImgUrl != null">describe_img_url,</if>
+            <if test="describe != null">describe,</if>
+            <if test="userType != null">user_type,</if>
+            <if test="isInvalid != null">is_invalid,</if>
+            <if test="isParticipateIn != null">is_participate_in,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="shareNumber != null">share_number,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="describeImgUrl != null">#{describeImgUrl},</if>
+            <if test="describe != null">#{describe},</if>
+            <if test="userType != null">#{userType},</if>
+            <if test="isInvalid != null">#{isInvalid},</if>
+            <if test="isParticipateIn != null">#{isParticipateIn},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="shareNumber != null">#{shareNumber},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserExtraInfo" parameterType="UserExtraInfo">
+        update user_extra_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="describeImgUrl != null">describe_img_url = #{describeImgUrl},</if>
+            <if test="describe != null">describe = #{describe},</if>
+            <if test="userType != null">user_type = #{userType},</if>
+            <if test="isInvalid != null">is_invalid = #{isInvalid},</if>
+            <if test="isParticipateIn != null">is_participate_in = #{isParticipateIn},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="shareNumber != null">share_number = #{shareNumber},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserExtraInfoById" parameterType="Integer">
+        delete from user_extra_info where id = #{id}
+    </delete>
+
+    <delete id="deleteUserExtraInfoByIds" parameterType="String">
+        delete from user_extra_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+<?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.zhonglai.luhui.user.mapper.UserLoginInfoMapper">
+    
+    <resultMap type="UserLoginInfo" id="UserLoginInfoResult">
+        <result property="id"    column="id"    />
+        <result property="onlineState"    column="online_state"    />
+        <result property="lastLoginTime"    column="last_login_time"    />
+        <result property="lastLoginIp"    column="last_login_ip"    />
+        <result property="lastAddress"    column="last_address"    />
+        <result property="lastLoginLongitude"    column="last_login_longitude"    />
+        <result property="lastLoginLatitude"    column="last_login_latitude"    />
+    </resultMap>
+
+    <sql id="selectUserLoginInfoVo">
+        select id, online_state, last_login_time, last_login_ip, last_address, last_login_longitude, last_login_latitude from user_login_info
+    </sql>
+
+    <select id="selectUserLoginInfoList" parameterType="UserLoginInfo" resultMap="UserLoginInfoResult">
+        <include refid="selectUserLoginInfoVo"/>
+        <where>  
+            <if test="onlineState != null "> and online_state = #{onlineState}</if>
+            <if test="lastLoginTime != null "> and last_login_time = #{lastLoginTime}</if>
+            <if test="lastLoginIp != null  and lastLoginIp != ''"> and last_login_ip = #{lastLoginIp}</if>
+            <if test="lastAddress != null  and lastAddress != ''"> and last_address = #{lastAddress}</if>
+            <if test="lastLoginLongitude != null  and lastLoginLongitude != ''"> and last_login_longitude = #{lastLoginLongitude}</if>
+            <if test="lastLoginLatitude != null  and lastLoginLatitude != ''"> and last_login_latitude = #{lastLoginLatitude}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserLoginInfoById" parameterType="Integer" resultMap="UserLoginInfoResult">
+        <include refid="selectUserLoginInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserLoginInfo" parameterType="UserLoginInfo">
+        insert into user_login_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="onlineState != null">online_state,</if>
+            <if test="lastLoginTime != null">last_login_time,</if>
+            <if test="lastLoginIp != null">last_login_ip,</if>
+            <if test="lastAddress != null">last_address,</if>
+            <if test="lastLoginLongitude != null">last_login_longitude,</if>
+            <if test="lastLoginLatitude != null">last_login_latitude,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="onlineState != null">#{onlineState},</if>
+            <if test="lastLoginTime != null">#{lastLoginTime},</if>
+            <if test="lastLoginIp != null">#{lastLoginIp},</if>
+            <if test="lastAddress != null">#{lastAddress},</if>
+            <if test="lastLoginLongitude != null">#{lastLoginLongitude},</if>
+            <if test="lastLoginLatitude != null">#{lastLoginLatitude},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserLoginInfo" parameterType="UserLoginInfo">
+        update user_login_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="onlineState != null">online_state = #{onlineState},</if>
+            <if test="lastLoginTime != null">last_login_time = #{lastLoginTime},</if>
+            <if test="lastLoginIp != null">last_login_ip = #{lastLoginIp},</if>
+            <if test="lastAddress != null">last_address = #{lastAddress},</if>
+            <if test="lastLoginLongitude != null">last_login_longitude = #{lastLoginLongitude},</if>
+            <if test="lastLoginLatitude != null">last_login_latitude = #{lastLoginLatitude},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserLoginInfoById" parameterType="Integer">
+        delete from user_login_info where id = #{id}
+    </delete>
+
+    <delete id="deleteUserLoginInfoByIds" parameterType="String">
+        delete from user_login_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+<?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.zhonglai.luhui.user.mapper.UserLoginMapper">
+    
+    <resultMap type="UserLogin" id="UserLoginResult">
+        <result property="id"    column="id"    />
+        <result property="userId"    column="user_id"    />
+        <result property="loginName"    column="login_name"    />
+        <result property="loginPass"    column="login_pass"    />
+        <result property="userLoginPassKey"    column="user_login_pass_key"    />
+    </resultMap>
+
+    <sql id="selectUserLoginVo">
+        select id, user_id, login_name, login_pass, user_login_pass_key from user_login
+    </sql>
+
+    <select id="selectUserLoginList" parameterType="UserLogin" resultMap="UserLoginResult">
+        <include refid="selectUserLoginVo"/>
+        <where>  
+            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="loginName != null  and loginName != ''"> and login_name like concat('%', #{loginName}, '%')</if>
+            <if test="loginPass != null  and loginPass != ''"> and login_pass = #{loginPass}</if>
+            <if test="userLoginPassKey != null  and userLoginPassKey != ''"> and user_login_pass_key = #{userLoginPassKey}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserLoginById" parameterType="Integer" resultMap="UserLoginResult">
+        <include refid="selectUserLoginVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserLogin" parameterType="UserLogin" useGeneratedKeys="true" keyProperty="id">
+        insert into user_login
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="loginName != null and loginName != ''">login_name,</if>
+            <if test="loginPass != null and loginPass != ''">login_pass,</if>
+            <if test="userLoginPassKey != null and userLoginPassKey != ''">user_login_pass_key,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="loginName != null and loginName != ''">#{loginName},</if>
+            <if test="loginPass != null and loginPass != ''">#{loginPass},</if>
+            <if test="userLoginPassKey != null and userLoginPassKey != ''">#{userLoginPassKey},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserLogin" parameterType="UserLogin">
+        update user_login
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="loginName != null and loginName != ''">login_name = #{loginName},</if>
+            <if test="loginPass != null and loginPass != ''">login_pass = #{loginPass},</if>
+            <if test="userLoginPassKey != null and userLoginPassKey != ''">user_login_pass_key = #{userLoginPassKey},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserLoginById" parameterType="Integer">
+        delete from user_login where id = #{id}
+    </delete>
+
+    <delete id="deleteUserLoginByIds" parameterType="String">
+        delete from user_login where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+<?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.zhonglai.luhui.user.mapper.UserOfficialInfoMapper">
+    
+    <resultMap type="UserOfficialInfo" id="UserOfficialInfoResult">
+        <result property="id"    column="id"    />
+        <result property="guarantee"    column="guarantee"    />
+        <result property="guaranteeDescribe"    column="guarantee_describe"    />
+        <result property="alarmAgreement"    column="alarm_agreement"    />
+        <result property="alarmNoticePhone"    column="alarm_notice_phone"    />
+        <result property="alarmNoticeOpenid"    column="alarm_notice_openid"    />
+        <result property="alarmNoticeWxopen"    column="alarm_notice_wxopen"    />
+    </resultMap>
+
+    <sql id="selectUserOfficialInfoVo">
+        select id, guarantee, guarantee_describe, alarm_agreement, alarm_notice_phone, alarm_notice_openid, alarm_notice_wxopen from user_official_info
+    </sql>
+
+    <select id="selectUserOfficialInfoList" parameterType="UserOfficialInfo" resultMap="UserOfficialInfoResult">
+        <include refid="selectUserOfficialInfoVo"/>
+        <where>  
+            <if test="guarantee != null "> and guarantee = #{guarantee}</if>
+            <if test="guaranteeDescribe != null  and guaranteeDescribe != ''"> and guarantee_describe = #{guaranteeDescribe}</if>
+            <if test="alarmAgreement != null "> and alarm_agreement = #{alarmAgreement}</if>
+            <if test="alarmNoticePhone != null  and alarmNoticePhone != ''"> and alarm_notice_phone like concat('%', #{alarmNoticePhone}, '%')</if>
+            <if test="alarmNoticeOpenid != null  and alarmNoticeOpenid != ''"> and alarm_notice_openid = #{alarmNoticeOpenid}</if>
+            <if test="alarmNoticeWxopen != null "> and alarm_notice_wxopen = #{alarmNoticeWxopen}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserOfficialInfoById" parameterType="Integer" resultMap="UserOfficialInfoResult">
+        <include refid="selectUserOfficialInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserOfficialInfo" parameterType="UserOfficialInfo">
+        insert into user_official_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="guarantee != null">guarantee,</if>
+            <if test="guaranteeDescribe != null">guarantee_describe,</if>
+            <if test="alarmAgreement != null">alarm_agreement,</if>
+            <if test="alarmNoticePhone != null">alarm_notice_phone,</if>
+            <if test="alarmNoticeOpenid != null">alarm_notice_openid,</if>
+            <if test="alarmNoticeWxopen != null">alarm_notice_wxopen,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="guarantee != null">#{guarantee},</if>
+            <if test="guaranteeDescribe != null">#{guaranteeDescribe},</if>
+            <if test="alarmAgreement != null">#{alarmAgreement},</if>
+            <if test="alarmNoticePhone != null">#{alarmNoticePhone},</if>
+            <if test="alarmNoticeOpenid != null">#{alarmNoticeOpenid},</if>
+            <if test="alarmNoticeWxopen != null">#{alarmNoticeWxopen},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserOfficialInfo" parameterType="UserOfficialInfo">
+        update user_official_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="guarantee != null">guarantee = #{guarantee},</if>
+            <if test="guaranteeDescribe != null">guarantee_describe = #{guaranteeDescribe},</if>
+            <if test="alarmAgreement != null">alarm_agreement = #{alarmAgreement},</if>
+            <if test="alarmNoticePhone != null">alarm_notice_phone = #{alarmNoticePhone},</if>
+            <if test="alarmNoticeOpenid != null">alarm_notice_openid = #{alarmNoticeOpenid},</if>
+            <if test="alarmNoticeWxopen != null">alarm_notice_wxopen = #{alarmNoticeWxopen},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserOfficialInfoById" parameterType="Integer">
+        delete from user_official_info where id = #{id}
+    </delete>
+
+    <delete id="deleteUserOfficialInfoByIds" parameterType="String">
+        delete from user_official_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

+<?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.zhonglai.luhui.user.mapper.UserSocialInfoMapper">
+    
+    <resultMap type="UserSocialInfo" id="UserSocialInfoResult">
+        <result property="id"    column="id"    />
+        <result property="qq"    column="qq"    />
+        <result property="weixin"    column="weixin"    />
+        <result property="openId"    column="open_id"    />
+        <result property="ysChildrenId"    column="ys_children_id"    />
+        <result property="ysChildrenPass"    column="ys_children_pass"    />
+        <result property="messagePassWord"    column="message_pass_word"    />
+        <result property="isMessageAction"    column="is_message_action"    />
+    </resultMap>
+
+    <sql id="selectUserSocialInfoVo">
+        select id, qq, weixin, open_id, ys_children_id, ys_children_pass, message_pass_word, is_message_action from user_social_info
+    </sql>
+
+    <select id="selectUserSocialInfoList" parameterType="UserSocialInfo" resultMap="UserSocialInfoResult">
+        <include refid="selectUserSocialInfoVo"/>
+        <where>  
+            <if test="qq != null  and qq != ''"> and qq = #{qq}</if>
+            <if test="weixin != null  and weixin != ''"> and weixin = #{weixin}</if>
+            <if test="openId != null "> and open_id = #{openId}</if>
+            <if test="ysChildrenId != null  and ysChildrenId != ''"> and ys_children_id = #{ysChildrenId}</if>
+            <if test="ysChildrenPass != null  and ysChildrenPass != ''"> and ys_children_pass = #{ysChildrenPass}</if>
+            <if test="messagePassWord != null  and messagePassWord != ''"> and message_pass_word = #{messagePassWord}</if>
+            <if test="isMessageAction != null "> and is_message_action = #{isMessageAction}</if>
+        </where>
+    </select>
+    
+    <select id="selectUserSocialInfoById" parameterType="Integer" resultMap="UserSocialInfoResult">
+        <include refid="selectUserSocialInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertUserSocialInfo" parameterType="UserSocialInfo">
+        insert into user_social_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="qq != null">qq,</if>
+            <if test="weixin != null">weixin,</if>
+            <if test="openId != null">open_id,</if>
+            <if test="ysChildrenId != null">ys_children_id,</if>
+            <if test="ysChildrenPass != null">ys_children_pass,</if>
+            <if test="messagePassWord != null">message_pass_word,</if>
+            <if test="isMessageAction != null">is_message_action,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="qq != null">#{qq},</if>
+            <if test="weixin != null">#{weixin},</if>
+            <if test="openId != null">#{openId},</if>
+            <if test="ysChildrenId != null">#{ysChildrenId},</if>
+            <if test="ysChildrenPass != null">#{ysChildrenPass},</if>
+            <if test="messagePassWord != null">#{messagePassWord},</if>
+            <if test="isMessageAction != null">#{isMessageAction},</if>
+         </trim>
+    </insert>
+
+    <update id="updateUserSocialInfo" parameterType="UserSocialInfo">
+        update user_social_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="qq != null">qq = #{qq},</if>
+            <if test="weixin != null">weixin = #{weixin},</if>
+            <if test="openId != null">open_id = #{openId},</if>
+            <if test="ysChildrenId != null">ys_children_id = #{ysChildrenId},</if>
+            <if test="ysChildrenPass != null">ys_children_pass = #{ysChildrenPass},</if>
+            <if test="messagePassWord != null">message_pass_word = #{messagePassWord},</if>
+            <if test="isMessageAction != null">is_message_action = #{isMessageAction},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteUserSocialInfoById" parameterType="Integer">
+        delete from user_social_info where id = #{id}
+    </delete>
+
+    <delete id="deleteUserSocialInfoByIds" parameterType="String">
+        delete from user_social_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

@@ -32,6 +32,7 @@
         <module>ruoyi-framework</module>
         <module>ruoyi-framework</module>
         <module>ruoyi-generator</module>
         <module>ruoyi-generator</module>
         <module>lh-service-dao</module>
         <module>lh-service-dao</module>
+        <module>lh-user</module>
     </modules>
     </modules>
 
 
     <packaging>pom</packaging>
     <packaging>pom</packaging>

@@ -116,7 +116,7 @@ public class GenController extends BaseController
         String[] tableNames = Convert.toStrArray(tables);
         String[] tableNames = Convert.toStrArray(tables);
         // 查询表信息
         // 查询表信息
         List<GenTable> tableList = genTableService.selectDbTableListByNames(databaseName,tableNames);
         List<GenTable> tableList = genTableService.selectDbTableListByNames(databaseName,tableNames);
-        genTableService.importGenTable(tableList, SecurityUtils.getUsername());
+        genTableService.importGenTable(databaseName,tableList, SecurityUtils.getUsername());
         return success();
         return success();
     }
     }
 
 
@@ -147,7 +147,7 @@ public class GenController extends BaseController
             }
             }
             List<GenTable> tableList = genTableService.selectDbTableListByNames(databaseName,tableNames.toArray(new String[tableNames.size()]));
             List<GenTable> tableList = genTableService.selectDbTableListByNames(databaseName,tableNames.toArray(new String[tableNames.size()]));
             String operName = SecurityUtils.getUsername();
             String operName = SecurityUtils.getUsername();
-            genTableService.importGenTable(tableList, operName);
+            genTableService.importGenTable(databaseName,tableList, operName);
             return AjaxResult.success();
             return AjaxResult.success();
         }
         }
         catch (Exception e)
         catch (Exception e)
@@ -223,9 +223,9 @@ public class GenController extends BaseController
     @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
     @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
     @Log(title = "同步数据库", businessType = BusinessType.UPDATE)
     @Log(title = "同步数据库", businessType = BusinessType.UPDATE)
     @GetMapping("/synchDb/{tableName}")
     @GetMapping("/synchDb/{tableName}")
-    public AjaxResult synchDb(@PathVariable("tableName") String tableName)
+    public AjaxResult synchDb(@PathVariable("tableName") String tableName,String databaseName)
     {
     {
-        genTableService.synchDb(tableName);
+        genTableService.synchDb(databaseName,tableName);
         return success();
         return success();
     }
     }
 
 

@@ -2,6 +2,7 @@ package com.ruoyi.generator.mapper;
 
 
 import java.util.List;
 import java.util.List;
 import com.ruoyi.generator.domain.GenTableColumn;
 import com.ruoyi.generator.domain.GenTableColumn;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
 /**
  * 业务字段 数据层
  * 业务字段 数据层
@@ -16,7 +17,7 @@ public interface GenTableColumnMapper
      * @param tableName 表名称
      * @param tableName 表名称
      * @return 列信息
      * @return 列信息
      */
      */
-    public List<GenTableColumn> selectDbTableColumnsByName(String tableName);
+    public List<GenTableColumn> selectDbTableColumnsByName(@Param("databaseName") String databaseName,@Param("tableName")  String tableName);
 
 
     /**
     /**
      * 查询业务字段列表
      * 查询业务字段列表

@@ -2,6 +2,7 @@ package com.ruoyi.generator.mapper;
 
 
 import java.util.List;
 import java.util.List;
 import com.ruoyi.generator.domain.GenTable;
 import com.ruoyi.generator.domain.GenTable;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
 /**
  * 业务 数据层
  * 业务 数据层
@@ -32,7 +33,7 @@ public interface GenTableMapper
      * @param tableNames 表名称组
      * @param tableNames 表名称组
      * @return 数据库表集合
      * @return 数据库表集合
      */
      */
-    public List<GenTable> selectDbTableListByNames(String databaseName,String[] tableNames);
+    public List<GenTable> selectDbTableListByNames(@Param("databaseName") String databaseName, @Param("tableNames") String[] tableNames);
 
 
     /**
     /**
      * 查询所有表信息
      * 查询所有表信息

@@ -170,7 +170,7 @@ public class GenTableServiceImpl implements IGenTableService
      */
      */
     @Override
     @Override
     @Transactional
     @Transactional
-    public void importGenTable(List<GenTable> tableList, String operName)
+    public void importGenTable(String databaseName,List<GenTable> tableList, String operName)
     {
     {
         try
         try
         {
         {
@@ -182,7 +182,7 @@ public class GenTableServiceImpl implements IGenTableService
                 if (row > 0)
                 if (row > 0)
                 {
                 {
                     // 保存列信息
                     // 保存列信息
-                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+                    List<GenTableColumn> genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(databaseName,tableName);
                     for (GenTableColumn column : genTableColumns)
                     for (GenTableColumn column : genTableColumns)
                     {
                     {
                         GenUtils.initColumnField(column, table);
                         GenUtils.initColumnField(column, table);
@@ -295,13 +295,13 @@ public class GenTableServiceImpl implements IGenTableService
      */
      */
     @Override
     @Override
     @Transactional
     @Transactional
-    public void synchDb(String tableName)
+    public void synchDb(String databaseName,String tableName)
     {
     {
         GenTable table = genTableMapper.selectGenTableByName(tableName);
         GenTable table = genTableMapper.selectGenTableByName(tableName);
         List<GenTableColumn> tableColumns = table.getColumns();
         List<GenTableColumn> tableColumns = table.getColumns();
         Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
         Map<String, GenTableColumn> tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity()));
 
 
-        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName);
+        List<GenTableColumn> dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(databaseName,tableName);
         if (StringUtils.isEmpty(dbTableColumns))
         if (StringUtils.isEmpty(dbTableColumns))
         {
         {
             throw new ServiceException("同步数据失败，原表结构不存在");
             throw new ServiceException("同步数据失败，原表结构不存在");

@@ -80,7 +80,7 @@ public interface IGenTableService
      * @param tableList 导入表列表
      * @param tableList 导入表列表
      * @param operName 操作人员
      * @param operName 操作人员
      */
      */
-    public void importGenTable(List<GenTable> tableList, String operName);
+    public void importGenTable(String databaseName,List<GenTable> tableList, String operName);
 
 
     /**
     /**
      * 预览代码
      * 预览代码
@@ -111,7 +111,7 @@ public interface IGenTableService
      * 
      * 
      * @param tableName 表名称
      * @param tableName 表名称
      */
      */
-    public void synchDb(String tableName);
+    public void synchDb(String databaseName,String tableName);
 
 
     /**
     /**
      * 批量生成代码（下载方式）
      * 批量生成代码（下载方式）

@@ -139,11 +139,11 @@ public class VelocityUtils
         }
         }
         List<String> templates = new ArrayList<String>();
         List<String> templates = new ArrayList<String>();
         templates.add("vm/java/domain.java.vm");
         templates.add("vm/java/domain.java.vm");
-//        templates.add("vm/java/mapper.java.vm");
-//        templates.add("vm/java/service.java.vm");
-//        templates.add("vm/java/serviceImpl.java.vm");
+        templates.add("vm/java/mapper.java.vm");
+        templates.add("vm/java/service.java.vm");
+        templates.add("vm/java/serviceImpl.java.vm");
         templates.add("vm/java/controller.java.vm");
         templates.add("vm/java/controller.java.vm");
-//        templates.add("vm/xml/mapper.xml.vm");
+        templates.add("vm/xml/mapper.xml.vm");
         templates.add("vm/sql/sql.vm");
         templates.add("vm/sql/sql.vm");
         templates.add("vm/js/api.js.vm");
         templates.add("vm/js/api.js.vm");
         if (GenConstants.TPL_CRUD.equals(tplCategory))
         if (GenConstants.TPL_CRUD.equals(tplCategory))
@@ -321,7 +321,11 @@ public class VelocityUtils
      */
      */
     public static String getPermissionPrefix(String modlePath,String moduleName, String businessName)
     public static String getPermissionPrefix(String modlePath,String moduleName, String businessName)
     {
     {
-        return StringUtils.format("{}:{}:{}",modlePath, moduleName, businessName);
+        if(StringUtils.isNotEmpty(modlePath))
+        {
+            return StringUtils.format("{}:{}:{}",modlePath, moduleName, businessName);
+        }
+        return StringUtils.format("{}:{}", moduleName, businessName);
     }
     }
 
 
     /**
     /**

@@ -39,9 +39,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by sort
         order by sort
     </select>
     </select>
 
 
-    <select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
+    <select id="selectDbTableColumnsByName" parameterType="map" resultMap="GenTableColumnResult">
 		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else '0' end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
 		select column_name, (case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else '0' end) as is_required, (case when column_key = 'PRI' then '1' else '0' end) as is_pk, ordinal_position as sort, column_comment, (case when extra = 'auto_increment' then '1' else '0' end) as is_increment, column_type
-		from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
+		from information_schema.columns where table_name = (#{tableName})
+        <if test="databaseName != null and databaseName != ''">
+            and table_schema = #{databaseName}
+        </if>
+        <if test="databaseName == null or databaseName == ''">
+            and table_schema = (select database())
+        </if>
 		order by ordinal_position
 		order by ordinal_position
 	</select>
 	</select>
 
 

@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by create_time desc
         order by create_time desc
 	</select>
 	</select>
 
 
-	<select id="selectDbTableListByNames" resultMap="GenTableResult">
+	<select id="selectDbTableListByNames" parameterType="map" resultMap="GenTableResult">
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		select table_name, table_comment, create_time, update_time from information_schema.tables
 		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%'
 		where table_name NOT LIKE 'qrtz_%' and table_name NOT LIKE 'gen_%'
 		<if test="databaseName != null and databaseName != ''">
 		<if test="databaseName != null and databaseName != ''">
@@ -110,7 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			and table_schema = (select database())
 			and table_schema = (select database())
 		</if>
 		</if>
 		and table_name in
 		and table_name in
-		<foreach collection="array" item="name" open="(" separator="," close=")">
+		<foreach collection="tableNames" item="name" open="(" separator="," close=")">
 			#{name}
 			#{name}
 		</foreach>
 		</foreach>
 	</select>
 	</select>

-package ${packageName}.${modlePath}.controller.${moduleName};
+package ${packageName}#if($modlePath).${modlePath}#end.controller.${moduleName};
 
 
 import java.util.List;
 import java.util.List;
 import com.zhonglai.luhui.datasource.enums.DataSource;
 import com.zhonglai.luhui.datasource.enums.DataSource;
@@ -22,7 +22,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.enums.BusinessType;
 import com.zhonglai.luhui.dao.service.PublicTemplateService;
 import com.zhonglai.luhui.dao.service.PublicTemplateService;
 import ${packageName}.domain.${moduleName}.${ClassName};
 import ${packageName}.domain.${moduleName}.${ClassName};
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
 
 
 #if($table.crud || $table.sub)
 #if($table.crud || $table.sub)
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -122,4 +122,4 @@ public class ${ClassName}Controller extends BaseController
     {
     {
         return toAjax(publicTemplateService.removeByIds(${ClassName}.class,${pkColumn.javaField}s));
         return toAjax(publicTemplateService.removeByIds(${ClassName}.class,${pkColumn.javaField}s));
     }
     }
-}
+}

@@ -5,7 +5,7 @@ import ${import};
 #end
 #end
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.zhonglai.luhui.common.util.annotation.Excel;
+##import com.zhonglai.luhui.common.util.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 #if($table.crud || $table.sub)
 #if($table.crud || $table.sub)
@@ -41,14 +41,14 @@ public class ${ClassName} extends ${Entity}
         #end
         #end
         #if($parentheseIndex != -1)
         #if($parentheseIndex != -1)
         @ApiModelProperty(value="${comment}",allowableValues="$column.readConverterExp()")
         @ApiModelProperty(value="${comment}",allowableValues="$column.readConverterExp()")
-        @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+##        @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
         #elseif($column.javaType == 'Date')
         #elseif($column.javaType == 'Date')
         @JsonFormat(pattern = "yyyy-MM-dd")
         @JsonFormat(pattern = "yyyy-MM-dd")
         @ApiModelProperty(value="${comment}")
         @ApiModelProperty(value="${comment}")
-        @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+##        @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
         #else
         #else
         @ApiModelProperty(value="${comment}")
         @ApiModelProperty(value="${comment}")
-        @Excel(name = "${comment}")
+##        @Excel(name = "${comment}")
         #end
         #end
         #end
         #end
     private $column.javaType $column.javaField;
     private $column.javaType $column.javaField;

@@ -93,6 +93,10 @@
             <groupId>com.zhonglai.luhui</groupId>
             <groupId>com.zhonglai.luhui</groupId>
             <artifactId>ruoyi-common-security</artifactId>
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
         </dependency>
+        <dependency>
+            <groupId>com.zhonglai.luhui</groupId>
+            <artifactId>lh-user</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

@@ -163,7 +163,7 @@ public class ControlGkjController extends BaseController {
     @ApiImplicitParams({
     @ApiImplicitParams({
             @ApiImplicitParam(name = "deviceId", value = "设备ID", required = true, dataType = "String", paramType = "path"),
             @ApiImplicitParam(name = "deviceId", value = "设备ID", required = true, dataType = "String", paramType = "path"),
             @ApiImplicitParam(name = "url", value = "url", required = true, dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "url", value = "url", required = true, dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "name", value = "名称", required = true, dataType = "String", paramType = "pqueryath"),
+            @ApiImplicitParam(name = "name", value = "名称", required = true, dataType = "String", paramType = "query"),
     })
     })
     @GetMapping("/upload/{deviceId}")
     @GetMapping("/upload/{deviceId}")
     public AjaxResult upload(@PathVariable String deviceId,String url,String name)   {
     public AjaxResult upload(@PathVariable String deviceId,String url,String name)   {

+package com.zhonglai.luhui.admin.controller.user;
+
+import java.util.List;
+import com.zhonglai.luhui.datasource.enums.DataSource;
+import com.zhonglai.luhui.datasource.enums.DataSourceType;
+import javax.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.zhonglai.luhui.action.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.zhonglai.luhui.dao.service.PublicTemplateService;
+import com.zhonglai.luhui.user.domain.UserAccountInfo;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户账户信息Controller
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Api(tags = "用户账户信息")
+@RestController
+@RequestMapping("/user/account_info")
+public class UserAccountInfoController extends BaseController
+{
+    @Autowired
+    private PublicTemplateService publicTemplateService;
+
+    @ApiOperation(value ="查询用户账户信息列表",notes="\n" +
+        "公共参数描述：\n" +
+        "条件参数：\n" +
+        "timeMap; //时间条件（如：{\"create_time\":[开始时间,结束时间]}）\n" +
+        "keyValue; //模糊匹配的关键字（如：[\"value\",\"name,no\"]）\n" +
+        "queryParams; //字段对应的比较符号（如：{\"id\":\"EQ\"}）\n" +
+        "orderBy; //排序（如：\"id desc,name asc\"）\n" +
+        "\n" +
+        "分页参数：\n" +
+        "pageNum; //当前记录起始索引,从1开始\n" +
+        "pageSize; //每页显示记录数")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:account_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserAccountInfo userAccountInfo)
+    {
+        startPage();
+        List<UserAccountInfo> list = publicTemplateService.selectTList(userAccountInfo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("导出用户账户信息列表")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:account_info:export')")
+    @Log(title = "用户账户信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserAccountInfo userAccountInfo)
+    {
+        List<UserAccountInfo> list = publicTemplateService.selectTList(userAccountInfo);
+        ExcelUtil<UserAccountInfo> util = new ExcelUtil<UserAccountInfo>(UserAccountInfo.class);
+        util.exportExcel(response, list, "用户账户信息数据");
+    }
+
+    @ApiOperation("获取用户账户信息详细信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:account_info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(publicTemplateService.getTById(id, UserAccountInfo.class));
+    }
+
+    @ApiOperation("新增用户账户信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:account_info:add')")
+    @Log(title = "用户账户信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserAccountInfo userAccountInfo)
+    {
+        return toAjax(publicTemplateService.add(userAccountInfo));
+    }
+
+    @ApiOperation("修改用户账户信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:account_info:edit')")
+    @Log(title = "用户账户信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserAccountInfo userAccountInfo)
+    {
+        return toAjax(publicTemplateService.edit((userAccountInfo)));
+    }
+
+    @ApiOperation("删除用户账户信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:account_info:remove')")
+    @Log(title = "用户账户信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(publicTemplateService.removeByIds(UserAccountInfo.class,ids));
+    }
+}

+package com.zhonglai.luhui.admin.controller.user;
+
+import java.util.List;
+import com.zhonglai.luhui.datasource.enums.DataSource;
+import com.zhonglai.luhui.datasource.enums.DataSourceType;
+import javax.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.zhonglai.luhui.action.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.zhonglai.luhui.dao.service.PublicTemplateService;
+import com.zhonglai.luhui.user.domain.UserAddressInfo;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户地理信息Controller
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Api(tags = "用户地理信息")
+@RestController
+@RequestMapping("/user/address_info")
+public class UserAddressInfoController extends BaseController
+{
+    @Autowired
+    private PublicTemplateService publicTemplateService;
+
+    @ApiOperation(value ="查询用户地理信息列表",notes="\n" +
+        "公共参数描述：\n" +
+        "条件参数：\n" +
+        "timeMap; //时间条件（如：{\"create_time\":[开始时间,结束时间]}）\n" +
+        "keyValue; //模糊匹配的关键字（如：[\"value\",\"name,no\"]）\n" +
+        "queryParams; //字段对应的比较符号（如：{\"id\":\"EQ\"}）\n" +
+        "orderBy; //排序（如：\"id desc,name asc\"）\n" +
+        "\n" +
+        "分页参数：\n" +
+        "pageNum; //当前记录起始索引,从1开始\n" +
+        "pageSize; //每页显示记录数")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:address_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserAddressInfo userAddressInfo)
+    {
+        startPage();
+        List<UserAddressInfo> list = publicTemplateService.selectTList(userAddressInfo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("导出用户地理信息列表")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:address_info:export')")
+    @Log(title = "用户地理信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserAddressInfo userAddressInfo)
+    {
+        List<UserAddressInfo> list = publicTemplateService.selectTList(userAddressInfo);
+        ExcelUtil<UserAddressInfo> util = new ExcelUtil<UserAddressInfo>(UserAddressInfo.class);
+        util.exportExcel(response, list, "用户地理信息数据");
+    }
+
+    @ApiOperation("获取用户地理信息详细信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:address_info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(publicTemplateService.getTById(id, UserAddressInfo.class));
+    }
+
+    @ApiOperation("新增用户地理信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:address_info:add')")
+    @Log(title = "用户地理信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserAddressInfo userAddressInfo)
+    {
+        return toAjax(publicTemplateService.add(userAddressInfo));
+    }
+
+    @ApiOperation("修改用户地理信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:address_info:edit')")
+    @Log(title = "用户地理信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserAddressInfo userAddressInfo)
+    {
+        return toAjax(publicTemplateService.edit((userAddressInfo)));
+    }
+
+    @ApiOperation("删除用户地理信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:address_info:remove')")
+    @Log(title = "用户地理信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(publicTemplateService.removeByIds(UserAddressInfo.class,ids));
+    }
+}

+package com.zhonglai.luhui.admin.controller.user;
+
+import java.util.List;
+import com.zhonglai.luhui.datasource.enums.DataSource;
+import com.zhonglai.luhui.datasource.enums.DataSourceType;
+import javax.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.zhonglai.luhui.action.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.zhonglai.luhui.dao.service.PublicTemplateService;
+import com.zhonglai.luhui.user.domain.UserAuthInfo;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户认证信息Controller
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Api(tags = "用户认证信息")
+@RestController
+@RequestMapping("/user/auth_info")
+public class UserAuthInfoController extends BaseController
+{
+    @Autowired
+    private PublicTemplateService publicTemplateService;
+
+    @ApiOperation(value ="查询用户认证信息列表",notes="\n" +
+        "公共参数描述：\n" +
+        "条件参数：\n" +
+        "timeMap; //时间条件（如：{\"create_time\":[开始时间,结束时间]}）\n" +
+        "keyValue; //模糊匹配的关键字（如：[\"value\",\"name,no\"]）\n" +
+        "queryParams; //字段对应的比较符号（如：{\"id\":\"EQ\"}）\n" +
+        "orderBy; //排序（如：\"id desc,name asc\"）\n" +
+        "\n" +
+        "分页参数：\n" +
+        "pageNum; //当前记录起始索引,从1开始\n" +
+        "pageSize; //每页显示记录数")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:auth_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserAuthInfo userAuthInfo)
+    {
+        startPage();
+        List<UserAuthInfo> list = publicTemplateService.selectTList(userAuthInfo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("导出用户认证信息列表")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:auth_info:export')")
+    @Log(title = "用户认证信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserAuthInfo userAuthInfo)
+    {
+        List<UserAuthInfo> list = publicTemplateService.selectTList(userAuthInfo);
+        ExcelUtil<UserAuthInfo> util = new ExcelUtil<UserAuthInfo>(UserAuthInfo.class);
+        util.exportExcel(response, list, "用户认证信息数据");
+    }
+
+    @ApiOperation("获取用户认证信息详细信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:auth_info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(publicTemplateService.getTById(id, UserAuthInfo.class));
+    }
+
+    @ApiOperation("新增用户认证信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:auth_info:add')")
+    @Log(title = "用户认证信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserAuthInfo userAuthInfo)
+    {
+        return toAjax(publicTemplateService.add(userAuthInfo));
+    }
+
+    @ApiOperation("修改用户认证信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:auth_info:edit')")
+    @Log(title = "用户认证信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserAuthInfo userAuthInfo)
+    {
+        return toAjax(publicTemplateService.edit((userAuthInfo)));
+    }
+
+    @ApiOperation("删除用户认证信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:auth_info:remove')")
+    @Log(title = "用户认证信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(publicTemplateService.removeByIds(UserAuthInfo.class,ids));
+    }
+}

+package com.zhonglai.luhui.admin.controller.user;
+
+import java.util.List;
+import com.zhonglai.luhui.datasource.enums.DataSource;
+import com.zhonglai.luhui.datasource.enums.DataSourceType;
+import javax.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.zhonglai.luhui.action.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.zhonglai.luhui.dao.service.PublicTemplateService;
+import com.zhonglai.luhui.user.domain.UserBaseInfo;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 基础用户信息Controller
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Api(tags = "基础用户信息")
+@RestController
+@RequestMapping("/base_info")
+public class UserBaseInfoController extends BaseController
+{
+    @Autowired
+    private PublicTemplateService publicTemplateService;
+
+    @ApiOperation(value ="查询基础用户信息列表",notes="\n" +
+        "公共参数描述：\n" +
+        "条件参数：\n" +
+        "timeMap; //时间条件（如：{\"create_time\":[开始时间,结束时间]}）\n" +
+        "keyValue; //模糊匹配的关键字（如：[\"value\",\"name,no\"]）\n" +
+        "queryParams; //字段对应的比较符号（如：{\"id\":\"EQ\"}）\n" +
+        "orderBy; //排序（如：\"id desc,name asc\"）\n" +
+        "\n" +
+        "分页参数：\n" +
+        "pageNum; //当前记录起始索引,从1开始\n" +
+        "pageSize; //每页显示记录数")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:base_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserBaseInfo userBaseInfo)
+    {
+        startPage();
+        List<UserBaseInfo> list = publicTemplateService.selectTList(userBaseInfo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("导出基础用户信息列表")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:base_info:export')")
+    @Log(title = "基础用户信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserBaseInfo userBaseInfo)
+    {
+        List<UserBaseInfo> list = publicTemplateService.selectTList(userBaseInfo);
+        ExcelUtil<UserBaseInfo> util = new ExcelUtil<UserBaseInfo>(UserBaseInfo.class);
+        util.exportExcel(response, list, "基础用户信息数据");
+    }
+
+    @ApiOperation("获取基础用户信息详细信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:base_info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(publicTemplateService.getTById(id, UserBaseInfo.class));
+    }
+
+    @ApiOperation("新增基础用户信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:base_info:add')")
+    @Log(title = "基础用户信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserBaseInfo userBaseInfo)
+    {
+        return toAjax(publicTemplateService.add(userBaseInfo));
+    }
+
+    @ApiOperation("修改基础用户信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:base_info:edit')")
+    @Log(title = "基础用户信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserBaseInfo userBaseInfo)
+    {
+        return toAjax(publicTemplateService.edit((userBaseInfo)));
+    }
+
+    @ApiOperation("删除基础用户信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:base_info:remove')")
+    @Log(title = "基础用户信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(publicTemplateService.removeByIds(UserBaseInfo.class,ids));
+    }
+}

+package com.zhonglai.luhui.admin.controller.user;
+
+import java.util.List;
+import com.zhonglai.luhui.datasource.enums.DataSource;
+import com.zhonglai.luhui.datasource.enums.DataSourceType;
+import javax.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.zhonglai.luhui.action.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.zhonglai.luhui.dao.service.PublicTemplateService;
+import com.zhonglai.luhui.user.domain.UserExtraInfo;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户其他信息Controller
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Api(tags = "用户其他信息")
+@RestController
+@RequestMapping("/user/extra_info")
+public class UserExtraInfoController extends BaseController
+{
+    @Autowired
+    private PublicTemplateService publicTemplateService;
+
+    @ApiOperation(value ="查询用户其他信息列表",notes="\n" +
+        "公共参数描述：\n" +
+        "条件参数：\n" +
+        "timeMap; //时间条件（如：{\"create_time\":[开始时间,结束时间]}）\n" +
+        "keyValue; //模糊匹配的关键字（如：[\"value\",\"name,no\"]）\n" +
+        "queryParams; //字段对应的比较符号（如：{\"id\":\"EQ\"}）\n" +
+        "orderBy; //排序（如：\"id desc,name asc\"）\n" +
+        "\n" +
+        "分页参数：\n" +
+        "pageNum; //当前记录起始索引,从1开始\n" +
+        "pageSize; //每页显示记录数")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:extra_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserExtraInfo userExtraInfo)
+    {
+        startPage();
+        List<UserExtraInfo> list = publicTemplateService.selectTList(userExtraInfo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("导出用户其他信息列表")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:extra_info:export')")
+    @Log(title = "用户其他信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserExtraInfo userExtraInfo)
+    {
+        List<UserExtraInfo> list = publicTemplateService.selectTList(userExtraInfo);
+        ExcelUtil<UserExtraInfo> util = new ExcelUtil<UserExtraInfo>(UserExtraInfo.class);
+        util.exportExcel(response, list, "用户其他信息数据");
+    }
+
+    @ApiOperation("获取用户其他信息详细信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:extra_info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(publicTemplateService.getTById(id, UserExtraInfo.class));
+    }
+
+    @ApiOperation("新增用户其他信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:extra_info:add')")
+    @Log(title = "用户其他信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserExtraInfo userExtraInfo)
+    {
+        return toAjax(publicTemplateService.add(userExtraInfo));
+    }
+
+    @ApiOperation("修改用户其他信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:extra_info:edit')")
+    @Log(title = "用户其他信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserExtraInfo userExtraInfo)
+    {
+        return toAjax(publicTemplateService.edit((userExtraInfo)));
+    }
+
+    @ApiOperation("删除用户其他信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:extra_info:remove')")
+    @Log(title = "用户其他信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(publicTemplateService.removeByIds(UserExtraInfo.class,ids));
+    }
+}

+package com.zhonglai.luhui.admin.controller.user;
+
+import java.util.List;
+import com.zhonglai.luhui.datasource.enums.DataSource;
+import com.zhonglai.luhui.datasource.enums.DataSourceType;
+import javax.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.zhonglai.luhui.action.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.zhonglai.luhui.dao.service.PublicTemplateService;
+import com.zhonglai.luhui.user.domain.UserLogin;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户登录Controller
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Api(tags = "用户登录")
+@RestController
+@RequestMapping("/user/login")
+public class UserLoginController extends BaseController
+{
+    @Autowired
+    private PublicTemplateService publicTemplateService;
+
+    @ApiOperation(value ="查询用户登录列表",notes="\n" +
+        "公共参数描述：\n" +
+        "条件参数：\n" +
+        "timeMap; //时间条件（如：{\"create_time\":[开始时间,结束时间]}）\n" +
+        "keyValue; //模糊匹配的关键字（如：[\"value\",\"name,no\"]）\n" +
+        "queryParams; //字段对应的比较符号（如：{\"id\":\"EQ\"}）\n" +
+        "orderBy; //排序（如：\"id desc,name asc\"）\n" +
+        "\n" +
+        "分页参数：\n" +
+        "pageNum; //当前记录起始索引,从1开始\n" +
+        "pageSize; //每页显示记录数")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserLogin userLogin)
+    {
+        startPage();
+        List<UserLogin> list = publicTemplateService.selectTList(userLogin);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("导出用户登录列表")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login:export')")
+    @Log(title = "用户登录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserLogin userLogin)
+    {
+        List<UserLogin> list = publicTemplateService.selectTList(userLogin);
+        ExcelUtil<UserLogin> util = new ExcelUtil<UserLogin>(UserLogin.class);
+        util.exportExcel(response, list, "用户登录数据");
+    }
+
+    @ApiOperation("获取用户登录详细信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(publicTemplateService.getTById(id, UserLogin.class));
+    }
+
+    @ApiOperation("新增用户登录")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login:add')")
+    @Log(title = "用户登录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserLogin userLogin)
+    {
+        return toAjax(publicTemplateService.add(userLogin));
+    }
+
+    @ApiOperation("修改用户登录")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login:edit')")
+    @Log(title = "用户登录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserLogin userLogin)
+    {
+        return toAjax(publicTemplateService.edit((userLogin)));
+    }
+
+    @ApiOperation("删除用户登录")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login:remove')")
+    @Log(title = "用户登录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(publicTemplateService.removeByIds(UserLogin.class,ids));
+    }
+}

+package com.zhonglai.luhui.admin.controller.user;
+
+import java.util.List;
+import com.zhonglai.luhui.datasource.enums.DataSource;
+import com.zhonglai.luhui.datasource.enums.DataSourceType;
+import javax.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.zhonglai.luhui.action.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.zhonglai.luhui.dao.service.PublicTemplateService;
+import com.zhonglai.luhui.user.domain.UserLoginInfo;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户登录信息Controller
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Api(tags = "用户登录信息")
+@RestController
+@RequestMapping("/user/login_info")
+public class UserLoginInfoController extends BaseController
+{
+    @Autowired
+    private PublicTemplateService publicTemplateService;
+
+    @ApiOperation(value ="查询用户登录信息列表",notes="\n" +
+        "公共参数描述：\n" +
+        "条件参数：\n" +
+        "timeMap; //时间条件（如：{\"create_time\":[开始时间,结束时间]}）\n" +
+        "keyValue; //模糊匹配的关键字（如：[\"value\",\"name,no\"]）\n" +
+        "queryParams; //字段对应的比较符号（如：{\"id\":\"EQ\"}）\n" +
+        "orderBy; //排序（如：\"id desc,name asc\"）\n" +
+        "\n" +
+        "分页参数：\n" +
+        "pageNum; //当前记录起始索引,从1开始\n" +
+        "pageSize; //每页显示记录数")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserLoginInfo userLoginInfo)
+    {
+        startPage();
+        List<UserLoginInfo> list = publicTemplateService.selectTList(userLoginInfo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("导出用户登录信息列表")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login_info:export')")
+    @Log(title = "用户登录信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserLoginInfo userLoginInfo)
+    {
+        List<UserLoginInfo> list = publicTemplateService.selectTList(userLoginInfo);
+        ExcelUtil<UserLoginInfo> util = new ExcelUtil<UserLoginInfo>(UserLoginInfo.class);
+        util.exportExcel(response, list, "用户登录信息数据");
+    }
+
+    @ApiOperation("获取用户登录信息详细信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login_info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(publicTemplateService.getTById(id, UserLoginInfo.class));
+    }
+
+    @ApiOperation("新增用户登录信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login_info:add')")
+    @Log(title = "用户登录信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserLoginInfo userLoginInfo)
+    {
+        return toAjax(publicTemplateService.add(userLoginInfo));
+    }
+
+    @ApiOperation("修改用户登录信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login_info:edit')")
+    @Log(title = "用户登录信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserLoginInfo userLoginInfo)
+    {
+        return toAjax(publicTemplateService.edit((userLoginInfo)));
+    }
+
+    @ApiOperation("删除用户登录信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:login_info:remove')")
+    @Log(title = "用户登录信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(publicTemplateService.removeByIds(UserLoginInfo.class,ids));
+    }
+}

+package com.zhonglai.luhui.admin.controller.user;
+
+import java.util.List;
+import com.zhonglai.luhui.datasource.enums.DataSource;
+import com.zhonglai.luhui.datasource.enums.DataSourceType;
+import javax.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.zhonglai.luhui.action.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.zhonglai.luhui.dao.service.PublicTemplateService;
+import com.zhonglai.luhui.user.domain.UserOfficialInfo;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户官方及告警信息Controller
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Api(tags = "用户官方及告警信息")
+@RestController
+@RequestMapping("/user/official_info")
+public class UserOfficialInfoController extends BaseController
+{
+    @Autowired
+    private PublicTemplateService publicTemplateService;
+
+    @ApiOperation(value ="查询用户官方及告警信息列表",notes="\n" +
+        "公共参数描述：\n" +
+        "条件参数：\n" +
+        "timeMap; //时间条件（如：{\"create_time\":[开始时间,结束时间]}）\n" +
+        "keyValue; //模糊匹配的关键字（如：[\"value\",\"name,no\"]）\n" +
+        "queryParams; //字段对应的比较符号（如：{\"id\":\"EQ\"}）\n" +
+        "orderBy; //排序（如：\"id desc,name asc\"）\n" +
+        "\n" +
+        "分页参数：\n" +
+        "pageNum; //当前记录起始索引,从1开始\n" +
+        "pageSize; //每页显示记录数")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:official_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserOfficialInfo userOfficialInfo)
+    {
+        startPage();
+        List<UserOfficialInfo> list = publicTemplateService.selectTList(userOfficialInfo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("导出用户官方及告警信息列表")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:official_info:export')")
+    @Log(title = "用户官方及告警信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserOfficialInfo userOfficialInfo)
+    {
+        List<UserOfficialInfo> list = publicTemplateService.selectTList(userOfficialInfo);
+        ExcelUtil<UserOfficialInfo> util = new ExcelUtil<UserOfficialInfo>(UserOfficialInfo.class);
+        util.exportExcel(response, list, "用户官方及告警信息数据");
+    }
+
+    @ApiOperation("获取用户官方及告警信息详细信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:official_info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(publicTemplateService.getTById(id, UserOfficialInfo.class));
+    }
+
+    @ApiOperation("新增用户官方及告警信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:official_info:add')")
+    @Log(title = "用户官方及告警信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserOfficialInfo userOfficialInfo)
+    {
+        return toAjax(publicTemplateService.add(userOfficialInfo));
+    }
+
+    @ApiOperation("修改用户官方及告警信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:official_info:edit')")
+    @Log(title = "用户官方及告警信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserOfficialInfo userOfficialInfo)
+    {
+        return toAjax(publicTemplateService.edit((userOfficialInfo)));
+    }
+
+    @ApiOperation("删除用户官方及告警信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:official_info:remove')")
+    @Log(title = "用户官方及告警信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(publicTemplateService.removeByIds(UserOfficialInfo.class,ids));
+    }
+}

+package com.zhonglai.luhui.admin.controller.user;
+
+import java.util.List;
+import com.zhonglai.luhui.datasource.enums.DataSource;
+import com.zhonglai.luhui.datasource.enums.DataSourceType;
+import javax.servlet.http.HttpServletResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.zhonglai.luhui.action.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.zhonglai.luhui.dao.service.PublicTemplateService;
+import com.zhonglai.luhui.user.domain.UserSocialInfo;
+import com.zhonglai.luhui.sys.utils.ExcelUtil;
+
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 用户社交信息Controller
+ * 
+ * @author zhonglai
+ * @date 2025-10-20
+ */
+@Api(tags = "用户社交信息")
+@RestController
+@RequestMapping("/user/social_info")
+public class UserSocialInfoController extends BaseController
+{
+    @Autowired
+    private PublicTemplateService publicTemplateService;
+
+    @ApiOperation(value ="查询用户社交信息列表",notes="\n" +
+        "公共参数描述：\n" +
+        "条件参数：\n" +
+        "timeMap; //时间条件（如：{\"create_time\":[开始时间,结束时间]}）\n" +
+        "keyValue; //模糊匹配的关键字（如：[\"value\",\"name,no\"]）\n" +
+        "queryParams; //字段对应的比较符号（如：{\"id\":\"EQ\"}）\n" +
+        "orderBy; //排序（如：\"id desc,name asc\"）\n" +
+        "\n" +
+        "分页参数：\n" +
+        "pageNum; //当前记录起始索引,从1开始\n" +
+        "pageSize; //每页显示记录数")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:social_info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(UserSocialInfo userSocialInfo)
+    {
+        startPage();
+        List<UserSocialInfo> list = publicTemplateService.selectTList(userSocialInfo);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("导出用户社交信息列表")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:social_info:export')")
+    @Log(title = "用户社交信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, UserSocialInfo userSocialInfo)
+    {
+        List<UserSocialInfo> list = publicTemplateService.selectTList(userSocialInfo);
+        ExcelUtil<UserSocialInfo> util = new ExcelUtil<UserSocialInfo>(UserSocialInfo.class);
+        util.exportExcel(response, list, "用户社交信息数据");
+    }
+
+    @ApiOperation("获取用户社交信息详细信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:social_info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Integer id)
+    {
+        return success(publicTemplateService.getTById(id, UserSocialInfo.class));
+    }
+
+    @ApiOperation("新增用户社交信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:social_info:add')")
+    @Log(title = "用户社交信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody UserSocialInfo userSocialInfo)
+    {
+        return toAjax(publicTemplateService.add(userSocialInfo));
+    }
+
+    @ApiOperation("修改用户社交信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:social_info:edit')")
+    @Log(title = "用户社交信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody UserSocialInfo userSocialInfo)
+    {
+        return toAjax(publicTemplateService.edit((userSocialInfo)));
+    }
+
+    @ApiOperation("删除用户社交信息")
+    @DataSource(DataSourceType.SLAVE)
+    @PreAuthorize("@ss.hasPermi('user:social_info:remove')")
+    @Log(title = "用户社交信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Integer[] ids)
+    {
+        return toAjax(publicTemplateService.removeByIds(UserSocialInfo.class,ids));
+    }
+}

@@ -80,6 +80,11 @@
             <groupId>org.apache.xmlgraphics</groupId>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>batik-transcoder</artifactId>
             <artifactId>batik-transcoder</artifactId>
         </dependency>
         </dependency>
+
+        <dependency>
+            <groupId>com.zhonglai.luhui</groupId>
+            <artifactId>lh-user</artifactId>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

@@ -13,7 +13,6 @@ import java.util.List;
  **/
  **/
 public class SensorData {
 public class SensorData {
 
 
-
     public static StringBuffer deviceSensorDataListToIntervalCompletion(List<DeviceSensorData> deviceSensorDataList,int lastTime,int interval,String day)
     public static StringBuffer deviceSensorDataListToIntervalCompletion(List<DeviceSensorData> deviceSensorDataList,int lastTime,int interval,String day)
     {
     {
         int abs = interval;
         int abs = interval;

@@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 @Api(tags = "数据管理")
 @Api(tags = "数据管理")
 @RestController
 @RestController
@@ -63,22 +64,12 @@ public class SensorDataController {
             @ApiParam(name = "startTime", value = "开始时间（时间戳）", required = true) @RequestParam(name = "startTime") int startTime,
             @ApiParam(name = "startTime", value = "开始时间（时间戳）", required = true) @RequestParam(name = "startTime") int startTime,
             @ApiParam(name = "endTime", value = "结束时间（时间戳）", required = true) @RequestParam(name = "endTime") int endTime,
             @ApiParam(name = "endTime", value = "结束时间（时间戳）", required = true) @RequestParam(name = "endTime") int endTime,
             @ApiParam(name = "deviceInfoId", value = "设备信息表id/imei号", required = true) @RequestParam(name = "id") String id,
             @ApiParam(name = "deviceInfoId", value = "设备信息表id/imei号", required = true) @RequestParam(name = "id") String id,
-            String dataType) throws IOException {
+            String dataType,Integer interval) throws IOException {
 
 
-        List<DeviceSensorData>  list = dataService.getBeifeiDbDeviceHistoryDataByDeviceId( id, dataType, startTime, endTime);
-        return AjaxResult.success().put("data",list);
+        Map<String,StringBuffer> map = dataService.getBeifeiDbDeviceHistoryDataByDeviceId( id, dataType, startTime, endTime,interval);
+        return AjaxResult.success().put("data",map);
     }
     }
 
 
-    /**
-     * 获取原始数据
-     * @param startTime
-     * @param endTime
-     * @param id
-     * @param dataType
-     * @return
-     * @throws IOException
-     */
-
 
 
     /**
     /**
      * 获取数据指定天的数据查询语句
      * 获取数据指定天的数据查询语句

+package com.zhonglai.luhui.api.controller.login.v2;
+
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.zhonglai.luhui.action.BaseController;
+import com.zhonglai.luhui.login.service.LoginService;
+import com.zhonglai.luhui.user.service.IUserLoginService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "api登陆-v2")
+@RestController
+@RequestMapping("/v2/login/ApiLogin")
+public class V2ApiLoginController extends BaseController {
+    @Autowired
+    private IUserLoginService userLoginService;
+    @ApiOperation("账号密码登陆")
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "账号",name = "user"),
+            @ApiImplicitParam(value = "密码",name = "pass"),
+    })
+    @PostMapping("/userpassLogin")
+    public AjaxResult userpassLogin(String user, String pass)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        //生成令牌
+        String token = userLoginService.apiLoginByPass(user,pass);
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+}

@@ -338,23 +338,71 @@ public class DataService {
         return null;
         return null;
     }
     }
 
 
-    public List<DeviceSensorData> getBeifeiDbDeviceHistoryDataByDeviceId(String deviceId,String dataType,int startTime,int endTime)
+    public Map<String,StringBuffer> getBeifeiDbDeviceHistoryDataByDeviceId(String deviceId,String dataType,int startTime,int endTime,Integer interval)
+    {
+        List<Map<String, Object>>  tempDataList = queryDeviceIdAndDataType(deviceId,  startTime,  endTime); //获取设备id和数据类型
+        if(null != tempDataList && tempDataList.size()!=0)
+        {
+            Map<String,StringBuffer> deviceAndDataTypeDataMap = new HashMap();
+            for(Map<String, Object> deviceAndDataTypeMap:tempDataList) //遍历设备id和数据类型，获取曲线数据
+            {
+                String deviceInfoId = deviceAndDataTypeMap.get("device_info_id")+"";
+                String dbDataType = deviceAndDataTypeMap.get("data_type")+"";
+                if (StringUtils.isNotEmpty(dataType) && !((","+dataType+",").indexOf(dbDataType+",")>=0)) ///数据类型过滤
+                {
+                    continue;
+                }
+                String key = deviceInfoId+"-"+dbDataType;
+                if (!deviceAndDataTypeDataMap.containsKey(key))
+                {
+                    List<DeviceSensorData> deviceSensorDataList = getBeifeiDbDeviceHistoryData(deviceInfoId,dbDataType,startTime,endTime); //获取设备历史数据
+                    if (null != deviceSensorDataList && deviceSensorDataList.size()!=0)
+                    {
+                        StringBuffer stringBuffer10 = null;
+                        //如果interval为0或者为空，则不进行间隔时间补全
+                        if(interval!=null && interval!=0)
+                        {
+                            //间隔时间补全
+                            Date sdate = new Date(startTime*1000l);
+                            String day = DateUtils.parseDateToStr("yyyyMMdd",sdate);
+                            stringBuffer10 = SensorData.deviceSensorDataListToIntervalCompletion(deviceSensorDataList, Integer.parseInt(sdate.getTime() / 1000 + ""), interval, day);
+
+                        }else {
+                            stringBuffer10 = new StringBuffer();
+                            for (DeviceSensorData deviceSensorData:deviceSensorDataList)
+                            {
+                                stringBuffer10.append(deviceSensorData.getCreatTime());
+                                stringBuffer10.append(",");
+                                stringBuffer10.append(deviceSensorData.getDataValue());
+                                stringBuffer10.append("\r\n");
+                            }
+                        }
+                        deviceAndDataTypeDataMap.put(key, stringBuffer10);
+                    }
+                }
+            }
+            return deviceAndDataTypeDataMap;
+        }
+        return null;
+    }
+
+    public List<Map<String, Object>> queryDeviceIdAndDataType(String deviceId,int startTime,int endTime)
     {
     {
         List<String> tableNames = getTableNames(startTime, endTime);
         List<String> tableNames = getTableNames(startTime, endTime);
+
         // 每次查询的最大天数，超过则分批查询
         // 每次查询的最大天数，超过则分批查询
         int BATCH_QUERY_DAYS = 30;
         int BATCH_QUERY_DAYS = 30;
 
 
         if(null != tableNames && tableNames.size() !=0 && null != tableNames.get(0) )
         if(null != tableNames && tableNames.size() !=0 && null != tableNames.get(0) )
         {
         {
-            List<DeviceSensorData> deviceSensorDataList = new ArrayList<>();
+            List<Map<String, Object>> deviceSensorDataList = new ArrayList<>();
 
 
             // **分批查询**（一次最多查 30 天）
             // **分批查询**（一次最多查 30 天）
             for (int i = 0; i < tableNames.size(); i += BATCH_QUERY_DAYS) {
             for (int i = 0; i < tableNames.size(); i += BATCH_QUERY_DAYS) {
                 int batchStart = i;
                 int batchStart = i;
                 int batchEnd = Math.min(i + BATCH_QUERY_DAYS, tableNames.size());
                 int batchEnd = Math.min(i + BATCH_QUERY_DAYS, tableNames.size());
                 List<String> batchTables = tableNames.subList(batchStart, batchEnd);
                 List<String> batchTables = tableNames.subList(batchStart, batchEnd);
-
-                List<DeviceSensorData> tempDataList = queryBatchTablesByDeviceId(batchTables, deviceId, dataType, startTime, endTime);
+                List<Map<String, Object>>  tempDataList = queryDeviceIdAndDataType(batchTables,  deviceId,  startTime,  endTime);
                 deviceSensorDataList.addAll(tempDataList);
                 deviceSensorDataList.addAll(tempDataList);
             }
             }
             return deviceSensorDataList;
             return deviceSensorDataList;
@@ -474,7 +522,7 @@ public class DataService {
             }
             }
             sqlBuilder.append("SELECT device_info_id, data_type, data_value, creat_time FROM ")
             sqlBuilder.append("SELECT device_info_id, data_type, data_value, creat_time FROM ")
                     .append(tableNames.get(i))
                     .append(tableNames.get(i))
-                    .append(" WHERE device_info_id = '"+deviceInfoId+"%'");
+                    .append(" WHERE device_info_id = '"+deviceInfoId+"'");
             if (StringUtils.isNotEmpty(dataType))
             if (StringUtils.isNotEmpty(dataType))
             {
             {
                 sqlBuilder.append(" AND data_type = '"+dataType+"'");
                 sqlBuilder.append(" AND data_type = '"+dataType+"'");
@@ -491,30 +539,27 @@ public class DataService {
     }
     }
 
 
     /**
     /**
-     * 查询一批表的数据
+     * 在指定时间范围内，查询出所有表中出现过的设备ID和数据类型的对应关系
      */
      */
-    private List<DeviceSensorData> queryBatchTablesByDeviceId(List<String> tableNames, String deviceId, String dataType, int startTime, int endTime) {
+    private List<Map<String, Object>> queryDeviceIdAndDataType(List<String> tableNames, String deviceId, int startTime, int endTime) {
         StringBuilder sqlBuilder = new StringBuilder();
         StringBuilder sqlBuilder = new StringBuilder();
 
 
         for (int i = 0; i < tableNames.size(); i++) {
         for (int i = 0; i < tableNames.size(); i++) {
             if (i > 0) {
             if (i > 0) {
                 sqlBuilder.append(" UNION ALL ");
                 sqlBuilder.append(" UNION ALL ");
             }
             }
-            sqlBuilder.append("SELECT device_info_id, data_type, data_value, creat_time FROM ")
+            sqlBuilder.append("SELECT DISTINCT device_info_id, data_type FROM ")
                     .append(tableNames.get(i))
                     .append(tableNames.get(i))
-                    .append(" WHERE device_info_id like '"+deviceId+"%'");
-            if (StringUtils.isNotEmpty(dataType))
-            {
-                sqlBuilder.append(" AND data_type = '"+dataType+"'");
-            }
-            sqlBuilder.append(" AND creat_time BETWEEN "+startTime+" AND "+endTime);
+                    .append(" WHERE device_info_id LIKE '").append(deviceId).append("%'")
+                    .append(" AND creat_time BETWEEN ").append(startTime).append(" AND ").append(endTime);
         }
         }
 
 
-        sqlBuilder.append(" ORDER BY creat_time ASC");
-
-        // **执行 SQL 查询**
-        List<DeviceSensorData> deviceSensorDataList = deviceSensorDataMapper.getDeviceSensorDataList(sqlBuilder.toString());
+        // 外层去重并排序（防止重复）
+        String finalSql = "SELECT DISTINCT device_info_id, data_type FROM (" + sqlBuilder + ") t ORDER BY device_info_id, data_type";
 
 
-        return deviceSensorDataList;
+        return publicMapper.getObjectListBySQL(finalSql);
     }
     }
+
+
+
 }
 }

@@ -374,6 +374,11 @@
                 <version>${ruoyi.version}</version>
                 <version>${ruoyi.version}</version>
             </dependency>
             </dependency>
             <dependency>
             <dependency>
+                <groupId>com.zhonglai.luhui</groupId>
+                <artifactId>lh-user</artifactId>
+                <version>${ruoyi.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.zhonglai</groupId>
                 <groupId>com.zhonglai</groupId>
                 <artifactId>ServiceDao</artifactId>
                 <artifactId>ServiceDao</artifactId>
                 <version>1.4.3</version>
                 <version>1.4.3</version>
@@ -651,6 +656,12 @@
                 <artifactId>ini4j</artifactId>
                 <artifactId>ini4j</artifactId>
                 <version>0.5.4</version>
                 <version>0.5.4</version>
             </dependency>
             </dependency>
+
+            <dependency>
+                <groupId>io.swagger</groupId>
+                <artifactId>swagger-annotations</artifactId>
+                <version>1.6.2</version>
+            </dependency>
         </dependencies>
         </dependencies>