xuhy
2024-03-01 8ea705a1ea9601a4931311bbeabfb090d756ac7a
用户管理
6个文件已删除
6个文件已添加
2个文件已修改
447 ■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPerformerController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TUserController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/domain/TPerformer.java 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/domain/TUser.java 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TPerformerMapper.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TUserMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TPerformerService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/TUserService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPerformerServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TUserServiceImpl.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TPerformerMapper.xml 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/TUserMapper.xml 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPerformerController.java
File was deleted
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TUserController.java
New file
@@ -0,0 +1,22 @@
package com.ruoyi.web.controller.api;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * <p>
 * 用户管理 前端控制器
 * </p>
 *
 * @author xiaochen
 * @since 2024-03-01
 */
@Api(tags = "用户管理")
@RestController
@RequestMapping("/tUser")
public class TUserController {
}
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -118,23 +118,6 @@
    @ApiModelProperty(value = "是否为黑名单 1是 0否")
    private Integer ifBlack;
    /**
     * 会员类型 1=个人会员 2=企业会员 3=普通用户
     */
    @ApiModelProperty(value = "会员类型 1=个人会员 2=企业会员 3=普通用户")
    private Integer vipType;
    @ApiModelProperty(value = "注册时间")
    private Date insertTime;
    @ApiModelProperty(value = "首次成为会员时间")
    private Integer firstVipTime;
    @ApiModelProperty(value = "会员开始时间")
    private Integer startTime;
    @ApiModelProperty(value = "会员到期时间")
    private Integer endTime;
    @ApiModelProperty(value = "已消费金额")
    private BigDecimal consumptionAmount;
    @TableField(exist = false)
    private String roleName;
ruoyi-system/src/main/java/com/ruoyi/system/domain/TPerformer.java
File was deleted
ruoyi-system/src/main/java/com/ruoyi/system/domain/TUser.java
New file
@@ -0,0 +1,112 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
 * <p>
 * 用户管理
 * </p>
 *
 * @author xiaochen
 * @since 2024-03-01
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_user")
@ApiModel(value="TUser对象", description="用户管理")
public class TUser extends BaseModel {
    private static final long serialVersionUID = 1L;
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    @ApiModelProperty(value = "用户名称")
    @TableField("userName")
    private String userName;
    @ApiModelProperty(value = "手机号")
    @TableField("userPhone")
    private String userPhone;
    @ApiModelProperty(value = "会员类型 1=个人会员 2=企业会员 3=普通用户")
    @TableField("vipType")
    private Integer vipType;
    @ApiModelProperty(value = "注册时间")
    @TableField("insertTime")
    private LocalDateTime insertTime;
    @ApiModelProperty(value = "毕业院校")
    @TableField("graduationInstitution")
    private String graduationInstitution;
    @ApiModelProperty(value = "自我介绍")
    @TableField("selfIntroduction")
    private String selfIntroduction;
    @ApiModelProperty(value = "首次成为会员时间")
    @TableField("firstVipTime")
    private LocalDateTime firstVipTime;
    @ApiModelProperty(value = "会员开始时间")
    @TableField("startTime")
    private LocalDateTime startTime;
    @ApiModelProperty(value = "会员到期时间")
    @TableField("endTime")
    private LocalDateTime endTime;
    @ApiModelProperty(value = "已消费金额")
    @TableField("consumptionAmount")
    private Double consumptionAmount;
    @ApiModelProperty(value = "省份")
    @TableField("provinceName")
    private String provinceName;
    @ApiModelProperty(value = "省份code")
    @TableField("provinceCode")
    private String provinceCode;
    @ApiModelProperty(value = "城市")
    @TableField("cityName")
    private String cityName;
    @ApiModelProperty(value = "城市code")
    @TableField("cityCode")
    private String cityCode;
    @ApiModelProperty(value = "演员封面")
    @TableField("performerCover")
    private String performerCover;
    @ApiModelProperty(value = "详情图片")
    @TableField("detailPicture")
    private String detailPicture;
    @ApiModelProperty(value = "openId")
    @TableField("openId")
    private String openId;
    @ApiModelProperty(value = "状态 1=正常 2=冻结")
    @TableField("status")
    private Integer status;
    @ApiModelProperty(value = "审核状态 1=待审核 2=通过 3=驳回")
    @TableField("auditStatus")
    private Integer auditStatus;
    @ApiModelProperty(value = "审核备注")
    @TableField("auditRemark")
    private String auditRemark;
}
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TPerformerMapper.java
File was deleted
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TUserMapper.java
New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.TUser;
/**
 * <p>
 * 用户管理 Mapper 接口
 * </p>
 *
 * @author xiaochen
 * @since 2024-03-01
 */
