diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
index 3efb09b66c..b640b06b67 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
@@ -5,6 +5,7 @@ public interface DataSourceConstant {
/**
* 统计数据库
*/
- String STATS_DISPLAY = "statsdisplay";
+ String STATS = "stats";
+ String STATS_DISPLAY = "statsDisplay";
}
diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml
index c72d1167db..e2239a5081 100644
--- a/epmet-module/data-report/data-report-server/pom.xml
+++ b/epmet-module/data-report/data-report-server/pom.xml
@@ -110,17 +110,17 @@
dev
-
+
-
- epmet_data_statistical_user
- EpmEt-db-UsEr
+
+ epmet_data_statistical_user
+ EpmEt-db-UsEr
-
+
- epmet_data_statistical_user
+ epmet_data_stats_display_user
EpmEt-db-UsEr
@@ -152,11 +152,11 @@
test
-
+
-
- epmet
- elink@833066
+
+ epmet
+ elink@833066
0
@@ -187,11 +187,11 @@
prod
-
+
-
- epmet_data_statistical
- EpmEt-db-UsEr
+
+ epmet_data_statistical
+ EpmEt-db-UsEr
0
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
index 411fd15230..dce609636d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
@@ -1,5 +1,7 @@
package com.epmet.datareport.service.screen.impl;
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.constant.DataSourceConstant;
import com.epmet.datareport.dao.screen.ScreenEventDataDao;
import com.epmet.datareport.dao.screen.ScreenEventImgDataDao;
import com.epmet.datareport.service.screen.ScreenProjectService;
@@ -30,6 +32,7 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
* @author zxc
* @date 2020/8/19 4:36 下午
*/
+ @DataSource(value = DataSourceConstant.STATS, datasourceNameFromArg = true)
@Override
public ProjectDetailResultDTO projectDetail(ProjectDetailFormDTO projectDetailFormDTO) {
ProjectDetailResultDTO projectDetailResultDTO = screenEventDataDao.selectEventDetail(projectDetailFormDTO.getProjectId());
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
index 0d4f2911fd..d4db395aa8 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
@@ -24,9 +24,9 @@ spring:
druid:
#MySQL
driver-class-name: com.mysql.cj.jdbc.Driver
- url: @datasource.druid.url@
- username: @datasource.druid.username@
- password: @datasource.druid.password@
+ url: @datasource.druid.stats.url@
+ username: @datasource.druid.stats.username@
+ password: @datasource.druid.stats.password@
cloud:
nacos:
discovery:
@@ -53,11 +53,11 @@ spring:
# 数据迁移工具flyway
flyway:
- enabled: false
+ enabled: @spring.flyway.enabled@
locations: classpath:db/migration
- url: @datasource.druid.url@
- user: @datasource.druid.username@
- password: @datasource.druid.password@
+ url: @datasource.druid.stats.url@
+ user: @datasource.druid.stats.username@
+ password: @datasource.druid.stats.password@
baseline-on-migrate: true
baseline-version: 0
@@ -94,7 +94,12 @@ mybatis-plus:
#动态数据源
dynamic:
datasource:
- statsdisplay:
+ stats:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: @datasource.druid.stats.url@
+ username: @datasource.druid.stats.username@
+ password: @datasource.druid.stats.password@
+ statsDisplay:
driver-class-name: com.mysql.cj.jdbc.Driver
url: @datasource.druid.statsdisplay.url@
username: @datasource.druid.statsdisplay.username@