elink-star
/
epmet-cloud-yifengdian
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

data-report增加动态数据源demo(projectDetail)

master
wxz 5 years ago
parent
380e472501
commit
7367601fb7
4 changed files with 32 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
  2. 28
      epmet-module/data-report/data-report-server/pom.xml
  3. 3
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
  4. 21
      epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml

3
epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/DataSourceConstant.java
View File

@ -5,6 +5,7 @@ public interface DataSourceConstant {
/**
* 统计数据库
*/
String STATS_DISPLAY = "statsdisplay";
String STATS = "stats";
String STATS_DISPLAY = "statsDisplay";
}

28
epmet-module/data-report/data-report-server/pom.xml
View File

@ -110,17 +110,17 @@
<spring.profiles.active>dev</spring.profiles.active>
<!-- 数据库配置-->
<datasource.druid.url>
<datasource.druid.stats.url>
<![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.url>
<datasource.druid.username>epmet_data_statistical_user</datasource.druid.username>
<datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
</datasource.druid.stats.url>
<datasource.druid.stats.username>epmet_data_statistical_user</datasource.druid.stats.username>
<datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
<!-- 展示用的统计数据库-->
<datasource.druid.statsdisplay.url>
<![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
<![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.statsdisplay.url>
<datasource.druid.statsdisplay.username>epmet_data_statistical_user</datasource.druid.statsdisplay.username>
<datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
<datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
<!-- redis配置 -->
@ -152,11 +152,11 @@
<spring.profiles.active>test</spring.profiles.active>
<!-- 数据库配置-->
<datasource.druid.url>
<datasource.druid.stats.url>
<![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.url>
<datasource.druid.username>epmet</datasource.druid.username>
<datasource.druid.password>elink@833066</datasource.druid.password>
</datasource.druid.stats.url>
<datasource.druid.stats.username>epmet</datasource.druid.stats.username>
<datasource.druid.stats.password>elink@833066</datasource.druid.stats.password>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
@ -187,11 +187,11 @@
<spring.profiles.active>prod</spring.profiles.active>
<!-- 数据库配置-->
<datasource.druid.url>
<datasource.druid.stats.url>
<![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</datasource.druid.url>
<datasource.druid.username>epmet_data_statistical</datasource.druid.username>
<datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
</datasource.druid.stats.url>
<datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
<datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>

3
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/ScreenProjectServiceImpl.java
View File

@ -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());

21
epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml
View File

@ -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@

Write Preview
Loading…
Cancel
Save