feat:加入合作机构自动开saas账号

新增添加saas账号接口与client

client/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-client</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.2.1</version>
     <name>pica-cloud-account-client</name>
     <packaging>jar</packaging>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.pica.cloud.account</groupId>
             <artifactId>pica-cloud-account-common</artifactId>
-            <version>1.1.2</version>
+            <version>1.1.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>

client/src/main/java/com/pica/cloud/account/account/client/RegisterClient.java

 package com.pica.cloud.account.account.client;
 
 import com.pica.cloud.account.account.common.req.EncryptEntity;
+import com.pica.cloud.account.account.common.req.HospitalSaasUserReq;
 import com.pica.cloud.account.account.common.req.LoginResult;
 import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.common.req.circle.CircleAcctInitReq;
@@ -36,4 +37,7 @@ public interface RegisterClient {
 
     @PostMapping("/account/account/login-register/v1")
     PicaResponse<LoginResult> loginRegister(@RequestBody EncryptEntity entity);
+
+    @PostMapping("/saas/hospital/registerV2")
+    PicaResponse<Integer> registerV2(@RequestBody HospitalSaasUserReq req, @RequestHeader("token") String token);
 }
\ No newline at end of file

common/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-common</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.2.1</version>
     <name>pica-cloud-account-common</name>
     <packaging>jar</packaging>
 

common/src/main/java/com/pica/cloud/account/account/common/req/HospitalSaasUserReq.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.common.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+
+/**
+ * @Author qinwh
+ * @Date 2022/3/1 10:45
+ */
+@ApiModel
+public class HospitalSaasUserReq {
+
+    @ApiModelProperty("人员id")
+    private Long id;
+
+    @ApiModelProperty("姓名")
+    private String name;
+
+    @ApiModelProperty("机构id")
+    private Integer hospitalId;
+
+    @ApiModelProperty("机构id")
+    private String hospitalName;
+
+    @ApiModelProperty("手机号")
+    private String mobile;
+
+    @ApiModelProperty("密码")
+    private String password;
+
+    @ApiModelProperty("备注")
+    private String comment;
+
+    @ApiModelProperty("角色id  0 无角色 1 主管理员 2 管理员 3 saas系统管理员 4 saas用户")
+    private List<Long> roleId;
+
+    @ApiModelProperty("产品类型 1.云鹊医 2.云鹊健康 3.直播 4.crm(saas注册固定写死为crm)")
+    private Integer productType;
+
+    @ApiModelProperty("资源类型 1表示安卓，2表示ios，3表示web，4表示H5登录，5表示admin后台 6.SAAS")
+    private Integer sourceType;
+
+
+    @ApiModelProperty("登录来源  0:运营平台 1:saas")
+    private Integer loginFlag = 0;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(Integer hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public String getHospitalName() {
+        return hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+
+    public List<Long> getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(List<Long> roleId) {
+        this.roleId = roleId;
+    }
+
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
+
+    public Integer getSourceType() {
+        return sourceType;
+    }
+
+    public void setSourceType(Integer sourceType) {
+        this.sourceType = sourceType;
+    }
+
+    public Integer getLoginFlag() {
+        return loginFlag;
+    }
+
+    public void setLoginFlag(Integer loginFlag) {
+        this.loginFlag = loginFlag;
+    }
+}

server/src/main/java/com/pica/cloud/account/account/server/controller/HospitalSaasUserController.java

@@ -39,9 +39,20 @@ public class HospitalSaasUserController extends AccountBaseController {
     @EnabledLoginValidate
     public PicaResponse<Integer> register(@RequestBody HospitalSaasUserReq req, @RequestHeader("token") String token) {
         logger.info("register: url:/saas/hospital/register. start: {}", JSON.toJSONString(req));
+        req.checkInsertParams();
         return PicaResponse.toResponse(hospitalSaasUserService.register(req, super.fetchPicaUser()));
     }
 
+    @ApiOperation("机构saas平台人员注册 0失败 1成功 (密码可为空)")
+    @PostMapping(value = "/hospital/registerV2")
+    @EnabledLoginValidate
+    public PicaResponse<Integer> registerV2(@RequestBody HospitalSaasUserReq req, @RequestHeader("token") String token) {
+        logger.info("register: url:/saas/hospital/registerV2. start: {}", JSON.toJSONString(req));
+        req.checkInsertParamsNoPassWord();
+        return PicaResponse.toResponse(hospitalSaasUserService.register(req, super.fetchPicaUser()));
+    }
+
+
     @ApiOperation("机构saas平台人员更新 0失败 1成功")
     @PostMapping(value = "/hospital/upsert")
     @EnabledLoginValidate

server/src/main/java/com/pica/cloud/account/account/server/req/HospitalSaasUserReq.java

@@ -89,4 +89,32 @@ public class HospitalSaasUserReq {
         }
 
     }
+
+    public void checkInsertParamsNoPassWord() {
+        if (StringUtils.isBlank(this.mobile)) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "手机号不能为空");
+        }
+        if (Objects.isNull(this.hospitalId)) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "机构id不能为空");
+        }
+        if (StringUtils.isBlank(this.name)) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "姓名不能为空");
+        }
+        if (this.name.length() > 16) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "姓名长度必须≤16字符！");
+        }
+        if (!ValidateUtils.isMobile(this.mobile)) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "手机号格式不正确！");
+        }
+        if (null == this.productType) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "产品类型不能为空！");
+        }
+        if (null == this.sourceType) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "资源类型不能为空！");
+        }
+        if (Objects.nonNull(this.comment) && this.comment.length() > 100) {
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "备注长度须≤100字符");
+        }
+
+    }
 }