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 3902f10..766c9aa 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 @@ -2,9 +2,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; @@ -93,4 +91,82 @@ public class ApiScreenController { return epdcScreenService.governanceRanking(formDto); } + /** + * 党建引领-内容列表接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + @GetMapping("partyBuilding/noticeList") + public Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.noticeList(formDto); + } + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 16:52 + */ + @GetMapping("partyBuilding/partyOrgActList") + public Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.partyOrgActList(formDto); + } + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + @GetMapping("partyBuilding/partyOrgTypeList") + public Result> partyOrgTypeList() { + return epdcScreenService.partyOrgTypeList(); + } + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + @GetMapping("partyBuilding/partyOrgList") + public Result> partyOrgList() { + return epdcScreenService.partyOrgList(); + } + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + @GetMapping("partyBuilding/brightIdentity") + public Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.brightIdentity(formDto); + } + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + @GetMapping("partyBuilding/partyMemberAge") + public Result> partyMemberAge() { + return epdcScreenService.partyMemberAge(); + } + } 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 6302dbd..a8a6da9 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 @@ -2,9 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; @@ -85,4 +83,67 @@ public interface AnalysisFeignClient { @GetMapping(value = "analysis/screen/gridGovernance/governanceRanking", consumes = MediaType.APPLICATION_JSON_VALUE) Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); + /** + * 党建引领-内容列表接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + @GetMapping(value = "analysis/screen/partyBuilding/noticeList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto); + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 16:52 + */ + @GetMapping(value = "analysis/screen/partyBuilding/partyOrgActList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto); + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + @GetMapping(value = "analysis/screen/partyBuilding/partyOrgTypeList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> partyOrgTypeList(); + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + @GetMapping(value = "analysis/screen/partyBuilding/partyOrgList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> partyOrgList(); + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + @GetMapping(value = "analysis/screen/partyBuilding/brightIdentity", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + @GetMapping(value = "analysis/screen/partyBuilding/partyMemberAge", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> partyMemberAge(); + } 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 71a51db..1dceab2 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 @@ -3,9 +3,8 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.springframework.stereotype.Component; @@ -49,4 +48,34 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "governanceRanking", formDto); } + @Override + public Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "noticeList", formDto); + } + + @Override + public Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partyOrgActList", formDto); + } + + @Override + public Result> partyOrgTypeList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partyOrgTypeList"); + } + + @Override + public Result> partyOrgList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partyOrgList"); + } + + @Override + public Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "brightIdentity", formDto); + } + + @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/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java index 7e4f0f6..689c428 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 @@ -1,10 +1,10 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; +import org.springframework.web.bind.annotation.GetMapping; import java.util.List; @@ -64,4 +64,61 @@ public interface EpdcScreenService { */ Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); + /** + * 党建引领-内容列表接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto); + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 16:52 + */ + Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto); + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + Result> partyOrgTypeList(); + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + Result> partyOrgList(); + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + Result> partyMemberAge(); + } 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 e72979b..944c028 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 @@ -1,14 +1,14 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemDifficultFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceRankingFormDTO; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.GetMapping; import java.util.List; @@ -48,4 +48,34 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { public Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto) { return analysisFeignClient.governanceRanking(formDto); } + + @Override + public Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto) { + return analysisFeignClient.noticeList(formDto); + } + + @Override + public Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) { + return analysisFeignClient.partyOrgActList(formDto); + } + + @Override + public Result> partyOrgTypeList() { + return analysisFeignClient.partyOrgTypeList(); + } + + @Override + public Result> partyOrgList() { + return analysisFeignClient.partyOrgList(); + } + + @Override + public Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) { + return analysisFeignClient.brightIdentity(formDto); + } + + @Override + public Result> partyMemberAge() { + return analysisFeignClient.partyMemberAge(); + } }