From 0a90b71e3a6bedee510cdc0a227587ef4840f654 Mon Sep 17 00:00:00 2001 From: luyan Date: Wed, 6 Sep 2023 11:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E8=81=8C=E5=85=9A=E5=91=98=E6=8A=A5?= =?UTF-8?q?=E9=81=93=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E9=81=93=E4=BF=A1=E6=81=AFfeign=E6=8E=A5=E5=8F=A3=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/ApiAppUserController.java | 7 +++++-- .../java/com/elink/esua/epdc/feign/UserFeignClient.java | 9 +++++++++ .../epdc/feign/fallback/UserFeignClientFallback.java | 5 +++++ .../java/com/elink/esua/epdc/service/AppUserService.java | 2 ++ .../elink/esua/epdc/service/impl/AppUserServiceImpl.java | 7 ++++++- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 2b0b0060c..7dcf48166 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -4,8 +4,6 @@ import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.dto.form.UserLoginLogDTO; import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; @@ -436,6 +434,11 @@ public class ApiAppUserController { return appUserService.saveReportparty(dto); } + @PostMapping("/reportparty/getByIdCardAndName") + public Result getByIdCardAndName(@LoginUser TokenDto tokenDto, @RequestBody ReportPartyDTO dto) { + return appUserService.getByIdCardAndName(dto); + } + /** * 红色尖兵 * 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 f37d1a69b..05f35a4aa 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 @@ -508,6 +508,15 @@ public interface UserFeignClient { @PostMapping("/app-user/reportparty/save") Result saveReportparty(ReportPartyDTO dto); + /** + * 获取在职党员报到信息 + * + * @param dto + * @return + */ + @PostMapping("/app-user/reportparty/getByIdCardAndName") + Result getByIdCardAndName(ReportPartyDTO dto); + /** * 红色尖兵 * 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 85718b72d..ad12f5c2c 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 @@ -267,6 +267,11 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveReportparty", dto); } + @Override + public Result getByIdCardAndName(ReportPartyDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getByIdCardAndName", dto); + } + @Override public Result saveRedspearhead(RedSpearheadDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "saveRedspearhead", dto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 3b40ad059..998f317fe 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -396,4 +396,6 @@ public interface AppUserService { Result npmUserRegister(EpdcUserNpmRegisterFormDTO formDto); Result npmUserUpdate(EpdcUserNpmRegisterFormDTO formDto); + + Result getByIdCardAndName(ReportPartyDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 7389783da..59931f85d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1636,6 +1636,11 @@ public class AppUserServiceImpl implements AppUserService { return userFeignClient.saveReportparty(dto); } + @Override + public Result getByIdCardAndName(ReportPartyDTO dto) { + return userFeignClient.getByIdCardAndName(dto); + } + @Override public Result saveRedspearhead(RedSpearheadDTO dto) { return userFeignClient.saveRedspearhead(dto); @@ -1701,7 +1706,7 @@ public class AppUserServiceImpl implements AppUserService { userDTO.setWorkType(formDto.getWorkType()); userDTO.setWorkIndustry(formDto.getWorkIndustry()); userDTO.setWorkIndustryText(formDto.getWorkIndustryText()); - if(StringUtils.isNotEmpty(formDto.getFaceImg())){ + if (StringUtils.isNotEmpty(formDto.getFaceImg())) { userDTO.setFaceImg(formDto.getFaceImg()); } // IP地址