用户认证

user-service/src/main/java/com/diagbot/entity/UserAuthentication.java

@@ -76,7 +76,7 @@ public class UserAuthentication implements Serializable {
     /**
      * 认证状态（0：未认证，1：已认证，2：认证中）
      */
-    private String status;
+    private Integer status;
 
     /**
      * 备注
@@ -172,11 +172,11 @@ public class UserAuthentication implements Serializable {
         this.rejectComment = rejectComment;
     }
 
-    public String getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 

user-service/src/main/java/com/diagbot/enums/AuthStatusEnum.java

@@ -1,6 +1,6 @@
 package com.diagbot.enums;
 
-import lombok.Getter;
+import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
@@ -8,26 +8,24 @@ import lombok.Setter;
  * @author: zhaops
  * @time: 2018/9/17 20:25
  */
-public enum AuthStatusEnum {
+public enum AuthStatusEnum implements KeyedNamed {
 
-    Unauthorized("0", "未认证"),
-    Authorized("1", "已认证"),
-    Authorizing("2", "认证中");
+    Unauthorized(0, "未认证"),
+    Authorized(1, "已认证"),
+    Authorizing(2, "认证中");
 
-    @Getter
     @Setter
-    private String key;
+    private Integer key;
 
-    @Getter
     @Setter
     private String name;
 
-    AuthStatusEnum(String key, String name) {
+    AuthStatusEnum(Integer key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static AuthStatusEnum getEnum(String key) {
+    public static AuthStatusEnum getEnum(Integer key) {
         for (AuthStatusEnum item : AuthStatusEnum.values()) {
             if (item.key == key) {
                 return item;
@@ -36,8 +34,18 @@ public enum AuthStatusEnum {
         return null;
     }
 
-    public static String getName(String key) {
+    public static String getName(Integer key) {
         AuthStatusEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
 }

user-service/src/main/java/com/diagbot/enums/OrganizationTypeEnum.java

@@ -1,6 +1,6 @@
 package com.diagbot.enums;
 
-import lombok.Getter;
+import com.diagbot.core.KeyedNamed;
 import lombok.Setter;
 
 /**
@@ -8,18 +8,16 @@ import lombok.Setter;
  * @author: zhaops
  * @time: 2018/9/18 14:25
  */
-public enum OrganizationTypeEnum {
+public enum OrganizationTypeEnum implements KeyedNamed {
     ChainMedical(0, "连锁医疗机构"),
     HealthStatisticsBureau(1, "卫计局"),
     PrimaryMedicalUnit(2, "基础医疗单位"),
     MedicalClinic(3, "医疗诊所"),
     Other(99, "其他");
 
-    @Getter
     @Setter
     private Integer key;
 
-    @Getter
     @Setter
     private String name;
 
@@ -41,4 +39,14 @@ public enum OrganizationTypeEnum {
         OrganizationTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
 }

user-service/src/main/java/com/diagbot/facade/UserAuthenticationFacade.java

@@ -80,11 +80,11 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
             userAuthentication.setCreator(userId.toString());
             userAuthentication.setGmtCreate(new Date());
             userAuthentication.setUserId(userId);
-        } else if (userAuthentication.getStatus().equals("1")) {
+        } else if (userAuthentication.getStatus() == 1) {
             userAuthenticationRespDTO.setMsg("用户【" + user.getUsername() + "】已认证，不允许重复认证！");
             userAuthenticationRespDTO.setIsSuccess(false);
             return userAuthenticationRespDTO;
-        } else if (userAuthentication.getStatus().equals("2")) {
+        } else if (userAuthentication.getStatus() == 2) {
             userAuthenticationRespDTO.setMsg("认证申请已提交，请耐心等待……");
             userAuthenticationRespDTO.setIsSuccess(false);
             return userAuthenticationRespDTO;
@@ -92,14 +92,16 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         userAuthentication.setModifier(userId.toString());
         userAuthentication.setGmtModified(new Date());
         userAuthentication.setPosition(userAuthenticationVO.getPosition());
-        userAuthentication.setStatus("2");  //状态设为认证中
+        userAuthentication.setStatus(2);  //状态设为认证中
         this.saveOrUpdate(userAuthentication);
 
         userAuthenticationRespDTO.setMsg("认证申请已提交成功，请耐心等待1~2个工作日");
         userAuthenticationRespDTO.setIsSuccess(true);
-        userAuthenticationRespDTO.getUserAuthenticationDTO().setUser(user);
-        userAuthenticationRespDTO.getUserAuthenticationDTO().setOrganization(organization);
-        userAuthenticationRespDTO.getUserAuthenticationDTO().setUserAuthentication(userAuthentication);
+        UserAuthenticationDTO userAuthenticationDTO = new UserAuthenticationDTO();
+        userAuthenticationDTO.setUser(user);
+        userAuthenticationDTO.setOrganization(organization);
+        userAuthenticationDTO.setUserAuthentication(userAuthentication);
+        userAuthenticationRespDTO.setUserAuthenticationDTO(userAuthenticationDTO);
         return userAuthenticationRespDTO;
     }
 
@@ -120,23 +122,23 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         return userAuthenticationDTO;
     }
 
-    public Map<String, Object> getUserAuthenticationStatus() {
+    public Map<Integer, Object> getUserAuthenticationStatus() {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         UserAuthentication userAuthentication = this.getByUserId(userId);
-        Map<String, Object> map = new HashMap<>();
+        Map<Integer, Object> map = new HashMap<>();
         if (userAuthentication == null) {
-            map.put("msg", "当前用户没有认证信息");
+            map.put(99, "当前用户没有认证信息");
         } else {
-            String status = userAuthentication.getStatus();
+            Integer status = userAuthentication.getStatus();
             String statusName = "";
             switch (status) {
-                case "0":
+                case 0:
                     statusName = AuthStatusEnum.Unauthorized.getName();
                     break;
-                case "1":
+                case 1:
                     statusName = AuthStatusEnum.Authorized.getName();
                     break;
-                case "2":
+                case 2:
                     statusName = AuthStatusEnum.Authorizing.getName();
                     break;
                 default:
@@ -146,31 +148,31 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         }
         return map;
     }
-    
+
     public QueryAuthProgressDTO queryAuthProgress() {
-    	QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
+        QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         UserAuthentication userAuthentication = this.getByUserId(userId);
-        String status = userAuthentication.getStatus();
+        Integer status = userAuthentication.getStatus();
         String isReject = userAuthentication.getIsReject();
-        if(StringUtils.isBlank(isReject)){
-        	if(status.equals("0")){
-        		queryAuthProgressDTO.setStatus("1");
-        		queryAuthProgressDTO.setStatusMessage("未认证");
-        	}else if(status.equals("2")){
-        		queryAuthProgressDTO.setStatus("2");
-        		queryAuthProgressDTO.setStatusMessage("认证中");
-        	}
-        }else if(isReject.equals("N")){
-        	if(status.equals("0")){
-        		queryAuthProgressDTO.setStatus("3");
-        		queryAuthProgressDTO.setStatusMessage("认证未通过");
-        	}
-        }else if(isReject.equals("Y")){
-          	if(status.equals("1")){
-        		queryAuthProgressDTO.setStatus("4");
-        		queryAuthProgressDTO.setStatusMessage("认证通过");
-        	}
+        if (StringUtils.isBlank(isReject)) {
+            if (status == 1) {
+                queryAuthProgressDTO.setStatus("1");
+                queryAuthProgressDTO.setStatusMessage("未认证");
+            } else if (status == 2) {
+                queryAuthProgressDTO.setStatus("2");
+                queryAuthProgressDTO.setStatusMessage("认证中");
+            }
+        } else if (isReject.equals("N")) {
+            if (status == 0) {
+                queryAuthProgressDTO.setStatus("3");
+                queryAuthProgressDTO.setStatusMessage("认证未通过");
+            }
+        } else if (isReject.equals("Y")) {
+            if (status == 1) {
+                queryAuthProgressDTO.setStatus("4");
+                queryAuthProgressDTO.setStatusMessage("认证通过");
+            }
         }
         return queryAuthProgressDTO;
     }

user-service/src/main/java/com/diagbot/web/UserAuthenticationController.java

@@ -59,8 +59,8 @@ public class UserAuthenticationController {
     @ApiOperation(value = "获取当前用户认证状态")
     @PostMapping("/getUserAuthenticationStatus")
     @SysLogger("getUserAuthenticationStatus")
-    public RespDTO<Map<String, Object>> getUserAuthenticationStatus() {
-        Map<String, Object> map = userAuthenticationFacade.getUserAuthenticationStatus();
+    public RespDTO<Map<Integer, Object>> getUserAuthenticationStatus() {
+        Map<Integer, Object> map = userAuthenticationFacade.getUserAuthenticationStatus();
         return RespDTO.onSuc(map);
     }