diff --git a/epdc-cloud-analysis-pc/pom.xml b/epdc-cloud-analysis-pc/pom.xml
index c11057d..1f23ff2 100644
--- a/epdc-cloud-analysis-pc/pom.xml
+++ b/epdc-cloud-analysis-pc/pom.xml
@@ -128,21 +128,15 @@
dev
- 9
- 114.215.125.123
- 9603
- epdc!redis@master1405
-
-
-
-
- yushan_epdc_test
- elink-epdc@yushan
+ 8
+ r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com
+ 10001
+ elink!888
false
- 47.104.224.45:8848
+ 115.29.142.202:8848
- de000340-5fc4-45aa-bdbc-dd96852012ad
+ 8831513c-2f72-42e8-899f-eb6c2c5ae110
wx50ebeb95943868cd
@@ -178,15 +172,15 @@
test
- 9
- 114.215.125.123
- 9603
- epdc!redis@master1405
+ 8
+ r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com
+ 10001
+ elink!888
true
- 192.168.0.59:8848
- 192.168.0.59
+ 115.29.142.202:8848
+ 115.29.142.202
8831513c-2f72-42e8-899f-eb6c2c5ae110
44ebf984898c497280a149a57c1c7b34b324ba06451148a9a2304b2c0f0035c8
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
new file mode 100644
index 0000000..c477ef4
--- /dev/null
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/controller/EpdcScreenController.java
@@ -0,0 +1,270 @@
+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.*;
+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;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 202108版大屏接口
+ *
+ * @Author:liuchuang
+ * @Date:2021/8/10 14:53
+ */
+@RestController
+@RequestMapping("screen")
+public class EpdcScreenController {
+
+ @Autowired
+ private EpdcScreenService epdcScreenService;
+
+ /**
+ * 网格治理-项目列表接口(事件总览最新列表、群众关心的事列表)
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/10 13:46
+ */
+ @GetMapping("gridGovernance/itemList")
+ public Result> gridGovernanceItemList(@RequestBody EpdcScreenGridGovernanceItemFormDTO formDto) {
+ ValidatorUtils.validateEntity(formDto);
+ return epdcScreenService.gridGovernanceItemList(formDto);
+ }
+
+ /**
+ * 网格治理-事件总览-项目类别统计
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:46
+ */
+ @GetMapping("gridGovernance/itemCategoryStatistics")
+ public Result> itemCategoryStatistics() {
+ return epdcScreenService.itemCategoryStatistics();
+ }
+
+ /**
+ * 网格治理-事件总览-项目状态统计列表接口
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:47
+ */
+ @GetMapping("gridGovernance/itemStatusStatistics")
+ public Result> itemStatusStatistics() {
+ return epdcScreenService.itemStatusStatistics();
+ }
+
+ /**
+ * 网格治理-难点堵点
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:49
+ */
+ @GetMapping("gridGovernance/difficultItemList")
+ public Result> difficultItemList(@RequestBody EpdcScreenGridGovernanceItemDifficultFormDTO formDto) {
+ ValidatorUtils.validateEntity(formDto);
+ return epdcScreenService.difficultItemList(formDto);
+ }
+
+ /**
+ * 网格治理-治理情况排行
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:52
+ */
+ @GetMapping("gridGovernance/governanceRanking")
+ public Result> governanceRanking(@RequestBody EpdcScreenGridGovernanceRankingFormDTO formDto) {
+ 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();
+ }
+
+
+ /**
+ *首页-组织信息接口
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author zhangfenghe
+ * @since 2021/8/11 15:23
+ */
+ @GetMapping("frontPage/deptInfoList")
+ public Result> frontPageDeptInfoList(@RequestBody EpdcScreenFrontPageDeptInfoFormDTO formDto){
+ ValidatorUtils.validateEntity(formDto);
+ return epdcScreenService.frontPageDeptInfoList(formDto);
+ }
+
+ /**
+ *首页-人口类型统计接口
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author zhangfenghe
+ * @since 2021/8/11 20:01
+ */
+ @GetMapping("frontPage/personInfoStatistics")
+ public Result frontPagePersonInfoStatisticsList(){
+ return epdcScreenService.frontPagePersonInfoStatisticsList();
+ }
+
+ /**
+ * 首页-房屋类型统计接口
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author zhangfenghe
+ * @since 2021/8/11 20:02
+ */
+ @GetMapping("frontPage/houseTypeStatistics")
+ public Result frontPageHouseTypeStatistics(){
+ return epdcScreenService.frontPageHouseTypeStatistics();
+ }
+
+ /**
+ * 疫情防控-社区接种情况统计(社区接种情况总览、地图数据)
+ * @params [formDto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author zhangfenghe
+ * @since 2021/8/12 10:10
+ */
+ @GetMapping("epidemic/vaccinationStatistics")
+ public Result epidemicVaccinationStatistics(){
+ return epdcScreenService.epidemicVaccinationStatistics();
+ }
+
+ /**
+ * 疫情防控-社区接种情况统计(社区接种情况总览、地图数据)
+ * @params [formDto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author zhangfenghe
+ * @since 2021/8/12 10:26
+ */
+ @GetMapping("epidemic/communityVaccinationStatistics")
+ public Result> epidemicCommunityVaccinationStatisticsList(@RequestBody EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto){
+ ValidatorUtils.validateEntity(formDto);
+ return epdcScreenService.epidemicCommunityVaccinationStatisticsList(formDto);
+ }
+
+ /**
+ * 疫情防控-接种企业统计
+ * @params []
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author zhangfenghe
+ * @since 2021/8/12 11:26
+ */
+ @GetMapping("epidemic/companyVaccinationStatistics")
+ public Result> epidemicCompanyVaccinationStatisticsList(){
+ return epdcScreenService.epidemicCompanyVaccinationStatisticsList();
+ }
+
+ /**
+ * 疫情防控-疫苗接种年龄分布
+ * @params [formDto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author zhangfenghe
+ * @since 2021/8/12 12:35
+ */
+ @GetMapping("vaccination/ageVaccinationStatistics")
+ public Result vaccinationAgeVaccinationStatistics(@RequestBody EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){
+ ValidatorUtils.validateEntity(formDto);
+ return epdcScreenService.vaccinationAgeVaccinationStatistics(formDto);
+ }
+
+ /**
+ *疫情防控-疫苗接种人口类型统计
+ * @params [formDto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author zhangfenghe
+ * @since 2021/8/12 15:29
+ */
+ @GetMapping("vaccination/personVaccinationStatistics")
+ public Result vaccinationPersonVaccinationStatistics(@RequestBody EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto){
+ ValidatorUtils.validateEntity(formDto);
+ return epdcScreenService.vaccinationPersonVaccinationStatistics(formDto);
+ }
+}
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
new file mode 100644
index 0000000..8b44cec
--- /dev/null
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcScreenDao.java
@@ -0,0 +1,191 @@
+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.*;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Author:liuchuang
+ * @Date:2021/8/10 15:04
+ */
+@Mapper
+public interface EpdcScreenDao extends BaseDao {
+
+ /**
+ * 网格治理-项目列表接口(事件总览最新列表、群众关心的事列表)
+ *
+ * @param formDto
+ * @return java.util.List
+ * @author Liuchuang
+ * @since 2021/8/10 15:09
+ */
+ List gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto);
+
+ /**
+ * 网格治理-事件总览-项目类别统计
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:46
+ */
+ List itemCategoryStatistics();
+
+ /**
+ * 网格治理-事件总览-项目状态统计列表接口
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:47
+ */
+ List itemStatusStatistics();
+
+ /**
+ * 网格治理-难点堵点
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:49
+ */
+ List difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto);
+
+ /**
+ * 网格治理-治理情况排行
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:52
+ */
+ List 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();
+
+ /**
+ * 首页-组织信息接口
+ * @return java.util.List
+ * @author zhangfenghe
+ * @since 2021/8/11 15:42
+ */
+ List frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto);
+
+ /**
+ * 首页-人口类型统计接口
+ * @return java.util.List
+ * @author zhangfenghe
+ * @since 2021/8/11 17:46
+ */
+ EpdcScreenFrontPagePersonInfoStatisticsResultDTO frontPagePersonInfoStatisticsList();
+
+ /**
+ * 首页-房屋类型统计接口
+ * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO
+ * @author zhangfenghe
+ * @since 2021/8/11 20:07
+ */
+ EpdcScreenFrontPageHouseTypeStatisticsResultDTO frontPageHouseTypeStatistics();
+
+ /**
+ * 疫情防控-疫苗接种情况统计
+ * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicVaccinationStatisticsResultDTO
+ * @author zhangfenghe
+ * @since 2021/8/11 23:41
+ */
+ EpdcScreenEpidemicVaccinationStatisticsResultDTO epidemicVaccinationStatistics();
+
+ /**
+ * 疫情防控-社区接种情况统计(社区接种情况总览、地图数据)
+ * @params [formDTO]
+ * @return java.util.List
+ * @author zhangfenghe
+ * @since 2021/8/12 10:41
+ */
+ List epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDTO);
+
+ /**
+ * 疫情防控-接种企业统计
+ * @params []
+ * @return java.util.List
+ * @author zhangfenghe
+ * @since 2021/8/12 11:31
+ */
+ List epidemicCompanyVaccinationStatisticsList();
+
+ /**
+ *疫情防控-疫苗接种年龄分布
+ * @params [formDto]
+ * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO
+ * @author zhangfenghe
+ * @since 2021/8/12 12:41
+ */
+ EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto);
+
+ /**
+ * 疫情防控-疫苗接种人口类型统计
+ * @params [formDto]
+ * @return com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO
+ * @author zhangfenghe
+ * @since 2021/8/12 15:33
+ */
+ EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto);
+
+}
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
new file mode 100644
index 0000000..e2a7f0a
--- /dev/null
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/EpdcScreenService.java
@@ -0,0 +1,190 @@
+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.*;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.List;
+
+/**
+ * 202108版大屏接口
+ *
+ * @Author:liuchuang
+ * @Date:2021/8/10 14:54
+ */
+public interface EpdcScreenService {
+
+ /**
+ * 网格治理-项目列表接口(事件总览最新列表、群众关心的事列表)
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/10 13:49
+ */
+ Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto);
+
+ /**
+ * 网格治理-事件总览-项目类别统计
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:46
+ */
+ Result> itemCategoryStatistics();
+
+ /**
+ * 网格治理-事件总览-项目状态统计列表接口
+ *
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:47
+ */
+ Result> itemStatusStatistics();
+
+ /**
+ * 网格治理-难点堵点
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @since 2021/8/11 9:49
+ */
+ Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto);
+
+ /**
+ * 网格治理-治理情况排行
+ *
+ * @param formDto
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author Liuchuang
+ * @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();
+
+
+ /**
+ * 首页-组织信息接口
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author zhangfenghe
+ * @since 2021/8/11 15:26
+ */
+ Result> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto);
+
+ /**
+ * 首页-人口类型统计接口
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author zhangfenghe
+ * @since 2021/8/11 17:38
+ */
+ Result frontPagePersonInfoStatisticsList();
+
+ /**
+ * 首页-房屋类型统计接口
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author zhangfenghe
+ * @since 2021/8/11 20:03
+ */
+ Result frontPageHouseTypeStatistics();
+ /**
+ * 疫情防控-疫苗接种情况统计
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author zhangfenghe
+ * @since 2021/8/11 23:39
+ */
+ Result epidemicVaccinationStatistics();
+
+ /**
+ * 疫情防控-社区接种情况统计(社区接种情况总览、地图数据)
+ * @params [formDto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author zhangfenghe
+ * @since 2021/8/12 10:31
+ */
+ Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto);
+
+ /**
+ * 疫情防控-接种企业统计
+ * @params []
+ * @return com.elink.esua.epdc.commons.tools.utils.Result>
+ * @author zhangfenghe
+ * @since 2021/8/12 11:27
+ */
+ Result> epidemicCompanyVaccinationStatisticsList();
+
+ /**
+ * 疫情防控-疫苗接种年龄分布
+ * @params [formDto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author jyyzz
+ * @since 2021/8/12 12:36
+ */
+ Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto);
+
+ /**
+ *疫情防控-疫苗接种人口类型统计
+ * @params [formDto]
+ * @return com.elink.esua.epdc.commons.tools.utils.Result
+ * @author zhangfenghe
+ * @since 2021/8/12 15:30
+ */
+ Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto);
+}
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
new file mode 100644
index 0000000..b97fcbc
--- /dev/null
+++ b/epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcScreenServiceImpl.java
@@ -0,0 +1,154 @@
+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.*;
+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;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 202108版大屏接口
+ *
+ * @Author:liuchuang
+ * @Date:2021/8/10 14:54
+ */
+@Service
+public class EpdcScreenServiceImpl extends BaseServiceImpl implements EpdcScreenService {
+
+ @Override
+ public Result> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) {
+ int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+ formDto.setPageIndex(pageIndex);
+ List data = baseDao.gridGovernanceItemList(formDto);
+ return new Result>().ok(data);
+ }
+
+ @Override
+ public Result> itemCategoryStatistics() {
+ List data = baseDao.itemCategoryStatistics();
+ return new Result>().ok(data);
+ }
+
+ @Override
+ public Result> itemStatusStatistics() {
+ List data = baseDao.itemStatusStatistics();
+ return new Result>().ok(data);
+ }
+
+ @Override
+ public Result> difficultItemList(EpdcScreenGridGovernanceItemDifficultFormDTO formDto) {
+ int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+ formDto.setPageIndex(pageIndex);
+ List data = baseDao.difficultItemList(formDto);
+ return new Result>().ok(data);
+ }
+
+ @Override
+ public Result> governanceRanking(EpdcScreenGridGovernanceRankingFormDTO formDto) {
+ int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+ formDto.setPageIndex(pageIndex);
+ List 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);
+ }
+
+ @Override
+ public Result> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto) {
+ List data = baseDao.frontPageDeptInfoList(formDto);
+ return new Result>().ok(data);
+ }
+
+ @Override
+ public Result frontPagePersonInfoStatisticsList() {
+ EpdcScreenFrontPagePersonInfoStatisticsResultDTO data = baseDao.frontPagePersonInfoStatisticsList();
+ return new Result().ok(data);
+ }
+
+ @Override
+ public Result frontPageHouseTypeStatistics() {
+ EpdcScreenFrontPageHouseTypeStatisticsResultDTO data = baseDao.frontPageHouseTypeStatistics();
+ return new Result().ok(data);
+ }
+
+ @Override
+ public Result epidemicVaccinationStatistics() {
+ EpdcScreenEpidemicVaccinationStatisticsResultDTO data = baseDao.epidemicVaccinationStatistics();
+ return new Result().ok(data);
+ }
+
+ @Override
+ public Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) {
+ int pageIndex = (formDto.getPageIndex() - NumConstant.ONE)*formDto.getPageSize();
+ formDto.setPageIndex(pageIndex);
+ List data = baseDao.epidemicCommunityVaccinationStatisticsList(formDto);
+ return new Result>().ok(data);
+ }
+
+ @Override
+ public Result> epidemicCompanyVaccinationStatisticsList() {
+ List data = baseDao.epidemicCompanyVaccinationStatisticsList();
+ return new Result>().ok(data);
+ }
+
+ @Override
+ public Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto) {
+ EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO data = baseDao.vaccinationAgeVaccinationStatistics(formDto);
+ return new Result().ok(data);
+ }
+
+ @Override
+ public Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto) {
+ EpdcScreenVaccinationPersonVaccinationStatisticsResultDTO data = baseDao.vaccinationPersonVaccinationStatistics(formDto);
+ 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
new file mode 100644
index 0000000..a29b507
--- /dev/null
+++ b/epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml
@@ -0,0 +1,383 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan
index 2b151d9..c660ca3 160000
--- a/epdc-cloud-client-yushan
+++ b/epdc-cloud-client-yushan
@@ -1 +1 @@
-Subproject commit 2b151d97fc6d0d2068ed5f46934f41dd57d50c44
+Subproject commit c660ca360356218f48dbdb987f4fba70f7642435
diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan
index 3c32a04..235f56d 160000
--- a/epdc-cloud-commons-yushan
+++ b/epdc-cloud-commons-yushan
@@ -1 +1 @@
-Subproject commit 3c32a04b69a4bef06bc48c3d9c17a5a1d96a8fed
+Subproject commit 235f56d5ea756317efe54c5e0d4be0ac45e09155