表结构变更

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/dict/SystemDictEntry.java

@@ -2,7 +2,12 @@ package com.yihu.jw.healthyhouse.model.dict;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import com.yihu.jw.healthyhouse.util.PinyinUtil;
import org.springframework.data.annotation.CreatedBy;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedBy;
import org.springframework.data.annotation.LastModifiedDate;
import javax.persistence.*;
import java.io.Serializable;
@@ -20,9 +25,8 @@ import java.util.Date;
@Access(value = AccessType.PROPERTY)
@Embeddable
@IdClass(DictEntryKey.class)
public class SystemDictEntry  implements Serializable {
public class SystemDictEntry implements Serializable {
    private static final long serialVersionUID = 1L;
    String dictId;
    String code;
    String value;
@@ -30,14 +34,18 @@ public class SystemDictEntry  implements Serializable {
    String phoneticCode;
    String catalog;
    String pcode;//上级id
    /** 创建日期 */
    private Date createDate;
    /** 创建者 */
    private String creator;
    /** 修改日期 */
    private Date modifyDate;
    /** 修改者 */
    private String modifier;
    //创建时间
    protected Date createTime;
    //创建者
    protected String createUser;
    //创建者
    protected String createUserName;
    //更新时间
    protected Date updateTime;
    //更新者
    protected String updateUser;
    //更新者
    protected String updateUserName;
    public SystemDictEntry(){
    }
@@ -94,50 +102,74 @@ public class SystemDictEntry  implements Serializable {
        this.catalog = catalog;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "create_date", nullable = false, updatable = false)
    public Date getCreateDate() {
        return createDate;
    @Column(name = "pcode")
    public String getPcode() {
        return pcode;
    }
    public void setCreateDate(Date createDate) {
        this.createDate = createDate;
    public void setPcode(String pcode) {
        this.pcode = pcode;
    }
    @Column(name = "creator")
    public String getCreator() {
        return creator;
    @CreatedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "create_time", nullable = false, length = 0,updatable = false)
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Column(name = "modify_date", nullable = false)
    public Date getModifyDate() {
        return modifyDate;
    @CreatedBy
    @Column(name = "create_user",updatable = false)
    public String getCreateUser() {
        return createUser;
    }
    public void setModifyDate(Date modifyDate) {
        this.modifyDate = modifyDate;
    public void setCreateUser(String createUser) {
        this.createUser = createUser;
    }
    @Column(name = "modifier")
    public String getModifier() {
        return modifier;
    @CreatedBy
    @Column(name = "create_user_name",updatable = false)
    public String getCreateUserName() {
        return createUserName;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    public void setCreateUserName(String createUserName) {
        this.createUserName = createUserName;
    }
    @Column(name = "pcode")
    public String getPcode() {
        return pcode;
    @LastModifiedDate
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time", nullable = false, length = 0)
    public Date getUpdateTime() {
        return updateTime;
    }
    public void setPcode(String pcode) {
        this.pcode = pcode;
    public void setUpdateTime(Date updateTime) {
        this.updateTime = updateTime;
    }
    @LastModifiedBy
    @Column(name = "update_user")
    public String getUpdateUser() {
        return updateUser;
    }
    public void setUpdateUser(String updateUser) {
        this.updateUser = updateUser;
    }
    @LastModifiedBy
    @Column(name = "update_user_name")
    public String getUpdateUserName() {
        return updateUserName;
    }
    public void setUpdateUserName(String updateUserName) {
        this.updateUserName = updateUserName;
    }
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/user/User.java

@@ -18,8 +18,6 @@ import java.util.Date;
@Table(name = "user")
public class User extends UuidIdentityEntityWithOperator {
    @Id
    private String id;
    @Column(name = "login_code", nullable = false)
    private String loginCode;
    @Column(name = "name", nullable = false)
@@ -49,12 +47,6 @@ public class User extends UuidIdentityEntityWithOperator {
    @Column(name = "salt")
    private String salt; //加密种子
    @Column(name = "creator")
    private String creator;
    @Column(name = "modifier")
    private String modifier;
    @Column(name = "modifier_name")
    private String modifierName;
    public String getLoginCode() {
        return loginCode;
@@ -160,30 +152,6 @@ public class User extends UuidIdentityEntityWithOperator {
        this.cityCode = cityCode;
    }
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    public String getModifier() {
        return modifier;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    }
    public String getModifierName() {
        return modifierName;
    }
    public void setModifierName(String modifierName) {
        this.modifierName = modifierName;
    }
    public String getSalt() {
        return salt;
    }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/UserService.java

@@ -76,8 +76,8 @@ public class UserService {
        for(String code:codes.split(",")){
            User user1 = findByCode(code);
            user1.setActivated(-1);
            user1.setModifierName(userName);
            user1.setModifier(userCode);
            user1.setUpdateUserName(userName);
            user1.setUpdateUser(userCode);
            userDao.save(user1);
        }
    }
@@ -97,7 +97,7 @@ public class UserService {
            user.setPassword(password);
            String code = UUID.randomUUID().toString().replaceAll("-", "");
            user.setId(code);
            user.setCreator(userCode);
            user.setCreateUser(userCode);
            user.setActivated(1);
            userDao.save(user);
            return Envelop.getSuccess("保存成功");
@@ -107,8 +107,8 @@ public class UserService {
            if(!user1.getPassword().equals(psd)){//判断密码是否相同
                throw new ManageException("原密码错误");
            }
            user.setModifier(userCode);
            user.setModifierName(userName);
            user.setUpdateUser(userCode);
            user.setUpdateUserName(userName);
            userDao.save(user);
            return Envelop.getSuccess("修改成功");
        }