Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

feige

4 天以前 ba97f97d28f65d2b8ed5406792aa66a9d3fc9ed8

Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java

@@ -158,6 +158,7 @@
        ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
        if(zInfoUser!=null)
        {
            zInfoUser.setUpdateTime(zInfoUser.getUpdateTime()==null?zInfoUser.getCreateTime():zInfoUser.getUpdateTime());
            return AjaxResult.success(zInfoUser);
        }
        else
@@ -171,7 +172,10 @@

        //查询sys_user表
        //  SysUser sysUser = sysUserService.selectUserById(userId);
        return AjaxResult.success(zInfoUserService.getInfoById(userId));
        ZInfoUser infoById = zInfoUserService.getInfoById(userId);
        if (infoById != null) infoById.setUpdateTime(infoById.getUpdateTime()==null?infoById.getCreateTime():infoById.getUpdateTime());

        return AjaxResult.success(infoById);
    }
//

@@ -205,6 +209,7 @@
//        if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
//            throw new RuntimeException("请输入只有数字和英文逗号的字符串，且数字和逗号必须交替出现");
//        }
        Date currentDate = new Date();
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        zInfoUser.setSysId(userId);
@@ -222,12 +227,15 @@
        user.setUserName(zInfoUser.getOldName());
        user.setPhonenumber(zInfoUser.getPhoneNumber());
        user.setEmail(zInfoUser.getEmail());
        user.setUpdateTime(zInfoUser.getUpdateTime()!=null?zInfoUser.getUpdateTime():currentDate);

        String oriUaid = zInfoUser.getUaid();

        String originalString = zInfoUser.getOldName()+"-"+zInfoUser.getPhoneNumber();
        String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
        zInfoUser.setUaid(uniqueId);


//
//        us.setUserId(user.getSysId());
//        us.setUserName(user.getUserName());

 ruoyi-common/src/main/java/com/ruoyi/common/config/ElasticSearchConfig.java

@@ -36,6 +36,7 @@
                        "localhost",
                        8087,
                        "http"

                )
        ));
    }

 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java

@@ -253,4 +253,11 @@
     */
    @TableField(exist = false)
    private List<ZInfoUser> childList;

    /**
     * 创建时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
    private Date updateTime;

}