From 35526b2a9ba8b5d8625dcab452479e69c30d0c84 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 16 Jun 2020 10:28:42 +0800
Subject: [PATCH] 修改 注册的必填项，网关的配置，注册接口的登录（登录未完成）
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 13 ++++++++++---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml | 14 ++++++++------
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java | 1 -
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js | 4 ++--
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java
index 401e96e..6fecb03 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/vo/UserRegVo.java
@@ -70,7 +70,6 @@
/**
* 所属医院ID 注册用户固定传0
*/
- @NotNull(message = "所属医院ID不能为空")
private Long hospitalId;
/**
* 医院名称
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 4e32911..672c6b0 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
@@ -614,7 +614,7 @@
return ResultBody.failed("该手机号已经注册");
}
//检查判断是注册 还是添加用户，注册用户先走基本数据建设
- if (StringUtils.isBlank(userRegVo.getHospitalId().toString())) {
+ if (userRegVo.getHospitalId()==null) {
userRegVo.setDoctorState(true);
//添加医院组织结构数据
List<SysOrganization> sysOrganizationList=new ArrayList<SysOrganization>();
@@ -622,6 +622,8 @@
sysOrganizationHos.setOrgAttr(1);
sysOrganizationHos.setOrgLevel(1);
sysOrganizationHos.setOrgName(userRegVo.getHospitalName());
+ sysOrganizationHos.setCreateUserId(0l);
+ sysOrganizationHos.setCreateUserName("自主注册");
sysOrganizationList.add(sysOrganizationHos);
//添加科室组织数据
@@ -629,6 +631,8 @@
sysOrganizationDe.setOrgAttr(2);
sysOrganizationDe.setOrgLevel(2);
sysOrganizationDe.setOrgName(userRegVo.getDepartmentName());
+ sysOrganizationDe.setCreateUserId(0L);
+ sysOrganizationDe.setCreateUserName("自主注册");
sysOrganizationList.add(sysOrganizationDe);
//批量写入
boolean orgRe= organizationService.saveBatch(sysOrganizationList);
@@ -654,7 +658,8 @@
sysDepartment.setSaleUserName("自主注册");
sysDepartment.setSaleUserTel("0");
sysDepartment.setServerUserId(0L);
- sysDepartment.setServerUserTel("0");
+ sysDepartment.setServerUserTel("0");//serverUserName
+ sysDepartment.setServerUserName("自主注册");
boolean d=departmentService.save(sysDepartment);
if (!d) {
return ResultBody.failed("科室数据写入失败");
@@ -702,6 +707,7 @@
sysUser.setHAdminUser(false);
sysUser.setOpenId(userRegVo.getOpenId());
sysUser.setDel(false);
+ sysUser.setTenantId("hospital");
boolean u=this.save(sysUser);
if(u)
{
@@ -754,7 +760,8 @@
sysDoctor.setServerUserName("自主注册");
if (sysDoctorMapper.insert(sysDoctor)==1) {
sysUser.setPassword(userRegVo.getPassword());
- return ResultBody.ok(200,"注册成功").data(sysUser);
+ return ResultBody.ok().data(sysUser);
+// return ResultBody.ok(200,"注册成功").data(sysUser);
}
else
{
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 7e65e30..19377ab 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml
@@ -187,9 +187,10 @@
- /actuator/health
- /actuator/info
- /api-sms/smsChangLan/send
- - /api-user/syshospital/findAllByMap
- - /api-user/sysdictionaries/findAll
- - /api-user/sysdepartment/findListByHospitalId
+ - /api-user/users/doctorUserReg
+# - /api-user/syshospital/findAllByMap
+# - /api-user/sysdictionaries/findAll
+# - /api-user/sysdepartment/findListByHospitalId
# 忽略权限鉴定
authority-ignores:
- /*/authority/granted/me
@@ -212,9 +213,10 @@
/login.html,
/user/login,
/api-sms/smsChangLan/send,
- /api-user/syshospital/findAllByMap,
- /api-user/sysdictionaries/findAll,
- /api-user/sysdepartment/findListByHospitalId
+ /api-user/users/doctorUserReg
+# /api-user/syshospital/findAllByMap,
+# /api-user/sysdictionaries/findAll,
+# /api-user/sysdepartment/findListByHospitalId
auth:
#开启时间戳验证
timestampenable: false
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
index 953b73e..6834f25 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1,4 +1,4 @@
// var my_api_server_url = 'http://zuul.kidgrow.com/';
-// var my_api_server_url = 'http://192.168.2.240:8888/';
-var my_api_server_url = 'http://127.0.0.1:8888/';
+var my_api_server_url = 'http://192.168.2.240:8888/';
+// var my_api_server_url = 'http://127.0.0.1:8888/';
--
Gitblit v1.8.0