fix --添加默认角色枚举类

server/src/main/java/com/pica/cloud/account/account/server/enums/SaasRoleEnum.java

+// Copyright 2016-2101 Pica.
+package com.pica.cloud.account.account.server.enums;
+
+import lombok.Getter;
+
+/**
+ * @Author Pica
+ * @Date 2022/3/4 18:39
+ */
+@Getter
+public enum SaasRoleEnum {
+    NULL_ROLE(0,"无角色信息"),
+    MAIN_ADMIN_ROLE(1, "主管理员"),
+    ADMIN_ROLE(2, "管理员"),
+    SAAS_MAIN_ADMIN(3, "saas系统管理员"),
+    SAAS_DOCTOR(4,"开单医生");
+    private int code;
+    private String msg;
+
+    SaasRoleEnum(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.pica.cloud.account.account.server.service.impl;
 
 import com.pica.cloud.account.account.server.entity.PermissionRole;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
+import com.pica.cloud.account.account.server.enums.SaasRoleEnum;
 import com.pica.cloud.account.account.server.mapper.PermissionDoctorRoleMapper;
 import com.pica.cloud.account.account.server.mapper.PermissionRoleMapper;
 import com.pica.cloud.account.account.server.req.HospitalRoleDetailReq;
@@ -42,7 +43,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
             throw new PicaWarnException(PicaResultCode.DATA_EXCEPTION.code(), "备注长度≤100字符");
         }
 
-        if (Objects.nonNull(req.getId()) && (req.getId() <= 4)) {
+        if (Objects.nonNull(req.getId()) && (req.getId() <= SaasRoleEnum.SAAS_DOCTOR.getCode())) {
             throw new PicaWarnException(AccountExceptionEnum.PAT_ACCT_HAS_EXIST.getCode(), "该角色无法编辑或删除");
         }
 
@@ -74,7 +75,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
 
     @Override
     public HospitalRoleResp listByPage(HospitalRoleListReq req) {
-        List<Integer> list = Arrays.asList(1, 2);
+        List<Integer> list = Arrays.asList(SaasRoleEnum.MAIN_ADMIN_ROLE.getCode(), SaasRoleEnum.ADMIN_ROLE.getCode());
         Map<String, Object> map = new HashMap(4);
         map.put("list", list);
         map.put("name", req.getName());
@@ -86,7 +87,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
         map.put("pageSize", req.getPageSize());
         List<HospitalRoleDto> roleDtos = permissionRoleMapper.listByPage(map);
         roleDtos.stream().forEach(t -> {
-            if (Objects.equals(t.getRoleId(), 3)) {
+            if (Objects.equals(t.getRoleId(), SaasRoleEnum.SAAS_MAIN_ADMIN.getCode())) {
                 t.setAdminSaasFlag(1);
             }
         });
@@ -100,7 +101,7 @@ public class HospitalSaasRoleServiceImpl implements HospitalSaasRoleService {
             throw new PicaWarnException(AccountExceptionEnum.PAT_ACCT_HAS_EXIST.getCode(), "请输入角色id");
         }
 
-        if (id <= 4) {
+        if (id <= SaasRoleEnum.SAAS_DOCTOR.getCode()) {
             throw new PicaWarnException(AccountExceptionEnum.PAT_ACCT_HAS_EXIST.getCode(), "该角色无法删除");
         }
 

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

@@ -3,11 +3,7 @@ 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.enums.SaasRoleEnum;
 import com.pica.cloud.account.account.server.mapper.*;
 import com.pica.cloud.account.account.server.req.HospitalSaasUserListReq;
 import com.pica.cloud.account.account.server.req.HospitalSaasUserReq;
@@ -20,7 +16,6 @@ import com.pica.cloud.account.account.server.service.HospitalSaasUserService;
 import com.pica.cloud.account.account.server.service.PasswordService;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.ExecutorServiceUtils;
-import com.pica.cloud.account.account.server.util.captcha.CommonUtils;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaException;
@@ -28,20 +23,16 @@ 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.MD5Util;
-import com.pica.cloud.foundation.utils.utils.date.D;
 import com.pica.cloud.trade.store.client.StoreCertifyServiceClient;
 import com.pica.cloud.trade.store.resp.certify.StoreCertifyStatus;
-import org.apache.commons.codec.digest.Md5Crypt;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 /**
@@ -147,7 +138,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
     }
 
     private void insertSaasRole(HospitalSaasUserReq req, Long doctorId, Long userId) {
-        if (Objects.equals(req.getRoleId(), 0)) {
+        if (Objects.equals(req.getRoleId(), SaasRoleEnum.NULL_ROLE.getCode())) {
             return;
         }
         PermissionDoctorRole doctorRole = new PermissionDoctorRole();
@@ -183,7 +174,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             String phone = EncryptUtils.decryptContent(t.getMobile(), EncryptConstants.ENCRYPT_TYPE_MOBILE, EncryptConstants.ENCRYPT_DECRYPT_KEY);
             String mixMobile = mixMobile(phone);
             t.setMobile(mixMobile);
-            if (Objects.equals(t.getRoleId(), 3)) {
+            if (Objects.equals(t.getRoleId(), SaasRoleEnum.SAAS_MAIN_ADMIN.getCode())) {
                 t.setAdminSaasFlag(1);
             }
         });
@@ -201,7 +192,7 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "参数错误");
         }
         int count = accountMapper.adminRoleCountByhospitalId(req.getHospitalId().longValue());
-        if (count >= 1 && null != req.getRoleId() && 3 == req.getRoleId()) {
+        if (count >= 1 && null != req.getRoleId() && SaasRoleEnum.SAAS_MAIN_ADMIN.getCode() == req.getRoleId()) {
             throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "当前已存在系统管理员,请勿重复设置");
         }
         if (accountExist == null) {