Commit 47831dfa authored by xiaoguang.xu's avatar xiaoguang.xu

去掉人工 setUpdatedAt 节点,改用 BaseEntity 处理

parent 143b963a
...@@ -64,17 +64,14 @@ public class UserDetailController implements IBaseController { ...@@ -64,17 +64,14 @@ public class UserDetailController implements IBaseController {
log.error("身份证号错误,userId:{}, idNo: {}", user.getId(), idNo); log.error("身份证号错误,userId:{}, idNo: {}", user.getId(), idNo);
return JsonResult.buildErrorStateResult("身份证号码错误", null); return JsonResult.buildErrorStateResult("身份证号码错误", null);
} }
Timestamp now = new Timestamp(System.currentTimeMillis());
/* 保存或更新 */ /* 保存或更新 */
UserDetail userDetail = userDetailService.findByUserId(user.getId()); UserDetail userDetail = userDetailService.findByUserId(user.getId());
if (Objects.isNull(userDetail)) { if (Objects.isNull(userDetail)) {
userDetail = new UserDetail(); userDetail = new UserDetail();
userDetail.setCreatedAt(now);
} }
userDetail.setIdNo(idNo); userDetail.setIdNo(idNo);
userDetail.setPhoneNo(user.getPhoneNo()); userDetail.setPhoneNo(user.getPhoneNo());
userDetail.setUserId(user.getId()); userDetail.setUserId(user.getId());
userDetail.setUpdatedAt(now);
userDetail.setName(name); userDetail.setName(name);
userDetail.setGender(info.getGender()); userDetail.setGender(info.getGender());
userDetail.setIdType(IdType.ID_CARD); userDetail.setIdType(IdType.ID_CARD);
......
...@@ -280,7 +280,6 @@ public class InnerController implements IBaseController { ...@@ -280,7 +280,6 @@ public class InnerController implements IBaseController {
} else if (!Objects.equals(user.getPhoneNo(), phoneNo)) { } else if (!Objects.equals(user.getPhoneNo(), phoneNo)) {
return JsonResult.buildErrorStateResult("用户手机号不匹配", null); return JsonResult.buildErrorStateResult("用户手机号不匹配", null);
} }
Timestamp now = new Timestamp(System.currentTimeMillis());
/* /*
* 如果已存在记录,则更新 * 如果已存在记录,则更新
*/ */
...@@ -294,13 +293,11 @@ public class InnerController implements IBaseController { ...@@ -294,13 +293,11 @@ public class InnerController implements IBaseController {
} }
if (Objects.isNull(userDetail)) { if (Objects.isNull(userDetail)) {
userDetail = new UserDetail(); userDetail = new UserDetail();
userDetail.setCreatedAt(now);
} }
userDetail.setUserId(userId); userDetail.setUserId(userId);
userDetail.setName(name); userDetail.setName(name);
userDetail.setPhoneNo(phoneNo); userDetail.setPhoneNo(phoneNo);
userDetail.setIdNo(idNo); userDetail.setIdNo(idNo);
userDetail.setUpdatedAt(now);
userDetail.setIdType(IdType.ID_CARD); userDetail.setIdType(IdType.ID_CARD);
userDetail.setGender(info.getGender()); userDetail.setGender(info.getGender());
userDetail.setEmail(email); userDetail.setEmail(email);
...@@ -922,7 +919,6 @@ public class InnerController implements IBaseController { ...@@ -922,7 +919,6 @@ public class InnerController implements IBaseController {
return false; return false;
} }
user.setEnable(enable); user.setEnable(enable);
user.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
log.info("刷新用户激活状态失败:userId:{},enable:{},user:{}", userId, enable, user); log.info("刷新用户激活状态失败:userId:{},enable:{},user:{}", userId, enable, user);
user = userService.saveUser(user); user = userService.saveUser(user);
if (!user.getEnable()) { if (!user.getEnable()) {
......
...@@ -71,17 +71,14 @@ public class SyncUserController { ...@@ -71,17 +71,14 @@ public class SyncUserController {
log.error("用户不存在,phoneNo:{}", phoneNo); log.error("用户不存在,phoneNo:{}", phoneNo);
return JsonResult.buildErrorStateResult("用户不存在", phoneNo); return JsonResult.buildErrorStateResult("用户不存在", phoneNo);
} }
Timestamp now = new Timestamp(System.currentTimeMillis());
/* 保存或更新 */ /* 保存或更新 */
UserDetail userDetail = userDetailService.findByUserId(user.getId()); UserDetail userDetail = userDetailService.findByUserId(user.getId());
if (Objects.isNull(userDetail)) { if (Objects.isNull(userDetail)) {
userDetail = new UserDetail(); userDetail = new UserDetail();
userDetail.setCreatedAt(now);
} }
userDetail.setUserId(user.getId()); userDetail.setUserId(user.getId());
userDetail.setIdNo(idNo); userDetail.setIdNo(idNo);
userDetail.setPhoneNo(phoneNo); userDetail.setPhoneNo(phoneNo);
userDetail.setUpdatedAt(now);
userDetail.setName(name); userDetail.setName(name);
userDetail.setGender(info.getGender()); userDetail.setGender(info.getGender());
userDetail.setIdType(IdType.ID_CARD); userDetail.setIdType(IdType.ID_CARD);
......
...@@ -48,7 +48,6 @@ public class UserDetailController { ...@@ -48,7 +48,6 @@ public class UserDetailController {
//更新 //更新
userDetail.setName(userDetailReq.getName()); userDetail.setName(userDetailReq.getName());
userDetail.setIdNo(userDetailReq.getIdNo()); userDetail.setIdNo(userDetailReq.getIdNo());
userDetail.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
userDetail = userDetailService.saveUserDetail(userDetail); userDetail = userDetailService.saveUserDetail(userDetail);
return JsonResult.buildSuccessResultGeneric(userDetail); return JsonResult.buildSuccessResultGeneric(userDetail);
} }
...@@ -69,7 +68,6 @@ public class UserDetailController { ...@@ -69,7 +68,6 @@ public class UserDetailController {
} }
User user = userService.findById(userId); User user = userService.findById(userId);
IdCardInfo idCardInfo = idCardService.getIdCardInfo(userDetailReq.getIdNo()); IdCardInfo idCardInfo = idCardService.getIdCardInfo(userDetailReq.getIdNo());
Timestamp now = new Timestamp(System.currentTimeMillis());
userDetail = new UserDetail(); userDetail = new UserDetail();
userDetail.setUserId(userId); userDetail.setUserId(userId);
...@@ -78,8 +76,6 @@ public class UserDetailController { ...@@ -78,8 +76,6 @@ public class UserDetailController {
userDetail.setIdNo(userDetailReq.getIdNo()); userDetail.setIdNo(userDetailReq.getIdNo());
userDetail.setIdType(IdType.ID_CARD); userDetail.setIdType(IdType.ID_CARD);
userDetail.setGender(idCardInfo.getGender()); userDetail.setGender(idCardInfo.getGender());
userDetail.setCreatedAt(now);
userDetail.setUpdatedAt(now);
userDetail = userDetailService.saveUserDetail(userDetail); userDetail = userDetailService.saveUserDetail(userDetail);
return JsonResult.buildSuccessResultGeneric(userDetail); return JsonResult.buildSuccessResultGeneric(userDetail);
} }
......
package cn.quantgroup.xyqb.entity;
import javax.persistence.*;
import java.io.Serializable;
/**
* Created by FrankChow on 15/7/8.
*/
@Entity
@Table(name = "channel", uniqueConstraints = @UniqueConstraint(columnNames = "channel_code"))
public class Channel implements Serializable {
private static final long serialVersionUID = -1L;
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
//渠道代号
@Column(name = "channel_code")
private String channelCode;
//渠道名称
@Column(name = "name")
private String name;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getChannelCode() {
return channelCode;
}
public void setChannelCode(String channelCode) {
this.channelCode = channelCode;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
@Override
public String toString() {
return "Channel{" +
"channelCode='" + channelCode + '\'' +
", id=" + id +
", name='" + name + '\'' +
'}';
}
}
...@@ -15,13 +15,9 @@ import java.sql.Timestamp; ...@@ -15,13 +15,9 @@ import java.sql.Timestamp;
@Data @Data
@Entity @Entity
@Table(name = "contact") @Table(name = "contact")
public class Contact implements Serializable { public class Contact extends BaseEntity implements Serializable {
private static final long serialVersionUID = -1L; private static final long serialVersionUID = -1L;
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "user_id") @Column(name = "user_id")
private Long userId; private Long userId;
@Column(name = "name") @Column(name = "name")
...@@ -30,10 +26,6 @@ public class Contact implements Serializable { ...@@ -30,10 +26,6 @@ public class Contact implements Serializable {
private String phoneNo; private String phoneNo;
@Column(name = "relation") @Column(name = "relation")
private Relation relation; private Relation relation;
@Column(name = "created_at")
private Timestamp createdAt;
@Column(name = "updated_at")
private Timestamp updateAt;
/** /**
* 数据合法性校验 * 数据合法性校验
......
...@@ -4,10 +4,8 @@ import lombok.Data; ...@@ -4,10 +4,8 @@ import lombok.Data;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
/** /**
* Created by 11 on 2016/12/30. * Created by 11 on 2016/12/30.
...@@ -15,18 +13,11 @@ import java.sql.Timestamp; ...@@ -15,18 +13,11 @@ import java.sql.Timestamp;
@Data @Data
@Entity @Entity
@Table(name = "merchant") @Table(name = "merchant")
public class Merchant implements Serializable { public class Merchant extends BaseEntity implements Serializable {
private static final long serialVersionUID = -1L; private static final long serialVersionUID = -1L;
@Id
@Column(name = "id")
private Long id;
@Column(name = "name") @Column(name = "name")
private String name; private String name;
@Column(name = "enable") @Column(name = "enable")
private boolean enable; private boolean enable;
@Column(name = "created_at")
private Timestamp createAt;
@Column(name = "updated_at")
private Timestamp updateAt;
} }
...@@ -4,10 +4,8 @@ import lombok.Data; ...@@ -4,10 +4,8 @@ import lombok.Data;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
/** /**
* Created by 11 on 2016/12/30. * Created by 11 on 2016/12/30.
...@@ -15,20 +13,13 @@ import java.sql.Timestamp; ...@@ -15,20 +13,13 @@ import java.sql.Timestamp;
@Data @Data
@Entity @Entity
@Table(name = "merchant_config") @Table(name = "merchant_config")
public class MerchantConfig implements Serializable { public class MerchantConfig extends BaseEntity implements Serializable {
private static final long serialVersionUID = -1L; private static final long serialVersionUID = -1L;
@Id
@Column(name = "id")
private Long id;
@Column(name = "merchant_id") @Column(name = "merchant_id")
private Long merchantId; private Long merchantId;
@Column(name = "config_name") @Column(name = "config_name")
private String configName; private String configName;
@Column(name = "config_value") @Column(name = "config_value")
private String configValue; private String configValue;
@Column(name = "created_at")
private Timestamp createdAt;
@Column(name = "updated_at")
private Timestamp updateAt;
} }
package cn.quantgroup.xyqb.entity; package cn.quantgroup.xyqb.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import javax.persistence.*; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* Date: 2019/11/4 * Date: 2019/11/4
...@@ -16,7 +16,7 @@ import java.util.Date; ...@@ -16,7 +16,7 @@ import java.util.Date;
@Data @Data
@Entity @Entity
@Table(name = "user_modify_phone_no") @Table(name = "user_modify_phone_no")
public class ModifyPhoneNo extends BaseEntity implements Serializable { public class ModifyPhoneNo extends BaseEntity implements Serializable {
private static final long serialVersionUID = -7797532159380593454L; private static final long serialVersionUID = -7797532159380593454L;
......
package cn.quantgroup.xyqb.entity; package cn.quantgroup.xyqb.entity;
import cn.quantgroup.xyqb.config.http.Timestamp2LongConverter;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import javax.persistence.*; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Objects; import java.util.Objects;
/** /**
...@@ -18,15 +18,11 @@ import java.util.Objects; ...@@ -18,15 +18,11 @@ import java.util.Objects;
@Setter @Setter
@ToString @ToString
@Entity @Entity
@Table(name = "user", uniqueConstraints = @UniqueConstraint(columnNames = "phone_no")) @Table(name = "user",
public class User implements Serializable { uniqueConstraints = @UniqueConstraint(columnNames = "phone_no"))
public class User extends BaseEntity implements Serializable {
private static final long serialVersionUID = -1L; private static final long serialVersionUID = -1L;
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
//手机号 //手机号
@Column(name = "phone_no") @Column(name = "phone_no")
private String phoneNo; private String phoneNo;
...@@ -35,7 +31,6 @@ public class User implements Serializable { ...@@ -35,7 +31,6 @@ public class User implements Serializable {
@Column(name = "password") @Column(name = "password")
private String password; private String password;
//第一次用户来源 channel_id //第一次用户来源 channel_id
@Column(name = "registered_from") @Column(name = "registered_from")
private Long registeredFrom; private Long registeredFrom;
...@@ -47,17 +42,9 @@ public class User implements Serializable { ...@@ -47,17 +42,9 @@ public class User implements Serializable {
@Column(name = "enable") @Column(name = "enable")
private Boolean enable; private Boolean enable;
//创建时间
@Column(name = "created_at")
private Timestamp createdAt;
//上一次修改时间
@Column(name = "updated_at")
@JSONField(serializeUsing = Timestamp2LongConverter.class)
private Timestamp updatedAt;
/** /**
* 是否有密码 * 是否有密码
*
* @return * @return
*/ */
public boolean getHasPassword() { public boolean getHasPassword() {
......
package cn.quantgroup.xyqb.entity; package cn.quantgroup.xyqb.entity;
import cn.quantgroup.xyqb.config.http.Timestamp2LongConverter;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import javax.persistence.*; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp;
/** /**
* Created by Administrator on 2017/5/16. * Created by Administrator on 2017/5/16.
...@@ -18,14 +17,9 @@ import java.sql.Timestamp; ...@@ -18,14 +17,9 @@ import java.sql.Timestamp;
@ToString @ToString
@Entity @Entity
@Table(name = "user_bt_register") @Table(name = "user_bt_register")
public class UserBtRegister implements Serializable { public class UserBtRegister extends BaseEntity implements Serializable {
private static final long serialVersionUID = -1L; private static final long serialVersionUID = -1L;
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "user_id") @Column(name = "user_id")
private Long userId; private Long userId;
...@@ -34,29 +28,4 @@ public class UserBtRegister implements Serializable { ...@@ -34,29 +28,4 @@ public class UserBtRegister implements Serializable {
@Column(name = "is_active") @Column(name = "is_active")
private Boolean isActive = Boolean.TRUE; private Boolean isActive = Boolean.TRUE;
//创建时间
@Column(name = "created_at")
private Timestamp createdAt;
//上一次修改时间
@Column(name = "updated_at")
@JSONField(serializeUsing = Timestamp2LongConverter.class)
private Timestamp updatedAt;
@PrePersist
public void prePersist() {
Timestamp now = new Timestamp(System.currentTimeMillis());
this.createdAt = now;
this.updatedAt = now;
}
@PreUpdate
public void preUpdate() {
Timestamp now = new Timestamp(System.currentTimeMillis());
this.createdAt = now;
this.updatedAt = now;
}
} }
...@@ -7,7 +7,10 @@ import lombok.Getter; ...@@ -7,7 +7,10 @@ import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
import javax.persistence.*; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.util.Optional; import java.util.Optional;
...@@ -19,16 +22,12 @@ import java.util.Optional; ...@@ -19,16 +22,12 @@ import java.util.Optional;
@Setter @Setter
@ToString @ToString
@Entity @Entity
@Table(name = "user_detail", uniqueConstraints = @UniqueConstraint(columnNames = "user_id")) @Table(name = "user_detail",
public class UserDetail implements Serializable { uniqueConstraints = @UniqueConstraint(columnNames = "user_id"))
public class UserDetail extends BaseEntity implements Serializable {
private static final long serialVersionUID = -1L; private static final long serialVersionUID = -1L;
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "user_id") @Column(name = "user_id")
private Long userId; private Long userId;
...@@ -60,14 +59,6 @@ public class UserDetail implements Serializable { ...@@ -60,14 +59,6 @@ public class UserDetail implements Serializable {
@Column(name = "qq") @Column(name = "qq")
private String qq; private String qq;
//创建时间
@Column(name = "created_at")
private Timestamp createdAt;
//上一次修改时间
@Column(name = "updated_at")
private Timestamp updatedAt;
public XUserDetail toXUserDetail() { public XUserDetail toXUserDetail() {
XUserDetail xUserDetail = new XUserDetail(); XUserDetail xUserDetail = new XUserDetail();
xUserDetail.setId(this.getId()); xUserDetail.setId(this.getId());
...@@ -76,10 +67,13 @@ public class UserDetail implements Serializable { ...@@ -76,10 +67,13 @@ public class UserDetail implements Serializable {
xUserDetail.setName(this.getName()); xUserDetail.setName(this.getName());
xUserDetail.setIdNo(this.getIdNo()); xUserDetail.setIdNo(this.getIdNo());
if (this.getIdType() != null) { if (this.getIdType() != null) {
xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType().name())); xUserDetail.setIdType(cn.quantgroup.motan.enums.IdType.valueOf(this.getIdType()
.name()));
} }
if (this.getGender() != null) { if (this.getGender() != null) {
xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(Optional.ofNullable(this.getGender()).orElse(Gender.UNKNOWN).name())); xUserDetail.setGender(cn.quantgroup.motan.enums.Gender.valueOf(Optional.ofNullable(this.getGender())
.orElse(Gender.UNKNOWN)
.name()));
} }
xUserDetail.setEmail(this.getEmail()); xUserDetail.setEmail(this.getEmail());
xUserDetail.setQq(this.getQq()); xUserDetail.setQq(this.getQq());
...@@ -90,5 +84,4 @@ public class UserDetail implements Serializable { ...@@ -90,5 +84,4 @@ public class UserDetail implements Serializable {
return xUserDetail; return xUserDetail;
} }
} }
package cn.quantgroup.xyqb.entity;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import javax.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
/**
* @author mengfan.feng
* @time 2015-09-10 15:32
*/
@Entity
@Table(name = "user_jr58", uniqueConstraints = @UniqueConstraint(columnNames = "user_id"))
@Getter
@Setter
@ToString
public class UserJr58 extends BaseEntity implements Serializable {
private static final long serialVersionUID = -1L;
@Column(name = "user_id")
private Long userId;
@Column(name = "wb_id")
private String wbId;
@Column(name = "wb_user_name")
private String wbUserName;
@Column(name = "customer_id")
private String customerId;
@Column(name = "name")
private String name;
@Column(name = "id_card")
private String idcard;
@Column(name = "email")
private String email;
@Column(name = "phone")
private String phone;
@Column(name = "info")
private String info;
@Column(name = "role_id")
private String roleId;
@Column(name = "flag")
private String flag;
@Column(name = "city")
private String city;
@Column(name = "access_mode")
private String accessMode;
@Column(name = "app_id")
private String appId;
@Column(name = "edu")
private String edu;
@Column(name = "income")
private String income;
@Column(name = "marry")
private String marry;
}
package cn.quantgroup.xyqb.entity; package cn.quantgroup.xyqb.entity;
import lombok.Data; import lombok.Data;
import javax.persistence.*; import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
/** /**
* Created by 11 on 2016/12/30. * Created by 11 on 2016/12/30.
...@@ -13,14 +14,10 @@ import java.util.Date; ...@@ -13,14 +14,10 @@ import java.util.Date;
@Data @Data
@Entity @Entity
@Table(name = "user_query_log") @Table(name = "user_query_log")
public class UserQueryLog implements Serializable { public class UserQueryLog extends BaseEntity implements Serializable {
private static final long serialVersionUID = -1L; private static final long serialVersionUID = -1L;
@Id
@Column(name = "id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "login_user_name") @Column(name = "login_user_name")
private String loginUserName; private String loginUserName;
@Column(name = "query_condition") @Column(name = "query_condition")
...@@ -31,8 +28,6 @@ public class UserQueryLog implements Serializable { ...@@ -31,8 +28,6 @@ public class UserQueryLog implements Serializable {
private Long resultAmount; private Long resultAmount;
@Column(name = "query_detail") @Column(name = "query_detail")
private String queryDetail; private String queryDetail;
@Column(name = "created_at")
private Date createdAt = new Date();
@Transient @Transient
private String createDate; private String createDate;
......
...@@ -36,9 +36,6 @@ public class BtRegisteredEventListener implements ApplicationListener<RegisterEv ...@@ -36,9 +36,6 @@ public class BtRegisteredEventListener implements ApplicationListener<RegisterEv
userBtRegister.setRegisterBtMerchantId(btRegisterChannelId); userBtRegister.setRegisterBtMerchantId(btRegisterChannelId);
} }
userBtRegister.setIsActive(true); userBtRegister.setIsActive(true);
Timestamp currentTime = new Timestamp(System.currentTimeMillis());
userBtRegister.setCreatedAt(currentTime);
userBtRegister.setUpdatedAt(currentTime);
userBtRegisterService.save(userBtRegister); userBtRegisterService.save(userBtRegister);
} }
} }
...@@ -51,9 +51,6 @@ public class DetailRegisteredEventListener implements ApplicationListener<Regist ...@@ -51,9 +51,6 @@ public class DetailRegisteredEventListener implements ApplicationListener<Regist
userDetail.setPhoneNo(phoneNo); userDetail.setPhoneNo(phoneNo);
userDetail.setName(name); userDetail.setName(name);
userDetail.setIdType(IdType.ID_CARD); userDetail.setIdType(IdType.ID_CARD);
Timestamp currentTime = new Timestamp(System.currentTimeMillis());
userDetail.setCreatedAt(currentTime);
userDetail.setUpdatedAt(currentTime);
userDetail.setUserId(user.getId()); userDetail.setUserId(user.getId());
userDetail.setGender(cardInfo.getGender()); userDetail.setGender(cardInfo.getGender());
userDetailService.saveUserDetail(userDetail); userDetailService.saveUserDetail(userDetail);
......
...@@ -40,8 +40,8 @@ public class ContactRet implements Serializable { ...@@ -40,8 +40,8 @@ public class ContactRet implements Serializable {
if(Objects.nonNull(c.getCreatedAt())){ if(Objects.nonNull(c.getCreatedAt())){
ret.setCreatedAt(c.getCreatedAt().getTime()); ret.setCreatedAt(c.getCreatedAt().getTime());
} }
if(Objects.nonNull(c.getUpdateAt())) { if(Objects.nonNull(c.getUpdatedAt())) {
ret.setUpdateAt(c.getUpdateAt().getTime()); ret.setUpdateAt(c.getUpdatedAt().getTime());
} }
return ret; return ret;
} }
......
package cn.quantgroup.xyqb.repository;
import cn.quantgroup.xyqb.entity.Channel;
import org.springframework.data.jpa.repository.JpaRepository;
/**
* @author mengfan.feng
* @time 2015-09-11 11:25
*/
public interface IChannelRepository extends JpaRepository<Channel, Long> {
}
package cn.quantgroup.xyqb.repository;
import cn.quantgroup.xyqb.entity.UserJr58;
import org.springframework.data.jpa.repository.JpaRepository;
/**
* @author mengfan.feng
* @time 2015-09-11 14:35
*/
public interface IUserJr58Repository extends JpaRepository<UserJr58, Long> {
}
...@@ -81,9 +81,6 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService { ...@@ -81,9 +81,6 @@ public class UserAuthorizedServiceImpl implements IUserAuthorizedService {
userAuthorized.setName(userAuthorizedParam.getName()); userAuthorized.setName(userAuthorizedParam.getName());
userAuthorized.setIdNo(userAuthorizedParam.getIdNo()); userAuthorized.setIdNo(userAuthorizedParam.getIdNo());
userAuthorized.setUserUuid(userAuthorizedParam.getUserUuid()); userAuthorized.setUserUuid(userAuthorizedParam.getUserUuid());
Timestamp now = new Timestamp(System.currentTimeMillis());
userAuthorized.setCreatedAt(now);
userAuthorized.setUpdatedAt(now);
try { try {
userAuthorized = userAuthorizedRepository.save(userAuthorized); userAuthorized = userAuthorizedRepository.save(userAuthorized);
......
...@@ -94,9 +94,6 @@ public class UserRegisterServiceImpl implements IUserRegisterService { ...@@ -94,9 +94,6 @@ public class UserRegisterServiceImpl implements IUserRegisterService {
if (StringUtils.isNotBlank(password)) { if (StringUtils.isNotBlank(password)) {
user.setPassword(PasswordUtil.MD5WithSalt(password)); user.setPassword(PasswordUtil.MD5WithSalt(password));
} }
Timestamp currentTime = new Timestamp(System.currentTimeMillis());
user.setUpdatedAt(currentTime);
user.setCreatedAt(currentTime);
user = userService.saveUser(user); user = userService.saveUser(user);
userRegisterParam.setUser(user); userRegisterParam.setUser(user);
return user; return user;
......
...@@ -30,14 +30,11 @@ public class AddressServiceImpl implements IAddressService { ...@@ -30,14 +30,11 @@ public class AddressServiceImpl implements IAddressService {
@Override @Override
@CacheEvict(value = "addresscache", key = "'address' + #addressObj.userId", cacheManager = "cacheManager") @CacheEvict(value = "addresscache", key = "'address' + #addressObj.userId", cacheManager = "cacheManager")
public Address save(Address addressObj) { public Address save(Address addressObj) {
Timestamp now = new Timestamp(System.currentTimeMillis());
/* 替换所有,UTF-8编码时4字节的Emoji表情字符 */ /* 替换所有,UTF-8编码时4字节的Emoji表情字符 */
addressObj.setProvince(EmojiUtil.filterUnicode4(addressObj.getProvince())); addressObj.setProvince(EmojiUtil.filterUnicode4(addressObj.getProvince()));
addressObj.setCity(EmojiUtil.filterUnicode4(addressObj.getCity())); addressObj.setCity(EmojiUtil.filterUnicode4(addressObj.getCity()));
addressObj.setDistrict(EmojiUtil.filterUnicode4(addressObj.getDistrict())); addressObj.setDistrict(EmojiUtil.filterUnicode4(addressObj.getDistrict()));
addressObj.setAddress(EmojiUtil.filterUnicode4(addressObj.getAddress())); addressObj.setAddress(EmojiUtil.filterUnicode4(addressObj.getAddress()));
addressObj.setCreatedAt(now);
addressObj.setUpdateAt(now);
return addressRepository.save(addressObj); return addressRepository.save(addressObj);
} }
......
...@@ -87,8 +87,6 @@ public class ContactServiceImpl implements IContactService { ...@@ -87,8 +87,6 @@ public class ContactServiceImpl implements IContactService {
contact.setRelation(relation); contact.setRelation(relation);
} }
log.info("修改前联系人信息:{}", contact); log.info("修改前联系人信息:{}", contact);
Timestamp now = new Timestamp(System.currentTimeMillis());
contact.setUpdateAt(now);
contact = save(contact); contact = save(contact);
return contact; return contact;
} }
...@@ -102,7 +100,6 @@ public class ContactServiceImpl implements IContactService { ...@@ -102,7 +100,6 @@ public class ContactServiceImpl implements IContactService {
private void mergeContacts(Long userId, List<Contact> contacts) { private void mergeContacts(Long userId, List<Contact> contacts) {
// 当前联系人列表 // 当前联系人列表
List<Contact> userContact = contactRepository.findByUserId(userId); List<Contact> userContact = contactRepository.findByUserId(userId);
Timestamp now = new Timestamp(System.currentTimeMillis());
for (int i = 0; i < contacts.size(); i++) { for (int i = 0; i < contacts.size(); i++) {
Contact c = contacts.get(i); Contact c = contacts.get(i);
c.setId(null); c.setId(null);
...@@ -110,8 +107,6 @@ public class ContactServiceImpl implements IContactService { ...@@ -110,8 +107,6 @@ public class ContactServiceImpl implements IContactService {
if(Objects.isNull(c.getRelation())){ if(Objects.isNull(c.getRelation())){
c.setRelation(Relation.OTHER); c.setRelation(Relation.OTHER);
} }
c.setCreatedAt(now);
c.setUpdateAt(now);
if (CollectionUtils.isEmpty(userContact) || userContact.size() <= i) { if (CollectionUtils.isEmpty(userContact) || userContact.size() <= i) {
continue; continue;
} }
......
...@@ -30,13 +30,6 @@ public class UserExtInfoServiceImpl implements IUserExtInfoService { ...@@ -30,13 +30,6 @@ public class UserExtInfoServiceImpl implements IUserExtInfoService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@CacheEvict(value = "userextinfocache", key = "'extinfo' + #info.userId", cacheManager = "cacheManager") @CacheEvict(value = "userextinfocache", key = "'extinfo' + #info.userId", cacheManager = "cacheManager")
public UserExtInfo save(UserExtInfo info) { public UserExtInfo save(UserExtInfo info) {
Timestamp timestamp = new Timestamp(System.currentTimeMillis());
if (info.getCreatedAt() == null) {
info.setCreatedAt(timestamp);
}
if (info.getUpdateAt() == null) {
info.setUpdateAt(timestamp);
}
return userExtInfoRepository.save(info); return userExtInfoRepository.save(info);
} }
......
...@@ -167,7 +167,6 @@ public class UserServiceImpl implements IUserService, IBaseController { ...@@ -167,7 +167,6 @@ public class UserServiceImpl implements IUserService, IBaseController {
if (user == null) { if (user == null) {
throw new RuntimeException("用户[" + phoneNo + "]不存在"); throw new RuntimeException("用户[" + phoneNo + "]不存在");
} }
user.setUpdatedAt(new Timestamp(System.currentTimeMillis()));
user.setPassword(PasswordUtil.MD5WithSalt(password)); user.setPassword(PasswordUtil.MD5WithSalt(password));
user = userRepository.save(user); user = userRepository.save(user);
stringRedisTemplate.expire("usercache:xyqbuser" + phoneNo, 1L, TimeUnit.MILLISECONDS); stringRedisTemplate.expire("usercache:xyqbuser" + phoneNo, 1L, TimeUnit.MILLISECONDS);
......
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