冲突解决

common/common-entity/src/main/java/com/yihu/jw/entity/UuidIdentityEntityWithOperator.java

@@ -5,11 +5,12 @@
 *******************************************************************************/
package com.yihu.jw.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
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 com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;
import javax.persistence.Column;

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

@@ -5,7 +5,6 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -18,8 +17,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 +46,7 @@ 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/LoginService.java

@@ -48,7 +48,6 @@ public class LoginService {
            user.setLoginCode(loginCode);
            user.setName(loginCode);
            user.setTelephone(loginCode);
            user.setCreator(loginCode);
            user.setPassword(LoginInfo.DEFAULT_PASSWORD);
            userService.saveOrUpdate(user,LoginInfo.SAVE_TYPE_PHONE);//设置默认密码123456
        }else {

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

@@ -85,8 +85,8 @@ public class UserService {
        for(String code:codes.split(",")){
            User user1 = findByCode(code);
            user1.setActivated(status);
            user1.setModifierName(userName);
            user1.setModifier(userCode);
            user1.setUpdateUserName(userName);
            user1.setUpdateUser(userCode);
            userDao.save(user1);
        }
    }
@@ -94,7 +94,6 @@ public class UserService {
    /**
     *  新增/修改用户
     * @param user      用户信息
     * @param oldPsd    密码
     * @param userCode  操作者编码
     * @return
     * @throws ManageException
@@ -112,10 +111,8 @@ public class UserService {
            user.setSalt(salt);
            String password = MD5.GetMD5Code(user.getPassword() + salt);
            user.setPassword(password);
            String code = UUID.randomUUID().toString().replaceAll("-", "");
            user.setId(code);
            user.setCreator(userCode);
            user.setCreateDate(new Date());
            user.setCreateUser(userCode);
            user.setCreateTime(new Date());
            user.setActivated(1);
            userDao.save(user);
            return Envelop.getSuccess("保存成功");
@@ -125,8 +122,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("修改成功");
        }