Merge remote-tracking branch 'origin/feature/stat_bak' into feature/stat_bak

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -375,4 +375,7 @@ public interface DataStatisticalOpenFeignClient {
 
     @PostMapping("/data/stats/factAgencyUserHouseDaily/userHouseStatAgency")
     Result userHouseStatAgency(@RequestBody FactUserHouseFormDTO formDTO);
+
+    @PostMapping("/data/stats/factAgencyUserHouseDaily/userHouseStatNeighborhood")
+    Result userHouseStatNeighborhood(@RequestBody FactUserHouseFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -362,4 +362,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result userHouseStatAgency(FactUserHouseFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "userHouseStatAgency", formDTO);
     }
+
+    @Override
+    public Result userHouseStatNeighborhood(FactUserHouseFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "userHouseStatNeighborhood", formDTO);
+    }
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsUserHouseService.java

@@ -24,4 +24,14 @@ public interface StatsUserHouseService {
      * @date 2022/5/30 10:25
      */
     Result execUserHouseAgencyStatistical(FactUserHouseFormDTO formDTO);
+
+    /**
+     * 人房信息统计
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author zhy
+     * @date 2022/5/30 10:25
+     */
+    Result execUserHouseNeighborhoodStatistical(FactUserHouseFormDTO formDTO);
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsUserHouseServiceImpl.java

@@ -27,4 +27,9 @@ public class StatsUserHouseServiceImpl implements StatsUserHouseService {
     public Result execUserHouseAgencyStatistical(FactUserHouseFormDTO formDTO) {
         return dataStatisticalOpenFeignClient.userHouseStatAgency(formDTO);
     }
+
+    @Override
+    public Result execUserHouseNeighborhoodStatistical(FactUserHouseFormDTO formDTO) {
+        return dataStatisticalOpenFeignClient.userHouseStatNeighborhood(formDTO);
+    }
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsUserHouseTask.java

@@ -44,5 +44,12 @@ public class StatsUserHouseTask implements ITask {
         } else {
             logger.error("StatsUserHouseTask-agency定时任务执行失败:" + result.getMsg());
         }
+
+        result = statsUserHouseService.execUserHouseNeighborhoodStatistical(formDTO);
+        if (result.success()) {
+            logger.info("StatsUserHouseTask-neighborhood定时任务执行成功");
+        } else {
+            logger.error("StatsUserHouseTask-neighborhood定时任务执行失败:" + result.getMsg());
+        }
     }
 }