抽取定时任务暂存

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java

@@ -4,18 +4,16 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.extract.form.ExtractFormDTO;
 import com.epmet.dto.extract.form.ProjectFormDTO;
+import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
 import com.epmet.service.evaluationindex.extract.IssueExtractService;
 import com.epmet.service.evaluationindex.extract.ProjectExtractService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
-import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Date;
-
 
 /**
  * 原始数据清洗
@@ -62,16 +60,16 @@ public class FactOriginController {
 
     /**
      * @param customerId yyyyMMdd
-     * @param dateId yyyyMMdd
+     * @param dateId     yyyyMMdd
      * @return com.epmet.commons.tools.utils.Result
      * @author yinzuomei
      * @description 话题 (fact_origin_topic_main_daily	话题主表_日统计  fact_origin_topic_log_daily 话题明细_日统计)
      * @Date 2020/9/15 13:39
      **/
     @PostMapping("topic")
-    public Result topicDataCleaning(String customerId,String dateId) {
-        if (StringUtils.isNotBlank(customerId) && StringUtils.isNotBlank(dateId)) {
-            factOriginTopicMainDailyService.topicCleaning(customerId,dateId);
+    public Result topicDataCleaning(@RequestBody ExtractFormDTO extractFormDTO) {
+        if (StringUtils.isNotBlank(extractFormDTO.getCustomerId()) && StringUtils.isNotBlank(extractFormDTO.getDateId())) {
+            factOriginTopicMainDailyService.topicCleaning(extractFormDTO);
         }
         return new Result();
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicMainDailyService.java

@@ -18,11 +18,9 @@
 package com.epmet.service.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.dto.topic.TopicOriginInfoDTO;
+import com.epmet.dto.extract.form.ExtractFormDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 
-import java.util.List;
-
 
 /**
  * 话题主表_日统计
@@ -33,14 +31,14 @@ import java.util.List;
 public interface FactOriginTopicMainDailyService extends BaseService<FactOriginTopicMainDailyEntity> {
 
     /**
-     * @return void
      * @param customerId 客户id
-     * @param dateId yyyyMMdd
+     * @param dateId     yyyyMMdd
+     * @return void
      * @author yinzuomei 数据采集：话题本身
      * @description fact_origin_topic_log_daily    话题明细_日统计  fact_origin_topic_main_daily	话题主表_日统计
      * @Date 2020/9/15 13:40
      **/
-    Boolean topicCleaning(String customerId, String dateId);
+    Boolean topicCleaning(ExtractFormDTO extractFormDTO);
 
 
 }

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

@@ -26,6 +26,7 @@ import com.epmet.constant.DimObjectActionConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicMainDailyDao;
+import com.epmet.dto.extract.form.ExtractFormDTO;
 import com.epmet.dto.org.GridInfoDTO;
 import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
@@ -64,6 +65,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
     private FactOriginTopicLogDailyDao factOriginTopicLogDailyDao;
     @Autowired
     private UserService userService;
+
     /**
      * @param customerId 客户id
      * @param dateId     yyyyMMdd
@@ -73,16 +75,18 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
      * @Date 2020/9/15 13:40
      **/
     @Override
-    public Boolean topicCleaning(String customerId, String dateId) {
+    public Boolean topicCleaning(ExtractFormDTO extractFormDTO) {
+        String customerId = extractFormDTO.getCustomerId();
+        String dateId = extractFormDTO.getDateId();
         List<TopicOriginInfoDTO> topicOriginInfoList = topicService.queryTopicOriginInfoList(customerId, dateId);
         if (CollectionUtils.isEmpty(topicOriginInfoList)) {
-            log.info(String.format("customerId%s,dateId%s,doesn't have any topic operation record",customerId,dateId));
+            log.info(String.format("customerId%s,dateId%s,doesn't have any topic operation record", customerId, dateId));
             return true;
         }
-        Map<String,GridInfoDTO> gridMap=getGridInfoMap(customerId);
-        Map<String, Object> map=this.constructFactOriginData(topicOriginInfoList,gridMap);
-        List<FactOriginTopicMainDailyEntity> mainDailyEntityList= (List<FactOriginTopicMainDailyEntity>) map.get("main");
-        List<FactOriginTopicLogDailyEntity> logDailyEntityList= (List<FactOriginTopicLogDailyEntity>) map.get("log");
+        Map<String, GridInfoDTO> gridMap = getGridInfoMap(customerId);
+        Map<String, Object> map = this.constructFactOriginData(topicOriginInfoList, gridMap);
+        List<FactOriginTopicMainDailyEntity> mainDailyEntityList = (List<FactOriginTopicMainDailyEntity>) map.get("main");
+        List<FactOriginTopicLogDailyEntity> logDailyEntityList = (List<FactOriginTopicLogDailyEntity>) map.get("log");
         //删除之前统计的数据
         deleteFactOriginData(customerId,dateId);
         //批量保存主表