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 @@ lb://resi-voice-server + + lb://data-report-server + + + lb://data-statistical-server + @@ -251,6 +257,10 @@ lb://gov-voice-server lb://resi-voice-server + + lb://data-report-server + + lb://data-statistical-server 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