|
@@ -1,6 +1,6 @@
|
|
|
package flink.zanxiangnet.ad.monitoring.process;
|
|
|
|
|
|
-import flink.zanxiangnet.ad.monitoring.config.ClickhouseDataSourceFactory;
|
|
|
+import flink.zanxiangnet.ad.monitoring.config.MysqlDataSourceFactory;
|
|
|
import flink.zanxiangnet.ad.monitoring.dao.mapper.AdStatOfDayDWDMapper;
|
|
|
import flink.zanxiangnet.ad.monitoring.pojo.entity.*;
|
|
|
import flink.zanxiangnet.ad.monitoring.pojo.properties.ApplicationProperties;
|
|
@@ -49,14 +49,17 @@ public class AdMinuteDWDProcess extends ProcessWindowFunction<AdDataOfMinuteODS,
|
|
|
.getGlobalJobParameters()
|
|
|
.toMap();
|
|
|
|
|
|
- Properties ckProps = new Properties();
|
|
|
- ckProps.setProperty(ClickhouseDataSourceFactory.PROP_URL, params.get(ApplicationProperties.CK_URL));
|
|
|
- ckProps.setProperty(ClickhouseDataSourceFactory.PROP_USER, params.get(ApplicationProperties.CK_USERNAME));
|
|
|
- ckProps.setProperty(ClickhouseDataSourceFactory.PROP_PASSWORD, params.get(ApplicationProperties.CK_PASSWORD));
|
|
|
-
|
|
|
- DataSourceFactory dataSourceFactory = new ClickhouseDataSourceFactory();
|
|
|
- dataSourceFactory.setProperties(ckProps);
|
|
|
- Environment environment = new Environment("clickhouse", new JdbcTransactionFactory(), dataSourceFactory.getDataSource());
|
|
|
+ Properties mysqlProps = new Properties();
|
|
|
+ mysqlProps.setProperty(ApplicationProperties.MYSQL_DRIVER_CLASS_NAME, params.get(ApplicationProperties.MYSQL_DRIVER_CLASS_NAME));
|
|
|
+ mysqlProps.setProperty(ApplicationProperties.MYSQL_URL, params.get(ApplicationProperties.MYSQL_URL));
|
|
|
+ mysqlProps.setProperty(ApplicationProperties.MYSQL_USERNAME, params.get(ApplicationProperties.MYSQL_USERNAME));
|
|
|
+ mysqlProps.setProperty(ApplicationProperties.MYSQL_PASSWORD, params.get(ApplicationProperties.MYSQL_PASSWORD));
|
|
|
+ mysqlProps.setProperty(ApplicationProperties.MYSQL_INIT_POOL_SIZE, params.get(ApplicationProperties.MYSQL_INIT_POOL_SIZE));
|
|
|
+ mysqlProps.setProperty(ApplicationProperties.MYSQL_MAX_POOL_SIZE, params.get(ApplicationProperties.MYSQL_MAX_POOL_SIZE));
|
|
|
+
|
|
|
+ DataSourceFactory dataSourceFactory = new MysqlDataSourceFactory();
|
|
|
+ dataSourceFactory.setProperties(mysqlProps);
|
|
|
+ Environment environment = new Environment("mysql", new JdbcTransactionFactory(), dataSourceFactory.getDataSource());
|
|
|
org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration(environment);
|
|
|
// 开启驼峰规则
|
|
|
configuration.setMapUnderscoreToCamelCase(true);
|
|
@@ -145,7 +148,7 @@ public class AdMinuteDWDProcess extends ProcessWindowFunction<AdDataOfMinuteODS,
|
|
|
LocalDateTime hourStatTime = LocalDateTime.of(beginDate, LocalTime.of(hour, 0, 0));
|
|
|
// 找今天聚合的最后一条历史数据
|
|
|
AdStatOfMinuteDWD temp = null;
|
|
|
- for (int i = hour - 1; i >= 0; i++) {
|
|
|
+ for (int i = hour - 1; i >= 0; i--) {
|
|
|
temp = lastReduceState.get(LocalDateTime.of(beginDate, LocalTime.of(i, 55, 0)).format(formatForLastReduceKey));
|
|
|
if (temp != null) {
|
|
|
break;
|