diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index aa2f4f0..5073d7c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -8,6 +8,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; +import com.elink.esua.epdc.dto.form.EpdcAppShowIdentityFormDTO; import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO; @@ -375,7 +376,7 @@ public class ApiAppUserController { * @since 2021/8/28 19:43 */ @PostMapping("partyMember/showIdentity") - public Result saveShowIdentity(@LoginUser UserDetail userDetail,EpdcAppShowIdentityFormDTO formDto){ + public Result saveShowIdentity(@LoginUser UserDetail userDetail, EpdcAppShowIdentityFormDTO formDto){ ValidatorUtils.validateEntity(formDto); return appUserService.saveShowIdentity(userDetail,formDto); } @@ -391,4 +392,29 @@ public class ApiAppUserController { public Result getDentityDetail(@LoginUser UserDetail userDetail){ return appUserService.getDentityDetail(userDetail); } + /** + * 党建引领-党员亮身份推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + @PostMapping("partyBuilding/brightIdentity/recommended") + public Result recommended(String id){ + return appUserService.recommended(id); + + } + + /** + * 党建引领-党员亮身份取消推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + @PostMapping("partyBuilding/brightIdentity/recommendedCancel") + public Result recommendedCancel(String id){ + return appUserService.recommendedCancel(id); + + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java index b40bce1..6bead3e 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java @@ -157,32 +157,6 @@ public class ApiScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.brightIdentity(formDto); } - - /** - * 党建引领-党员亮身份推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - @PostMapping("partyBuilding/brightIdentity/recommended") - public Result recommended(String id){ - return epdcScreenService.recommended(id); - - } - - /** - * 党建引领-党员亮身份取消推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - @PostMapping("partyBuilding/brightIdentity/recommendedCancel") - public Result recommendedCancel(String id){ - return epdcScreenService.recommendedCancel(id); - - } /** * 党建引领-党员画像 * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index e88529b..8c47bcd 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -137,27 +137,6 @@ public interface AnalysisFeignClient { @GetMapping(value = "analysis/screen/partyBuilding/brightIdentity", consumes = MediaType.APPLICATION_JSON_VALUE) Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); - /** - * 党建引领-党员亮身份推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - @PostMapping(value = "analysis/screen/partyBuilding/brightIdentity/recommended",consumes = MediaType.APPLICATION_JSON_VALUE) - Result recommended(String id); - - - /** - * 党建引领-党员亮身份取消推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - @PostMapping(value = "analysis/screen/partyBuilding/brightIdentity/recommendedCancel",consumes = MediaType.APPLICATION_JSON_VALUE) - Result recommendedCaancel(String id); - /** * 党建引领-党员画像 * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 9dd6e54..104d476 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -459,4 +459,26 @@ public interface UserFeignClient { */ @GetMapping(value = "app-user/partyMember/dentityDetail",consumes = MediaType.APPLICATION_JSON_VALUE) Result getDentityDetail(Long userId); + + /** + * 党建引领-党员亮身份推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + @PostMapping(value = "app-user/partyMember/dentityDetail/recommended",consumes = MediaType.APPLICATION_JSON_VALUE) + Result recommended(String id); + + + /** + * 党建引领-党员亮身份取消推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + @PostMapping(value = "app-user/partyMember/dentityDetail/recommendedCancel",consumes = MediaType.APPLICATION_JSON_VALUE) + Result recommendedCaancel(String id); } + diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 95aa239..f83ef22 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -76,16 +76,6 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "brightIdentity", formDto); } - @Override - public Result recommended(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"recommended",id); - } - - @Override - public Result recommendedCaancel(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"recommendedCaancel",id); - } - @Override public Result> partyMemberAge() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partyMemberAge"); diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 972dd71..ba8a146 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -224,4 +224,14 @@ public class UserFeignClientFallback implements UserFeignClient { public Result getDentityDetail(Long userId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"getDentityDetail",userId); } + + @Override + public Result recommended(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"recommended",id); + } + + @Override + public Result recommendedCaancel(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"recommendedCaancel",id); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 4697990..9dac126 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.form.EpdcAppShowIdentityFormDTO; import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; import com.elink.esua.epdc.dto.result.EpdcAppIdentityDetailResultDTO; @@ -312,7 +313,7 @@ public interface AppUserService { * @author zhangfenghe * @since 2021/8/28 19:43 */ - Result saveShowIdentity(UserDetail userDetail,EpdcAppShowIdentityFormDTO forDto); + Result saveShowIdentity(UserDetail userDetail, EpdcAppShowIdentityFormDTO forDto); /** * 小程序-我的-党员亮身份详细信息 @@ -323,4 +324,22 @@ public interface AppUserService { */ Result getDentityDetail(UserDetail userDetail); + /** + * 党建引领-党员亮身份推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + Result recommended(String id); + + /** + * 党建引领-党员亮身份取消推荐 + * @params [id] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/30 9:08 + */ + Result recommendedCancel(String id); + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java index 3676d77..44862b9 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java @@ -117,24 +117,6 @@ public interface EpdcScreenService { */ Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); - /** - * 党建引领-党员亮身份推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - Result recommended(String id); - - /** - * 党建引领-党员亮身份取消推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - Result recommendedCancel(String id); - /** * 党建引领-党员画像 * diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index d36ce90..8b939dd 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -26,6 +26,7 @@ import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.form.*; +import com.elink.esua.epdc.dto.form.EpdcAppShowIdentityFormDTO; import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO; import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; import com.elink.esua.epdc.dto.group.form.GroupUserPartyMemberFormDTO; @@ -59,9 +60,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; -import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -1412,7 +1411,7 @@ public class AppUserServiceImpl implements AppUserService { } @Override - public Result saveShowIdentity(UserDetail userDetail,EpdcAppShowIdentityFormDTO formDto) { + public Result saveShowIdentity(UserDetail userDetail, EpdcAppShowIdentityFormDTO formDto) { if (null == userDetail) { return new Result().error("获取用户信息失败"); } @@ -1428,5 +1427,14 @@ public class AppUserServiceImpl implements AppUserService { return userFeignClient.getDentityDetail(userDetail.getId()); } + @Override + public Result recommended(String id) { + return userFeignClient.recommended(id); + } + + @Override + public Result recommendedCancel(String id) { + return userFeignClient.recommendedCaancel(id); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java index 616d0c2..76915ca 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java @@ -77,16 +77,6 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { return analysisFeignClient.brightIdentity(formDto); } - @Override - public Result recommended(String id) { - return analysisFeignClient.recommended(id); - } - - @Override - public Result recommendedCancel(String id) { - return analysisFeignClient.recommendedCaancel(id); - } - @Override public Result> partyMemberAge() { return analysisFeignClient.partyMemberAge();