1.修改用户注册字段默认值 2.给用户信息中增加医生id 3.数据需求增加其他字段 4。全局排除文件上传的token验证

houruijun

2020-06-22 bf5d9213a282f787e86f541993c18290645d590e

1.修改用户注册字段默认值
2.给用户信息中增加医生id
3.数据需求增加其他字段
4。全局排除文件上传的token验证

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DataNeed.java

@@ -87,6 +87,10 @@
    @NotEmpty(message = "需求标签不能为空")
    private String needTags;
    /**
     * 其他需求标签
     */
    private String needDataRemark;
    /**
     * 是否删除，1删除（已下载），0未删除（未下载）
     */
    private Boolean isDel;

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -722,11 +722,9 @@
        if (StringUtils.isBlank(userRegVo.getPassword())) {
            defaultPassWord = com.kidgrow.common.utils.RandomValueUtils.getRandom(6);
            sysUser.setPassword(passwordEncoder.encode(defaultPassWord));
            sysUser.setDefaultAuth(false);
            userRegVo.setPassword(defaultPassWord);
        } else {
            sysUser.setPassword(passwordEncoder.encode(userRegVo.getPassword()));
            sysUser.setDefaultAuth(false);
        }
        sysUser.setNickname(userRegVo.getNickname());
        sysUser.setSex(userRegVo.getSex());
@@ -737,6 +735,7 @@
            sysUser.setType(UserType.DOCTOR.name());
        }
        sysUser.setHAdminUser(false);
        sysUser.setDefaultAuth(false);
        sysUser.setOpenId(userRegVo.getOpenId());
        sysUser.setDel(false);
        sysUser.setTenantId("hospital");
@@ -811,7 +810,13 @@
                                sysDoctor.setDoctorRankId(userRegVo.getDoctorRankId());
                                sysDoctor.setCreateUserId(isReg ? createUserId : sysUserd.getId());
                                sysDoctor.setCreateUserName(isReg ? createUserName : sysUserd.getUsername());
                                sysDoctor.setDoctorState(userRegVo.getDoctorState());
                                if (isReg) {
                                    sysDoctor.setDoctorState(false);
                                }
                                else
                                {
                                    sysDoctor.setDoctorState(true);
                                }
                                sysDoctor.setDoctorTel(userRegVo.getMobile());
                                sysDoctor.setDoctorName(userRegVo.getNickname());
                                sysDoctor.setServerUserId(isReg ? createUserId : sysUserd.getId());

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -102,6 +102,7 @@
    <select id="findDoctorUserAllData" parameterType="long" resultType="com.kidgrow.common.model.DoctorUserAll">
        SELECT sysuser.id,
        sysdoctor.doctor_name,
        sysdoctor.doctor_id,
        sysdoctor.doctor_ccie,
        sysdoctor.doctor_tel,
        sysdoctor.doctor_rank,

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/DoctorUserAll.java

@@ -23,6 +23,10 @@
    /**
     * 医生姓名
     */
    private Long doctorId;
    /**
     * 医生姓名
     */
    private String doctorName;
    /**
     * 医生的头像

 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml

@@ -219,7 +219,8 @@
        /login.html,
        /user/login,
        /api-sms/smsChangLan/send,
        /api-user/users/doctorUserReg
        /api-user/users/doctorUserReg,
        /api-file/files-upload
#        /api-user/syshospital/findAllByMap,
#        /api-user/sysdictionaries/findAll,
#        /api-user/sysdepartment/findListByHospitalId