认证用户接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java

@@ -1,12 +1,11 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 工作端，用户登录，用户管理相关接口
@@ -30,4 +29,14 @@ public class ApiWorkUserController {
     public Result<EpdcResidentDetailResultDTO> residentDetail(String userId){
         return workUserService.residentDetail(userId);
     }
+
+    /**
+     * 认证用户（用户信息审核）
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("authenticateResident")
+    public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO){
+        return workUserService.authenticateResident(formDTO);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -259,4 +259,12 @@ public interface UserFeignClient {
      */
     @GetMapping("app-user/epdc-app/user/residentDetail/{userId}")
     Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId);
+
+	/**
+	 * 认证用户（用户信息审核）
+	 * @param formDTO
+	 * @return
+	 */
+	@PostMapping("app-user/epdc-app/user/authenticateResident")
+	  Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -125,4 +125,9 @@ public class UserFeignClientFallback implements UserFeignClient {
     public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
         return  ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "residentDetail", userId);
     }
+
+    @Override
+    public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) {
+        return  ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "authenticateResident", formDTO);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 
 /**
@@ -16,4 +17,10 @@ public interface WorkUserService {
 	 * @return
 	 */
 	Result<EpdcResidentDetailResultDTO> residentDetail(String userId);
+	/**
+	 * 认证用户（用户信息审核）
+	 * @param formDTO
+	 * @return
+	 */
+	Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.epdc.form.EpdcAppAuthenticateResidentFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO;
 import com.elink.esua.epdc.feign.UserFeignClient;
 import com.elink.esua.epdc.service.WorkUserService;
@@ -27,4 +28,14 @@ public class WorkUserServiceImpl implements WorkUserService {
 	public Result<EpdcResidentDetailResultDTO> residentDetail(String userId) {
 		return userFeignClient.residentDetail(userId);
 	}
+
+	/**
+	 * 认证用户（用户信息审核）
+	 * @param formDTO
+	 * @return
+	 */
+	@Override
+	public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) {
+		return userFeignClient.authenticateResident(formDTO);
+	}
 }

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java

@@ -0,0 +1,25 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Auther: yinzuomei
+ * @Date: 2019/11/18 16:37
+ * @Description: 业务端 认证用户（用户信息审核）入参DTO
+ */
+@Data
+public class EpdcAppAuthenticateResidentFormDTO implements Serializable {
+	private static final long serialVersionUID = 6035055052382466281L;
+	/**
+	 * 是否认证通过 0否 1是
+	 */
+	private String authenticatedFlag;
+	/**
+	 * 用户ID
+	 */
+	@NotBlank(message = "用户ID不能为空")
+	private String userId;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDTO.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 /**
  * @Auther: yinzuomei
  * @Date: 2019/11/18 12:54
- * @Description:
+ * @Description: 业务端 居民用户详情-扫码网格列表
  */
 @Data
 public class EpdcResidentDetailGridResultDTO implements Serializable {

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java

@@ -8,7 +8,7 @@ import java.util.List;
 /**
  * @Auther: yinzuomei
  * @Date: 2019/11/18 12:54
- * @Description:
+ * @Description: 业务端 居民用户详情接口返参DTO
  */
 @Data
 public class EpdcResidentDetailResultDTO implements Serializable {

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -259,4 +259,14 @@ public class EpdcAppUserController {
     public Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId){
         return userService.residentDetail(userId);
     }
+
+	/**
+	 * 认证用户（用户信息审核）
+	 * @param formDTO
+	 * @return
+	 */
+	@PostMapping("authenticateResident")
+		public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO){
+			return userService.authenticateResident(formDTO);
+		}
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -205,4 +205,11 @@ public interface UserService extends BaseService<UserEntity> {
      * @return
      */
 	  Result<EpdcResidentDetailResultDTO> residentDetail(String userId);
+
+    /**
+     * 认证用户（用户信息审核）
+     * @param formDTO
+     * @return
+     */
+    Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -515,4 +515,26 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         EpdcResidentDetailResultDTO dto = this.baseDao.residentDetailByUserId(userId);
         return new Result().ok(dto);
     }
+
+    /**
+     * 认证用户（用户信息审核）
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) {
+    	if(StringUtils.isBlank(formDTO.getAuthenticatedFlag())){
+    		formDTO.setAuthenticatedFlag("0");
+	    }
+      UserDTO userDTO=this.get(formDTO.getUserId());
+      if(null!=userDTO){
+          if("0".equals(formDTO.getAuthenticatedFlag())){//不通过
+              userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value());
+          }else if("1".equals(formDTO.getAuthenticatedFlag())){//通过
+              userDTO.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value());
+          }
+          this.update(userDTO);
+      }
+      return new Result();
+    }
 }