Skip to content

D
data-server
Commit d0e182fe authored by codezwjava's avatar codezwjava
Browse files
Options

user表多余字段删除，user实体类，mapper.xml文件修改

parent bd9e8c73
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 314 deletions
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @ d0e182fe
...@@ -13,16 +13,16 @@ ...@@ -13,16 +13,16 @@
<result column="fans_id" property="fansId"/> <result column="fans_id" property="fansId"/>
<result column="invite_code" property="inviteCode"/> <result column="invite_code" property="inviteCode"/>
<result column="be_invited_code" property="beInvitedCode"/> <result column="be_invited_code" property="beInvitedCode"/>
<result column="team_members_num" property="teamMembersNum"/> <!-- <result column="team_members_num" property="teamMembersNum"/>-->
<result column="normal_user_num" property="normalUserNum"/> <!-- <result column="normal_user_num" property="normalUserNum"/>-->
<result column="seedling_num" property="seedlingNum"/> <!-- <result column="seedling_num" property="seedlingNum"/>-->
<result column="bronze_tree_num" property="bronzeTreeNum"/> <!-- <result column="bronze_tree_num" property="bronzeTreeNum"/>-->
<result column="silver_tree_num" property="silverTreeNum"/> <!-- <result column="silver_tree_num" property="silverTreeNum"/>-->
<result column="gold_tree_num" property="goldTreeNum"/> <!-- <result column="gold_tree_num" property="goldTreeNum"/>-->
<result column="farmer_num" property="farmerNum"/> <!-- <result column="farmer_num" property="farmerNum"/>-->
<result column="forest_start_num" property="forestStartNum"/> <!-- <result column="forest_start_num" property="forestStartNum"/>-->
<result column="partner_num" property="partnerNum"/> <!-- <result column="partner_num" property="partnerNum"/>-->
<result column="referrer_num" property="referrerNum"/> <!-- <result column="referrer_num" property="referrerNum"/>-->
<result column="create_time" property="createTime"/> <result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/> <result column="update_time" property="updateTime"/>
</resultMap> </resultMap>
...@@ -36,16 +36,74 @@ ...@@ -36,16 +36,74 @@
<include refid="cols_exclude_id"/> <include refid="cols_exclude_id"/>
</sql> </sql>
<!-- <sql id="cols_exclude_id">-->
<!-- user_id,password, user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,-->
<!-- be_invited_code,team_members_num,normal_user_num,seedling_num,bronze_tree_num,silver_tree_num,-->
<!-- gold_tree_num,farmer_num,forest_start_num,partner_num,referrer_num,create_time,update_time-->
<!-- </sql>-->
<!-- <sql id="vals">-->
<!-- #{userId},#{password},#{userLevel},#{crossBorderLine},#{idCardNumber},#{fansNickname},#{fansId},#{inviteCode},-->
<!-- #{beInvitedCode}, #{teamMembersNum},#{normalUserNum},#{seedlingNum},#{bronzeTreeNum},#{silverTreeNum},-->
<!-- #{goldTreeNum}, #{farmerNum},#{forestStartNum},#{partnerNum},#{referrerNum},now(),now()-->
<!-- </sql>-->
<!-- <sql id="updateCondition">-->
<!-- <if test="userId != null">user_id = #{userId},</if>-->
<!-- <if test="password != null">password =#{password},</if>-->
<!-- <if test="userLevel != null">user_level =#{userLevel},</if>-->
<!-- <if test="crossBorderLine != null">cross_border_line =#{crossBorderLine},</if>-->
<!-- <if test="idCardNumber != null">id_card_number = #{idCardNumber},</if>-->
<!-- <if test="fansNickname != null">fans_nickname =#{fansNickname},</if>-->
<!-- <if test="fansId != null">fans_id =#{fansId},</if>-->
<!-- <if test="inviteCode != null">invite_code =#{inviteCode},</if>-->
<!-- <if test="beInvitedCode != null">be_invited_code = #{beInvitedCode},</if>-->
<!-- <if test="teamMembersNum != null">team_members_num = #{teamMembersNum},</if>-->
<!-- <if test="normalUserNum != null">normal_user_num = #{normalUserNum},</if>-->
<!-- <if test="seedlingNum != null">seedling_num = #{seedlingNum},</if>-->
<!-- <if test="bronzeTreeNum != null">bronze_tree_num = #{bronzeTreeNum},</if>-->
<!-- <if test="silverTreeNum != null">silver_tree_num = #{silverTreeNum},</if>-->
<!-- <if test="goldTreeNum != null">gold_tree_num = #{goldTreeNum},</if>-->
<!-- <if test="farmerNum != null">farmer_num = #{farmerNum},</if>-->
<!-- <if test="forestStartNum != null">forest_start_num = #{forestStartNum},</if>-->
<!-- <if test="partnerNum != null">partner_num = #{partnerNum},</if>-->
<!-- <if test="referrerNum != null">referrer_num = #{referrerNum},</if>-->
<!-- update_time =now()-->
<!-- </sql>-->
<!-- <sql id="criteria">-->
<!-- <if test="id != null">id = #{id}</if>-->
<!-- <if test="userId != null">and user_id = #{userId}</if>-->
<!-- <if test="password != null">and password =#{password}</if>-->
<!-- <if test="userLevel != null">and user_level =#{userLevel}</if>-->
<!-- <if test="crossBorderLine != null">and cross_border_line =#{crossBorderLine}</if>-->
<!-- <if test="idCardNumber != null">and id_card_number = #{idCardNumber}</if>-->
<!-- <if test="fansNickname != null">and fans_nickname =#{fansNickname}</if>-->
<!-- <if test="fansId != null">and fans_id =#{fansId}</if>-->
<!-- <if test="inviteCode != null">and invite_code =#{inviteCode}</if>-->
<!-- <if test="beInvitedCode != null">and be_invited_code = #{beInvitedCode}</if>-->
<!-- <if test="teamMembersNum != null">and team_members_num = #{teamMembersNum}</if>-->
<!-- <if test="normalUserNum != null">and normal_user_num = #{normalUserNum}</if>-->
<!-- <if test="seedlingNum != null">and seedling_num = #{seedlingNum}</if>-->
<!-- <if test="bronzeTreeNum != null">and bronze_tree_num = #{bronzeTreeNum}</if>-->
<!-- <if test="silverTreeNum != null">and silver_tree_num = #{silverTreeNum}</if>-->
<!-- <if test="goldTreeNum != null">and gold_tree_num = #{goldTreeNum}</if>-->
<!-- <if test="farmerNum != null">and farmer_num = #{farmerNum}</if>-->
<!-- <if test="forestStartNum != null">and forest_start_num = #{forestStartNum}</if>-->
<!-- <if test="partnerNum != null">and partner_num = #{partnerNum}</if>-->
<!-- <if test="referrerNum != null">and referrer_num = #{referrerNum}</if>-->
<!-- <if test="createTime != null">and create_time &gt;= #{createTime}</if>-->
<!-- <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>-->
<!-- </sql>-->
<sql id="cols_exclude_id"> <sql id="cols_exclude_id">
user_id,password, user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code, user_id,password, user_level,cross_border_line,id_card_number,fans_nickname,fans_id, invite_code,
be_invited_code,team_members_num,normal_user_num,seedling_num,bronze_tree_num,silver_tree_num, be_invited_code,create_time,update_time
gold_tree_num,farmer_num,forest_start_num,partner_num,referrer_num,create_time,update_time
</sql> </sql>
<sql id="vals"> <sql id="vals">
#{userId},#{password},#{userLevel},#{crossBorderLine},#{idCardNumber},#{fansNickname},#{fansId},#{inviteCode}, #{userId},#{password},#{userLevel},#{crossBorderLine},#{idCardNumber},#{fansNickname},#{fansId},#{inviteCode},
#{beInvitedCode}, #{teamMembersNum},#{normalUserNum},#{seedlingNum},#{bronzeTreeNum},#{silverTreeNum}, #{beInvitedCode},now(),now()
#{goldTreeNum}, #{farmerNum},#{forestStartNum},#{partnerNum},#{referrerNum},now(),now()
</sql> </sql>
<sql id="updateCondition"> <sql id="updateCondition">
...@@ -58,16 +116,6 @@ ...@@ -58,16 +116,6 @@
<if test="fansId != null">fans_id =#{fansId},</if> <if test="fansId != null">fans_id =#{fansId},</if>
<if test="inviteCode != null">invite_code =#{inviteCode},</if> <if test="inviteCode != null">invite_code =#{inviteCode},</if>
<if test="beInvitedCode != null">be_invited_code = #{beInvitedCode},</if> <if test="beInvitedCode != null">be_invited_code = #{beInvitedCode},</if>
<if test="teamMembersNum != null">team_members_num = #{teamMembersNum},</if>
<if test="normalUserNum != null">normal_user_num = #{normalUserNum},</if>
<if test="seedlingNum != null">seedling_num = #{seedlingNum},</if>
<if test="bronzeTreeNum != null">bronze_tree_num = #{bronzeTreeNum},</if>
<if test="silverTreeNum != null">silver_tree_num = #{silverTreeNum},</if>
<if test="goldTreeNum != null">gold_tree_num = #{goldTreeNum},</if>
<if test="farmerNum != null">farmer_num = #{farmerNum},</if>
<if test="forestStartNum != null">forest_start_num = #{forestStartNum},</if>
<if test="partnerNum != null">partner_num = #{partnerNum},</if>
<if test="referrerNum != null">referrer_num = #{referrerNum},</if>
update_time =now() update_time =now()
</sql> </sql>
...@@ -82,20 +130,11 @@ ...@@ -82,20 +130,11 @@
<if test="fansId != null">and fans_id =#{fansId}</if> <if test="fansId != null">and fans_id =#{fansId}</if>
<if test="inviteCode != null">and invite_code =#{inviteCode}</if> <if test="inviteCode != null">and invite_code =#{inviteCode}</if>
<if test="beInvitedCode != null">and be_invited_code = #{beInvitedCode}</if> <if test="beInvitedCode != null">and be_invited_code = #{beInvitedCode}</if>
<if test="teamMembersNum != null">and team_members_num = #{teamMembersNum}</if>
<if test="normalUserNum != null">and normal_user_num = #{normalUserNum}</if>
<if test="seedlingNum != null">and seedling_num = #{seedlingNum}</if>
<if test="bronzeTreeNum != null">and bronze_tree_num = #{bronzeTreeNum}</if>
<if test="silverTreeNum != null">and silver_tree_num = #{silverTreeNum}</if>
<if test="goldTreeNum != null">and gold_tree_num = #{goldTreeNum}</if>
<if test="farmerNum != null">and farmer_num = #{farmerNum}</if>
<if test="forestStartNum != null">and forest_start_num = #{forestStartNum}</if>
<if test="partnerNum != null">and partner_num = #{partnerNum}</if>
<if test="referrerNum != null">and referrer_num = #{referrerNum}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if> <if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if> <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
</sql> </sql>
<insert id="add" parameterType="cn.wisenergy.model.app.User" keyProperty="id" useGeneratedKeys="true"> <insert id="add" parameterType="cn.wisenergy.model.app.User" keyProperty="id" useGeneratedKeys="true">
insert into insert into
<include refid="table"/> <include refid="table"/>
......
wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
View file @ d0e182fe
...@@ -10,7 +10,6 @@ import lombok.Data; ...@@ -10,7 +10,6 @@ import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @author 86187 * @author 86187
...@@ -38,7 +37,6 @@ public class User extends Model<User> implements Serializable{ ...@@ -38,7 +37,6 @@ public class User extends Model<User> implements Serializable{
@TableId("user_id") @TableId("user_id")
private String userId; private String userId;
/** /**
* 密码 * 密码
*/ */
...@@ -83,90 +81,19 @@ public class User extends Model<User> implements Serializable{ ...@@ -83,90 +81,19 @@ public class User extends Model<User> implements Serializable{
private String fansId; private String fansId;
/** /**
* 用户邀请码 * 用户本人邀请码
*/ */
@ApiModelProperty(name = "invite_code", value = "用户邀请码") @ApiModelProperty(name = "invite_code", value = "用户本人邀请码")
@TableId("invite_code") @TableId("invite_code")
private String inviteCode; private String inviteCode;
/** /**
* 被邀请码 * 推荐人邀请码
*/ */
@ApiModelProperty(name = "be_invited_code", value = "被邀请码") @ApiModelProperty(name = "be_invited_code", value = "推荐人邀请码")
@TableId("be_invited_code") @TableId("be_invited_code")
private String beInvitedCode; private String beInvitedCode;
/**
* 团队成员数量
*/
@ApiModelProperty(name = "team_members_num", value = "团队成员数量")
@TableId("team_members_num")
private Integer teamMembersNum;
/**
* 普通用户数量
*/
@ApiModelProperty(name = "normal_user_num", value = "普通用户数量")
@TableId("normal_user_num")
private Integer normalUserNum;
/**
* 幼苗数量
*/
@ApiModelProperty(name = "seedling_num", value = "幼苗数量")
@TableId("seedling_num")
private Integer seedlingNum;
/**
* 青铜树数量
*/
@ApiModelProperty(name = " bronze_tree_num", value = "青铜树数量")
@TableId("bronze_tree_num")
private Integer bronzeTreeNum;
/**
* 白银树数量
*/
@ApiModelProperty(name = "silver_tree_num", value = "白银树数量")
@TableId("silver_tree_num")
private Integer silverTreeNum;
/**
* 黄金树数量
*/
@ApiModelProperty(name = "gold_tree_num", value = "黄金树数量")
@TableId("gold_tree_num")
private Integer goldTreeNum;
/**
* 农场主数量
*/
@ApiModelProperty(name = "farmer_num", value = "农场主数量")
@TableId("farmer_num")
private Integer farmerNum;
/**
* 森林之星数量
*/
@ApiModelProperty(name = "forest_start_num", value = "森林之星数量")
@TableId("forest_start_num")
private Integer forestStartNum;
/**
* 西田森合伙人数量
*/
@ApiModelProperty(name = "partner_num", value = "西田森合伙人数量")
@TableId("partnerNum")
private Integer partnerNum;
/**
* 直推人数
*/
@ApiModelProperty(name = "referrer_num", value = "直推人数")
@TableId("referrerNum")
private Integer referrerNum;
/** /**
* 创建时间 * 创建时间
*/ */
...@@ -178,207 +105,4 @@ public class User extends Model<User> implements Serializable{ ...@@ -178,207 +105,4 @@ public class User extends Model<User> implements Serializable{
@ApiModelProperty(name = "updateTime", value = "修改时间") @ApiModelProperty(name = "updateTime", value = "修改时间")
private Date updateTime; private Date updateTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public Integer getUserLevel() {
return userLevel;
}
public void setUserLevel(Integer userLevel) {
this.userLevel = userLevel;
}
public BigDecimal getCrossBorderLine() {
return crossBorderLine;
}
public void setCrossBorderLine(BigDecimal crossBorderLine) {
this.crossBorderLine = crossBorderLine;
}
public String getIdCardNumber() {
return idCardNumber;
}
public void setIdCardNumber(String idCardNumber) {
this.idCardNumber = idCardNumber;
}
public String getFansNickname() {
return fansNickname;
}
public void setFansNickname(String fansNickname) {
this.fansNickname = fansNickname;
}
public String getFansId() {
return fansId;
}
public void setFansId(String fansId) {
this.fansId = fansId;
}
public String getInviteCode() {
return inviteCode;
}
public void setInviteCode(String inviteCode) {
this.inviteCode = inviteCode;
}
public String getBeInvitedCode() {
return beInvitedCode;
}
public void setBeInvitedCode(String beInvitedCode) {
this.beInvitedCode = beInvitedCode;
}
public Integer getTeamMembersNum() {
return teamMembersNum;
}
public void setTeamMembersNum(Integer teamMembersNum) {
this.teamMembersNum = teamMembersNum;
}
public Integer getNormalUserNum() {
return normalUserNum;
}
public void setNormalUserNum(Integer normalUserNum) {
this.normalUserNum = normalUserNum;
}
public Integer getSeedlingNum() {
return seedlingNum;
}
public void setSeedlingNum(Integer seedlingNum) {
this.seedlingNum = seedlingNum;
}
public Integer getBronzeTreeNum() {
return bronzeTreeNum;
}
public void setBronzeTreeNum(Integer bronzeTreeNum) {
this.bronzeTreeNum = bronzeTreeNum;
}
public Integer getSilverTreeNum() {
return silverTreeNum;
}
public void setSilverTreeNum(Integer silverTreeNum) {
this.silverTreeNum = silverTreeNum;
}
public Integer getGoldTreeNum() {
return goldTreeNum;
}
public void setGoldTreeNum(Integer goldTreeNum) {
this.goldTreeNum = goldTreeNum;
}
public Integer getFarmerNum() {
return farmerNum;
}
public void setFarmerNum(Integer farmerNum) {
this.farmerNum = farmerNum;
}
public Integer getForestStartNum() {
return forestStartNum;
}
public void setForestStartNum(Integer forestStartNum) {
this.forestStartNum = forestStartNum;
}
public Integer getPartnerNum() {
return partnerNum;
}
public void setPartnerNum(Integer partnerNum) {
this.partnerNum = partnerNum;
}
public Integer getReferrerNum() {
return referrerNum;
}
public void setReferrerNum(Integer referrerNum) {
this.referrerNum = referrerNum;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
@Override
public String toString() {
return "userInfo{" +
" id=" + id +
", userId=" + userId +
", password=" + password +
", userLevel=" + userLevel +
", crossBorderLine=" + crossBorderLine +
", idCardNumber=" + idCardNumber +
", fansNickname=" + fansNickname +
", fansId=" + fansId +
", inviteCode=" + inviteCode +
", beLnvitedCode=" + beInvitedCode +
", teamMembersNum=" + teamMembersNum +
", normalUserNum=" + normalUserNum +
", seedlingNum=" + seedlingNum +
", bronzeTreeNum=" + bronzeTreeNum +
", silverTreeNum=" + silverTreeNum +
", goldTreeNum=" + goldTreeNum +
", farmerNum=" + farmerNum +
", forestStartNum=" + forestStartNum +
", partnerNum=" + partnerNum +
", referrerNum=" + referrerNum +
"}";
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment