Merge remote-tracking branch 'origin/dev_third_data' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -5,10 +5,12 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.EnvEnum;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
+import com.epmet.dto.extract.form.ExtractFactGridGovernDailyFromDTO;
 import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.dto.extract.form.ExtractScreenFormDTO;
 import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
+import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
 import com.epmet.service.evaluationindex.screen.*;
@@ -69,6 +71,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
     @Autowired
     private ScreenProjectCategoryOrgDailyService projectCategoryOrgDailyService;
+    @Autowired
+    private FactGridGovernDailyService factGridGovernDailyService;
 
     /**
      * @param extractOriginFormDTO
@@ -243,6 +247,14 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
         }
 
+        try{
+            ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO=new ExtractFactGridGovernDailyFromDTO();
+            extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
+            extractFactGridGovernDailyFromDTO.setDateId(dateId);
+            factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
+        }catch(Exception e){
+            log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+        }
         extractPartData(customerId, dateId);
         log.info("===== extractDaily method end ======");
     }