public interface TUserMapper extends BaseMapper<TUser> {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/TPerformerService.java
File was deleted
ruoyi-system/src/main/java/com/ruoyi/system/service/TUserService.java
New file
@@ -0,0 +1,16 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.domain.TUser;
/**
 * <p>
 * 用户管理 服务类
 * </p>
 *
 * @author xiaochen
 * @since 2024-03-01
 */
public interface TUserService extends IService<TUser> {
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPerformerServiceImpl.java
File was deleted
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TUserServiceImpl.java
New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.TUser;
import com.ruoyi.system.mapper.TUserMapper;
import com.ruoyi.system.service.TUserService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 用户管理 服务实现类
 * </p>
 *
 * @author xiaochen
 * @since 2024-03-01
 */
@Service
public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements TUserService {
}
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,12 +24,6 @@
        <result property="updateTime"   column="update_time"  />
        <result property="remark"       column="remark"       />
        <result property="ifBlack"       column="ifBlack"       />
        <result property="vipType"       column="vipType"       />
        <result property="insertTime"       column="insertTime"       />
        <result property="firstVipTime"       column="firstVipTime"       />
        <result property="startTime"       column="startTime"       />
        <result property="endTime"       column="endTime"       />
        <result property="consumptionAmount"       column="consumptionAmount"       />
        <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
        <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
    </resultMap>
ruoyi-system/src/main/resources/mapper/system/TPerformerMapper.xml
File was deleted
ruoyi-system/src/main/resources/mapper/system/TUserMapper.xml
New file
@@ -0,0 +1,40 @@
<?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.ruoyi.system.mapper.TUserMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.system.domain.TUser">
        <id column="id" property="id" />
        <result column="userName" property="userName" />
        <result column="userPhone" property="userPhone" />
        <result column="vipType" property="vipType" />
        <result column="insertTime" property="insertTime" />
        <result column="graduationInstitution" property="graduationInstitution" />
        <result column="selfIntroduction" property="selfIntroduction" />
        <result column="firstVipTime" property="firstVipTime" />
        <result column="startTime" property="startTime" />
        <result column="endTime" property="endTime" />
        <result column="consumptionAmount" property="consumptionAmount" />
        <result column="provinceName" property="provinceName" />
        <result column="provinceCode" property="provinceCode" />
        <result column="cityName" property="cityName" />
        <result column="cityCode" property="cityCode" />
        <result column="performerCover" property="performerCover" />
        <result column="detailPicture" property="detailPicture" />
        <result column="openId" property="openId" />
        <result column="status" property="status" />
        <result column="auditStatus" property="auditStatus" />
        <result column="auditRemark" property="auditRemark" />
        <result column="createTime" property="createTime" />
        <result column="updateTime" property="updateTime" />
        <result column="createBy" property="createBy" />
        <result column="updateBy" property="updateBy" />
        <result column="isDelete" property="isDelete" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, userName, userPhone, vipType, insertTime, graduationInstitution, selfIntroduction, firstVipTime, startTime, endTime, consumptionAmount, provinceName, provinceCode, cityName, cityCode, performerCover, detailPicture, openId, status, auditStatus, auditRemark, createTime, updateTime, createBy, updateBy, isDelete
    </sql>
</mapper>