Merge branch 'dev_special_topic' into develop

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

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.extract.form.*;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.screen.form.InitCustomerIndexForm;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
 import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBack;
@@ -272,5 +273,5 @@ public interface DataStatisticalOpenFeignClient {
      * @author sun
      */
     @PostMapping("/data/stats/statsgroup/groupandhottopic")
-    Result groupAndHotTopicTask();
+    Result groupAndHotTopicTask(@RequestBody GroupTotalFormDTO formDTO);
 }

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

@@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.extract.form.*;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.dto.screen.form.InitCustomerIndexForm;
 import com.epmet.dto.stats.form.CustomerIdAndDateIdFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
@@ -261,7 +262,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     }
 
     @Override
-    public Result groupAndHotTopicTask() {
-        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAndHotTopic");
+    public Result groupAndHotTopicTask(GroupTotalFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAndHotTopic", formDTO);
     }
 }

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

@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
@@ -92,27 +93,28 @@ public class StatsGroupController {
      * @author sun
      */
     @PostMapping("/groupandhottopic")
-    public Result groupAndHotTopic() {
+    public Result groupAndHotTopic(GroupTotalFormDTO formDTO) {
         try {
-            statsGroupService.gridGroupTotal(new GroupTotalFormDTO());
+            statsGroupService.gridGroupTotal(formDTO);
             logger.info("小组总数-网格日统计任务成功");
         } catch (Exception e) {
             logger.error("小组总数-网格日统计任务:", e);
         }
         try {
-            statsGroupService.agencyGroupTotal(new GroupTotalFormDTO());
+            statsGroupService.agencyGroupTotal(formDTO);
             logger.info("小组总数-机关日统计任务成功");
         } catch (Exception e) {
             logger.error("小组总数-机关日统计任务失败:", e);
         }
+        TopicStatusFormDTO topic = ConvertUtils.sourceToTarget(formDTO, TopicStatusFormDTO.class);
         try {
-            statsTopicService.gridTopicStatus(new TopicStatusFormDTO());
+            statsTopicService.gridTopicStatus(topic);
             logger.info("热议中话题-网格日统计任务成功");
         } catch (Exception e) {
             logger.error("热议中话题-网格日统计任务失败:", e);
         }
         try {
-            statsTopicService.agencyTopicStatus(new TopicStatusFormDTO());
+            statsTopicService.agencyTopicStatus(topic);
             logger.info("热议中话题-机关日统计任务成功");
         } catch (Exception e) {
             logger.error("热议中话题-机关日统计任务失败:", e);

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

@@ -1,6 +1,7 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
 
 /**
  * @Author zxc
@@ -33,5 +34,5 @@ public interface StatsGroupService {
      * @dscription 小组总数日统计和热议话题日统计任务
      * @author sun
      */
-    Result groupAndHotTopicTask();
+    Result groupAndHotTopicTask(GroupTotalFormDTO formDTO);
 }

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

@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.service.StatsGroupService;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -43,7 +44,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
      * @author sun
      */
     @Override
-    public Result groupAndHotTopicTask() {
-        return statsPublicityFeignClient.groupAndHotTopicTask();
+    public Result groupAndHotTopicTask(GroupTotalFormDTO formDTO) {
+        return statsPublicityFeignClient.groupAndHotTopicTask(formDTO);
     }
 }

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

@@ -1,9 +1,13 @@
 package com.epmet.task;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.group.form.GroupTotalFormDTO;
 import com.epmet.service.DimInitService;
 import com.epmet.service.StatsGroupService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -22,7 +26,11 @@ public class GroupAndHotTopicTask implements ITask {
 	@Override
 	public void run(String params) {
 		log.debug("groupAndHotTopicTask定时任务正在执行，参数为：{}", params);
-		Result result = statsGroupService.groupAndHotTopicTask();
+		GroupTotalFormDTO formDTO = new GroupTotalFormDTO();
+		if (StringUtils.isNotBlank(params)) {
+			formDTO = JSON.parseObject(params, GroupTotalFormDTO.class);
+		}
+		Result result = statsGroupService.groupAndHotTopicTask(formDTO);
 		if (result.success()){
 			log.debug("groupAndHotTopicTask定时任务正在执行定时任务执行成功");
 		}else {