类别分析，定时任务

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -761,7 +761,6 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         // 1、 先查询出居民类别配置（状态为显示）
         List<IcUserCategoryResultDTO> resList=customerFootBarService.queryCustomerIcResiCategoryStatsConfig(formDTO.getCustomerId());
         if(CollectionUtils.isNotEmpty(resList)){
-            //所有类别初始值为0 todo
             List<String> configIds=resList.stream().map(IcUserCategoryResultDTO::getConfigId).collect(Collectors.toList());
             if(OrgInfoConstant.GRID.equals(formDTO.getOrgType())){
                 List<FactIcuserCategoryAnalysisDailyDTO> list=dataStatsService.queryGridIcUserCategoryData(formDTO.getOrgId(),formDTO.getDateId(),configIds);

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

@@ -5,10 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
 import com.epmet.dto.basereport.result.EventInfoResultDTO;
-import com.epmet.dto.extract.form.BizDataFormDTO;
+import com.epmet.dto.extract.form.*;
-import com.epmet.dto.extract.form.ExtractIndexFormDTO;
-import com.epmet.dto.extract.form.ExtractOriginFormDTO;
-import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.org.form.GridBaseInfoFormDTO;
@@ -353,4 +350,7 @@ public interface DataStatisticalOpenFeignClient {
      */
     @PostMapping("/data/stats/demand/volunteer/daily")
     Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId);
+
+    @PostMapping("/data/stats/ic/user/category-analysis-daily")
+    Result statUserCategoryDaily(@RequestBody IcUserCategoryAnalysisDailyFormDTO formDTO);
 }

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

@@ -6,10 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.basereport.form.EventInfoFormDTO;
 import com.epmet.dto.basereport.result.EventInfoResultDTO;
-import com.epmet.dto.extract.form.BizDataFormDTO;
+import com.epmet.dto.extract.form.*;
-import com.epmet.dto.extract.form.ExtractIndexFormDTO;
-import com.epmet.dto.extract.form.ExtractOriginFormDTO;
-import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.org.form.GridBaseInfoFormDTO;
@@ -339,4 +336,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result statsVolunteerDemandServicesDaily(String customerId) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statsVolunteerDemandServicesDaily", customerId);
     }
+
+    @Override
+    public Result statUserCategoryDaily(IcUserCategoryAnalysisDailyFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statUserCategoryDaily", formDTO);
+    }
 }

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

@@ -0,0 +1,34 @@
+package com.epmet.task;
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.extract.form.IcUserCategoryAnalysisDailyFormDTO;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+
+@Slf4j
+@Component("icUserCategoryAnalysisTask")
+public class IcUserCategoryAnalysisTask implements ITask {
+
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+
+    @Override
+    public void run(String params) {
+        log.info("icUserCategoryAnalysisTask定时任务正在执行，参数为：{}", params);
+        IcUserCategoryAnalysisDailyFormDTO formDTO = new IcUserCategoryAnalysisDailyFormDTO();
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, IcUserCategoryAnalysisDailyFormDTO.class);
+        }
+        Result result = dataStatisticalOpenFeignClient.statUserCategoryDaily(formDTO);
+        if (result.success()) {
+            log.info("icUserCategoryAnalysisTask定时任务正在执行定时任务执行成功");
+        } else {
+            log.warn("icUserCategoryAnalysisTask定时任务正在执行定时任务执行失败:" + result.getMsg());
+        }
+    }
+}