From 757c080a38e982c0bc47da5ea1c440dbc33155a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Wed, 20 May 2020 09:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E7=AB=AF=E3=80=91-?= =?UTF-8?q?=E3=80=90=E5=BB=89=E6=94=BF=E5=B8=82=E5=8C=97=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E3=80=91-=E6=9D=8E=E9=B9=8F=E9=A3=9E-20200520?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/commons/tools/enums/YesOrNoEnum.java | 8 +++++++- .../elink/esua/epdc/controller/ApiAdminController.java | 5 +++++ .../java/com/elink/esua/epdc/service/AdminService.java | 10 ++++++++++ .../elink/esua/epdc/service/impl/AdminServiceImpl.java | 7 +++++++ .../elink/esua/epdc/service/impl/UserServiceImpl.java | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java index ca35dc490..ab734a6a2 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/YesOrNoEnum.java @@ -22,7 +22,13 @@ public enum YesOrNoEnum { /** * 否 */ - NO("0"); + NO("0"), + /** + * 待审核 + */ + WAIT("2"); + + private String value; diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java index 8f181538c..7d45d2b36 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java @@ -1,6 +1,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.service.AdminService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -33,4 +34,8 @@ public class ApiAdminController { public Result getCompleteDeptName(Long gridId) { return adminService.getCompleteDeptName(gridId); } + @GetMapping("/dept/getComplete") + public Result getComplete(Long gridId) { + return adminService.getComplete(gridId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java index 55e06883a..706e825f4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.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.CompleteDeptDTO; /** * 管理端相关接口 @@ -20,4 +21,13 @@ public interface AdminService { * @date 2019/9/11 09:46 */ Result getCompleteDeptName(Long gridId); + /** + * 获取完整机构名称（市区/街道/社区/网格） + * + * @param gridId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author yujintao + * @date 2019/9/11 09:46 + */ + Result getComplete(Long gridId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index c5f799828..b5bd83659 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -33,4 +33,11 @@ public class AdminServiceImpl implements AdminService { .concat(completeDept.getGrid()); return new Result().ok(deptName); } + @Override + public Result getComplete(Long gridId) { + Result adminResult = adminFeignClient.getCompleteDept(gridId); + + CompleteDeptDTO completeDept = adminResult.getData(); + return adminResult; + } } 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 abbc20ef6..46ebe71a5 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 @@ -832,6 +832,7 @@ public class UserServiceImpl extends BaseServiceImpl implem if (!updateById(userEntity)) { throw new RenException("用户认证修改居民信息时失败！"); } + generateUserAuthenticateHistory(completeAppUser, UserAuthTypeEnum.RESIDENT_AUTH, YesOrNoEnum.WAIT, null); UserDTO userDto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class); userDto.setLeaderFlag(relationInfo.getLeaderFlag()); userDto.setFaceImg(StringUtils.isBlank(userDto.getFaceImg()) ? findUser.getFaceImg() : userDto.getFaceImg());