榆山代码更新

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.EpdcScreenGridGovernanceItemFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO;
 import com.elink.esua.epdc.service.EpdcScreenService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,4 +41,37 @@ public class ApiScreenController {
         ValidatorUtils.validateEntity(formDto);
         return epdcScreenService.gridGovernanceItemList(formDto);
     }
+
+    /**
+     *首页-组织信息接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO>>
+     * @athor zhangfenghe
+     * @since 2021/8/11 14:32
+     */
+    @GetMapping("frontPage/deptInfoList")
+    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList(){
+        return epdcScreenService.frontPageDeptInfoList();
+    }
+
+    /**
+     * 首页-人口类型统计接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/11 17:14
+     */
+    @GetMapping("frontPage/personInfoStatistics")
+    public Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList(){
+        return epdcScreenService.frontPagePersonInfoStatisticsList();
+    }
+
+    /**
+     * 首页-房屋类型统计接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/11 19:38
+     */
+    @GetMapping("frontPage/houseTypeStatistics")
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics(){
+        return epdcScreenService.FrontPageHouseTypeStatistics();
+    }
 }

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

@@ -3,6 +3,9 @@ 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.EpdcScreenGridGovernanceItemFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO;
 import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -41,4 +44,30 @@ public interface AnalysisFeignClient {
     @GetMapping(value = "analysis/screen/gridGovernance/itemList", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto);
 
+    /**
+     * 首页-组织信息接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/11 17:18
+     */
+    @GetMapping(value = "analysis/screen/frontPage/deptInfoList",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList();
+
+    /**
+     * 首页-人口类型统计接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/11 17:26
+     */
+    @GetMapping(value = "analysis/screen/frontPage/personInfoStatistics",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList();
+
+    /**
+     * 首页-房屋类型统计接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/11 19:42
+     */
+    @GetMapping(value = "analysis/screen/frontPage/houseTypeStatistics",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics();
 }

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

@@ -4,10 +4,14 @@ 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.EpdcScreenGridGovernanceItemFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -26,4 +30,19 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     public Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "gridGovernanceItemList", formDto);
     }
+
+    @Override
+    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPageDeptInfoList");
+    }
+
+    @Override
+    public Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPagePersonInfoStatisticsList");
+    }
+
+    @Override
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"FrontPageHouseTypeStatistics");
+    }
 }

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

@@ -2,6 +2,9 @@ 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.EpdcScreenGridGovernanceItemFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO;
 
 import java.util.List;
@@ -23,4 +26,29 @@ public interface EpdcScreenService {
      * @since 2021/8/10 13:49
      */
     Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto);
+
+    /**
+     *首页-组织信息接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO>>
+     * @athor zhangfenghe
+     * @since 2021/8/11 14:32
+     */
+    Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList();
+
+    /**
+     * 首页-人口类型统计接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/11 17:19
+     */
+    Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList();
+
+    /**
+     * 首页-房屋类型统计接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/11 19:39
+     */
+    Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics();
+
 }

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

@@ -2,6 +2,9 @@ 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.EpdcScreenGridGovernanceItemFormDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.service.EpdcScreenService;
@@ -26,4 +29,20 @@ public class EpdcScreenServiceImpl implements EpdcScreenService {
     public Result<List<EpdcScreenGridGovernanceItemResultDTO>> gridGovernanceItemList(EpdcScreenGridGovernanceItemFormDTO formDto) {
         return analysisFeignClient.gridGovernanceItemList(formDto);
     }
+
+    @Override
+    public Result<List<EpdcScreenFrontPageDeptInfoResultDTO>> frontPageDeptInfoList() {
+        return analysisFeignClient.frontPageDeptInfoList();
+    }
+
+    @Override
+    public Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList() {
+        return analysisFeignClient.frontPagePersonInfoStatisticsList();
+    }
+
+    @Override
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics() {
+        return analysisFeignClient.FrontPageHouseTypeStatistics();
+    }
+
 }

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 096ff38dd013a46809f94a815018b9ac3ea7f7ad
+Subproject commit d4185d93c86e09c2b284906e65fb2d6d15c37e6c