Skip to content

GitLab

Q
qk_backend
Commit 87d39627 authored by shiyu's avatar shiyu
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 83a9dc44 508916b0
Show whitespace changes
Inline Side-by-side
Showing with 1259 additions and 1659 deletions
ch-dao/src/main/java/com/wwdz/ch/db/dao/ItemManager.java
View file @ 87d39627
...@@ -27,4 +27,6 @@ public interface ItemManager { ...@@ -27,4 +27,6 @@ public interface ItemManager {
long countByCid(Integer cid); long countByCid(Integer cid);
int insert(Item item); int insert(Item item);
int update(Item item);
} }
ch-dao/src/main/java/com/wwdz/ch/db/dao/UserDao.java 0 → 100644
View file @ 87d39627
package com.wwdz.ch.db.dao;
import com.wwdz.ch.db.domain.User;
public interface UserDao {
User queryByOid(String openId);
User queryByMobile(String mobile);
User queryById(Long id);
int insert(User user);
int updateById(User user);
boolean isExistedByMobile(String beforeMobile, String afterMobile);
}
ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/ItemManagerImpl.java
View file @ 87d39627
...@@ -119,4 +119,9 @@ public class ItemManagerImpl implements ItemManager { ...@@ -119,4 +119,9 @@ public class ItemManagerImpl implements ItemManager {
public int insert(Item item) { public int insert(Item item) {
return itemMapper.insert(item); return itemMapper.insert(item);
} }
@Override
public int update(Item item) {
return itemMapper.updateByPrimaryKeySelective(item);
}
} }
ch-dao/src/main/java/com/wwdz/ch/db/dao/impl/UserDaoImpl.java 0 → 100644
View file @ 87d39627
package com.wwdz.ch.db.dao.impl;
import com.wwdz.ch.db.dao.UserDao;
import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.db.domain.UserExample;
import com.wwdz.ch.db.mapper.UserMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import java.util.Date;
@Repository
public class UserDaoImpl implements UserDao {
@Autowired
private UserMapper userMapper;
@Override
public User queryByOid(String openId) {
UserExample example = new UserExample();
example.or().andWeixinOpenidEqualTo(openId).andDeletedEqualTo(false);
return userMapper.selectOneByExample(example);
}
@Override
public User queryByMobile(String mobile) {
UserExample example = new UserExample();
example.or().andMobileEqualTo(mobile).andDeletedEqualTo(false);
return userMapper.selectOneByExample(example);
}
@Override
public User queryById(Long id) {
UserExample example = new UserExample();
example.or().andIdEqualTo(id).andDeletedEqualTo(false);
return userMapper.selectOneByExample(example);
}
@Override
public int insert(User user) {
return userMapper.insert(user);
}
@Override
public int updateById(User user) {
user.setUpdateTime(new Date());
return userMapper.updateByPrimaryKeySelective(user);
}
@Override
public boolean isExistedByMobile(String beforeMobile, String afterMobile) {
UserExample example = new UserExample();
UserExample.Criteria criteria = example.createCriteria();
if (StringUtils.isNotBlank(beforeMobile)) {
criteria.andMobileNotEqualTo(beforeMobile);
}
criteria.andMobileEqualTo(afterMobile);
criteria.andDeletedEqualTo(false);
return userMapper.countByExample(example) > 0;
}
}
ch-dao/src/main/java/com/wwdz/ch/db/domain/Footprint.java
View file @ 87d39627
package com.wwdz.ch.db.domain; package com.wwdz.ch.db.domain;
import java.time.LocalDateTime; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import lombok.Data;
public class Footprint { /**
* @author shiyu
* @date 2023/07/26
*/
@Data
public class Footprint implements Serializable {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint * This field corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -16,217 +23,42 @@ public class Footprint { ...@@ -16,217 +23,42 @@ public class Footprint {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint * This field corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
public static final Boolean IS_DELETED = true; public static final Boolean IS_DELETED = true;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_footprint.id
*
* @mbg.generated
*/
private Long id; private Long id;
/** /**
* * 用户表的用户ID
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_footprint.user_id
*
* @mbg.generated
*/ */
private Long userId; private Long userId;
/** /**
* * 浏览商品ID
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_footprint.coins_id
*
* @mbg.generated
*/ */
private Long coinsId; private Long itemId;
/** /**
* * 创建时间
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_footprint.add_time
*
* @mbg.generated
*/ */
private LocalDateTime addTime; private Date addTime;
/** /**
* * 更新时间
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_footprint.update_time
*
* @mbg.generated
*/ */
private LocalDateTime updateTime; private Date updateTime;
/** /**
* * 逻辑删除
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_footprint.deleted
*
* @mbg.generated
*/ */
private Boolean deleted; private Boolean deleted;
/** private static final long serialVersionUID = 1L;
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_footprint.id
*
* @return the value of dts_footprint.id
*
* @mbg.generated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_footprint.id
*
* @param id the value for dts_footprint.id
*
* @mbg.generated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_footprint.user_id
*
* @return the value of dts_footprint.user_id
*
* @mbg.generated
*/
public Long getUserId() {
return userId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_footprint.user_id
*
* @param userId the value for dts_footprint.user_id
*
* @mbg.generated
*/
public void setUserId(Long userId) {
this.userId = userId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_footprint.coins_id
*
* @return the value of dts_footprint.coins_id
*
* @mbg.generated
*/
public Long getCoinsId() {
return coinsId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_footprint.coins_id
*
* @param coinsId the value for dts_footprint.coins_id
*
* @mbg.generated
*/
public void setCoinsId(Long coinsId) {
this.coinsId = coinsId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_footprint.add_time
*
* @return the value of dts_footprint.add_time
*
* @mbg.generated
*/
public LocalDateTime getAddTime() {
return addTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_footprint.add_time
*
* @param addTime the value for dts_footprint.add_time
*
* @mbg.generated
*/
public void setAddTime(LocalDateTime addTime) {
this.addTime = addTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_footprint.update_time
*
* @return the value of dts_footprint.update_time
*
* @mbg.generated
*/
public LocalDateTime getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_footprint.update_time
*
* @param updateTime the value for dts_footprint.update_time
*
* @mbg.generated
*/
public void setUpdateTime(LocalDateTime updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_footprint.deleted
*
* @return the value of dts_footprint.deleted
*
* @mbg.generated
*/
public Boolean getDeleted() {
return deleted;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_footprint.deleted
*
* @param deleted the value for dts_footprint.deleted
*
* @mbg.generated
*/
public void setDeleted(Boolean deleted) {
this.deleted = deleted;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
...@@ -235,20 +67,15 @@ public class Footprint { ...@@ -235,20 +67,15 @@ public class Footprint {
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", userId=").append(userId); sb.append(", userId=").append(userId);
sb.append(", coinsId=").append(coinsId); sb.append(", itemId=").append(itemId);
sb.append(", addTime=").append(addTime); sb.append(", addTime=").append(addTime);
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);
sb.append(", deleted=").append(deleted); sb.append(", deleted=").append(deleted);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
if (this == that) { if (this == that) {
...@@ -263,25 +90,19 @@ public class Footprint { ...@@ -263,25 +90,19 @@ public class Footprint {
Footprint other = (Footprint) that; Footprint other = (Footprint) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
&& (this.getCoinsId() == null ? other.getCoinsId() == null : this.getCoinsId().equals(other.getCoinsId())) && (this.getItemId() == null ? other.getItemId() == null : this.getItemId().equals(other.getItemId()))
&& (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted()));
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
@Override @Override
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;
int result = 1; int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
result = prime * result + ((getCoinsId() == null) ? 0 : getCoinsId().hashCode()); result = prime * result + ((getItemId() == null) ? 0 : getItemId().hashCode());
result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode());
...@@ -290,7 +111,7 @@ public class Footprint { ...@@ -290,7 +111,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -301,7 +122,7 @@ public class Footprint { ...@@ -301,7 +122,7 @@ public class Footprint {
/** /**
* This enum was generated by MyBatis Generator. * This enum was generated by MyBatis Generator.
* This enum corresponds to the database table dts_footprint * This enum corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -309,14 +130,14 @@ public class Footprint { ...@@ -309,14 +130,14 @@ public class Footprint {
public enum Column { public enum Column {
id("id", "id", "BIGINT", false), id("id", "id", "BIGINT", false),
userId("user_id", "userId", "BIGINT", false), userId("user_id", "userId", "BIGINT", false),
coinsId("coins_id", "coinsId", "BIGINT", false), itemId("item_id", "itemId", "BIGINT", false),
addTime("add_time", "addTime", "TIMESTAMP", false), addTime("add_time", "addTime", "TIMESTAMP", false),
updateTime("update_time", "updateTime", "TIMESTAMP", false), updateTime("update_time", "updateTime", "TIMESTAMP", false),
deleted("deleted", "deleted", "BIT", false); deleted("deleted", "deleted", "BIT", false);
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint * This field corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -325,7 +146,7 @@ public class Footprint { ...@@ -325,7 +146,7 @@ public class Footprint {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint * This field corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -334,7 +155,7 @@ public class Footprint { ...@@ -334,7 +155,7 @@ public class Footprint {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint * This field corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -343,7 +164,7 @@ public class Footprint { ...@@ -343,7 +164,7 @@ public class Footprint {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint * This field corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -352,7 +173,7 @@ public class Footprint { ...@@ -352,7 +173,7 @@ public class Footprint {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint * This field corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -361,7 +182,7 @@ public class Footprint { ...@@ -361,7 +182,7 @@ public class Footprint {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint * This field corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -370,7 +191,7 @@ public class Footprint { ...@@ -370,7 +191,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -381,7 +202,7 @@ public class Footprint { ...@@ -381,7 +202,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -392,7 +213,7 @@ public class Footprint { ...@@ -392,7 +213,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -403,7 +224,7 @@ public class Footprint { ...@@ -403,7 +224,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -414,7 +235,7 @@ public class Footprint { ...@@ -414,7 +235,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -428,7 +249,7 @@ public class Footprint { ...@@ -428,7 +249,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -439,7 +260,7 @@ public class Footprint { ...@@ -439,7 +260,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -450,7 +271,7 @@ public class Footprint { ...@@ -450,7 +271,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -465,7 +286,7 @@ public class Footprint { ...@@ -465,7 +286,7 @@ public class Footprint {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/FootprintExample.java
View file @ 87d39627
package com.wwdz.ch.db.domain; package com.wwdz.ch.db.domain;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
public class FootprintExample { public class FootprintExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint
*
* @mbg.generated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint
*
* @mbg.generated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint
*
* @mbg.generated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public FootprintExample() { public FootprintExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<Criteria>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
...@@ -113,7 +47,7 @@ public class FootprintExample { ...@@ -113,7 +47,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -125,7 +59,7 @@ public class FootprintExample { ...@@ -125,7 +59,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -142,12 +76,6 @@ public class FootprintExample { ...@@ -142,12 +76,6 @@ public class FootprintExample {
return this; return this;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
...@@ -156,23 +84,11 @@ public class FootprintExample { ...@@ -156,23 +84,11 @@ public class FootprintExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(this); Criteria criteria = new Criteria(this);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
...@@ -181,7 +97,7 @@ public class FootprintExample { ...@@ -181,7 +97,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -191,12 +107,6 @@ public class FootprintExample { ...@@ -191,12 +107,6 @@ public class FootprintExample {
return example.createCriteria(); return example.createCriteria();
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table dts_footprint
*
* @mbg.generated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
...@@ -255,7 +165,7 @@ public class FootprintExample { ...@@ -255,7 +165,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -272,7 +182,7 @@ public class FootprintExample { ...@@ -272,7 +182,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -289,7 +199,7 @@ public class FootprintExample { ...@@ -289,7 +199,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -306,7 +216,7 @@ public class FootprintExample { ...@@ -306,7 +216,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -323,7 +233,7 @@ public class FootprintExample { ...@@ -323,7 +233,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -340,7 +250,7 @@ public class FootprintExample { ...@@ -340,7 +250,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -387,7 +297,7 @@ public class FootprintExample { ...@@ -387,7 +297,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -404,7 +314,7 @@ public class FootprintExample { ...@@ -404,7 +314,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -421,7 +331,7 @@ public class FootprintExample { ...@@ -421,7 +331,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -438,7 +348,7 @@ public class FootprintExample { ...@@ -438,7 +348,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -455,7 +365,7 @@ public class FootprintExample { ...@@ -455,7 +365,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -472,7 +382,7 @@ public class FootprintExample { ...@@ -472,7 +382,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -502,135 +412,135 @@ public class FootprintExample { ...@@ -502,135 +412,135 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdIsNull() { public Criteria andItemIdIsNull() {
addCriterion("coins_id is null"); addCriterion("item_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdIsNotNull() { public Criteria andItemIdIsNotNull() {
addCriterion("coins_id is not null"); addCriterion("item_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdEqualTo(Long value) { public Criteria andItemIdEqualTo(Long value) {
addCriterion("coins_id =", value, "coinsId"); addCriterion("item_id =", value, "itemId");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
public Criteria andCoinsIdEqualToColumn(Footprint.Column column) { public Criteria andItemIdEqualToColumn(Footprint.Column column) {
addCriterion(new StringBuilder("coins_id = ").append(column.getEscapedColumnName()).toString()); addCriterion(new StringBuilder("item_id = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdNotEqualTo(Long value) { public Criteria andItemIdNotEqualTo(Long value) {
addCriterion("coins_id <>", value, "coinsId"); addCriterion("item_id <>", value, "itemId");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
public Criteria andCoinsIdNotEqualToColumn(Footprint.Column column) { public Criteria andItemIdNotEqualToColumn(Footprint.Column column) {
addCriterion(new StringBuilder("coins_id <> ").append(column.getEscapedColumnName()).toString()); addCriterion(new StringBuilder("item_id <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdGreaterThan(Long value) { public Criteria andItemIdGreaterThan(Long value) {
addCriterion("coins_id >", value, "coinsId"); addCriterion("item_id >", value, "itemId");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
public Criteria andCoinsIdGreaterThanColumn(Footprint.Column column) { public Criteria andItemIdGreaterThanColumn(Footprint.Column column) {
addCriterion(new StringBuilder("coins_id > ").append(column.getEscapedColumnName()).toString()); addCriterion(new StringBuilder("item_id > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdGreaterThanOrEqualTo(Long value) { public Criteria andItemIdGreaterThanOrEqualTo(Long value) {
addCriterion("coins_id >=", value, "coinsId"); addCriterion("item_id >=", value, "itemId");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
public Criteria andCoinsIdGreaterThanOrEqualToColumn(Footprint.Column column) { public Criteria andItemIdGreaterThanOrEqualToColumn(Footprint.Column column) {
addCriterion(new StringBuilder("coins_id >= ").append(column.getEscapedColumnName()).toString()); addCriterion(new StringBuilder("item_id >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdLessThan(Long value) { public Criteria andItemIdLessThan(Long value) {
addCriterion("coins_id <", value, "coinsId"); addCriterion("item_id <", value, "itemId");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
public Criteria andCoinsIdLessThanColumn(Footprint.Column column) { public Criteria andItemIdLessThanColumn(Footprint.Column column) {
addCriterion(new StringBuilder("coins_id < ").append(column.getEscapedColumnName()).toString()); addCriterion(new StringBuilder("item_id < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdLessThanOrEqualTo(Long value) { public Criteria andItemIdLessThanOrEqualTo(Long value) {
addCriterion("coins_id <=", value, "coinsId"); addCriterion("item_id <=", value, "itemId");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
public Criteria andCoinsIdLessThanOrEqualToColumn(Footprint.Column column) { public Criteria andItemIdLessThanOrEqualToColumn(Footprint.Column column) {
addCriterion(new StringBuilder("coins_id <= ").append(column.getEscapedColumnName()).toString()); addCriterion(new StringBuilder("item_id <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdIn(List<Long> values) { public Criteria andItemIdIn(List<Long> values) {
addCriterion("coins_id in", values, "coinsId"); addCriterion("item_id in", values, "itemId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdNotIn(List<Long> values) { public Criteria andItemIdNotIn(List<Long> values) {
addCriterion("coins_id not in", values, "coinsId"); addCriterion("item_id not in", values, "itemId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdBetween(Long value1, Long value2) { public Criteria andItemIdBetween(Long value1, Long value2) {
addCriterion("coins_id between", value1, value2, "coinsId"); addCriterion("item_id between", value1, value2, "itemId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andCoinsIdNotBetween(Long value1, Long value2) { public Criteria andItemIdNotBetween(Long value1, Long value2) {
addCriterion("coins_id not between", value1, value2, "coinsId"); addCriterion("item_id not between", value1, value2, "itemId");
return (Criteria) this; return (Criteria) this;
} }
...@@ -644,14 +554,14 @@ public class FootprintExample { ...@@ -644,14 +554,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeEqualTo(LocalDateTime value) { public Criteria andAddTimeEqualTo(Date value) {
addCriterion("add_time =", value, "addTime"); addCriterion("add_time =", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -661,14 +571,14 @@ public class FootprintExample { ...@@ -661,14 +571,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeNotEqualTo(LocalDateTime value) { public Criteria andAddTimeNotEqualTo(Date value) {
addCriterion("add_time <>", value, "addTime"); addCriterion("add_time <>", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -678,14 +588,14 @@ public class FootprintExample { ...@@ -678,14 +588,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeGreaterThan(LocalDateTime value) { public Criteria andAddTimeGreaterThan(Date value) {
addCriterion("add_time >", value, "addTime"); addCriterion("add_time >", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -695,14 +605,14 @@ public class FootprintExample { ...@@ -695,14 +605,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeGreaterThanOrEqualTo(LocalDateTime value) { public Criteria andAddTimeGreaterThanOrEqualTo(Date value) {
addCriterion("add_time >=", value, "addTime"); addCriterion("add_time >=", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -712,14 +622,14 @@ public class FootprintExample { ...@@ -712,14 +622,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeLessThan(LocalDateTime value) { public Criteria andAddTimeLessThan(Date value) {
addCriterion("add_time <", value, "addTime"); addCriterion("add_time <", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -729,14 +639,14 @@ public class FootprintExample { ...@@ -729,14 +639,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeLessThanOrEqualTo(LocalDateTime value) { public Criteria andAddTimeLessThanOrEqualTo(Date value) {
addCriterion("add_time <=", value, "addTime"); addCriterion("add_time <=", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -746,22 +656,22 @@ public class FootprintExample { ...@@ -746,22 +656,22 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeIn(List<LocalDateTime> values) { public Criteria andAddTimeIn(List<Date> values) {
addCriterion("add_time in", values, "addTime"); addCriterion("add_time in", values, "addTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeNotIn(List<LocalDateTime> values) { public Criteria andAddTimeNotIn(List<Date> values) {
addCriterion("add_time not in", values, "addTime"); addCriterion("add_time not in", values, "addTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andAddTimeBetween(Date value1, Date value2) {
addCriterion("add_time between", value1, value2, "addTime"); addCriterion("add_time between", value1, value2, "addTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andAddTimeNotBetween(Date value1, Date value2) {
addCriterion("add_time not between", value1, value2, "addTime"); addCriterion("add_time not between", value1, value2, "addTime");
return (Criteria) this; return (Criteria) this;
} }
...@@ -776,14 +686,14 @@ public class FootprintExample { ...@@ -776,14 +686,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeEqualTo(LocalDateTime value) { public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime"); addCriterion("update_time =", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -793,14 +703,14 @@ public class FootprintExample { ...@@ -793,14 +703,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeNotEqualTo(LocalDateTime value) { public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime"); addCriterion("update_time <>", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -810,14 +720,14 @@ public class FootprintExample { ...@@ -810,14 +720,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeGreaterThan(LocalDateTime value) { public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime"); addCriterion("update_time >", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -827,14 +737,14 @@ public class FootprintExample { ...@@ -827,14 +737,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeGreaterThanOrEqualTo(LocalDateTime value) { public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime"); addCriterion("update_time >=", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -844,14 +754,14 @@ public class FootprintExample { ...@@ -844,14 +754,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeLessThan(LocalDateTime value) { public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime"); addCriterion("update_time <", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -861,14 +771,14 @@ public class FootprintExample { ...@@ -861,14 +771,14 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeLessThanOrEqualTo(LocalDateTime value) { public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime"); addCriterion("update_time <=", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -878,22 +788,22 @@ public class FootprintExample { ...@@ -878,22 +788,22 @@ public class FootprintExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeIn(List<LocalDateTime> values) { public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime"); addCriterion("update_time in", values, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeNotIn(List<LocalDateTime> values) { public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime"); addCriterion("update_time not in", values, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime"); addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime"); addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
...@@ -915,7 +825,7 @@ public class FootprintExample { ...@@ -915,7 +825,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -932,7 +842,7 @@ public class FootprintExample { ...@@ -932,7 +842,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -949,7 +859,7 @@ public class FootprintExample { ...@@ -949,7 +859,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -966,7 +876,7 @@ public class FootprintExample { ...@@ -966,7 +876,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -983,7 +893,7 @@ public class FootprintExample { ...@@ -983,7 +893,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1000,7 +910,7 @@ public class FootprintExample { ...@@ -1000,7 +910,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1031,16 +941,10 @@ public class FootprintExample { ...@@ -1031,16 +941,10 @@ public class FootprintExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table dts_footprint
*
* @mbg.generated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_footprint * This field corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1049,7 +953,7 @@ public class FootprintExample { ...@@ -1049,7 +953,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1061,7 +965,7 @@ public class FootprintExample { ...@@ -1061,7 +965,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1072,7 +976,7 @@ public class FootprintExample { ...@@ -1072,7 +976,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1086,7 +990,7 @@ public class FootprintExample { ...@@ -1086,7 +990,7 @@ public class FootprintExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1097,7 +1001,7 @@ public class FootprintExample { ...@@ -1097,7 +1001,7 @@ public class FootprintExample {
/** /**
* This interface was generated by MyBatis Generator. * This interface was generated by MyBatis Generator.
* This interface corresponds to the database table dts_footprint * This interface corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1105,7 +1009,7 @@ public class FootprintExample { ...@@ -1105,7 +1009,7 @@ public class FootprintExample {
public interface ICriteriaAdd { public interface ICriteriaAdd {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1114,12 +1018,6 @@ public class FootprintExample { ...@@ -1114,12 +1018,6 @@ public class FootprintExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table dts_footprint
*
* @mbg.generated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/User.java
View file @ 87d39627
package com.wwdz.ch.db.domain; package com.wwdz.ch.db.domain;
import java.time.LocalDate; import lombok.Data;
import java.time.LocalDateTime;
import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
public class User { /**
* @author shiyu
* @date 2023/07/26
*/
@Data
public class User implements Serializable {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user * This field corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -17,580 +24,99 @@ public class User { ...@@ -17,580 +24,99 @@ public class User {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user * This field corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
public static final Boolean IS_DELETED = true; public static final Boolean IS_DELETED = true;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.id
*
* @mbg.generated
*/
private Long id; private Long id;
/** /**
* * 用户名称
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.username
*
* @mbg.generated
*/ */
private String username; private String username;
/** /**
* * 用户密码
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.password
*
* @mbg.generated
*/ */
private String password; private String password;
/** /**
* * 性别：0 未知， 1男， 1 女
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.gender
*
* @mbg.generated
*/ */
private Byte gender; private Byte gender;
/** /**
* * 生日
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.birthday
*
* @mbg.generated
*/ */
private LocalDate birthday; private Date birthday;
/** /**
* * 最近一次登录时间
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.last_login_time
*
* @mbg.generated
*/ */
private LocalDateTime lastLoginTime; private Date lastLoginTime;
/** /**
* * 最近一次登录IP地址
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.last_login_ip
*
* @mbg.generated
*/ */
private String lastLoginIp; private String lastLoginIp;
/** /**
* * 用户层级 0 普通用户，1 VIP用户，2 区域代理用户
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.user_level
*
* @mbg.generated
*/ */
private Byte userLevel; private Byte userLevel;
/** /**
* * 用户昵称或网络名称
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.nickname
*
* @mbg.generated
*/ */
private String nickname; private String nickname;
/** /**
* * 用户手机号码
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.mobile
*
* @mbg.generated
*/ */
private String mobile; private String mobile;
/** /**
* * 用户头像图片
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.avatar
*
* @mbg.generated
*/ */
private String avatar; private String avatar;
/** /**
* * 微信登录openid
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.weixin_openid
*
* @mbg.generated
*/ */
private String weixinOpenid; private String weixinOpenid;
/** /**
* * 微信号
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.status
*
* @mbg.generated
*/
private Byte status;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.add_time
*
* @mbg.generated
*/
private LocalDateTime addTime;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.update_time
*
* @mbg.generated
*/
private LocalDateTime updateTime;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.deleted
*
* @mbg.generated
*/
private Boolean deleted;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column dts_user.share_user_id
*
* @mbg.generated
*/
private Long shareUserId;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.id
*
* @return the value of dts_user.id
*
* @mbg.generated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.id
*
* @param id the value for dts_user.id
*
* @mbg.generated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.username
*
* @return the value of dts_user.username
*
* @mbg.generated
*/
public String getUsername() {
return username;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.username
*
* @param username the value for dts_user.username
*
* @mbg.generated
*/ */
public void setUsername(String username) { private String wechatId;
this.username = username;
}
/** /**
* This method was generated by MyBatis Generator. * 0 可用, 1 禁用, 2 注销
* This method returns the value of the database column dts_user.password
*
* @return the value of dts_user.password
*
* @mbg.generated
*/ */
public String getPassword() { private Byte status;
return password;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.password
*
* @param password the value for dts_user.password
*
* @mbg.generated
*/
public void setPassword(String password) {
this.password = password;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.gender
*
* @return the value of dts_user.gender
*
* @mbg.generated
*/
public Byte getGender() {
return gender;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.gender
*
* @param gender the value for dts_user.gender
*
* @mbg.generated
*/
public void setGender(Byte gender) {
this.gender = gender;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.birthday
*
* @return the value of dts_user.birthday
*
* @mbg.generated
*/
public LocalDate getBirthday() {
return birthday;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.birthday
*
* @param birthday the value for dts_user.birthday
*
* @mbg.generated
*/
public void setBirthday(LocalDate birthday) {
this.birthday = birthday;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.last_login_time
*
* @return the value of dts_user.last_login_time
*
* @mbg.generated
*/
public LocalDateTime getLastLoginTime() {
return lastLoginTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.last_login_time
*
* @param lastLoginTime the value for dts_user.last_login_time
*
* @mbg.generated
*/
public void setLastLoginTime(LocalDateTime lastLoginTime) {
this.lastLoginTime = lastLoginTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.last_login_ip
*
* @return the value of dts_user.last_login_ip
*
* @mbg.generated
*/
public String getLastLoginIp() {
return lastLoginIp;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.last_login_ip
*
* @param lastLoginIp the value for dts_user.last_login_ip
*
* @mbg.generated
*/
public void setLastLoginIp(String lastLoginIp) {
this.lastLoginIp = lastLoginIp;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.user_level
*
* @return the value of dts_user.user_level
*
* @mbg.generated
*/
public Byte getUserLevel() {
return userLevel;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.user_level
*
* @param userLevel the value for dts_user.user_level
*
* @mbg.generated
*/
public void setUserLevel(Byte userLevel) {
this.userLevel = userLevel;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.nickname
*
* @return the value of dts_user.nickname
*
* @mbg.generated
*/
public String getNickname() {
return nickname;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.nickname
*
* @param nickname the value for dts_user.nickname
*
* @mbg.generated
*/
public void setNickname(String nickname) {
this.nickname = nickname;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.mobile
*
* @return the value of dts_user.mobile
*
* @mbg.generated
*/
public String getMobile() {
return mobile;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.mobile
*
* @param mobile the value for dts_user.mobile
*
* @mbg.generated
*/
public void setMobile(String mobile) {
this.mobile = mobile;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.avatar
*
* @return the value of dts_user.avatar
*
* @mbg.generated
*/
public String getAvatar() {
return avatar;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.avatar
*
* @param avatar the value for dts_user.avatar
*
* @mbg.generated
*/
public void setAvatar(String avatar) {
this.avatar = avatar;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.weixin_openid
*
* @return the value of dts_user.weixin_openid
*
* @mbg.generated
*/
public String getWeixinOpenid() {
return weixinOpenid;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.weixin_openid
*
* @param weixinOpenid the value for dts_user.weixin_openid
*
* @mbg.generated
*/
public void setWeixinOpenid(String weixinOpenid) {
this.weixinOpenid = weixinOpenid;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.status
*
* @return the value of dts_user.status
*
* @mbg.generated
*/
public Byte getStatus() {
return status;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.status
*
* @param status the value for dts_user.status
*
* @mbg.generated
*/
public void setStatus(Byte status) {
this.status = status;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.add_time
*
* @return the value of dts_user.add_time
*
* @mbg.generated
*/
public LocalDateTime getAddTime() {
return addTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.add_time
*
* @param addTime the value for dts_user.add_time
*
* @mbg.generated
*/
public void setAddTime(LocalDateTime addTime) {
this.addTime = addTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.update_time
*
* @return the value of dts_user.update_time
*
* @mbg.generated
*/
public LocalDateTime getUpdateTime() {
return updateTime;
}
/** /**
* This method was generated by MyBatis Generator. * 创建时间
* This method sets the value of the database column dts_user.update_time
*
* @param updateTime the value for dts_user.update_time
*
* @mbg.generated
*/ */
public void setUpdateTime(LocalDateTime updateTime) { private Date addTime;
this.updateTime = updateTime;
}
/** /**
* This method was generated by MyBatis Generator. * 更新时间
* This method returns the value of the database column dts_user.deleted
*
* @return the value of dts_user.deleted
*
* @mbg.generated
*/ */
public Boolean getDeleted() { private Date updateTime;
return deleted;
}
/** /**
* This method was generated by MyBatis Generator. * 逻辑删除
* This method sets the value of the database column dts_user.deleted
*
* @param deleted the value for dts_user.deleted
*
* @mbg.generated
*/ */
public void setDeleted(Boolean deleted) { private Boolean deleted;
this.deleted = deleted;
}
/** private Long shareUserId;
* This method was generated by MyBatis Generator.
* This method returns the value of the database column dts_user.share_user_id
*
* @return the value of dts_user.share_user_id
*
* @mbg.generated
*/
public Long getShareUserId() {
return shareUserId;
}
/** private static final long serialVersionUID = 1L;
* This method was generated by MyBatis Generator.
* This method sets the value of the database column dts_user.share_user_id
*
* @param shareUserId the value for dts_user.share_user_id
*
* @mbg.generated
*/
public void setShareUserId(Long shareUserId) {
this.shareUserId = shareUserId;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
@Override @Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
...@@ -609,21 +135,17 @@ public class User { ...@@ -609,21 +135,17 @@ public class User {
sb.append(", mobile=").append(mobile); sb.append(", mobile=").append(mobile);
sb.append(", avatar=").append(avatar); sb.append(", avatar=").append(avatar);
sb.append(", weixinOpenid=").append(weixinOpenid); sb.append(", weixinOpenid=").append(weixinOpenid);
sb.append(", wechatId=").append(wechatId);
sb.append(", status=").append(status); sb.append(", status=").append(status);
sb.append(", addTime=").append(addTime); sb.append(", addTime=").append(addTime);
sb.append(", updateTime=").append(updateTime); sb.append(", updateTime=").append(updateTime);
sb.append(", deleted=").append(deleted); sb.append(", deleted=").append(deleted);
sb.append(", shareUserId=").append(shareUserId); sb.append(", shareUserId=").append(shareUserId);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]"); sb.append("]");
return sb.toString(); return sb.toString();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
@Override @Override
public boolean equals(Object that) { public boolean equals(Object that) {
if (this == that) { if (this == that) {
...@@ -648,6 +170,7 @@ public class User { ...@@ -648,6 +170,7 @@ public class User {
&& (this.getMobile() == null ? other.getMobile() == null : this.getMobile().equals(other.getMobile())) && (this.getMobile() == null ? other.getMobile() == null : this.getMobile().equals(other.getMobile()))
&& (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar())) && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar()))
&& (this.getWeixinOpenid() == null ? other.getWeixinOpenid() == null : this.getWeixinOpenid().equals(other.getWeixinOpenid())) && (this.getWeixinOpenid() == null ? other.getWeixinOpenid() == null : this.getWeixinOpenid().equals(other.getWeixinOpenid()))
&& (this.getWechatId() == null ? other.getWechatId() == null : this.getWechatId().equals(other.getWechatId()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
...@@ -655,12 +178,6 @@ public class User { ...@@ -655,12 +178,6 @@ public class User {
&& (this.getShareUserId() == null ? other.getShareUserId() == null : this.getShareUserId().equals(other.getShareUserId())); && (this.getShareUserId() == null ? other.getShareUserId() == null : this.getShareUserId().equals(other.getShareUserId()));
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
@Override @Override
public int hashCode() { public int hashCode() {
final int prime = 31; final int prime = 31;
...@@ -677,6 +194,7 @@ public class User { ...@@ -677,6 +194,7 @@ public class User {
result = prime * result + ((getMobile() == null) ? 0 : getMobile().hashCode()); result = prime * result + ((getMobile() == null) ? 0 : getMobile().hashCode());
result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode()); result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode());
result = prime * result + ((getWeixinOpenid() == null) ? 0 : getWeixinOpenid().hashCode()); result = prime * result + ((getWeixinOpenid() == null) ? 0 : getWeixinOpenid().hashCode());
result = prime * result + ((getWechatId() == null) ? 0 : getWechatId().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
...@@ -687,7 +205,7 @@ public class User { ...@@ -687,7 +205,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -698,7 +216,7 @@ public class User { ...@@ -698,7 +216,7 @@ public class User {
/** /**
* This enum was generated by MyBatis Generator. * This enum was generated by MyBatis Generator.
* This enum corresponds to the database table dts_user * This enum corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -716,6 +234,7 @@ public class User { ...@@ -716,6 +234,7 @@ public class User {
mobile("mobile", "mobile", "VARCHAR", false), mobile("mobile", "mobile", "VARCHAR", false),
avatar("avatar", "avatar", "VARCHAR", false), avatar("avatar", "avatar", "VARCHAR", false),
weixinOpenid("weixin_openid", "weixinOpenid", "VARCHAR", false), weixinOpenid("weixin_openid", "weixinOpenid", "VARCHAR", false),
wechatId("wechat_id", "wechatId", "VARCHAR", false),
status("status", "status", "TINYINT", true), status("status", "status", "TINYINT", true),
addTime("add_time", "addTime", "TIMESTAMP", false), addTime("add_time", "addTime", "TIMESTAMP", false),
updateTime("update_time", "updateTime", "TIMESTAMP", false), updateTime("update_time", "updateTime", "TIMESTAMP", false),
...@@ -724,7 +243,7 @@ public class User { ...@@ -724,7 +243,7 @@ public class User {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user * This field corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -733,7 +252,7 @@ public class User { ...@@ -733,7 +252,7 @@ public class User {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user * This field corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -742,7 +261,7 @@ public class User { ...@@ -742,7 +261,7 @@ public class User {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user * This field corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -751,7 +270,7 @@ public class User { ...@@ -751,7 +270,7 @@ public class User {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user * This field corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -760,7 +279,7 @@ public class User { ...@@ -760,7 +279,7 @@ public class User {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user * This field corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -769,7 +288,7 @@ public class User { ...@@ -769,7 +288,7 @@ public class User {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user * This field corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -778,7 +297,7 @@ public class User { ...@@ -778,7 +297,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -789,7 +308,7 @@ public class User { ...@@ -789,7 +308,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -800,7 +319,7 @@ public class User { ...@@ -800,7 +319,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -811,7 +330,7 @@ public class User { ...@@ -811,7 +330,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -822,7 +341,7 @@ public class User { ...@@ -822,7 +341,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -836,7 +355,7 @@ public class User { ...@@ -836,7 +355,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -847,7 +366,7 @@ public class User { ...@@ -847,7 +366,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -858,7 +377,7 @@ public class User { ...@@ -858,7 +377,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -873,7 +392,7 @@ public class User { ...@@ -873,7 +392,7 @@ public class User {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/UserExample.java
View file @ 87d39627
package com.wwdz.ch.db.domain; package com.wwdz.ch.db.domain;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List; import java.util.List;
public class UserExample { public class UserExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user
*
* @mbg.generated
*/
protected String orderByClause; protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user
*
* @mbg.generated
*/
protected boolean distinct; protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user
*
* @mbg.generated
*/
protected List<Criteria> oredCriteria; protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public UserExample() { public UserExample() {
oredCriteria = new ArrayList<Criteria>(); oredCriteria = new ArrayList<Criteria>();
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public void setOrderByClause(String orderByClause) { public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause; this.orderByClause = orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public String getOrderByClause() { public String getOrderByClause() {
return orderByClause; return orderByClause;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public void setDistinct(boolean distinct) { public void setDistinct(boolean distinct) {
this.distinct = distinct; this.distinct = distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public boolean isDistinct() { public boolean isDistinct() {
return distinct; return distinct;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public List<Criteria> getOredCriteria() { public List<Criteria> getOredCriteria() {
return oredCriteria; return oredCriteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public void or(Criteria criteria) { public void or(Criteria criteria) {
oredCriteria.add(criteria); oredCriteria.add(criteria);
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public Criteria or() { public Criteria or() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria); oredCriteria.add(criteria);
...@@ -114,7 +48,7 @@ public class UserExample { ...@@ -114,7 +48,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -126,7 +60,7 @@ public class UserExample { ...@@ -126,7 +60,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -143,12 +77,6 @@ public class UserExample { ...@@ -143,12 +77,6 @@ public class UserExample {
return this; return this;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public Criteria createCriteria() { public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal(); Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) { if (oredCriteria.size() == 0) {
...@@ -157,23 +85,11 @@ public class UserExample { ...@@ -157,23 +85,11 @@ public class UserExample {
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
protected Criteria createCriteriaInternal() { protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria(this); Criteria criteria = new Criteria(this);
return criteria; return criteria;
} }
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
public void clear() { public void clear() {
oredCriteria.clear(); oredCriteria.clear();
orderByClause = null; orderByClause = null;
...@@ -182,7 +98,7 @@ public class UserExample { ...@@ -182,7 +98,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -192,12 +108,6 @@ public class UserExample { ...@@ -192,12 +108,6 @@ public class UserExample {
return example.createCriteria(); return example.createCriteria();
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table dts_user
*
* @mbg.generated
*/
protected abstract static class GeneratedCriteria { protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria; protected List<Criterion> criteria;
...@@ -239,6 +149,32 @@ public class UserExample { ...@@ -239,6 +149,32 @@ public class UserExample {
criteria.add(new Criterion(condition, value1, value2)); criteria.add(new Criterion(condition, value1, value2));
} }
protected void addCriterionForJDBCDate(String condition, Date value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
addCriterion(condition, new java.sql.Date(value.getTime()), property);
}
protected void addCriterionForJDBCDate(String condition, List<Date> values, String property) {
if (values == null || values.size() == 0) {
throw new RuntimeException("Value list for " + property + " cannot be null or empty");
}
List<java.sql.Date> dateList = new ArrayList<java.sql.Date>();
Iterator<Date> iter = values.iterator();
while (iter.hasNext()) {
dateList.add(new java.sql.Date(iter.next().getTime()));
}
addCriterion(condition, dateList, property);
}
protected void addCriterionForJDBCDate(String condition, Date value1, Date value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
addCriterion(condition, new java.sql.Date(value1.getTime()), new java.sql.Date(value2.getTime()), property);
}
public Criteria andIdIsNull() { public Criteria andIdIsNull() {
addCriterion("id is null"); addCriterion("id is null");
return (Criteria) this; return (Criteria) this;
...@@ -256,7 +192,7 @@ public class UserExample { ...@@ -256,7 +192,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -273,7 +209,7 @@ public class UserExample { ...@@ -273,7 +209,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -290,7 +226,7 @@ public class UserExample { ...@@ -290,7 +226,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -307,7 +243,7 @@ public class UserExample { ...@@ -307,7 +243,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -324,7 +260,7 @@ public class UserExample { ...@@ -324,7 +260,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -341,7 +277,7 @@ public class UserExample { ...@@ -341,7 +277,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -388,7 +324,7 @@ public class UserExample { ...@@ -388,7 +324,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -405,7 +341,7 @@ public class UserExample { ...@@ -405,7 +341,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -422,7 +358,7 @@ public class UserExample { ...@@ -422,7 +358,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -439,7 +375,7 @@ public class UserExample { ...@@ -439,7 +375,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -456,7 +392,7 @@ public class UserExample { ...@@ -456,7 +392,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -473,7 +409,7 @@ public class UserExample { ...@@ -473,7 +409,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -530,7 +466,7 @@ public class UserExample { ...@@ -530,7 +466,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -547,7 +483,7 @@ public class UserExample { ...@@ -547,7 +483,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -564,7 +500,7 @@ public class UserExample { ...@@ -564,7 +500,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -581,7 +517,7 @@ public class UserExample { ...@@ -581,7 +517,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -598,7 +534,7 @@ public class UserExample { ...@@ -598,7 +534,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -615,7 +551,7 @@ public class UserExample { ...@@ -615,7 +551,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -672,7 +608,7 @@ public class UserExample { ...@@ -672,7 +608,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -689,7 +625,7 @@ public class UserExample { ...@@ -689,7 +625,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -706,7 +642,7 @@ public class UserExample { ...@@ -706,7 +642,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -723,7 +659,7 @@ public class UserExample { ...@@ -723,7 +659,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -740,7 +676,7 @@ public class UserExample { ...@@ -740,7 +676,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -757,7 +693,7 @@ public class UserExample { ...@@ -757,7 +693,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -797,14 +733,14 @@ public class UserExample { ...@@ -797,14 +733,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayEqualTo(LocalDate value) { public Criteria andBirthdayEqualTo(Date value) {
addCriterion("birthday =", value, "birthday"); addCriterionForJDBCDate("birthday =", value, "birthday");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -814,14 +750,14 @@ public class UserExample { ...@@ -814,14 +750,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayNotEqualTo(LocalDate value) { public Criteria andBirthdayNotEqualTo(Date value) {
addCriterion("birthday <>", value, "birthday"); addCriterionForJDBCDate("birthday <>", value, "birthday");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -831,14 +767,14 @@ public class UserExample { ...@@ -831,14 +767,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayGreaterThan(LocalDate value) { public Criteria andBirthdayGreaterThan(Date value) {
addCriterion("birthday >", value, "birthday"); addCriterionForJDBCDate("birthday >", value, "birthday");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -848,14 +784,14 @@ public class UserExample { ...@@ -848,14 +784,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayGreaterThanOrEqualTo(LocalDate value) { public Criteria andBirthdayGreaterThanOrEqualTo(Date value) {
addCriterion("birthday >=", value, "birthday"); addCriterionForJDBCDate("birthday >=", value, "birthday");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -865,14 +801,14 @@ public class UserExample { ...@@ -865,14 +801,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayLessThan(LocalDate value) { public Criteria andBirthdayLessThan(Date value) {
addCriterion("birthday <", value, "birthday"); addCriterionForJDBCDate("birthday <", value, "birthday");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -882,14 +818,14 @@ public class UserExample { ...@@ -882,14 +818,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayLessThanOrEqualTo(LocalDate value) { public Criteria andBirthdayLessThanOrEqualTo(Date value) {
addCriterion("birthday <=", value, "birthday"); addCriterionForJDBCDate("birthday <=", value, "birthday");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -899,23 +835,23 @@ public class UserExample { ...@@ -899,23 +835,23 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayIn(List<LocalDate> values) { public Criteria andBirthdayIn(List<Date> values) {
addCriterion("birthday in", values, "birthday"); addCriterionForJDBCDate("birthday in", values, "birthday");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayNotIn(List<LocalDate> values) { public Criteria andBirthdayNotIn(List<Date> values) {
addCriterion("birthday not in", values, "birthday"); addCriterionForJDBCDate("birthday not in", values, "birthday");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayBetween(LocalDate value1, LocalDate value2) { public Criteria andBirthdayBetween(Date value1, Date value2) {
addCriterion("birthday between", value1, value2, "birthday"); addCriterionForJDBCDate("birthday between", value1, value2, "birthday");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andBirthdayNotBetween(LocalDate value1, LocalDate value2) { public Criteria andBirthdayNotBetween(Date value1, Date value2) {
addCriterion("birthday not between", value1, value2, "birthday"); addCriterionForJDBCDate("birthday not between", value1, value2, "birthday");
return (Criteria) this; return (Criteria) this;
} }
...@@ -929,14 +865,14 @@ public class UserExample { ...@@ -929,14 +865,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeEqualTo(LocalDateTime value) { public Criteria andLastLoginTimeEqualTo(Date value) {
addCriterion("last_login_time =", value, "lastLoginTime"); addCriterion("last_login_time =", value, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -946,14 +882,14 @@ public class UserExample { ...@@ -946,14 +882,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeNotEqualTo(LocalDateTime value) { public Criteria andLastLoginTimeNotEqualTo(Date value) {
addCriterion("last_login_time <>", value, "lastLoginTime"); addCriterion("last_login_time <>", value, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -963,14 +899,14 @@ public class UserExample { ...@@ -963,14 +899,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeGreaterThan(LocalDateTime value) { public Criteria andLastLoginTimeGreaterThan(Date value) {
addCriterion("last_login_time >", value, "lastLoginTime"); addCriterion("last_login_time >", value, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -980,14 +916,14 @@ public class UserExample { ...@@ -980,14 +916,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeGreaterThanOrEqualTo(LocalDateTime value) { public Criteria andLastLoginTimeGreaterThanOrEqualTo(Date value) {
addCriterion("last_login_time >=", value, "lastLoginTime"); addCriterion("last_login_time >=", value, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -997,14 +933,14 @@ public class UserExample { ...@@ -997,14 +933,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeLessThan(LocalDateTime value) { public Criteria andLastLoginTimeLessThan(Date value) {
addCriterion("last_login_time <", value, "lastLoginTime"); addCriterion("last_login_time <", value, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1014,14 +950,14 @@ public class UserExample { ...@@ -1014,14 +950,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeLessThanOrEqualTo(LocalDateTime value) { public Criteria andLastLoginTimeLessThanOrEqualTo(Date value) {
addCriterion("last_login_time <=", value, "lastLoginTime"); addCriterion("last_login_time <=", value, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1031,22 +967,22 @@ public class UserExample { ...@@ -1031,22 +967,22 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeIn(List<LocalDateTime> values) { public Criteria andLastLoginTimeIn(List<Date> values) {
addCriterion("last_login_time in", values, "lastLoginTime"); addCriterion("last_login_time in", values, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeNotIn(List<LocalDateTime> values) { public Criteria andLastLoginTimeNotIn(List<Date> values) {
addCriterion("last_login_time not in", values, "lastLoginTime"); addCriterion("last_login_time not in", values, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andLastLoginTimeBetween(Date value1, Date value2) {
addCriterion("last_login_time between", value1, value2, "lastLoginTime"); addCriterion("last_login_time between", value1, value2, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLastLoginTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andLastLoginTimeNotBetween(Date value1, Date value2) {
addCriterion("last_login_time not between", value1, value2, "lastLoginTime"); addCriterion("last_login_time not between", value1, value2, "lastLoginTime");
return (Criteria) this; return (Criteria) this;
} }
...@@ -1068,7 +1004,7 @@ public class UserExample { ...@@ -1068,7 +1004,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1085,7 +1021,7 @@ public class UserExample { ...@@ -1085,7 +1021,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1102,7 +1038,7 @@ public class UserExample { ...@@ -1102,7 +1038,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1119,7 +1055,7 @@ public class UserExample { ...@@ -1119,7 +1055,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1136,7 +1072,7 @@ public class UserExample { ...@@ -1136,7 +1072,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1153,7 +1089,7 @@ public class UserExample { ...@@ -1153,7 +1089,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1210,7 +1146,7 @@ public class UserExample { ...@@ -1210,7 +1146,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1227,7 +1163,7 @@ public class UserExample { ...@@ -1227,7 +1163,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1244,7 +1180,7 @@ public class UserExample { ...@@ -1244,7 +1180,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1261,7 +1197,7 @@ public class UserExample { ...@@ -1261,7 +1197,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1278,7 +1214,7 @@ public class UserExample { ...@@ -1278,7 +1214,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1295,7 +1231,7 @@ public class UserExample { ...@@ -1295,7 +1231,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1342,7 +1278,7 @@ public class UserExample { ...@@ -1342,7 +1278,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1359,7 +1295,7 @@ public class UserExample { ...@@ -1359,7 +1295,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1376,7 +1312,7 @@ public class UserExample { ...@@ -1376,7 +1312,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1393,7 +1329,7 @@ public class UserExample { ...@@ -1393,7 +1329,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1410,7 +1346,7 @@ public class UserExample { ...@@ -1410,7 +1346,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1427,7 +1363,7 @@ public class UserExample { ...@@ -1427,7 +1363,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1484,7 +1420,7 @@ public class UserExample { ...@@ -1484,7 +1420,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1501,7 +1437,7 @@ public class UserExample { ...@@ -1501,7 +1437,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1518,7 +1454,7 @@ public class UserExample { ...@@ -1518,7 +1454,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1535,7 +1471,7 @@ public class UserExample { ...@@ -1535,7 +1471,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1552,7 +1488,7 @@ public class UserExample { ...@@ -1552,7 +1488,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1569,7 +1505,7 @@ public class UserExample { ...@@ -1569,7 +1505,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1626,7 +1562,7 @@ public class UserExample { ...@@ -1626,7 +1562,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1643,7 +1579,7 @@ public class UserExample { ...@@ -1643,7 +1579,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1660,7 +1596,7 @@ public class UserExample { ...@@ -1660,7 +1596,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1677,7 +1613,7 @@ public class UserExample { ...@@ -1677,7 +1613,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1694,7 +1630,7 @@ public class UserExample { ...@@ -1694,7 +1630,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1711,7 +1647,7 @@ public class UserExample { ...@@ -1711,7 +1647,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1768,7 +1704,7 @@ public class UserExample { ...@@ -1768,7 +1704,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1785,7 +1721,7 @@ public class UserExample { ...@@ -1785,7 +1721,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1802,7 +1738,7 @@ public class UserExample { ...@@ -1802,7 +1738,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1819,7 +1755,7 @@ public class UserExample { ...@@ -1819,7 +1755,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1836,7 +1772,7 @@ public class UserExample { ...@@ -1836,7 +1772,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1853,7 +1789,7 @@ public class UserExample { ...@@ -1853,7 +1789,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1893,6 +1829,148 @@ public class UserExample { ...@@ -1893,6 +1829,148 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andWechatIdIsNull() {
addCriterion("wechat_id is null");
return (Criteria) this;
}
public Criteria andWechatIdIsNotNull() {
addCriterion("wechat_id is not null");
return (Criteria) this;
}
public Criteria andWechatIdEqualTo(String value) {
addCriterion("wechat_id =", value, "wechatId");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andWechatIdEqualToColumn(User.Column column) {
addCriterion(new StringBuilder("wechat_id = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andWechatIdNotEqualTo(String value) {
addCriterion("wechat_id <>", value, "wechatId");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andWechatIdNotEqualToColumn(User.Column column) {
addCriterion(new StringBuilder("wechat_id <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andWechatIdGreaterThan(String value) {
addCriterion("wechat_id >", value, "wechatId");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andWechatIdGreaterThanColumn(User.Column column) {
addCriterion(new StringBuilder("wechat_id > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andWechatIdGreaterThanOrEqualTo(String value) {
addCriterion("wechat_id >=", value, "wechatId");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andWechatIdGreaterThanOrEqualToColumn(User.Column column) {
addCriterion(new StringBuilder("wechat_id >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andWechatIdLessThan(String value) {
addCriterion("wechat_id <", value, "wechatId");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andWechatIdLessThanColumn(User.Column column) {
addCriterion(new StringBuilder("wechat_id < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andWechatIdLessThanOrEqualTo(String value) {
addCriterion("wechat_id <=", value, "wechatId");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table user
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andWechatIdLessThanOrEqualToColumn(User.Column column) {
addCriterion(new StringBuilder("wechat_id <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andWechatIdLike(String value) {
addCriterion("wechat_id like", value, "wechatId");
return (Criteria) this;
}
public Criteria andWechatIdNotLike(String value) {
addCriterion("wechat_id not like", value, "wechatId");
return (Criteria) this;
}
public Criteria andWechatIdIn(List<String> values) {
addCriterion("wechat_id in", values, "wechatId");
return (Criteria) this;
}
public Criteria andWechatIdNotIn(List<String> values) {
addCriterion("wechat_id not in", values, "wechatId");
return (Criteria) this;
}
public Criteria andWechatIdBetween(String value1, String value2) {
addCriterion("wechat_id between", value1, value2, "wechatId");
return (Criteria) this;
}
public Criteria andWechatIdNotBetween(String value1, String value2) {
addCriterion("wechat_id not between", value1, value2, "wechatId");
return (Criteria) this;
}
public Criteria andStatusIsNull() { public Criteria andStatusIsNull() {
addCriterion("`status` is null"); addCriterion("`status` is null");
return (Criteria) this; return (Criteria) this;
...@@ -1910,7 +1988,7 @@ public class UserExample { ...@@ -1910,7 +1988,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1927,7 +2005,7 @@ public class UserExample { ...@@ -1927,7 +2005,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1944,7 +2022,7 @@ public class UserExample { ...@@ -1944,7 +2022,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1961,7 +2039,7 @@ public class UserExample { ...@@ -1961,7 +2039,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1978,7 +2056,7 @@ public class UserExample { ...@@ -1978,7 +2056,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -1995,7 +2073,7 @@ public class UserExample { ...@@ -1995,7 +2073,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2035,14 +2113,14 @@ public class UserExample { ...@@ -2035,14 +2113,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeEqualTo(LocalDateTime value) { public Criteria andAddTimeEqualTo(Date value) {
addCriterion("add_time =", value, "addTime"); addCriterion("add_time =", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2052,14 +2130,14 @@ public class UserExample { ...@@ -2052,14 +2130,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeNotEqualTo(LocalDateTime value) { public Criteria andAddTimeNotEqualTo(Date value) {
addCriterion("add_time <>", value, "addTime"); addCriterion("add_time <>", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2069,14 +2147,14 @@ public class UserExample { ...@@ -2069,14 +2147,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeGreaterThan(LocalDateTime value) { public Criteria andAddTimeGreaterThan(Date value) {
addCriterion("add_time >", value, "addTime"); addCriterion("add_time >", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2086,14 +2164,14 @@ public class UserExample { ...@@ -2086,14 +2164,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeGreaterThanOrEqualTo(LocalDateTime value) { public Criteria andAddTimeGreaterThanOrEqualTo(Date value) {
addCriterion("add_time >=", value, "addTime"); addCriterion("add_time >=", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2103,14 +2181,14 @@ public class UserExample { ...@@ -2103,14 +2181,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeLessThan(LocalDateTime value) { public Criteria andAddTimeLessThan(Date value) {
addCriterion("add_time <", value, "addTime"); addCriterion("add_time <", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2120,14 +2198,14 @@ public class UserExample { ...@@ -2120,14 +2198,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeLessThanOrEqualTo(LocalDateTime value) { public Criteria andAddTimeLessThanOrEqualTo(Date value) {
addCriterion("add_time <=", value, "addTime"); addCriterion("add_time <=", value, "addTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2137,22 +2215,22 @@ public class UserExample { ...@@ -2137,22 +2215,22 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeIn(List<LocalDateTime> values) { public Criteria andAddTimeIn(List<Date> values) {
addCriterion("add_time in", values, "addTime"); addCriterion("add_time in", values, "addTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeNotIn(List<LocalDateTime> values) { public Criteria andAddTimeNotIn(List<Date> values) {
addCriterion("add_time not in", values, "addTime"); addCriterion("add_time not in", values, "addTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andAddTimeBetween(Date value1, Date value2) {
addCriterion("add_time between", value1, value2, "addTime"); addCriterion("add_time between", value1, value2, "addTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andAddTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andAddTimeNotBetween(Date value1, Date value2) {
addCriterion("add_time not between", value1, value2, "addTime"); addCriterion("add_time not between", value1, value2, "addTime");
return (Criteria) this; return (Criteria) this;
} }
...@@ -2167,14 +2245,14 @@ public class UserExample { ...@@ -2167,14 +2245,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeEqualTo(LocalDateTime value) { public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime"); addCriterion("update_time =", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2184,14 +2262,14 @@ public class UserExample { ...@@ -2184,14 +2262,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeNotEqualTo(LocalDateTime value) { public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime"); addCriterion("update_time <>", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2201,14 +2279,14 @@ public class UserExample { ...@@ -2201,14 +2279,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeGreaterThan(LocalDateTime value) { public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime"); addCriterion("update_time >", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2218,14 +2296,14 @@ public class UserExample { ...@@ -2218,14 +2296,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeGreaterThanOrEqualTo(LocalDateTime value) { public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime"); addCriterion("update_time >=", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2235,14 +2313,14 @@ public class UserExample { ...@@ -2235,14 +2313,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeLessThan(LocalDateTime value) { public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime"); addCriterion("update_time <", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2252,14 +2330,14 @@ public class UserExample { ...@@ -2252,14 +2330,14 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeLessThanOrEqualTo(LocalDateTime value) { public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime"); addCriterion("update_time <=", value, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2269,22 +2347,22 @@ public class UserExample { ...@@ -2269,22 +2347,22 @@ public class UserExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeIn(List<LocalDateTime> values) { public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime"); addCriterion("update_time in", values, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeNotIn(List<LocalDateTime> values) { public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime"); addCriterion("update_time not in", values, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime"); addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andUpdateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime"); addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this; return (Criteria) this;
} }
...@@ -2306,7 +2384,7 @@ public class UserExample { ...@@ -2306,7 +2384,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2323,7 +2401,7 @@ public class UserExample { ...@@ -2323,7 +2401,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2340,7 +2418,7 @@ public class UserExample { ...@@ -2340,7 +2418,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2357,7 +2435,7 @@ public class UserExample { ...@@ -2357,7 +2435,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2374,7 +2452,7 @@ public class UserExample { ...@@ -2374,7 +2452,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2391,7 +2469,7 @@ public class UserExample { ...@@ -2391,7 +2469,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2438,7 +2516,7 @@ public class UserExample { ...@@ -2438,7 +2516,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2455,7 +2533,7 @@ public class UserExample { ...@@ -2455,7 +2533,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2472,7 +2550,7 @@ public class UserExample { ...@@ -2472,7 +2550,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2489,7 +2567,7 @@ public class UserExample { ...@@ -2489,7 +2567,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2506,7 +2584,7 @@ public class UserExample { ...@@ -2506,7 +2584,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2523,7 +2601,7 @@ public class UserExample { ...@@ -2523,7 +2601,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2554,16 +2632,10 @@ public class UserExample { ...@@ -2554,16 +2632,10 @@ public class UserExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table dts_user
*
* @mbg.generated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database table dts_user * This field corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2572,7 +2644,7 @@ public class UserExample { ...@@ -2572,7 +2644,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2584,7 +2656,7 @@ public class UserExample { ...@@ -2584,7 +2656,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2595,7 +2667,7 @@ public class UserExample { ...@@ -2595,7 +2667,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2609,7 +2681,7 @@ public class UserExample { ...@@ -2609,7 +2681,7 @@ public class UserExample {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2620,7 +2692,7 @@ public class UserExample { ...@@ -2620,7 +2692,7 @@ public class UserExample {
/** /**
* This interface was generated by MyBatis Generator. * This interface was generated by MyBatis Generator.
* This interface corresponds to the database table dts_user * This interface corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2628,7 +2700,7 @@ public class UserExample { ...@@ -2628,7 +2700,7 @@ public class UserExample {
public interface ICriteriaAdd { public interface ICriteriaAdd {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -2637,12 +2709,6 @@ public class UserExample { ...@@ -2637,12 +2709,6 @@ public class UserExample {
} }
} }
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table dts_user
*
* @mbg.generated
*/
public static class Criterion { public static class Criterion {
private String condition; private String condition;
......
ch-dao/src/main/java/com/wwdz/ch/db/mapper/FootprintMapper.java
View file @ 87d39627
...@@ -2,55 +2,24 @@ package com.wwdz.ch.db.mapper; ...@@ -2,55 +2,24 @@ package com.wwdz.ch.db.mapper;
import com.wwdz.ch.db.domain.Footprint; import com.wwdz.ch.db.domain.Footprint;
import com.wwdz.ch.db.domain.FootprintExample; import com.wwdz.ch.db.domain.FootprintExample;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface FootprintMapper { public interface FootprintMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
long countByExample(FootprintExample example); long countByExample(FootprintExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
int deleteByExample(FootprintExample example); int deleteByExample(FootprintExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
int insert(Footprint record); int insert(Footprint record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
int insertSelective(Footprint record); int insertSelective(Footprint record);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -59,7 +28,7 @@ public interface FootprintMapper { ...@@ -59,7 +28,7 @@ public interface FootprintMapper {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -68,82 +37,46 @@ public interface FootprintMapper { ...@@ -68,82 +37,46 @@ public interface FootprintMapper {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
List<Footprint> selectByExampleSelective(@Param("example") FootprintExample example, @Param("selective") Footprint.Column ... selective); List<Footprint> selectByExampleSelective(@Param("example") FootprintExample example, @Param("selective") Footprint.Column ... selective);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
List<Footprint> selectByExample(FootprintExample example); List<Footprint> selectByExample(FootprintExample example);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
Footprint selectByPrimaryKeySelective(@Param("id") Long id, @Param("selective") Footprint.Column ... selective); Footprint selectByPrimaryKeySelective(@Param("id") Long id, @Param("selective") Footprint.Column ... selective);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
Footprint selectByPrimaryKey(Long id); Footprint selectByPrimaryKey(Long id);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
Footprint selectByPrimaryKeyWithLogicalDelete(@Param("id") Long id, @Param("andLogicalDeleted") boolean andLogicalDeleted); Footprint selectByPrimaryKeyWithLogicalDelete(@Param("id") Long id, @Param("andLogicalDeleted") boolean andLogicalDeleted);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") Footprint record, @Param("example") FootprintExample example); int updateByExampleSelective(@Param("record") Footprint record, @Param("example") FootprintExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
int updateByExample(@Param("record") Footprint record, @Param("example") FootprintExample example); int updateByExample(@Param("record") Footprint record, @Param("example") FootprintExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(Footprint record); int updateByPrimaryKeySelective(Footprint record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint
*
* @mbg.generated
*/
int updateByPrimaryKey(Footprint record); int updateByPrimaryKey(Footprint record);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -152,7 +85,7 @@ public interface FootprintMapper { ...@@ -152,7 +85,7 @@ public interface FootprintMapper {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_footprint * This method corresponds to the database table footprint
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
......
ch-dao/src/main/java/com/wwdz/ch/db/mapper/UserMapper.java
View file @ 87d39627
...@@ -2,55 +2,24 @@ package com.wwdz.ch.db.mapper; ...@@ -2,55 +2,24 @@ package com.wwdz.ch.db.mapper;
import com.wwdz.ch.db.domain.User; import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.db.domain.UserExample; import com.wwdz.ch.db.domain.UserExample;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface UserMapper { public interface UserMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
long countByExample(UserExample example); long countByExample(UserExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
int deleteByExample(UserExample example); int deleteByExample(UserExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
int insert(User record); int insert(User record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
int insertSelective(User record); int insertSelective(User record);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -59,7 +28,7 @@ public interface UserMapper { ...@@ -59,7 +28,7 @@ public interface UserMapper {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -68,82 +37,46 @@ public interface UserMapper { ...@@ -68,82 +37,46 @@ public interface UserMapper {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
List<User> selectByExampleSelective(@Param("example") UserExample example, @Param("selective") User.Column ... selective); List<User> selectByExampleSelective(@Param("example") UserExample example, @Param("selective") User.Column ... selective);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
List<User> selectByExample(UserExample example); List<User> selectByExample(UserExample example);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
User selectByPrimaryKeySelective(@Param("id") Long id, @Param("selective") User.Column ... selective); User selectByPrimaryKeySelective(@Param("id") Long id, @Param("selective") User.Column ... selective);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
User selectByPrimaryKey(Long id); User selectByPrimaryKey(Long id);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
*/ */
User selectByPrimaryKeyWithLogicalDelete(@Param("id") Long id, @Param("andLogicalDeleted") boolean andLogicalDeleted); User selectByPrimaryKeyWithLogicalDelete(@Param("id") Long id, @Param("andLogicalDeleted") boolean andLogicalDeleted);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example); int updateByExampleSelective(@Param("record") User record, @Param("example") UserExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
int updateByExample(@Param("record") User record, @Param("example") UserExample example); int updateByExample(@Param("record") User record, @Param("example") UserExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(User record); int updateByPrimaryKeySelective(User record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user
*
* @mbg.generated
*/
int updateByPrimaryKey(User record); int updateByPrimaryKey(User record);
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
...@@ -152,7 +85,7 @@ public interface UserMapper { ...@@ -152,7 +85,7 @@ public interface UserMapper {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method corresponds to the database table dts_user * This method corresponds to the database table user
* *
* @mbg.generated * @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin * @project https://github.com/itfsw/mybatis-generator-plugin
......
ch-dao/src/main/java/com/wwdz/ch/db/service/DtsFootprintService.java
View file @ 87d39627
package com.wwdz.ch.db.service; package com.wwdz.ch.db.service;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.wwdz.ch.db.mapper.FootprintMapper;
import com.wwdz.ch.db.domain.Footprint; import com.wwdz.ch.db.domain.Footprint;
import com.wwdz.ch.db.domain.FootprintExample; import com.wwdz.ch.db.domain.FootprintExample;
import com.wwdz.ch.db.mapper.FootprintMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime; import java.util.Date;
import java.util.List; import java.util.List;
@Service @Service
...@@ -34,8 +33,8 @@ public class DtsFootprintService { ...@@ -34,8 +33,8 @@ public class DtsFootprintService {
} }
public void add(Footprint footprint) { public void add(Footprint footprint) {
footprint.setAddTime(LocalDateTime.now()); footprint.setAddTime(new Date());
footprint.setUpdateTime(LocalDateTime.now()); footprint.setUpdateTime(new Date());
footprintMapper.insertSelective(footprint); footprintMapper.insertSelective(footprint);
} }
...@@ -48,7 +47,7 @@ public class DtsFootprintService { ...@@ -48,7 +47,7 @@ public class DtsFootprintService {
criteria.andUserIdEqualTo(Long.valueOf(userId)); criteria.andUserIdEqualTo(Long.valueOf(userId));
} }
if (!StringUtils.isEmpty(coinsId)) { if (!StringUtils.isEmpty(coinsId)) {
criteria.andCoinsIdEqualTo(Long.valueOf(coinsId)); criteria.andItemIdEqualTo(Long.valueOf(coinsId));
} }
criteria.andDeletedEqualTo(false); criteria.andDeletedEqualTo(false);
......
ch-dao/src/main/java/com/wwdz/ch/db/service/DtsUserService.java
View file @ 87d39627
package com.wwdz.ch.db.service; package com.wwdz.ch.db.service;
import java.time.LocalDateTime;
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.wwdz.ch.db.bean.DayStatis; import com.wwdz.ch.db.bean.DayStatis;
import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
import com.wwdz.ch.db.mapper.UserMapper;
import com.wwdz.ch.db.mapper.ex.StatMapper;
import com.wwdz.ch.db.domain.User; import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.db.domain.UserExample; import com.wwdz.ch.db.domain.UserExample;
import com.wwdz.ch.db.domain.UserVo; import com.wwdz.ch.db.domain.UserVo;
import com.wwdz.ch.db.mapper.UserAccountObsoleteMapper;
import com.wwdz.ch.db.mapper.UserMapper;
import com.wwdz.ch.db.mapper.ex.StatMapper;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@Service @Service
public class DtsUserService { public class DtsUserService {
...@@ -48,13 +46,13 @@ public class DtsUserService { ...@@ -48,13 +46,13 @@ public class DtsUserService {
} }
public void add(User user) { public void add(User user) {
user.setAddTime(LocalDateTime.now()); user.setAddTime(new Date());
user.setUpdateTime(LocalDateTime.now()); user.setUpdateTime(new Date());
userMapper.insertSelective(user); userMapper.insertSelective(user);
} }
public int updateById(User user) { public int updateById(User user) {
user.setUpdateTime(LocalDateTime.now()); user.setUpdateTime(new Date());
return userMapper.updateByPrimaryKeySelective(user); return userMapper.updateByPrimaryKeySelective(user);
} }
......
ch-dao/src/main/resources/com/wwdz/ch/db/mapper/FootprintMapper.xml
View file @ 87d39627
...@@ -2,22 +2,14 @@ ...@@ -2,22 +2,14 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.wwdz.ch.db.mapper.FootprintMapper"> <mapper namespace="com.wwdz.ch.db.mapper.FootprintMapper">
<resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Footprint"> <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.Footprint">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="user_id" jdbcType="BIGINT" property="userId" /> <result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="coins_id" jdbcType="BIGINT" property="coinsId" /> <result column="item_id" jdbcType="BIGINT" property="itemId" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="deleted" jdbcType="BIT" property="deleted" /> <result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
...@@ -47,10 +39,6 @@ ...@@ -47,10 +39,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
...@@ -80,21 +68,14 @@ ...@@ -80,21 +68,14 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!-- id, user_id, item_id, add_time, update_time, deleted
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, user_id, coins_id, add_time, update_time, deleted
</sql> </sql>
<select id="selectByExample" parameterType="com.wwdz.ch.db.domain.FootprintExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.FootprintExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
</if> </if>
'true' as QUERYID,
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from footprint from footprint
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -111,6 +92,7 @@ ...@@ -111,6 +92,7 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
'true' as QUERYID,
<if test="example.distinct"> <if test="example.distinct">
distinct distinct
</if> </if>
...@@ -121,7 +103,7 @@ ...@@ -121,7 +103,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, coins_id, add_time, update_time, deleted id, user_id, item_id, add_time, update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from footprint from footprint
...@@ -133,10 +115,6 @@ ...@@ -133,10 +115,6 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from footprint from footprint
...@@ -148,10 +126,6 @@ ...@@ -148,10 +126,6 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from footprint from footprint
...@@ -180,48 +154,32 @@ ...@@ -180,48 +154,32 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, coins_id, add_time, update_time, deleted id, user_id, item_id, add_time, update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from footprint from footprint
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from footprint delete from footprint
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.FootprintExample"> <delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.FootprintExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from footprint delete from footprint
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.wwdz.ch.db.domain.Footprint"> <insert id="insert" parameterType="com.wwdz.ch.db.domain.Footprint">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
insert into footprint (user_id, coins_id, add_time, insert into footprint (user_id, item_id, add_time,
update_time, deleted) update_time, deleted)
values (#{userId,jdbcType=BIGINT}, #{coinsId,jdbcType=BIGINT}, #{addTime,jdbcType=TIMESTAMP}, values (#{userId,jdbcType=BIGINT}, #{itemId,jdbcType=BIGINT}, #{addTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}) #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.Footprint"> <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.Footprint">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
...@@ -230,8 +188,8 @@ ...@@ -230,8 +188,8 @@
<if test="userId != null"> <if test="userId != null">
user_id, user_id,
</if> </if>
<if test="coinsId != null"> <if test="itemId != null">
coins_id, item_id,
</if> </if>
<if test="addTime != null"> <if test="addTime != null">
add_time, add_time,
...@@ -247,8 +205,8 @@ ...@@ -247,8 +205,8 @@
<if test="userId != null"> <if test="userId != null">
#{userId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT},
</if> </if>
<if test="coinsId != null"> <if test="itemId != null">
#{coinsId,jdbcType=BIGINT}, #{itemId,jdbcType=BIGINT},
</if> </if>
<if test="addTime != null"> <if test="addTime != null">
#{addTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP},
...@@ -262,20 +220,12 @@ ...@@ -262,20 +220,12 @@
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.wwdz.ch.db.domain.FootprintExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.wwdz.ch.db.domain.FootprintExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from footprint select count(*) from footprint
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update footprint update footprint
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
...@@ -284,8 +234,8 @@ ...@@ -284,8 +234,8 @@
<if test="record.userId != null"> <if test="record.userId != null">
user_id = #{record.userId,jdbcType=BIGINT}, user_id = #{record.userId,jdbcType=BIGINT},
</if> </if>
<if test="record.coinsId != null"> <if test="record.itemId != null">
coins_id = #{record.coinsId,jdbcType=BIGINT}, item_id = #{record.itemId,jdbcType=BIGINT},
</if> </if>
<if test="record.addTime != null"> <if test="record.addTime != null">
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
...@@ -302,14 +252,10 @@ ...@@ -302,14 +252,10 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update footprint update footprint
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
user_id = #{record.userId,jdbcType=BIGINT}, user_id = #{record.userId,jdbcType=BIGINT},
coins_id = #{record.coinsId,jdbcType=BIGINT}, item_id = #{record.itemId,jdbcType=BIGINT},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
deleted = #{record.deleted,jdbcType=BIT} deleted = #{record.deleted,jdbcType=BIT}
...@@ -318,17 +264,13 @@ ...@@ -318,17 +264,13 @@
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.Footprint"> <update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.Footprint">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update footprint update footprint
<set> <set>
<if test="userId != null"> <if test="userId != null">
user_id = #{userId,jdbcType=BIGINT}, user_id = #{userId,jdbcType=BIGINT},
</if> </if>
<if test="coinsId != null"> <if test="itemId != null">
coins_id = #{coinsId,jdbcType=BIGINT}, item_id = #{itemId,jdbcType=BIGINT},
</if> </if>
<if test="addTime != null"> <if test="addTime != null">
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
...@@ -343,13 +285,9 @@ ...@@ -343,13 +285,9 @@
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.Footprint"> <update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.Footprint">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update footprint update footprint
set user_id = #{userId,jdbcType=BIGINT}, set user_id = #{userId,jdbcType=BIGINT},
coins_id = #{coinsId,jdbcType=BIGINT}, item_id = #{itemId,jdbcType=BIGINT},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
deleted = #{deleted,jdbcType=BIT} deleted = #{deleted,jdbcType=BIT}
...@@ -362,6 +300,7 @@ ...@@ -362,6 +300,7 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
'true' as QUERYID,
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from footprint from footprint
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -379,6 +318,7 @@ ...@@ -379,6 +318,7 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
'true' as QUERYID,
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
...@@ -386,7 +326,7 @@ ...@@ -386,7 +326,7 @@
</foreach> </foreach>
</when> </when>
<otherwise> <otherwise>
id, user_id, coins_id, add_time, update_time, deleted id, user_id, item_id, add_time, update_time, deleted
</otherwise> </otherwise>
</choose> </choose>
from footprint from footprint
......
ch-dao/src/main/resources/com/wwdz/ch/db/mapper/UserMapper.xml
View file @ 87d39627
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.wwdz.ch.db.mapper.UserMapper"> <mapper namespace="com.wwdz.ch.db.mapper.UserMapper">
<resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.User"> <resultMap id="BaseResultMap" type="com.wwdz.ch.db.domain.User">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="username" jdbcType="VARCHAR" property="username" /> <result column="username" jdbcType="VARCHAR" property="username" />
<result column="password" jdbcType="VARCHAR" property="password" /> <result column="password" jdbcType="VARCHAR" property="password" />
...@@ -18,6 +14,7 @@ ...@@ -18,6 +14,7 @@
<result column="mobile" jdbcType="VARCHAR" property="mobile" /> <result column="mobile" jdbcType="VARCHAR" property="mobile" />
<result column="avatar" jdbcType="VARCHAR" property="avatar" /> <result column="avatar" jdbcType="VARCHAR" property="avatar" />
<result column="weixin_openid" jdbcType="VARCHAR" property="weixinOpenid" /> <result column="weixin_openid" jdbcType="VARCHAR" property="weixinOpenid" />
<result column="wechat_id" jdbcType="VARCHAR" property="wechatId" />
<result column="status" jdbcType="TINYINT" property="status" /> <result column="status" jdbcType="TINYINT" property="status" />
<result column="add_time" jdbcType="TIMESTAMP" property="addTime" /> <result column="add_time" jdbcType="TIMESTAMP" property="addTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
...@@ -25,10 +22,6 @@ ...@@ -25,10 +22,6 @@
<result column="share_user_id" jdbcType="BIGINT" property="shareUserId" /> <result column="share_user_id" jdbcType="BIGINT" property="shareUserId" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="oredCriteria" item="criteria" separator="or"> <foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
...@@ -58,10 +51,6 @@ ...@@ -58,10 +51,6 @@
</where> </where>
</sql> </sql>
<sql id="Update_By_Example_Where_Clause"> <sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where> <where>
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <if test="criteria.valid">
...@@ -91,23 +80,16 @@ ...@@ -91,23 +80,16 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level,
nickname, mobile, avatar, weixin_openid, `status`, add_time, update_time, deleted, nickname, mobile, avatar, weixin_openid, wechat_id, `status`, add_time, update_time,
share_user_id deleted, share_user_id
</sql> </sql>
<select id="selectByExample" parameterType="com.wwdz.ch.db.domain.UserExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.wwdz.ch.db.domain.UserExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<if test="distinct"> <if test="distinct">
distinct distinct
</if> </if>
'true' as QUERYID,
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from user from user
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -124,6 +106,7 @@ ...@@ -124,6 +106,7 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
'true' as QUERYID,
<if test="example.distinct"> <if test="example.distinct">
distinct distinct
</if> </if>
...@@ -135,8 +118,8 @@ ...@@ -135,8 +118,8 @@
</when> </when>
<otherwise> <otherwise>
id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level,
nickname, mobile, avatar, weixin_openid, `status`, add_time, update_time, deleted, nickname, mobile, avatar, weixin_openid, wechat_id, `status`, add_time, update_time,
share_user_id deleted, share_user_id
</otherwise> </otherwise>
</choose> </choose>
from user from user
...@@ -148,10 +131,6 @@ ...@@ -148,10 +131,6 @@
</if> </if>
</select> </select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from user from user
...@@ -163,10 +142,6 @@ ...@@ -163,10 +142,6 @@
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from user from user
...@@ -196,57 +171,41 @@ ...@@ -196,57 +171,41 @@
</when> </when>
<otherwise> <otherwise>
id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level,
nickname, mobile, avatar, weixin_openid, `status`, add_time, update_time, deleted, nickname, mobile, avatar, weixin_openid, wechat_id, `status`, add_time, update_time,
share_user_id deleted, share_user_id
</otherwise> </otherwise>
</choose> </choose>
from user from user
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from user delete from user
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</delete> </delete>
<delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.UserExample"> <delete id="deleteByExample" parameterType="com.wwdz.ch.db.domain.UserExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from user delete from user
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="com.wwdz.ch.db.domain.User"> <insert id="insert" parameterType="com.wwdz.ch.db.domain.User">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
insert into user (username, `password`, gender, insert into user (username, `password`, gender,
birthday, last_login_time, last_login_ip, birthday, last_login_time, last_login_ip,
user_level, nickname, mobile, user_level, nickname, mobile,
avatar, weixin_openid, `status`, avatar, weixin_openid, wechat_id,
add_time, update_time, deleted, `status`, add_time, update_time,
share_user_id) deleted, share_user_id)
values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT}, values (#{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{gender,jdbcType=TINYINT},
#{birthday,jdbcType=DATE}, #{lastLoginTime,jdbcType=TIMESTAMP}, #{lastLoginIp,jdbcType=VARCHAR}, #{birthday,jdbcType=DATE}, #{lastLoginTime,jdbcType=TIMESTAMP}, #{lastLoginIp,jdbcType=VARCHAR},
#{userLevel,jdbcType=TINYINT}, #{nickname,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{userLevel,jdbcType=TINYINT}, #{nickname,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR},
#{avatar,jdbcType=VARCHAR}, #{weixinOpenid,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, #{avatar,jdbcType=VARCHAR}, #{weixinOpenid,jdbcType=VARCHAR}, #{wechatId,jdbcType=VARCHAR},
#{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT}, #{status,jdbcType=TINYINT}, #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{shareUserId,jdbcType=BIGINT}) #{deleted,jdbcType=BIT}, #{shareUserId,jdbcType=BIGINT})
</insert> </insert>
<insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.User"> <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.User">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long"> <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID() SELECT LAST_INSERT_ID()
</selectKey> </selectKey>
...@@ -285,6 +244,9 @@ ...@@ -285,6 +244,9 @@
<if test="weixinOpenid != null"> <if test="weixinOpenid != null">
weixin_openid, weixin_openid,
</if> </if>
<if test="wechatId != null">
wechat_id,
</if>
<if test="status != null"> <if test="status != null">
`status`, `status`,
</if> </if>
...@@ -335,6 +297,9 @@ ...@@ -335,6 +297,9 @@
<if test="weixinOpenid != null"> <if test="weixinOpenid != null">
#{weixinOpenid,jdbcType=VARCHAR}, #{weixinOpenid,jdbcType=VARCHAR},
</if> </if>
<if test="wechatId != null">
#{wechatId,jdbcType=VARCHAR},
</if>
<if test="status != null"> <if test="status != null">
#{status,jdbcType=TINYINT}, #{status,jdbcType=TINYINT},
</if> </if>
...@@ -353,20 +318,12 @@ ...@@ -353,20 +318,12 @@
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="com.wwdz.ch.db.domain.UserExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="com.wwdz.ch.db.domain.UserExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from user select count(*) from user
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Example_Where_Clause" /> <include refid="Example_Where_Clause" />
</if> </if>
</select> </select>
<update id="updateByExampleSelective" parameterType="map"> <update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update user update user
<set> <set>
<if test="record.id != null"> <if test="record.id != null">
...@@ -405,6 +362,9 @@ ...@@ -405,6 +362,9 @@
<if test="record.weixinOpenid != null"> <if test="record.weixinOpenid != null">
weixin_openid = #{record.weixinOpenid,jdbcType=VARCHAR}, weixin_openid = #{record.weixinOpenid,jdbcType=VARCHAR},
</if> </if>
<if test="record.wechatId != null">
wechat_id = #{record.wechatId,jdbcType=VARCHAR},
</if>
<if test="record.status != null"> <if test="record.status != null">
`status` = #{record.status,jdbcType=TINYINT}, `status` = #{record.status,jdbcType=TINYINT},
</if> </if>
...@@ -426,10 +386,6 @@ ...@@ -426,10 +386,6 @@
</if> </if>
</update> </update>
<update id="updateByExample" parameterType="map"> <update id="updateByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update user update user
set id = #{record.id,jdbcType=BIGINT}, set id = #{record.id,jdbcType=BIGINT},
username = #{record.username,jdbcType=VARCHAR}, username = #{record.username,jdbcType=VARCHAR},
...@@ -443,6 +399,7 @@ ...@@ -443,6 +399,7 @@
mobile = #{record.mobile,jdbcType=VARCHAR}, mobile = #{record.mobile,jdbcType=VARCHAR},
avatar = #{record.avatar,jdbcType=VARCHAR}, avatar = #{record.avatar,jdbcType=VARCHAR},
weixin_openid = #{record.weixinOpenid,jdbcType=VARCHAR}, weixin_openid = #{record.weixinOpenid,jdbcType=VARCHAR},
wechat_id = #{record.wechatId,jdbcType=VARCHAR},
`status` = #{record.status,jdbcType=TINYINT}, `status` = #{record.status,jdbcType=TINYINT},
add_time = #{record.addTime,jdbcType=TIMESTAMP}, add_time = #{record.addTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}, update_time = #{record.updateTime,jdbcType=TIMESTAMP},
...@@ -453,10 +410,6 @@ ...@@ -453,10 +410,6 @@
</if> </if>
</update> </update>
<update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.User"> <update id="updateByPrimaryKeySelective" parameterType="com.wwdz.ch.db.domain.User">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update user update user
<set> <set>
<if test="username != null"> <if test="username != null">
...@@ -492,6 +445,9 @@ ...@@ -492,6 +445,9 @@
<if test="weixinOpenid != null"> <if test="weixinOpenid != null">
weixin_openid = #{weixinOpenid,jdbcType=VARCHAR}, weixin_openid = #{weixinOpenid,jdbcType=VARCHAR},
</if> </if>
<if test="wechatId != null">
wechat_id = #{wechatId,jdbcType=VARCHAR},
</if>
<if test="status != null"> <if test="status != null">
`status` = #{status,jdbcType=TINYINT}, `status` = #{status,jdbcType=TINYINT},
</if> </if>
...@@ -511,10 +467,6 @@ ...@@ -511,10 +467,6 @@
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.User"> <update id="updateByPrimaryKey" parameterType="com.wwdz.ch.db.domain.User">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update user update user
set username = #{username,jdbcType=VARCHAR}, set username = #{username,jdbcType=VARCHAR},
`password` = #{password,jdbcType=VARCHAR}, `password` = #{password,jdbcType=VARCHAR},
...@@ -527,6 +479,7 @@ ...@@ -527,6 +479,7 @@
mobile = #{mobile,jdbcType=VARCHAR}, mobile = #{mobile,jdbcType=VARCHAR},
avatar = #{avatar,jdbcType=VARCHAR}, avatar = #{avatar,jdbcType=VARCHAR},
weixin_openid = #{weixinOpenid,jdbcType=VARCHAR}, weixin_openid = #{weixinOpenid,jdbcType=VARCHAR},
wechat_id = #{wechatId,jdbcType=VARCHAR},
`status` = #{status,jdbcType=TINYINT}, `status` = #{status,jdbcType=TINYINT},
add_time = #{addTime,jdbcType=TIMESTAMP}, add_time = #{addTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}, update_time = #{updateTime,jdbcType=TIMESTAMP},
...@@ -541,6 +494,7 @@ ...@@ -541,6 +494,7 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
'true' as QUERYID,
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from user from user
<if test="_parameter != null"> <if test="_parameter != null">
...@@ -558,6 +512,7 @@ ...@@ -558,6 +512,7 @@
@project https://github.com/itfsw/mybatis-generator-plugin @project https://github.com/itfsw/mybatis-generator-plugin
--> -->
select select
'true' as QUERYID,
<choose> <choose>
<when test="selective != null and selective.length &gt; 0"> <when test="selective != null and selective.length &gt; 0">
<foreach collection="selective" item="column" separator=","> <foreach collection="selective" item="column" separator=",">
...@@ -566,8 +521,8 @@ ...@@ -566,8 +521,8 @@
</when> </when>
<otherwise> <otherwise>
id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level,
nickname, mobile, avatar, weixin_openid, `status`, add_time, update_time, deleted, nickname, mobile, avatar, weixin_openid, wechat_id, `status`, add_time, update_time,
share_user_id deleted, share_user_id
</otherwise> </otherwise>
</choose> </choose>
from user from user
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/dao/UserInfo.java
View file @ 87d39627
...@@ -26,6 +26,8 @@ public class UserInfo implements Serializable { ...@@ -26,6 +26,8 @@ public class UserInfo implements Serializable {
private Byte status;//状态 private Byte status;//状态
private String registerDate;//注册日期 private String registerDate;//注册日期
// 微信号
private String wechatId;
public String getCountry() { public String getCountry() {
return country; return country;
...@@ -99,6 +101,14 @@ public class UserInfo implements Serializable { ...@@ -99,6 +101,14 @@ public class UserInfo implements Serializable {
this.phone = phone; this.phone = phone;
} }
public String getWechatId() {
return wechatId;
}
public void setWechatId(String wechatId) {
this.wechatId = phone;
}
public Byte getUserLevel() { public Byte getUserLevel() {
return userLevel; return userLevel;
} }
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/request/UserRequestDto.java 0 → 100644
View file @ 87d39627
package com.wwdz.ch.wx.entity.request;
import com.xxdxxs.entity.Entity;
import lombok.Data;
@Data
public class UserRequestDto implements Entity {
private Long userId;
private String mobile;
private String code;
private String avatarUrl;
private Long shareUserId;
private String nickname;
private String wechatId;
private String beforeMobile;
private String afterMobile;
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/impl/CategoryImpl.java → ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/CategoryImpl.java
View file @ 87d39627
package com.wwdz.ch.wx.service.impl; package com.wwdz.ch.wx.impl;
import com.wwdz.ch.wx.service.CategoryService; import com.wwdz.ch.wx.service.CategoryService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/impl/FavoritesServiceImpl.java → ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java
View file @ 87d39627
package com.wwdz.ch.wx.service.impl; package com.wwdz.ch.wx.impl;
import com.wwdz.ch.core.type.Result; import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.db.dao.UserItemsRelationDao; import com.wwdz.ch.db.dao.UserItemsRelationDao;
...@@ -31,11 +31,11 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -31,11 +31,11 @@ public class FavoritesServiceImpl implements FavoritesService {
private static final Logger logger = LoggerFactory.getLogger(FavoritesServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(FavoritesServiceImpl.class);
@Autowired @Autowired
private FavoritesDao favoritesManager; private FavoritesDao favoritesDao;
@Autowired @Autowired
private FavoritesItemsRelationDao favoritesItemsRelationManager; private FavoritesItemsRelationDao favoritesItemsRelationDao;
@Autowired @Autowired
private UserItemsRelationDao userItemsRelationManager; private UserItemsRelationDao userItemsRelationDao;
@Autowired @Autowired
private ItemManager itemManager; private ItemManager itemManager;
...@@ -53,7 +53,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -53,7 +53,7 @@ public class FavoritesServiceImpl implements FavoritesService {
favorites.setUpdateTime(date); favorites.setUpdateTime(date);
favorites.setDeleted(false); favorites.setDeleted(false);
favorites.setSort(1); favorites.setSort(1);
favoritesManager.insert(favorites); favoritesDao.insert(favorites);
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.error("新建默认收藏册失败，原因：" + e.getMessage(), e); logger.error("新建默认收藏册失败，原因：" + e.getMessage(), e);
...@@ -65,7 +65,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -65,7 +65,7 @@ public class FavoritesServiceImpl implements FavoritesService {
@Override @Override
public Result page(FavoritesRequestDto dto) { public Result page(FavoritesRequestDto dto) {
try { try {
return Result.success(favoritesManager.pageByUserId(dto.getUserId(), dto.getPage(), dto.getSize())); return Result.success(favoritesDao.pageByUserId(dto.getUserId(), dto.getPage(), dto.getSize()));
} catch (Exception e) { } catch (Exception e) {
logger.error("查询收藏册列表失败，原因：" + e.getMessage(), e); logger.error("查询收藏册列表失败，原因：" + e.getMessage(), e);
return Result.failed(-1, "查询收藏册列表失败"); return Result.failed(-1, "查询收藏册列表失败");
...@@ -75,7 +75,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -75,7 +75,7 @@ public class FavoritesServiceImpl implements FavoritesService {
@Override @Override
public Result list(FavoritesRequestDto dto) { public Result list(FavoritesRequestDto dto) {
try { try {
return Result.success(favoritesManager.listByUserId(dto.getUserId())); return Result.success(favoritesDao.listByUserId(dto.getUserId()));
} catch (Exception e) { } catch (Exception e) {
logger.error("获取收藏册列表失败，原因：" + e.getMessage(), e); logger.error("获取收藏册列表失败，原因：" + e.getMessage(), e);
return Result.failed(-1, "获取收藏册列表失败"); return Result.failed(-1, "获取收藏册列表失败");
...@@ -87,7 +87,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -87,7 +87,7 @@ public class FavoritesServiceImpl implements FavoritesService {
public Result add(FavoritesRequestDto dto) { public Result add(FavoritesRequestDto dto) {
try { try {
// 判断收藏册标题是否已存在 // 判断收藏册标题是否已存在
if (favoritesManager.isExisted(null, dto.getUserId(), dto.getTitle())) { if (favoritesDao.isExisted(null, dto.getUserId(), dto.getTitle())) {
return Result.failed(-1, "收藏册的标题不能重复"); return Result.failed(-1, "收藏册的标题不能重复");
} }
...@@ -101,7 +101,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -101,7 +101,7 @@ public class FavoritesServiceImpl implements FavoritesService {
favorites.setUpdateTime(date); favorites.setUpdateTime(date);
favorites.setDeleted(false); favorites.setDeleted(false);
favorites.setSort(0); favorites.setSort(0);
favoritesManager.insert(favorites); favoritesDao.insert(favorites);
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.error("新增收藏册失败，原因：" + e.getMessage(), e); logger.error("新增收藏册失败，原因：" + e.getMessage(), e);
...@@ -114,12 +114,12 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -114,12 +114,12 @@ public class FavoritesServiceImpl implements FavoritesService {
@Override @Override
public Result update(FavoritesRequestDto dto) { public Result update(FavoritesRequestDto dto) {
try { try {
Favorites favorites = favoritesManager.info(dto.getId()); Favorites favorites = favoritesDao.info(dto.getId());
if (Objects.isNull(favorites)) { if (Objects.isNull(favorites)) {
return Result.failed("数据异常，记录不存在"); return Result.failed("数据异常，记录不存在");
} }
// 判断收藏册标题是否已存在 // 判断收藏册标题是否已存在
if (favoritesManager.isExisted(dto.getId(), dto.getUserId(), dto.getTitle())) { if (favoritesDao.isExisted(dto.getId(), dto.getUserId(), dto.getTitle())) {
return Result.failed("收藏册的标题不能重复"); return Result.failed("收藏册的标题不能重复");
} }
...@@ -127,7 +127,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -127,7 +127,7 @@ public class FavoritesServiceImpl implements FavoritesService {
favorites.setDescription(dto.getDescription()); favorites.setDescription(dto.getDescription());
favorites.setImages(dto.getImages()); favorites.setImages(dto.getImages());
favorites.setUpdateTime(new Date()); favorites.setUpdateTime(new Date());
favoritesManager.update(favorites); favoritesDao.update(favorites);
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.error("新增收藏册失败，原因：" + e.getMessage(), e); logger.error("新增收藏册失败，原因：" + e.getMessage(), e);
...@@ -139,7 +139,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -139,7 +139,7 @@ public class FavoritesServiceImpl implements FavoritesService {
@Override @Override
public Result info(FavoritesRequestDto dto) { public Result info(FavoritesRequestDto dto) {
try { try {
Favorites favorites = favoritesManager.info(dto.getId()); Favorites favorites = favoritesDao.info(dto.getId());
if (Objects.isNull(favorites)) { if (Objects.isNull(favorites)) {
return Result.failed("数据异常，记录不存在"); return Result.failed("数据异常，记录不存在");
} }
...@@ -154,13 +154,13 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -154,13 +154,13 @@ public class FavoritesServiceImpl implements FavoritesService {
@Override @Override
public Result delete(FavoritesRequestDto dto) { public Result delete(FavoritesRequestDto dto) {
try { try {
List<FavoritesItemsRelation> favoritesItemsList = favoritesItemsRelationManager.listByFavoritesId(dto.getId(), null); List<FavoritesItemsRelation> favoritesItemsList = favoritesItemsRelationDao.listByFavoritesId(dto.getId(), null);
if (CollectionUtils.isNotEmpty(favoritesItemsList)) { if (CollectionUtils.isNotEmpty(favoritesItemsList)) {
return Result.failed("收藏册内有藏品，请先移除藏品"); return Result.failed("收藏册内有藏品，请先移除藏品");
} }
// 删除收藏册 // 删除收藏册
favoritesManager.delete(dto.getId(), null); favoritesDao.delete(dto.getId(), null);
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.error("删除收藏册失败，原因：" + e.getMessage(), e); logger.error("删除收藏册失败，原因：" + e.getMessage(), e);
...@@ -174,11 +174,11 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -174,11 +174,11 @@ public class FavoritesServiceImpl implements FavoritesService {
public Result batchDelete(FavoritesRequestDto dto) { public Result batchDelete(FavoritesRequestDto dto) {
try { try {
// 批量删除收藏册下用户创建的钱币 // 批量删除收藏册下用户创建的钱币
List<FavoritesItemsRelation> list = favoritesItemsRelationManager.listByFavoritesId(null, dto.getIds()); List<FavoritesItemsRelation> list = favoritesItemsRelationDao.listByFavoritesId(null, dto.getIds());
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
List<Long> favoritesItemsIds = list.stream() List<Long> favoritesItemsIds = list.stream()
.map(FavoritesItemsRelation::getItemId).collect(Collectors.toList()); .map(FavoritesItemsRelation::getItemId).collect(Collectors.toList());
List<UserItemsRelation> usersItemsList = userItemsRelationManager.listByUserIds(dto.getUserId(), null); List<UserItemsRelation> usersItemsList = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
if (CollectionUtils.isNotEmpty(usersItemsList)) { if (CollectionUtils.isNotEmpty(usersItemsList)) {
List<Long> usersItemsIds = usersItemsList.stream() List<Long> usersItemsIds = usersItemsList.stream()
.map(UserItemsRelation::getItemId).collect(Collectors.toList()); .map(UserItemsRelation::getItemId).collect(Collectors.toList());
...@@ -191,10 +191,10 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -191,10 +191,10 @@ public class FavoritesServiceImpl implements FavoritesService {
} }
// 删除收藏册和钱币的关联 // 删除收藏册和钱币的关联
favoritesItemsRelationManager.deleteByFavoritesId(null, dto.getIds()); favoritesItemsRelationDao.deleteByFavoritesId(null, dto.getIds());
// 删除收藏册 // 删除收藏册
favoritesManager.delete(null, dto.getIds()); favoritesDao.delete(null, dto.getIds());
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.error("批量删除收藏册失败，原因：" + e.getMessage(), e); logger.error("批量删除收藏册失败，原因：" + e.getMessage(), e);
...@@ -208,7 +208,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -208,7 +208,7 @@ public class FavoritesServiceImpl implements FavoritesService {
public Result removeItem(ItemRequestDto dto) { public Result removeItem(ItemRequestDto dto) {
try { try {
// 批量删除收藏册下用户创建的钱币 // 批量删除收藏册下用户创建的钱币
List<UserItemsRelation> usersItemsList = userItemsRelationManager.listByUserIds(dto.getUserId(), null); List<UserItemsRelation> usersItemsList = userItemsRelationDao.listByUserIds(dto.getUserId(), null);
if (CollectionUtils.isNotEmpty(usersItemsList)) { if (CollectionUtils.isNotEmpty(usersItemsList)) {
List<Long> usersItemsIds = usersItemsList.stream() List<Long> usersItemsIds = usersItemsList.stream()
.map(UserItemsRelation::getItemId).collect(Collectors.toList()); .map(UserItemsRelation::getItemId).collect(Collectors.toList());
...@@ -220,7 +220,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -220,7 +220,7 @@ public class FavoritesServiceImpl implements FavoritesService {
} }
// 删除收藏册和钱币的关联 // 删除收藏册和钱币的关联
favoritesItemsRelationManager.deleteByChosen(dto.getFavoritesId(), dto.getItemIds()); favoritesItemsRelationDao.deleteByChosen(dto.getFavoritesId(), dto.getItemIds());
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.info("收藏册取消收藏失败，原因：" + e.getMessage(), e); logger.info("收藏册取消收藏失败，原因：" + e.getMessage(), e);
...@@ -234,7 +234,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -234,7 +234,7 @@ public class FavoritesServiceImpl implements FavoritesService {
public Result moveItem(ItemRequestDto dto) { public Result moveItem(ItemRequestDto dto) {
try { try {
// 删除原收藏册和藏品关联记录 // 删除原收藏册和藏品关联记录
favoritesItemsRelationManager.deleteByChosen(dto.getBeforeFavoritesId(), dto.getItemIds()); favoritesItemsRelationDao.deleteByChosen(dto.getBeforeFavoritesId(), dto.getItemIds());
// 新增新收藏册和藏品关联记录 // 新增新收藏册和藏品关联记录
Date now = new Date(); Date now = new Date();
...@@ -247,7 +247,7 @@ public class FavoritesServiceImpl implements FavoritesService { ...@@ -247,7 +247,7 @@ public class FavoritesServiceImpl implements FavoritesService {
list.add(record); list.add(record);
} }
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
favoritesItemsRelationManager.batchInsert(list); favoritesItemsRelationDao.batchInsert(list);
} }
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/impl/ItemServiceImpl.java → ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java
View file @ 87d39627
package com.wwdz.ch.wx.service.impl; package com.wwdz.ch.wx.impl;
import com.wwdz.ch.core.consts.CommonEnum; import com.wwdz.ch.core.consts.CommonEnum;
import com.wwdz.ch.core.type.Result; import com.wwdz.ch.core.type.Result;
...@@ -20,7 +20,9 @@ import org.springframework.stereotype.Service; ...@@ -20,7 +20,9 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List;
import java.util.Objects; import java.util.Objects;
@Service @Service
...@@ -35,6 +37,17 @@ public class ItemServiceImpl implements ItemService { ...@@ -35,6 +37,17 @@ public class ItemServiceImpl implements ItemService {
@Autowired @Autowired
private CategoryManager categoryManager; private CategoryManager categoryManager;
@Override
public Result page(ItemRequestDto dto) {
return null;
}
@Override
public Result list(ItemRequestDto dto) {
return null;
}
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public Result add(ItemRequestDto dto) { public Result add(ItemRequestDto dto) {
...@@ -115,8 +128,49 @@ public class ItemServiceImpl implements ItemService { ...@@ -115,8 +128,49 @@ public class ItemServiceImpl implements ItemService {
if (null == item.getId()) { if (null == item.getId()) {
return Result.failed("数据异常，该藏品不存在"); return Result.failed("数据异常，该藏品不存在");
} }
item.setName(dto.getName());
item.setCid(dto.getCid());
item.setImages(dto.getImages());
item.setPrice(Long.parseLong(dto.getPrice()) * 100);
item.setDetail(dto.getDetail());
Date now = new Date();
item.setUpdateTime(now);
item.setSourceType(CommonEnum.SourceTypeEnum.USER_UPLOAD.getCode());
item.setIsDeleted(false);
itemManager.update(item);
// 删除藏品和原收藏册关联
List<Long> itemIds = new ArrayList<>();
itemIds.add(item.getId());
favoritesItemsRelationManager.deleteByChosen(dto.getBeforeFavoritesId(), itemIds);
// 新增藏品和新收藏册关联
FavoritesItemsRelation favoritesItemsRelation = new FavoritesItemsRelation();
favoritesItemsRelation.setUserId(dto.getUserId());
favoritesItemsRelation.setFavoritesId(dto.getAfterFavoritesId());
favoritesItemsRelation.setItemId(item.getId());
favoritesItemsRelationManager.insert(favoritesItemsRelation);
return Result.success();
} catch (Exception e) {
logger.error("修改藏品失败，原因：" + e.getMessage(), e);
return Result.failed("修改藏品失败");
}
}
@Override
public Result update(ItemRequestDto dto) {
try {
Item item = itemManager.findDetails(dto.getId());
if (null == item.getId()) {
return Result.failed("数据异常，该藏品不存在");
}
// 新增藏品和收藏册关联
FavoritesItemsRelation favoritesItemsRelation = new FavoritesItemsRelation();
favoritesItemsRelation.setUserId(dto.getUserId());
favoritesItemsRelation.setFavoritesId(dto.getFavoritesId());
favoritesItemsRelation.setItemId(item.getId());
favoritesItemsRelationManager.insert(favoritesItemsRelation);
return Result.success(); return Result.success();
} catch (Exception e) { } catch (Exception e) {
logger.error("收藏藏品失败，原因：" + e.getMessage(), e); logger.error("收藏藏品失败，原因：" + e.getMessage(), e);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java 0 → 100644
View file @ 87d39627
package com.wwdz.ch.wx.impl;
import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import com.alibaba.fastjson.JSONObject;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.type.UserTypeEnum;
import com.wwdz.ch.db.dao.UserDao;
import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.wx.dao.UserInfo;
import com.wwdz.ch.wx.dao.UserToken;
import com.wwdz.ch.wx.dao.WxLoginInfo;
import com.wwdz.ch.wx.entity.request.UserRequestDto;
import com.wwdz.ch.wx.service.CaptchaCodeManager;
import com.wwdz.ch.wx.service.UserService;
import com.wwdz.ch.wx.service.UserTokenManager;
import com.wwdz.ch.wx.util.IpUtil;
import com.wwdz.ch.wx.util.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@Service
public class UserServiceImpl implements UserService {
private static final Logger logger = LoggerFactory.getLogger(UserServiceImpl.class);
@Autowired
private UserDao userDao;
@Autowired
private WxMaService wxMaService;
@Autowired
private UserTokenManager userTokenManager;
@Transactional(rollbackFor = Exception.class)
@Override
public Result loginByWx(WxLoginInfo wxLoginInfo, HttpServletRequest request) {
try {
String code = wxLoginInfo.getCode();
UserInfo userInfo = wxLoginInfo.getUserInfo();
if (StringUtils.isBlank(code) || Objects.isNull(userInfo)) {
return Result.failed(401, "参数不对");
}
Long shareUserId = wxLoginInfo.getShareUserId();
String sessionKey = null;
String openId = null;
try {
WxMaJscode2SessionResult result = wxMaService.getUserService().getSessionInfo(code);
sessionKey = result.getSessionKey();
openId = result.getOpenid();
} catch (Exception e) {
logger.error("微信登录,调用官方接口失败：{}", code, e);
return Result.failed("微信登录失败，获取openid失败");
}
if (sessionKey == null || openId == null) {
logger.error("微信登录,调用官方接口失败：{}", code);
return Result.failed("微信登录失败，获取openid失败");
}
User user = userDao.queryByOid(openId);
if (user == null) {
user = new User();
user.setUsername(openId);
user.setPassword(openId);
user.setWeixinOpenid(openId);
user.setAvatar(userInfo.getAvatarUrl());
user.setNickname("微信用户" + StringUtil.generateRandomString(10));
user.setGender((byte) 0);
user.setUserLevel((byte) 0);
user.setStatus((byte) 0);
user.setLastLoginTime(new Date());
user.setLastLoginIp(IpUtil.client(request));
user.setShareUserId(shareUserId);
userDao.insert(user);
} else {
user.setLastLoginTime(new Date());
user.setLastLoginIp(IpUtil.client(request));
if (userDao.updateById(user) == 0) {
return Result.failed(505, "更新用户数据失败");
}
}
// token
UserToken userToken = null;
try {
userToken = userTokenManager.generateToken(user.getId());
} catch (Exception e) {
logger.error("微信登录失败,生成token失败：{}", user.getId(), e);
return Result.failed("微信登录失败，生成token失败");
}
userToken.setSessionKey(sessionKey);
Map<Object, Object> result = new HashMap<Object, Object>();
result.put("token", userToken.getToken());
result.put("tokenExpire", userToken.getExpireTime().toString());
userInfo.setUserId(user.getId());
userInfo.setWechatId(user.getWechatId());
if (!StringUtils.isEmpty(user.getMobile())) {// 手机号存在则设置
userInfo.setPhone(user.getMobile());
}
try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
String registerDate = simpleDateFormat.format(user.getAddTime() != null ? user.getAddTime() : new Date());
userInfo.setRegisterDate(registerDate);
userInfo.setStatus(user.getStatus());
userInfo.setUserLevel(user.getUserLevel());// 用户层级
userInfo.setUserLevelDesc(UserTypeEnum.getInstance(user.getUserLevel()).getDesc());// 用户层级描述
} catch (Exception e) {
logger.error("微信登录：设置用户指定信息出错："+ e.getMessage(), e);
}
result.put("userInfo", userInfo);
logger.info("【请求结束】微信登录,响应结果:{}", JSONObject.toJSONString(result));
return Result.success(result);
} catch (Exception e){
logger.error("微信登录失败", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return Result.failed("微信登录失败");
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public Result loginByMobile(UserRequestDto dto, HttpServletRequest request) {
try {
String mobileCode = CaptchaCodeManager.getCachedCaptcha(dto.getMobile());
if (!StringUtils.equals(dto.getCode(), mobileCode)) {
return Result.failed("验证码不正确");
}
User user = userDao.queryByMobile(dto.getMobile());
if (Objects.isNull(user)) {
String openId = "";
try {
WxMaJscode2SessionResult result = wxMaService.getUserService().getSessionInfo(dto.getCode());
openId = result.getOpenid();
} catch (Exception e) {
logger.error("微信登录,调用官方接口失败：{}", dto.getCode(), e);
return Result.failed("手机号登录失败，获取openid失败");
}
if (StringUtils.isBlank(openId)) {
return Result.failed("手机号登录失败，获取openid失败");
}
user = new User();
user.setUsername(openId);
user.setPassword(openId);
user.setWeixinOpenid(openId);
user.setAvatar(dto.getAvatarUrl());
user.setNickname("微信用户" + StringUtil.generateRandomString(10));
user.setGender((byte) 0);
user.setUserLevel((byte) 0);
user.setStatus((byte) 0);
user.setLastLoginTime(new Date());
user.setLastLoginIp(IpUtil.client(request));
user.setShareUserId(dto.getShareUserId());
userDao.insert(user);
} else {
user.setLastLoginTime(new Date());
user.setLastLoginIp(IpUtil.client(request));
if (userDao.updateById(user) == 0) {
return Result.failed(505, "更新用户数据失败");
}
}
// token
UserToken userToken = null;
try {
userToken = userTokenManager.generateToken(user.getId());
} catch (Exception e) {
logger.error("手机号登录失败,生成token失败：{}", user.getId(), e);
return Result.failed("手机号登录失败，生成token失败");
}
Map<Object, Object> result = new HashMap<Object, Object>();
result.put("token", userToken.getToken());
result.put("tokenExpire", userToken.getExpireTime().toString());
UserInfo userInfo = new UserInfo();
userInfo.setUserId(user.getId());
userInfo.setPhone(user.getMobile());
userInfo.setAvatarUrl(user.getAvatar());
userInfo.setGender(user.getGender());
userInfo.setNickName(user.getNickname());
userInfo.setWechatId(user.getWechatId());
try {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
String registerDate = simpleDateFormat.format(user.getAddTime() != null ? user.getAddTime() : new Date());
userInfo.setRegisterDate(registerDate);
userInfo.setStatus(user.getStatus());
userInfo.setUserLevel(user.getUserLevel());// 用户层级
userInfo.setUserLevelDesc(UserTypeEnum.getInstance(user.getUserLevel()).getDesc());// 用户层级描述
} catch (Exception e) {
logger.error("手机号登录：设置用户指定信息出错："+ e.getMessage(), e);
}
result.put("userInfo", userInfo);
logger.info("【请求结束】手机号登录,响应结果:{}", JSONObject.toJSONString(result));
return Result.success();
} catch (Exception e) {
logger.error("手机号登录失败", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return Result.failed("手机号登录失败");
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public Result updateNickname(UserRequestDto dto) {
try {
User user = userDao.queryById(dto.getUserId());
if (Objects.isNull(user)) {
return Result.failed("数据异常，用户不存在");
}
user.setNickname(dto.getNickname());
userDao.updateById(user);
return Result.success();
} catch (Exception e) {
logger.error("用户修改昵称失败", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return Result.failed("修改昵称失败");
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public Result updateAvatar(UserRequestDto dto) {
try {
User user = userDao.queryById(dto.getUserId());
if (Objects.isNull(user)) {
return Result.failed("数据异常，用户不存在");
}
user.setAvatar(dto.getAvatarUrl());
userDao.updateById(user);
return Result.success();
} catch (Exception e) {
logger.error("用户修改头像失败", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return Result.failed("修改头像失败");
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public Result bindWechatId(UserRequestDto dto) {
try {
User user = userDao.queryById(dto.getUserId());
if (Objects.isNull(user)) {
return Result.failed("数据异常，用户不存在");
}
user.setWechatId(dto.getWechatId());
userDao.updateById(user);
return Result.success();
} catch (Exception e) {
logger.error("用户绑定微信号失败", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return Result.failed("绑定微信号失败");
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public Result updateMobile(UserRequestDto dto) {
try {
User user = userDao.queryById(dto.getUserId());
if (Objects.isNull(user)) {
return Result.failed("数据异常，用户不存在");
}
if (!StringUtils.equals(user.getMobile(), dto.getBeforeMobile())) {
return Result.failed("原手机号码不正确");
}
String mobileCode = CaptchaCodeManager.getCachedCaptcha(dto.getAfterMobile());
if (!StringUtils.equals(dto.getCode(), mobileCode)) {
return Result.failed("验证码不正确");
}
if (userDao.isExistedByMobile(dto.getBeforeMobile(), dto.getAfterMobile())) {
return Result.failed("新手机号已被绑定");
}
user.setMobile(dto.getAfterMobile());
userDao.updateById(user);
return Result.success();
} catch (Exception e) {
logger.error("用户修改手机号失败", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return Result.failed("修改手机号失败");
}
}
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/ItemService.java
View file @ 87d39627
...@@ -4,9 +4,15 @@ import com.wwdz.ch.core.type.Result; ...@@ -4,9 +4,15 @@ import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.wx.entity.request.ItemRequestDto; import com.wwdz.ch.wx.entity.request.ItemRequestDto;
public interface ItemService { public interface ItemService {
Result page(ItemRequestDto dto);
Result list(ItemRequestDto dto);
Result add(ItemRequestDto dto); Result add(ItemRequestDto dto);
Result info(ItemRequestDto dto); Result info(ItemRequestDto dto);
Result collect(ItemRequestDto dto); Result collect(ItemRequestDto dto);
Result update(ItemRequestDto dto);
} }
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/UserService.java 0 → 100644
View file @ 87d39627
package com.wwdz.ch.wx.service;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.wx.dao.WxLoginInfo;
import com.wwdz.ch.wx.entity.request.UserRequestDto;
import javax.servlet.http.HttpServletRequest;
public interface UserService {
Result loginByWx(WxLoginInfo wxLoginInfo, HttpServletRequest request);
Result loginByMobile(UserRequestDto dto, HttpServletRequest request);
Result updateNickname(UserRequestDto dto);
Result updateAvatar(UserRequestDto dto);
Result bindWechatId(UserRequestDto dto);
Result updateMobile(UserRequestDto dto);
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/util/StringUtil.java 0 → 100644
View file @ 87d39627
package com.wwdz.ch.wx.util;
import java.util.Random;
public class StringUtil {
private static final String ALLOWED_CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
public static String generateRandomString(int length) {
Random random = new Random();
StringBuilder sb = new StringBuilder(length);
for (int i = 0; i < length; i++) {
sb.append(ALLOWED_CHARACTERS.charAt(random.nextInt(ALLOWED_CHARACTERS.length())));
}
return sb.toString();
}
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxAuthController.java
View file @ 87d39627
package com.wwdz.ch.wx.web; package com.wwdz.ch.wx.web;
import java.text.SimpleDateFormat; import cn.binarywang.wx.miniapp.api.WxMaService;
import java.time.LocalDateTime; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import java.time.format.DateTimeFormatter; import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import com.wwdz.ch.wx.annotation.LoginUser;
import com.wwdz.ch.wx.dao.UserInfo;
import com.wwdz.ch.wx.service.UserTokenManager;
import com.wwdz.ch.wx.util.IpUtil;
import com.wwdz.ch.wx.util.WxResponseCode;
import com.wwdz.ch.wx.util.WxResponseUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.wwdz.ch.core.captcha.CaptchaCodeManager; import com.wwdz.ch.core.captcha.CaptchaCodeManager;
import com.wwdz.ch.core.consts.CommConsts; import com.wwdz.ch.core.consts.CommConsts;
...@@ -39,12 +17,31 @@ import com.wwdz.ch.core.util.ResponseUtil; ...@@ -39,12 +17,31 @@ import com.wwdz.ch.core.util.ResponseUtil;
import com.wwdz.ch.core.util.bcrypt.BCryptPasswordEncoder; import com.wwdz.ch.core.util.bcrypt.BCryptPasswordEncoder;
import com.wwdz.ch.db.domain.User; import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.db.service.DtsUserService; import com.wwdz.ch.db.service.DtsUserService;
import com.wwdz.ch.wx.annotation.LoginUser;
import com.wwdz.ch.wx.dao.UserInfo;
import com.wwdz.ch.wx.dao.UserToken; import com.wwdz.ch.wx.dao.UserToken;
import com.wwdz.ch.wx.dao.WxLoginInfo; import com.wwdz.ch.wx.dao.WxLoginInfo;
import com.wwdz.ch.wx.service.UserTokenManager;
import com.wwdz.ch.wx.util.IpUtil;
import com.wwdz.ch.wx.util.WxResponseCode;
import com.wwdz.ch.wx.util.WxResponseUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.binarywang.wx.miniapp.api.WxMaService; import javax.servlet.http.HttpServletRequest;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import java.text.SimpleDateFormat;
import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import java.time.LocalDateTime;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 鉴权服务 * 鉴权服务
...@@ -188,14 +185,14 @@ public class WxAuthController { ...@@ -188,14 +185,14 @@ public class WxAuthController {
user.setGender(userInfo.getGender()); user.setGender(userInfo.getGender());
user.setUserLevel((byte) 0); user.setUserLevel((byte) 0);
user.setStatus((byte) 0); user.setStatus((byte) 0);
user.setLastLoginTime(LocalDateTime.now()); user.setLastLoginTime(new Date());
user.setLastLoginIp(IpUtil.client(request)); user.setLastLoginIp(IpUtil.client(request));
user.setShareUserId(shareUserId); user.setShareUserId(shareUserId);
userService.add(user); userService.add(user);
} else { } else {
user.setLastLoginTime(LocalDateTime.now()); user.setLastLoginTime(new Date());
user.setLastLoginIp(IpUtil.client(request)); user.setLastLoginIp(IpUtil.client(request));
if (userService.updateById(user) == 0) { if (userService.updateById(user) == 0) {
return ResponseUtil.updatedDataFailed(); return ResponseUtil.updatedDataFailed();
...@@ -221,8 +218,8 @@ public class WxAuthController { ...@@ -221,8 +218,8 @@ public class WxAuthController {
userInfo.setPhone(user.getMobile()); userInfo.setPhone(user.getMobile());
} }
try { try {
String registerDate = DateTimeFormatter.ofPattern("yyyy-MM-dd") SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
.format(user.getAddTime() != null ? user.getAddTime() : LocalDateTime.now()); String registerDate = simpleDateFormat.format(user.getAddTime() != null ? user.getAddTime() : new Date());
userInfo.setRegisterDate(registerDate); userInfo.setRegisterDate(registerDate);
userInfo.setStatus(user.getStatus()); userInfo.setStatus(user.getStatus());
userInfo.setUserLevel(user.getUserLevel());// 用户层级 userInfo.setUserLevel(user.getUserLevel());// 用户层级
...@@ -360,7 +357,7 @@ public class WxAuthController { ...@@ -360,7 +357,7 @@ public class WxAuthController {
user.setGender((byte) 0); user.setGender((byte) 0);
user.setUserLevel((byte) 0); user.setUserLevel((byte) 0);
user.setStatus((byte) 0); user.setStatus((byte) 0);
user.setLastLoginTime(LocalDateTime.now()); user.setLastLoginTime(new Date());
user.setLastLoginIp(IpUtil.client(request)); user.setLastLoginIp(IpUtil.client(request));
userService.add(user); userService.add(user);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxFootprintController.java
View file @ 87d39627
package com.wwdz.ch.wx.web; package com.wwdz.ch.wx.web;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.wwdz.ch.db.domain.Item;
import com.wwdz.ch.wx.annotation.LoginUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.wwdz.ch.core.util.JacksonUtil; import com.wwdz.ch.core.util.JacksonUtil;
import com.wwdz.ch.core.util.ResponseUtil; import com.wwdz.ch.core.util.ResponseUtil;
import com.wwdz.ch.db.domain.Footprint; import com.wwdz.ch.db.domain.Footprint;
import com.wwdz.ch.db.domain.Item;
import com.wwdz.ch.db.service.DtsFootprintService; import com.wwdz.ch.db.service.DtsFootprintService;
import com.wwdz.ch.db.service.ItemService; import com.wwdz.ch.db.service.ItemService;
import com.wwdz.ch.wx.annotation.LoginUser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* 用户访问足迹服务 * 用户访问足迹服务
...@@ -107,10 +101,10 @@ public class WxFootprintController { ...@@ -107,10 +101,10 @@ public class WxFootprintController {
for (Footprint footprint : footprintList) { for (Footprint footprint : footprintList) {
Map<String, Object> c = new HashMap<String, Object>(); Map<String, Object> c = new HashMap<String, Object>();
c.put("id", footprint.getId()); c.put("id", footprint.getId());
c.put("coinsId", footprint.getCoinsId()); c.put("coinsId", footprint.getItemId());
c.put("addTime", footprint.getAddTime()); c.put("addTime", footprint.getAddTime());
Item item = itemService.findById(footprint.getCoinsId().longValue()); Item item = itemService.findById(footprint.getItemId().longValue());
c.put("name", item.getName()); c.put("name", item.getName());
c.put("retailPrice", item.getPrice()); c.put("retailPrice", item.getPrice());
c.put("image", item.getImages().split(";")[0]); c.put("image", item.getImages().split(";")[0]);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxGoodsController.java
View file @ 87d39627
package com.wwdz.ch.wx.web; package com.wwdz.ch.wx.web;
import java.io.Serializable;
import java.util.*;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import javax.validation.constraints.NotNull;
import com.alibaba.druid.support.json.JSONUtils; import com.alibaba.druid.support.json.JSONUtils;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.mysql.jdbc.StringUtils;
import com.wwdz.ch.core.util.PriceUtil; import com.wwdz.ch.core.util.PriceUtil;
import com.wwdz.ch.core.util.ResponseUtil;
import com.wwdz.ch.core.util.ZincUtil; import com.wwdz.ch.core.util.ZincUtil;
import com.wwdz.ch.db.domain.*; import com.wwdz.ch.core.validator.Order;
import com.wwdz.ch.core.validator.Sort;
import com.wwdz.ch.db.dao.impl.CategoryManagerImpl; import com.wwdz.ch.db.dao.impl.CategoryManagerImpl;
import com.wwdz.ch.db.domain.Category;
import com.wwdz.ch.db.domain.Footprint;
import com.wwdz.ch.db.domain.Item;
import com.wwdz.ch.db.domain.SearchHistory;
import com.wwdz.ch.db.service.*; import com.wwdz.ch.db.service.*;
import com.wwdz.ch.wx.annotation.LoginUser; import com.wwdz.ch.wx.annotation.LoginUser;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -26,12 +26,13 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -26,12 +26,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject; import javax.validation.constraints.NotNull;
import com.github.pagehelper.PageInfo; import java.io.Serializable;
import com.mysql.jdbc.StringUtils; import java.util.*;
import com.wwdz.ch.core.util.ResponseUtil; import java.util.concurrent.ArrayBlockingQueue;
import com.wwdz.ch.core.validator.Order; import java.util.concurrent.RejectedExecutionHandler;
import com.wwdz.ch.core.validator.Sort; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
/** /**
* 商品服务 * 商品服务
...@@ -111,7 +112,7 @@ public class WxGoodsController { ...@@ -111,7 +112,7 @@ public class WxGoodsController {
executorService.execute(() -> { executorService.execute(() -> {
Footprint footprint = new Footprint(); Footprint footprint = new Footprint();
footprint.setUserId(userId); footprint.setUserId(userId);
footprint.setCoinsId(id); footprint.setItemId(id);
footprintService.add(footprint); footprintService.add(footprint);
short num = 1; short num = 1;
productService.addBrowse(id.intValue(), num);// 新增商品点击量 productService.addBrowse(id.intValue(), num);// 新增商品点击量
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxItemController.java
View file @ 87d39627
package com.wwdz.ch.wx.web; package com.wwdz.ch.wx.web;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.wx.entity.request.ItemRequestDto;
import com.wwdz.ch.wx.service.ItemService;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -10,5 +17,36 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -10,5 +17,36 @@ import org.springframework.web.bind.annotation.RestController;
public class WxItemController { public class WxItemController {
private static final Logger logger = LoggerFactory.getLogger(WxItemController.class); private static final Logger logger = LoggerFactory.getLogger(WxItemController.class);
@Autowired
private ItemService itemService;
@ApiOperation(value = "分页查询")
@PostMapping("/page")
public Result page(@RequestBody ItemRequestDto dto) {
return itemService.page(dto);
}
@ApiOperation(value = "列表查询")
@PostMapping("/list")
public Result list(@RequestBody ItemRequestDto dto) {
return itemService.list(dto);
}
@ApiOperation(value = "新增")
@PostMapping("/add")
public Result add(@RequestBody ItemRequestDto dto) {
return itemService.add(dto);
}
@ApiOperation(value = "修改")
@PostMapping("/update")
public Result update(@RequestBody ItemRequestDto dto) {
return itemService.update(dto);
}
@ApiOperation(value = "详情")
@PostMapping("/info")
public Result info(@RequestBody ItemRequestDto dto) {
return itemService.info(dto);
}
} }
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