From cd61543d72eab633f61f769e243a08ea4a03cc5d Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 11 Aug 2021 19:16:55 +0800 Subject: [PATCH] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F-=E5=85=9A?= =?UTF-8?q?=E5=BB=BA=E5=BC=95=E9=A2=86=E6=9D=BF=E5=9D=97=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EpdcScreenController.java | 83 +++++++++++- .../modules/screen/dao/EpdcScreenDao.java | 61 ++++++++- .../screen/service/EpdcScreenService.java | 62 ++++++++- .../service/impl/EpdcScreenServiceImpl.java | 47 ++++++- .../resources/mapper/screen/EpdcScreenDao.xml | 118 ++++++++++++++++++ 5 files changed, 359 insertions(+), 12 deletions(-) diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java index 11ce830..96f6c33 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java @@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.screen.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.modules.screen.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; @@ -93,4 +91,83 @@ public class EpdcScreenController { ValidatorUtils.validateEntity(formDto); 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(@RequestBody 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(@RequestBody 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(@RequestBody 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-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java index 9a40baa..99ab86b 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java @@ -2,9 +2,7 @@ package com.elink.esua.epdc.modules.screen.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; 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 org.apache.ibatis.annotations.Mapper; @@ -64,4 +62,61 @@ public interface EpdcScreenDao extends BaseDao governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto); + + /** + * 党建引领-内容列表接口 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:31 + */ + List noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto); + + /** + * 党建引领-党组织活动排名接口 + * + * @param formDto + * @return java.util.List + * @author Liuchuang + * @since 2021/8/11 16:57 + */ + List partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto); + + /** + * 党建引领-党组织类型列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + List partyOrgTypeList(); + + /** + * 党建引领-党组织列表接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:34 + */ + List partyOrgList(); + + /** + * 党建引领-党员亮身份列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + List brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto); + + /** + * 党建引领-党员画像 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2021/8/11 14:37 + */ + List partyMemberAge(); } diff --git a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java index 55c3ff1..4119800 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java @@ -1,9 +1,7 @@ package com.elink.esua.epdc.modules.screen.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.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import java.util.List; @@ -63,4 +61,62 @@ public interface EpdcScreenService { * @since 2021/8/11 9:52 */ 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-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java index bd130c6..64b43bf 100644 --- a/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java @@ -3,9 +3,8 @@ package com.elink.esua.epdc.modules.screen.service.impl; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.NumConstant; 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.modules.screen.dao.EpdcScreenDao; import com.elink.esua.epdc.modules.screen.service.EpdcScreenService; @@ -57,4 +56,46 @@ public class EpdcScreenServiceImpl extends BaseServiceImpl data = baseDao.governanceRanking(formDto); return new Result>().ok(data); } + + @Override + public Result> noticeList(EpdcScreenPartyBuildingNoticeListFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.noticeList(formDto); + return new Result>().ok(data); + } + + @Override + public Result> partyOrgActList(EpdcScreenPartyBuildingPartyOrgActFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.partyOrgActList(formDto); + return new Result>().ok(data); + } + + @Override + public Result> partyOrgTypeList() { + List data = baseDao.partyOrgTypeList(); + return new Result>().ok(data); + } + + @Override + public Result> partyOrgList() { + List data = baseDao.partyOrgList(); + return new Result>().ok(data); + } + + @Override + public Result> brightIdentity(EpdcScreenPartyBuildingBrightIdentityFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.brightIdentity(formDto); + return new Result>().ok(data); + } + + @Override + public Result> partyMemberAge() { + List data = baseDao.partyMemberAge(); + return new Result>().ok(data); + } } diff --git a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml index ddcca01..8329329 100644 --- a/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml +++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml @@ -123,4 +123,122 @@ LIMIT #{pageIndex}, #{pageSize} + + + + + + + + + + + +