Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category

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

@@ -11,10 +11,7 @@ import com.epmet.dto.indexcal.CalculateCommonFormDTO;
 import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.service.evaluationindex.extract.toscreen.*;
 import com.epmet.service.evaluationindex.indexcal.IndexCalculateService;
-import com.epmet.service.evaluationindex.screen.ScreenProjectGridDailyService;
-import com.epmet.service.evaluationindex.screen.ScreenProjectOrgDailyService;
-import com.epmet.service.evaluationindex.screen.ScreenProjectQuantityGridMonthlyService;
-import com.epmet.service.evaluationindex.screen.ScreenProjectQuantityOrgMonthlyService;
+import com.epmet.service.evaluationindex.screen.*;
 import com.epmet.service.stats.DimCustomerService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -68,6 +65,8 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
     private ScreenProjectOrgDailyService screenProjectOrgDailyService;
     @Autowired
     private ScreenProjectSettleService screenProjectSettleService;
+    @Autowired
+    private ScreenProjectCategoryGridDailyService projectCategoryGridDailyService;
 
     /**
      * @param extractOriginFormDTO
@@ -198,12 +197,18 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             log.error("项目(事件)分析按组织_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e);
         }
         //项目分类打标签未上线，暂时屏蔽
-        /*try{
+        try{
             //大屏项目数据抽取_按天抽取
             screenProjectSettleService.extractScreenData(param);
         }catch (Exception e){
             log.error("大屏项目数据抽取_按天抽取_按天统计失败，customerId为："+customerId+"dateId为："+dateId, e);
-        }*/
+        }
+        //按天统计：网格内各个分类下的项目总数
+        try{
+            projectCategoryGridDailyService.extractProjectCategoryData(customerId,dateId);
+        }catch(Exception e){
+            log.error("按天统计：网格内各个分类下的项目总数，customerId为："+customerId+"dateId为："+dateId, e);
+        }
         log.info("===== extractDaily method end ======");
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenProjectCategoryGridDailyService.java

@@ -102,4 +102,14 @@ public interface ScreenProjectCategoryGridDailyService extends BaseService<Scree
      * @return void
      */
     void collect(ScreenCollFormDTO<ScreenProjectCategoryGridDailyDTO> param);
+
+    /**
+     * @return void
+     * @param customerId
+     * @param dateId
+     * @author yinzuomei
+     * @description 产品内部计算：网格内按分类统计项目数量
+     * @Date 2021/3/22 16:46
+     **/
+    void extractProjectCategoryData(String customerId, String dateId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectCategoryGridDailyServiceImpl.java

@@ -128,4 +128,17 @@ public class ScreenProjectCategoryGridDailyServiceImpl extends BaseServiceImpl<S
         }
     }
 
+    /**
+     * @param customerId
+     * @param dateId
+     * @return void
+     * @author yinzuomei
+     * @description 产品内部计算：网格内按分类统计项目数量
+     * @Date 2021/3/22 16:46
+     **/
+    @Override
+    public void extractProjectCategoryData(String customerId, String dateId) {
+        //todo
+    }
+
 }