From 64908fe9252e37ae66de12a100a85efcf0b6a499 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Mon, 22 Jun 2020 18:11:31 +0800
Subject: [PATCH] =?UTF-8?q?job=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=92=8C=E7=BB=9F=E8=AE=A1=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml                                  | 10 ++++++++++
 epmet-gateway/src/main/resources/bootstrap.yml         |  9 +++++++++
 .../java/com/epmet/task/StatsGroupAgencyDailyTask.java |  2 ++
 .../com/epmet/task/StatsGroupAgencyMonthlyTask.java    |  2 ++
 .../java/com/epmet/task/StatsGroupGridDailyTask.java   |  2 ++
 5 files changed, 25 insertions(+)

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index a7c4228a85..354c47f3ea 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -175,6 +175,12 @@
                 <!--  27、居民端-党建声音              -->
                 <gateway.routes.resi-voice-server.uri>lb://resi-voice-server</gateway.routes.resi-voice-server.uri>
                 <!--                <gateway.routes.resi-voice-server.uri>http://localhost:8106</gateway.routes.resi-voice-server.uri>-->
+                <!--  28、政府端-数据首页  -->
+                <gateway.routes.data-report-server.uri>lb://data-report-server</gateway.routes.data-report-server.uri>
+<!--                <gateway.routes.data-report-server.uri>http://localhost:8109</gateway.routes.data-report-server.uri>-->
+                <!-- 29、统计服务 -->
+                <gateway.routes.data-statistical-server.uri>lb://data-statistical-server</gateway.routes.data-statistical-server.uri>
+<!--                <gateway.routes.data-statistical-server.uri>http://localhost:8108</gateway.routes.data-statistical-server.uri>-->
             </properties>
         </profile>
         <profile>
@@ -251,6 +257,10 @@
                 <gateway.routes.gov-voice-server.uri>lb://gov-voice-server</gateway.routes.gov-voice-server.uri>
                 <!--  27、居民端-党建声音              -->
                 <gateway.routes.resi-voice-server.uri>lb://resi-voice-server</gateway.routes.resi-voice-server.uri>
+                <!--  28、政府端-数据首页              -->
+                <gateway.routes.data-report-server.uri>lb://data-report-server</gateway.routes.data-report-server.uri>
+                <!--  29、数据统计服务              -->
+                <gateway.routes.data-statistical-server.uri>lb://data-statistical-server</gateway.routes.data-statistical-server.uri>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index f8a8c8f75b..f67bd8fdec 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -268,6 +268,15 @@ spring:
           filters:
             - StripPrefix=1
             - CpAuth=true
+        #统计服务
+        - id: data-statistical-server
+          uri: @gateway.routes.data-statistical-server.uri@
+          order: 29
+          predicates:
+            - Path=${server.servlet.context-path}/data/stats/**
+          filters:
+            - StripPrefix=1
+            - CpAuth=true
     nacos:
       discovery:
         server-addr: @nacos.server-addr@
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
index fb754ac396..99f2d1739a 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyDailyTask.java
@@ -5,6 +5,7 @@ import com.epmet.service.StatsGroupService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * @Author zxc
@@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  *
  * 统计 “网格小组”， dim：【机关-日】
  */
+@Component("statsGroupAgencyDailyTask")
 public class StatsGroupAgencyDailyTask implements ITask {
 
     @Autowired
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java
index dd4fcc2d2f..bcd59c4047 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupAgencyMonthlyTask.java
@@ -5,6 +5,7 @@ import com.epmet.service.StatsGroupService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * @Author zxc
@@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  *
  * 统计 “网格小组”， dim：【机关-日】
  */
+@Component("statsGroupAgencyMonthlyTask")
 public class StatsGroupAgencyMonthlyTask implements ITask {
 
     @Autowired
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java
index 2b1271eb81..675c63ea88 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsGroupGridDailyTask.java
@@ -5,6 +5,7 @@ import com.epmet.service.StatsGroupService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
  * @Author zxc
@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * 统计 “网格小组”， dim：【网格-日】
  *
  */
+@Component("statsGroupGridDailyTask")
 public class StatsGroupGridDailyTask implements ITask {
 
     @Autowired