saas平台修改

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

@@ -38,9 +38,6 @@ import java.util.*;
 public abstract class AccountBaseController extends BaseController {
 
 
-
-
-
     private static final String KEY_PREFIX = "token-doctor-";
     private Logger logger = LoggerFactory.getLogger(AccountBaseController.class);
     @Autowired
@@ -118,7 +115,7 @@ public abstract class AccountBaseController extends BaseController {
     public void sendMobileMessage(String mobile, String content, long senderId) {
         //接入新旭事务一致性
         String batchNo = IntactUtils.getUUID();
-        intactUtil.sendIntact(batchNo,"sendMobileMessage",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"mobile:"+mobile+",content:"+content+",senderId:"+senderId);
+        intactUtil.sendIntact(batchNo, "sendMobileMessage", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1, "mobile:" + mobile + ",content:" + content + ",senderId:" + senderId);
         String sysCodeStr = super.getSysCode();
         int sysCode = 10; //默认移动端
         if (StringUtils.isNotBlank(sysCodeStr)) {
@@ -151,13 +148,13 @@ public abstract class AccountBaseController extends BaseController {
         picapSendMsgModel.setSysName(SysCode.APP.sysName());
 
         String postData = JSON.toJSONString(picapSendMsgModel);
-        logger.info("sendMobileTo-mobile:{}, senderId-{}",mobile, senderId);
+        logger.info("sendMobileTo-mobile:{}, senderId-{}", mobile, senderId);
         long start = System.currentTimeMillis();
         String jsonObj = HttpClientUtil.httpExecute(messageUrl, postData);
-        intactUtil.sendIntact(batchNo,"sendMobileMessage",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"jsonObj:"+jsonObj);
+        intactUtil.sendIntact(batchNo, "sendMobileMessage", com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3, "jsonObj:" + jsonObj);
 
         long end1 = System.currentTimeMillis();
-        logger.info("sendMobileMessage-send message used {} million seconds", end1-start);
+        logger.info("sendMobileMessage-send message used {} million seconds", end1 - start);
         logger.info("sendMobileTo-{}", jsonObj);
 
         if (StringUtils.isEmpty(jsonObj)) {
@@ -167,7 +164,7 @@ public abstract class AccountBaseController extends BaseController {
         }
         try {
             PicaResponse resp = JSON.parseObject(jsonObj, PicaResponse.class);
-            if(Objects.nonNull(resp) && PicaResultCode.SUCCESS.code().equals(resp.getCode())){
+            if (Objects.nonNull(resp) && PicaResultCode.SUCCESS.code().equals(resp.getCode())) {
                 logger.info("send message success, the result is: {}", jsonObj);
             } else {
                 logger.error("send message fail, response code not equals success code");
@@ -214,7 +211,7 @@ public abstract class AccountBaseController extends BaseController {
     }
 
     /**
-     * 产品线类型：productType： 1.云鹊医（默认值） 2云鹊健康
+     * 产品线类型：productType： 1.云鹊医（默认值） 2云鹊健康  3 saas
      *
      * @return
      */
@@ -229,7 +226,7 @@ public abstract class AccountBaseController extends BaseController {
 
     /**
      * 终端来源 sourceType:1.android  2.ios  3.web
-     * 4.wechat(例如微信小程序)、H5 5.admin
+     * 4.wechat(例如微信小程序)、H5 5.admin   6. saas
      *
      * @return
      */

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

@@ -33,7 +33,7 @@ public class HospitalSaasRoleController extends AccountBaseController {
     }
 
     @ApiOperation("机构saas角色-删除")
-    @DeleteMapping(value = "/hospital/role/delete{id}")
+    @DeleteMapping(value = "/hospital/role/delete/{id}")
     @EnabledLoginValidate
     public PicaResponse<Integer> delete(@PathVariable("id") Long id) {
         return PicaResponse.toResponse(hospitalSaasRoleService.delete(id));

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

@@ -13,7 +13,6 @@ import com.pica.cloud.foundation.service.starter.interceptor.EnabledLoginValidat
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -44,7 +43,7 @@ public class HospitalSaasUserController extends AccountBaseController {
     }
 
     @ApiOperation("机构saas平台人员列表查询")
-    @GetMapping(value = "/hospital/list")
+    @PostMapping(value = "/hospital/list")
     @EnabledLoginValidate
     public PicaResponse<HospitalSaasUserResp> list(@RequestBody HospitalSaasUserListReq req) {
         return PicaResponse.toResponse(hospitalSaasUserService.listByPage(req));

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

@@ -17,5 +17,5 @@ public class HospitalRoleDetailReq {
     @ApiModelProperty("角色name")
     private String name;
     @ApiModelProperty("角色描述")
-    private String describe;
+    private String remark;
 }

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

@@ -45,7 +45,7 @@ public class HospitalSaasUserReq {
     private Long roleId;
 
 
-    private void checkInsertParams() {
+    public void checkInsertParams() {
         if (StringUtils.isBlank(this.mobile)) {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "手机号不能为空");
         }
@@ -59,10 +59,10 @@ public class HospitalSaasUserReq {
             throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "角色id不能为空");
         }
         if (this.name.length() > 16) {
-            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "姓名长度≤16字符！");
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "姓名长度必须≤16字符！");
         }
         if (!ValidateUtils.isMobile(this.mobile)) {
-            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "姓名长度≤16字符！");
+            throw new PicaWarnException(AccountExceptionEnum.PICA_NOT_EMPTY.getCode(), "手机号格式不正确！");
         }
     }
 

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasRoleServiceImpl.java

@@ -45,7 +45,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
             }
             role.setId(req.getId());
             role.setRoleName(req.getName());
-            role.setRemark(req.getDescribe());
+            role.setRemark(req.getRemark());
             role.setModifiedId(Long.valueOf(user.getId()));
             role.setModifiedTime(new Date());
             num = permissionRoleMapper.updateByPrimaryKeySelective(role);
@@ -54,7 +54,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
                 throw new PicaWarnException(AccountExceptionEnum.PAT_ACCT_HAS_EXIST.getCode(), AccountExceptionEnum.PAT_ACCT_HAS_EXIST.getMessage());
             }
             role.setRoleCode("saas_admin" + CommonUtil.getRandom(10));
-            role.setRemark(req.getDescribe());
+            role.setRemark(req.getRemark());
             role.setCreatedId(Long.valueOf(user.getId()));
             role.setCreatedTime(new Date());
             role.setModifiedId(Long.valueOf(user.getId()));

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasUserServiceImpl.java

@@ -3,7 +3,9 @@ package com.pica.cloud.account.account.server.service.impl;
 
 import com.pica.cloud.account.account.server.constants.Constants;
 import com.pica.cloud.account.account.server.entity.*;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
+import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
 import com.pica.cloud.account.account.server.mapper.*;
@@ -18,8 +20,9 @@ import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
-import com.pica.cloud.foundation.utils.utils.ValidateUtils;
 import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +36,7 @@ import java.util.concurrent.ExecutorService;
  */
 @Service
 public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
+    private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
     private ICacheClient redisClient;
@@ -52,7 +56,8 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
     @Override
     @Transactional
     public int register(HospitalSaasUserReq req, Integer productType, Integer sourceType, PicaUser user) {
-        if (!ValidateUtils.isMobile(req.getMobile()) || Objects.isNull(productType) || Objects.isNull(sourceType)) {
+        req.checkInsertParams();
+        if (Objects.isNull(productType) || Objects.isNull(sourceType)) {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), PicaResultCode.PARAM_IS_INVALID.message());
         }
         //得到手机号
@@ -86,14 +91,15 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
                 redisClient.del(nxKey);
                 return 1;
             } else {
-                //走更新的逻辑,只可以更新角色和备注,  如果需要更新密码 就覆盖老的密码
-                byMobilePhone.setComment(req.getComment());
-                byMobilePhone.setPassword(req.getPassword());
-                accountMapper.updateByIdSelective(byMobilePhone);
-                //更新角色信息  逻辑删除
-                doctorRoleMapper.deleteByDoctorId(req.getId());
-                //插入新的角色关系
-                insertSaasRole(req, user);
+                logger.info("register-account is exists");
+                throw new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER);
+//                byMobilePhone.setComment(req.getComment());
+//                byMobilePhone.setPassword(req.getPassword());
+//                accountMapper.updateByIdSelective(byMobilePhone);
+//                //更新角色信息  逻辑删除
+//                doctorRoleMapper.deleteByDoctorId(req.getId());
+//                //插入新的角色关系
+//                insertSaasRole(req, user);
             }
         }
         return 1;
@@ -233,7 +239,6 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         account.setFirstLoginTime(currentTime);
         account.setLastLoginTime(currentTime);
         account.setRegisterSource(sourceType);
-        //  logger.info("register-add-doctor-start");
         return account;
     }
 }

server/src/main/resources/mybatis/PermissionRoleMapper.xml

@@ -29,10 +29,11 @@
     </delete>
 
     <insert id="insert" parameterType="com.pica.cloud.account.account.server.entity.PermissionRole">
-        insert into permission_role (id, role_code, role_name,remark,
+        insert into permission_role (id, role_code, role_name, remark,
                                      delete_flag, created_id, created_time,
                                      modified_id, modified_time)
-        values (#{id,jdbcType=BIGINT}, #{roleCode,jdbcType=VARCHAR}, #{roleName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
+        values (#{id,jdbcType=BIGINT}, #{roleCode,jdbcType=VARCHAR}, #{roleName,jdbcType=VARCHAR},
+                #{remark,jdbcType=VARCHAR},
                 #{deleteFlag,jdbcType=INTEGER}, #{createdId,jdbcType=BIGINT}, #{createdTime,jdbcType=TIMESTAMP},
                 #{modifiedId,jdbcType=BIGINT}, #{modifiedTime,jdbcType=TIMESTAMP})
     </insert>
@@ -166,7 +167,7 @@
         pr.created_time as createTime,
         pr.role_name as roleName,
         pr.id as roleId,
-        pr.remark
+        pr.remark as remark
         from permission_role as pr
         where pr.delete_flag = 1
         <include refid="list_by_page"></include>
@@ -176,7 +177,7 @@
     <select id="querySaasRoles" resultType="com.pica.cloud.account.account.server.resp.RoleDto">
         select p.id as id, p.role_name as name
         from permission_role as p
-        #  todo  id暂不确定
+             #  todo  id暂不确定
         where p.id not in (1, 2, 3)
     </select>