小组总数热议话题单独拆除定时任务，凌晨三点执行

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

@@ -266,4 +266,11 @@ public interface DataStatisticalOpenFeignClient {
      */
     @PostMapping("/data/stats/bizData/stats/daily")
     Result exeStatsDaily(@RequestBody BizDataFormDTO formDTO);
+
+    /**
+     * @dscription 小组总数日统计和热议话题日统计任务
+     * @author sun
+     */
+    @PostMapping("/data/stats/statsgroup/groupandhottopic")
+    Result groupAndHotTopicTask();
 }

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

@@ -259,4 +259,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
     public Result exeStatsDaily(BizDataFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "exeStatsDaily", formDTO);
     }
+
+    @Override
+    public Result groupAndHotTopicTask() {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "groupAndHotTopic");
+    }
 }

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

@@ -4,7 +4,11 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.group.form.GroupStatsFormDTO;
 import com.epmet.dto.group.form.GroupTotalFormDTO;
+import com.epmet.dto.stats.topic.form.TopicStatusFormDTO;
 import com.epmet.service.StatsGroupService;
+import com.epmet.service.StatsTopicService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,9 +22,11 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("statsgroup")
 public class StatsGroupController {
-
+    Logger logger = LoggerFactory.getLogger(getClass());
     @Autowired
     private StatsGroupService statsGroupService;
+    @Autowired
+    private StatsTopicService statsTopicService;
 
     /**
      * 网格数、小组数、网格下所有组内人数（不去重）
@@ -81,5 +87,38 @@ public class StatsGroupController {
         return new Result();
     }
 
+    /**
+     * @dscription 小组总数日统计和热议话题日统计任务
+     * @author sun
+     */
+    @PostMapping("/groupandhottopic")
+    public Result groupAndHotTopic() {
+        try {
+            statsGroupService.gridGroupTotal(new GroupTotalFormDTO());
+            logger.info("小组总数-网格日统计任务成功");
+        } catch (Exception e) {
+            logger.error("小组总数-网格日统计任务:", e);
+        }
+        try {
+            statsGroupService.agencyGroupTotal(new GroupTotalFormDTO());
+            logger.info("小组总数-机关日统计任务成功");
+        } catch (Exception e) {
+            logger.error("小组总数-机关日统计任务失败:", e);
+        }
+        try {
+            statsTopicService.gridTopicStatus(new TopicStatusFormDTO());
+            logger.info("热议中话题-网格日统计任务成功");
+        } catch (Exception e) {
+            logger.error("热议中话题-网格日统计任务失败:", e);
+        }
+        try {
+            statsTopicService.agencyTopicStatus(new TopicStatusFormDTO());
+            logger.info("热议中话题-机关日统计任务成功");
+        } catch (Exception e) {
+            logger.error("热议中话题-机关日统计任务失败:", e);
+        }
+        return new Result();
+    }
+
 
 }

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

@@ -29,4 +29,9 @@ public interface StatsGroupService {
      */
     Result groupAgencyMonthly(String date);
 
+    /**
+     * @dscription 小组总数日统计和热议话题日统计任务
+     * @author sun
+     */
+    Result groupAndHotTopicTask();
 }

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

@@ -37,4 +37,13 @@ public class StatsGroupServiceImpl implements StatsGroupService {
         formDTO.setDate(date);
         return statsPublicityFeignClient.groupAgencyMonthly(formDTO);
     }
+
+    /**
+     * @dscription 小组总数日统计和热议话题日统计任务
+     * @author sun
+     */
+    @Override
+    public Result groupAndHotTopicTask() {
+        return statsPublicityFeignClient.groupAndHotTopicTask();
+    }
 }

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

@@ -0,0 +1,32 @@
+package com.epmet.task;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.service.DimInitService;
+import com.epmet.service.StatsGroupService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @dscription 小组总数日统计和热议话题日统计任务【因任务中用到了其他日统计表数据，需要在那些日统计任务之后单独执行】
+ *  每天凌晨三点执行【0 0 3 * * ?】
+ * @author sun
+ */
+@Slf4j
+@Component("groupAndHotTopicTask")
+public class GroupAndHotTopicTask implements ITask {
+
+	@Autowired
+	private StatsGroupService statsGroupService;
+
+	@Override
+	public void run(String params) {
+		log.debug("groupAndHotTopicTask定时任务正在执行，参数为：{}", params);
+		Result result = statsGroupService.groupAndHotTopicTask();
+		if (result.success()){
+			log.debug("groupAndHotTopicTask定时任务正在执行定时任务执行成功");
+		}else {
+			log.debug("groupAndHotTopicTask定时任务正在执行定时任务执行失败:" + result.getMsg());
+		}
+	}
+}