diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java index 110f7fc10..7955680e0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java +++ b/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.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * 工作端，用户登录，用户管理相关接口 @@ -30,4 +29,14 @@ public class ApiWorkUserController { public Result residentDetail(String userId){ return workUserService.residentDetail(userId); } + + /** + * 认证用户（用户信息审核） + * @param formDTO + * @return + */ + @PostMapping("authenticateResident") + public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO){ + return workUserService.authenticateResident(formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 6d9af8b79..0e37e963a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/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 residentDetail(@PathVariable("userId") String userId); + + /** + * 认证用户（用户信息审核） + * @param formDTO + * @return + */ + @PostMapping("app-user/epdc-app/user/authenticateResident") + Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index c3f90280c..f958ca08b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/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 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); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java index 0a6b510b6..4aff2c6ea 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java +++ b/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 residentDetail(String userId); + /** + * 认证用户（用户信息审核） + * @param formDTO + * @return + */ + Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 5be6a04cd..e556a45e4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/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 residentDetail(String userId) { return userFeignClient.residentDetail(userId); } + + /** + * 认证用户（用户信息审核） + * @param formDTO + * @return + */ + @Override + public Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO) { + return userFeignClient.authenticateResident(formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppAuthenticateResidentFormDTO.java new file mode 100644 index 000000000..dc99def7c --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDTO.java index e521309a8..7bad702bb 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailGridResultDTO.java +++ b/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 { diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java index 5f8bb7c8a..d8f13c357 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcResidentDetailResultDTO.java +++ b/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 { diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index fe40b5914..7c9877d77 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/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 residentDetail(@PathVariable("userId") String userId){ return userService.residentDetail(userId); } + + /** + * 认证用户（用户信息审核） + * @param formDTO + * @return + */ + @PostMapping("authenticateResident") + public Result authenticateResident(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO){ + return userService.authenticateResident(formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index f720272d1..b56e2d2a5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/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 { * @return */ Result residentDetail(String userId); + + /** + * 认证用户（用户信息审核） + * @param formDTO + * @return + */ + Result authenticateResident(EpdcAppAuthenticateResidentFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index b343c36f6..b89d70749 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/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 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(); + } }