去掉 组织新增的按钮，修改添加医院的bug，添加Python 获取加密码的接口

zhaoxiaohao

2020-07-30 79810458e869450fcdfa96b92f79e5c78cb46c04

去掉 组织新增的按钮，修改添加医院的bug，添加Python 获取加密码的接口

 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml

@@ -56,10 +56,11 @@
      accessKeySecret: NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
      endpoint: oss-accelerate.aliyuncs.com
      bucketName: kidgrow
      #注意加上/
      domain: https://kidgrow.oss-accelerate.aliyuncs.com/
      #注意加上/   http://123.kidgrow.cloud
      domain: /
      folder: kidgrow/


  swagger:
    base-package: com.kidgrow.filecenter.controller
    description: 文件上传服务接口文档

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

@@ -159,4 +159,5 @@
    ResultBody isRegUser(String userTel);
    boolean phoneIsUsed(String phone);

    ResultBody jiaMipython(String password);
}

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

@@ -225,25 +225,38 @@
            //查询
            QueryWrapper queryWrapper = new QueryWrapper();
            queryWrapper.eq("org_parent_id", sysOrg.getId());
            queryWrapper.orderByAsc("id");
            queryWrapper.orderByDesc("org_code");
            queryWrapper.last("limit 1");
            List<SysOrganization> list = baseMapper.selectList(queryWrapper);
            if (list.size() > 0) {
                SysOrganization sysOrganizationLast = list.get(list.size() - 1);
                if(sysOrganizationLast.getOrgLevel()>=2){
                String orgCodeLast = sysOrganizationLast.getOrgCode();
                String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 4);
                Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 4));
                String str = "0000";
                    //取前部分
                    String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 3);
                    //取后部分
                    Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 3));
                    String str = "00";
                str += (codenum + 1);
                String substring = str.substring(str.length() - 4);
                    String substring = str.substring(str.length() - 3);
                return orgCodeLastQianZhui + substring;
            } else {
                    String orgCodeLast = sysOrganizationLast.getOrgCode();
                    //取前部分
                    String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 7);
                    //取后部分
                    Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 7));
                    String str = "0000000";
                    str += (codenum + 1);
                    String substring = str.substring(str.length() - 7);
                    return orgCodeLastQianZhui + substring;
                }
            } else {
                String fucode = sysOrg.getOrgCode();
                String str = "0001";
                String str = "01";
                return fucode + str;
            }

        }
        return null;
    }

}

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

@@ -1062,4 +1062,10 @@
            return ResultBody.failed("必要参数有误！");
        }
    }

    @Override
    public ResultBody jiaMipython(String password) {
        String encode = passwordEncoder.encode(password);
        return ResultBody.ok().data(encode);
    }
}

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java

@@ -139,7 +139,7 @@
            } else {
                sysOrganization.setOrgName(sysDepartment.getDepartmentName());
            }
            boolean org = sysOrganizationService.saveOrUpdate(sysOrganization);
            boolean org = sysOrganizationService.saveOrUpdateSer(sysOrganization);
            sysDepartment.setOrgId(sysOrganization.getId());
            boolean v = sysDepartmentService.saveOrUpdate(sysDepartment);
            if (v) {

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java

@@ -255,6 +255,18 @@
    }

    /**
     * 返回给Python加密密码
     */
    @GetMapping(value = "/users/python")
    public ResultBody jiaMipython(@RequestBody String password)  {
        if (password==null||"".equals(password)) {
            return ResultBody.failed().msg("请输入密码");
        }
        ResultBody resultBody = appUserService.jiaMipython(password);
        return resultBody;
    }

    /**
     * 用户自己修改密码
     */
    @PutMapping(value = "/users/password")

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

@@ -224,6 +224,7 @@
      - /api-evaluation/evaluationxrayinfo/appUpload
      - /api-evaluation/evaluationxrayinfo/appSave
      - /api-file/baseUplaod
      - /api-user/users/python
#      - /api-user/syshospital/findAllByMap
#      - /api-user/sysdictionaries/findAll
#      - /api-user/sysdepartment/findListByHospitalId
@@ -255,7 +256,8 @@
        /api-user/users/passwordByPhone,
        /api-evaluation/evaluationxrayinfo/appUpload,
        /api-evaluation/evaluationxrayinfo/appSave,
        /api-file/baseUplaod
        /api-file/baseUplaod,
        /api-user/users/python
#        /api-user/syshospital/findAllByMap,
#        /api-user/sysdictionaries/findAll,
#        /api-user/sysdepartment/findListByHospitalId

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html

@@ -10,7 +10,7 @@
        <div class="layui-form toolbar">
            <input id="orgName-search" class="layui-input search-input" type="text" placeholder="请输入名称" />&emsp;
            <button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="sysorganization-list"><i class="layui-icon">&#xe615;</i>搜索</button>
            <button id="organization-add" class="layui-btn icon-btn permissions" permissions="sysorganization-edit"><i class="layui-icon">&#xe654;</i>添加</button>
            <!-- <button id="organization-add" class="layui-btn icon-btn permissions" permissions="sysorganization-edit"><i class="layui-icon">&#xe654;</i>添加</button> -->
        </div>

        <!-- 数据表格 -->