代码提交 解决冲突

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java

@@ -3,6 +3,9 @@ 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.*;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 import com.elink.esua.epdc.service.EpdcScreenService;
 import org.springframework.beans.factory.annotation.Autowired;

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -42,6 +42,7 @@ public interface AnalysisFeignClient {
     Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto);
 
     /**
+<<<<<<< HEAD
      * 网格治理-事件总览-项目类别统计
      *
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemCategoryResultDTO>>

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

@@ -5,6 +5,9 @@ import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 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.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import org.springframework.stereotype.Component;
@@ -77,5 +80,39 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     public Result<List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO>> partyMemberAge() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partyMemberAge");
     }
+    @Override
+    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPageDeptInfoList");
+    }
+
+    @Override
+    public Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatistics() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPagePersonInfoStatisticsList");
+    }
+
+    @Override
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"FrontPageHouseTypeStatistics");
+    }
+
+    @Override
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatistics");
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicCommunityVaccinationStatisticsList",formDto);
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicCompanyVaccinationStatisticsList");
+    }
+
+    @Override
+    public Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"vaccinationAgeVaccinationStatistics",formDto);
+    }
 
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java

@@ -5,6 +5,10 @@ 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 com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 
 import java.util.List;
 
@@ -27,6 +31,7 @@ public interface EpdcScreenService {
     Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto);
 
     /**
+<<<<<<< HEAD
      * 网格治理-事件总览-项目类别统计
      *
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemCategoryResultDTO>>

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java

@@ -3,6 +3,9 @@ package com.elink.esua.epdc.service.impl;
 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.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.service.EpdcScreenService;
@@ -78,4 +81,39 @@ public class EpdcScreenServiceImpl implements EpdcScreenService {
     public Result<List<EpdcScreenPartyBuildingPartyMemberAgeResultDTO>> partyMemberAge() {
         return analysisFeignClient.partyMemberAge();
     }
+    @Override
+    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList() {
+        return analysisFeignClient.frontPageDeptInfoList();
+    }
+
+    @Override
+    public Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatistics() {
+        return analysisFeignClient.frontPagePersonInfoStatistics();
+    }
+
+    @Override
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics() {
+        return analysisFeignClient.frontPageHouseTypeStatistics();
+    }
+
+    @Override
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics() {
+        return analysisFeignClient.epidemicVaccinationStatistics();
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) {
+        return analysisFeignClient.epidemicCommunityVaccinationStatisticsList(formDto);
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList() {
+        return analysisFeignClient.epidemicCompanyVaccinationStatisticsList();
+    }
+
+    @Override
+    public Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDTO) {
+        return analysisFeignClient.vaccinationAgeVaccinationStatistics(formDTO);
+    }
+
 }