From 79810458e869450fcdfa96b92f79e5c78cb46c04 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Thu, 30 Jul 2020 16:37:55 +0800 Subject: [PATCH] 去掉 组织新增的按钮,修改添加医院的bug,添加Python 获取加密码的接口 --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 12 ++++++ kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 6 +++ kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java | 1 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 4 + kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml | 5 +- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java | 2 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html | 2 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java | 35 ++++++++++++----- 8 files changed, 51 insertions(+), 16 deletions(-) diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml index 4be85f5..0b06792 100644 --- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml +++ b/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: 文件上传服务接口文档 diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java index d480053..359a51b 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java +++ b/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); } diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java index b47160b..d3795a3 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java +++ b/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); - String orgCodeLast = sysOrganizationLast.getOrgCode(); - String orgCodeLastQianZhui = orgCodeLast.substring(0, orgCodeLast.length() - 4); - Integer codenum = Integer.valueOf(orgCodeLast.substring(orgCodeLast.length() - 4)); - String str = "0000"; - str += (codenum + 1); - String substring = str.substring(str.length() - 4); - return orgCodeLastQianZhui + substring; + if(sysOrganizationLast.getOrgLevel()>=2){ + String orgCodeLast = sysOrganizationLast.getOrgCode(); + //取前部分 + 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() - 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; } - } diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java index 1ffc091..9478ffe 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java +++ b/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); + } } \ No newline at end of file diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java index 15d2364..9ba707d 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java +++ b/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) { diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java index b87c8f8..124cbdd 100644 --- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java +++ b/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") diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml index 1049a52..59f972e 100644 --- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml +++ b/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 diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html index 81bdbde..91be0df 100644 --- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html +++ b/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="请输入名称" />  <button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="sysorganization-list"><i class="layui-icon"></i>搜索</button> - <button id="organization-add" class="layui-btn icon-btn permissions" permissions="sysorganization-edit"><i class="layui-icon"></i>添加</button> + <!-- <button id="organization-add" class="layui-btn icon-btn permissions" permissions="sysorganization-edit"><i class="layui-icon"></i>添加</button> --> </div> <!-- 数据表格 --> -- Gitblit v1.8.0