Skip to content

eagleEye / eagleEye-flink_kafka

Go to a project
Commit de18ac73 by 魏建枢
Options

日活，好友汇总代码提交

parent 5333e716
Expand all
Inline Side-by-side
Showing with 383 additions and 22 deletions
eagleEye-flink_kafka/dependency-reduced-pom.xml
......@@ -64,6 +64,50 @@
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner_2.12</artifactId>
<version>1.20.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>value</artifactId>
<groupId>org.immutables</groupId>
</exclusion>
<exclusion>
<artifactId>value-annotations</artifactId>
<groupId>org.immutables</groupId>
</exclusion>
<exclusion>
<artifactId>commons-compiler</artifactId>
<groupId>org.codehaus.janino</groupId>
</exclusion>
<exclusion>
<artifactId>janino</artifactId>
<groupId>org.codehaus.janino</groupId>
</exclusion>
<exclusion>
<artifactId>flink-scala_2.12</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-table-runtime</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-api-java</artifactId>
<version>1.20.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>flink-table-common</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-api-java-bridge</artifactId>
<version>1.20.0</version>
<scope>provided</scope>
......@@ -76,9 +120,115 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>1.20.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>flink-core</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>chill-java</artifactId>
<groupId>com.twitter</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala_2.12</artifactId>
<version>1.20.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>scala-reflect</artifactId>
<groupId>org.scala-lang</groupId>
</exclusion>
<exclusion>
<artifactId>scala-library</artifactId>
<groupId>org.scala-lang</groupId>
</exclusion>
<exclusion>
<artifactId>scala-compiler</artifactId>
<groupId>org.scala-lang</groupId>
</exclusion>
<exclusion>
<artifactId>flink-scala_2.12</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>1.20.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>flink-runtime</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-optimizer</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-datastream</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-core</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java</artifactId>
<version>1.20.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>flink-shaded-guava</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-connector-datagen</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-runtime</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-core</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime-web</artifactId>
<version>1.20.0</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>flink-shaded-netty</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-shaded-jackson</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-shaded-guava</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
<exclusion>
<artifactId>flink-runtime</artifactId>
<groupId>org.apache.flink</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jdk.tools</groupId>
......@@ -91,7 +241,7 @@
<properties>
<maven.plugin.version>3.8.1</maven.plugin.version>
<flink.version>1.20.0</flink.version>
<scala.binary.version>2.11</scala.binary.version>
<scala.binary.version>2.12</scala.binary.version>
<maven.compiler.target>1.8</maven.compiler.target>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<log4j.version>2.17.1</log4j.version>
......
eagleEye-flink_kafka/pom.xml
......@@ -26,22 +26,23 @@
<!--flink版本 -->
<flink.version>1.20.0</flink.version>
<!--scala版本 -->
<scala.binary.version>2.11</scala.binary.version>
<scala.binary.version>2.12</scala.binary.version>
</properties>
<!--通用依赖 -->
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner_2.12</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-api-java</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
......@@ -61,12 +62,14 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-java</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala_2.12</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.flink/flink-clients -->
......@@ -74,12 +77,14 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
......@@ -154,6 +159,12 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>3.3.6</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
......
eagleEye-flink_kafka/src/main/java/com/flink/achieve/doris/EventIpLatestAchi.java
......@@ -354,6 +354,8 @@ public class EventIpLatestAchi extends SourceCommonBase implements Serializable{
eventIp.setAppKey(appKey);
eventIp.setAppType(appType);
eventIp.setCreateTime(createTime);
eventIp.setDeviceId(odsEventLog.getDevice_id());
eventIp.setUniqueId(odsEventLog.getUnique_id());
return eventIp;
}
......@@ -417,6 +419,8 @@ public class EventIpLatestAchi extends SourceCommonBase implements Serializable{
eventIp.setAppKey(appKey);
eventIp.setAppType(appType);
eventIp.setCreateTime(createTime);
eventIp.setDeviceId(pcEventInfo.getI8());
eventIp.setUniqueId(pcEventInfo.getI8());
return eventIp;
}
......
eagleEye-flink_kafka/src/main/java/com/flink/achieve/doris/UserDailyActivityAchi.java
......@@ -9,6 +9,7 @@ import java.time.Duration;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
......@@ -18,6 +19,7 @@ import org.apache.doris.flink.sink.DorisSink;
import org.apache.flink.api.common.eventtime.WatermarkStrategy;
import org.apache.flink.api.common.functions.CoGroupFunction;
import org.apache.flink.api.common.functions.FlatMapFunction;
import org.apache.flink.api.common.functions.MapFunction;
import org.apache.flink.api.common.io.ParseException;
import org.apache.flink.api.common.state.StateTtlConfig;
import org.apache.flink.api.common.state.ValueState;
......@@ -50,6 +52,7 @@ import org.apache.flink.util.OutputTag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.flink.common.DorisConnector;
......@@ -58,6 +61,7 @@ import com.flink.enums.TopicTypeEnum;
import com.flink.processor.function.LatestUserProcessFunction;
import com.flink.util.CompareUtils;
import com.flink.util.TimeConvertUtil;
import com.flink.vo.DwdSysLog;
import com.flink.vo.EventList;
import com.flink.vo.KafkaDataSource;
import com.flink.vo.OdsEventLog;
......@@ -93,8 +97,12 @@ public class UserDailyActivityAchi extends SourceCommonBase implements Serializa
DataStreamSource<String> pcEventStreamSource = null;
DataStreamSource<String> userStreamSource = null;
DataStreamSource<String> abroadUserStreamSource = null;
DataStreamSource<String> sysLogStreamSource = null;
if(CollectionUtils.isNotEmpty(dataSourceList)) {
for(KafkaDataSource kafkaDataSource : dataSourceList) {
if(StringUtils.equals(kafkaDataSource.getTopic(),TopicTypeEnum.DWD_SYS_LOG.getTopic())) {
sysLogStreamSource = kafkaDataSource.getDataStreamSource();
}
if(StringUtils.equals(kafkaDataSource.getTopic(),TopicTypeEnum.ODS_NEW_COLLECT_LOG.getTopic())) {
collectLogStreamSource = kafkaDataSource.getDataStreamSource();
}
......@@ -119,7 +127,7 @@ public class UserDailyActivityAchi extends SourceCommonBase implements Serializa
}
//设备信息合并
DataStream<DailyActivityDeviceInfo> mergedDeviceStream = mergedDeviceStream(collectLogStreamSource,pcCollectLogStreamSource);
DataStream<DailyActivityDeviceInfo> mergedDeviceStream = mergedDeviceStream(collectLogStreamSource,pcCollectLogStreamSource,sysLogStreamSource);
//事件信息合并
DataStream<DailyActivityEventInfo> mergedEventStream = mergedEventStream(eventStreamSource,pcEventStreamSource);
// 用户数据合并
......@@ -352,6 +360,8 @@ public class UserDailyActivityAchi extends SourceCommonBase implements Serializa
output.setAppVersion(log.getAppVersion());
output.setIp(log.getIp());
output.setAreaName(log.getAreaName());
output.setNetworkIp(log.getNetwork_ip());
output.setNetworkAreaName(log.getNetwork_area_name());
output.setFirstTime(log.getFirstTime());
output.setLatestTime(log.getLatestTime());
output.setPhoneName(log.getPhoneName());
......@@ -387,6 +397,8 @@ public class UserDailyActivityAchi extends SourceCommonBase implements Serializa
output.setAppVersion(log.getAppVersion());
output.setIp(log.getIp());
output.setAreaName(log.getAreaName());
output.setNetworkIp(log.getNetwork_ip());
output.setNetworkAreaName(log.getNetwork_area_name());
output.setFirstTime(log.getFirstTime());
output.setLatestTime(log.getLatestTime());
output.setPhoneName(log.getPhoneName());
......@@ -436,7 +448,7 @@ public class UserDailyActivityAchi extends SourceCommonBase implements Serializa
dev.getModel(), dev.getBrand(), dev.getOsRelease(), dev.getAppVersion(),
evt.getCid(), phone, evt.getNick(), evt.getIp(), evt.getAreaName(),
dev.getWaterMarkTime(), dev.getZoneName(), dev.getZoneType(), dev.getZoneCode(),
0L, 0L,dev.getDeviceName(),dev.getPlatform(),countryCode
0L, 0L,dev.getDeviceName(),dev.getPlatform(),countryCode,dev.getNetwork_ip(),dev.getNetwork_area_name()
));
}
});
......@@ -582,10 +594,49 @@ public class UserDailyActivityAchi extends SourceCommonBase implements Serializa
}
}
//设备信息合并
//设备信息关联入网ip合并
private DataStream<DailyActivityDeviceInfo> mergedDeviceStream(DataStreamSource<String> collectLogStreamSource,
DataStreamSource<String> pcCollectLogStreamSource) {
return collectLogStreamSource.flatMap(new FlatMapFunction<String, DailyActivityDeviceInfo>() {
DataStreamSource<String> pcCollectLogStreamSource,DataStreamSource<String> sysLogStreamSource) {
SingleOutputStreamOperator<DwdSysLog> sysDataStream = sysLogStreamSource
.map(new MapFunction<String, DwdSysLog>() {
/**
*
*/
private static final long serialVersionUID = 1L;
@Override
public DwdSysLog map(String value) throws Exception {
try {
DwdSysLog sysLog = JSON.parseObject(value, DwdSysLog.class);
logger.debug("sysLog原始数据: {}", sysLog);
if (sysLog == null || StringUtils.isEmpty(sysLog.getSend_time())) {
logger.warn("空值日志: {}", value);
return null;
}
// 时间戳转换（添加异常捕获）
Long waterMarkTime = TimeConvertUtil.convertToTimestamp(sysLog.getSend_time());
if (waterMarkTime <= 0) {
logger.error("时间转换失败: {}", sysLog.getSend_time());
return null;
}
sysLog.setWaterMarkTime(waterMarkTime);
return sysLog;
} catch (Exception e) {
logger.error("JSON解析失败: {} | 错误: {}", value, e.getMessage());
return null;
}
}
})
.filter(Objects::nonNull)
.assignTimestampsAndWatermarks(
WatermarkStrategy.<DwdSysLog>forBoundedOutOfOrderness(Duration.ofSeconds(5))
.withTimestampAssigner((sysLog, ts) -> sysLog.getWaterMarkTime())
);
SingleOutputStreamOperator<DailyActivityDeviceInfo> mergedDeviceStream = collectLogStreamSource.flatMap(new FlatMapFunction<String, DailyActivityDeviceInfo>() {
private static final long serialVersionUID = 1L;
@Override
......@@ -619,6 +670,51 @@ public class UserDailyActivityAchi extends SourceCommonBase implements Serializa
)
.assignTimestampsAndWatermarks(WatermarkStrategy.<DailyActivityDeviceInfo>forBoundedOutOfOrderness(Duration.ofSeconds(5))
.withTimestampAssigner((device, ts) -> device.getWaterMarkTime()));
return sysDataStream
.keyBy(new KeySelector<DwdSysLog, String>() {
/**
*
*/
private static final long serialVersionUID = 1L;
@Override
public String getKey(DwdSysLog sysLog) {
return sysLog.getDevice_id() + "#_#" +
sysLog.getUnique_id() + "#_#" +
sysLog.getDevice_id_v1();
}
})
.intervalJoin(
mergedDeviceStream.keyBy(new KeySelector<DailyActivityDeviceInfo, String>() {
/**
*
*/
private static final long serialVersionUID = 1L;
@Override
public String getKey(DailyActivityDeviceInfo dev) {
return dev.getDeviceId() + "#_#" +
dev.getUniqueId() + "#_#" +
dev.getDeviceIdV1(); // 注意字段名一致性！
}
})
)
.between(Duration.ofMinutes(-10), Duration.ofMinutes(5))
.process(new ProcessJoinFunction<DwdSysLog, DailyActivityDeviceInfo, DailyActivityDeviceInfo>() {
/**
*
*/
private static final long serialVersionUID = 1L;
@Override
public void processElement(DwdSysLog sysLog, DailyActivityDeviceInfo dev, Context ctx, Collector<DailyActivityDeviceInfo> out) {
out.collect(new DailyActivityDeviceInfo(dev.getDeviceId(), dev.getDeviceIdV1(), dev.getAppKey(), dev.getUniqueId(),
dev.getAppType(), dev.getDt(),dev.getModel(),dev.getBrand(),dev.getOsRelease(),dev.getAppVersion(),dev.getWaterMarkTime(),
dev.getZoneName(),dev.getZoneType(),dev.getZoneCode(),dev.getPlatform(),dev.getDeviceName(),sysLog.getNetwork_ip(),sysLog.getNetwork_area_name()));
}
});
}
// 用户数据合并
......
eagleEye-flink_kafka/src/main/java/com/flink/achieve/table/TableSqlSinkKafkaAchi.java
......@@ -3,7 +3,6 @@ package com.flink.achieve.table;
import java.io.Serializable;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.io.ParseException;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.datastream.DataStreamSource;
......
eagleEye-flink_kafka/src/main/java/com/flink/achieve/table/sql/BaseKafkaToSqlCreateTable.java
......@@ -3,7 +3,7 @@ package com.flink.achieve.table.sql;
import java.util.List;
import org.apache.commons.collections.CollectionUtils;
import org.apache.flink.calcite.shaded.org.apache.commons.codec.binary.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
import com.flink.achieve.table.schema.KafkaBaseSchema;
......
eagleEye-flink_kafka/src/main/java/com/flink/common/KafkaConnector.java
package com.flink.common;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.eventtime.WatermarkStrategy;
import org.apache.flink.api.common.serialization.SimpleStringSchema;
import org.apache.flink.connector.base.DeliveryGuarantee;
......
eagleEye-flink_kafka/src/main/java/com/flink/enums/JobTypeEnum.java
......@@ -20,6 +20,7 @@ public enum JobTypeEnum {
EVENT_IP_CONVERT("JOB_01", "事件IP转换作业"),
COMMON_CONSUME_BASE("JOB_02", "公共基础消费采集作业"),
USER_DAILY_ACTIVITY("JOB_03", "用户日活作业"),
COMMON_CONSUME_SQL_BASE("JOB_04", "公共基础消费采集SQL作业"),
EVENT_IP_CONVERT_CID("JOB_07", "最新事件IP作业"),
DEVICE_ID_CID("JOB_08", "最新设备ID作业"),
......
eagleEye-flink_kafka/src/main/java/com/flink/enums/TopicTypeEnum.java
......@@ -8,7 +8,7 @@ import com.flink.vo.KafkaTopic;
* 类说明
*/
public enum TopicTypeEnum {
DWD_SYS_LOG("dwd_sys_log","dwdSysLog"),
ODS_EVENT_LOG("ods_event_log","eventLogGroup"),
ODS_NEW_COLLECT_LOG("ods_new_collect_log","odsNewCollectLog"),
ODS_ZIPPER_STRATEGY("ods_zipper_strategy","odsZipperStrategy"),
......@@ -31,6 +31,7 @@ public enum TopicTypeEnum {
ODS_PC_COLLECT_LOG("ods_pc_collect_log","odsPcCollectLog"),
ODS_COMMUNITY_HISTORY("ods_community_history","odsCommunityHistory"),
ODS_SYS_LOG("ods_sys_log","odsSysLog"),
;
private String topic;
......
eagleEye-flink_kafka/src/main/java/com/flink/factory/JobProcessorFactory.java
......@@ -3,6 +3,7 @@ package com.flink.factory;
import com.flink.enums.JobTypeEnum;
import com.flink.processor.JobProcessor;
import com.flink.processor.impl.CommonConsumeBaseProcessor;
import com.flink.processor.impl.CommonConsumeSqlBaseProcessor;
import com.flink.processor.impl.DeviceIdLatestProcessor;
import com.flink.processor.impl.EventIpConvertProcessor;
import com.flink.processor.impl.EventIpLatestProcessor;
......@@ -25,6 +26,8 @@ public class JobProcessorFactory {
return new EventIpConvertProcessor();
case COMMON_CONSUME_BASE:
return new CommonConsumeBaseProcessor();
case COMMON_CONSUME_SQL_BASE:
return new CommonConsumeSqlBaseProcessor();
case USER_DAILY_ACTIVITY:
return new UserDailyActivityProcessor();
case EVENT_IP_CONVERT_CID:
......
eagleEye-flink_kafka/src/main/java/com/flink/processor/function/SimiFriendsTempJoinProcessor.java
......@@ -75,7 +75,10 @@ public class SimiFriendsTempJoinProcessor extends CoProcessFunction<TotalTemp, S
totalTemp.getCreateTime(),
totalTemp.getCidsList(),
totalTemp.getFriendsList(),
totalTemp.getCollectTime()
totalTemp.getCollectTime(),
StringUtils.isNotEmpty(totalTemp.getNetwork_ip())?totalTemp.getNetwork_ip() : null,
StringUtils.isNotEmpty(totalTemp.getNetwork_area_name())?totalTemp.getNetwork_area_name() : null,
StringUtils.isNotEmpty(totalTemp.getZone_name())?totalTemp.getZone_name() : null
);
}
......
eagleEye-flink_kafka/src/main/java/com/flink/processor/impl/CommonConsumeSqlBaseProcessor.java 0 → 100644
package com.flink.processor.impl;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import com.flink.achieve.table.TableSqlSinkKafkaAchi;
import com.flink.enums.JobTypeEnum;
import com.flink.enums.TopicTypeEnum;
import com.flink.processor.JobProcessor;
import com.flink.vo.KafkaTopic;
/**
* @author wjs
* @version 创建时间：2025-8-24 17:37:39
* 类说明
*/
public class CommonConsumeSqlBaseProcessor implements JobProcessor{
@Override
public void process() throws Exception {
new TableSqlSinkKafkaAchi().multipleExecuteJob(
createTopicList(),
JobTypeEnum.COMMON_CONSUME_SQL_BASE,
true,
false
);
}
private static List<KafkaTopic> createTopicList() {
return Arrays.stream(new TopicTypeEnum[]{
TopicTypeEnum.ODS_SYS_LOG
}).map(TopicTypeEnum::createKafkaTopic)
.collect(Collectors.toList());
}
}
eagleEye-flink_kafka/src/main/java/com/flink/processor/impl/SimiFriendsProcessor.java
......@@ -31,7 +31,8 @@ public class SimiFriendsProcessor implements JobProcessor{
return Arrays.stream(new TopicTypeEnum[]{
TopicTypeEnum.OPEN_SIMI_API,
TopicTypeEnum.ODS_EVENT_LOG,
TopicTypeEnum.SIMI_USER_LIST_TOPIC
TopicTypeEnum.SIMI_USER_LIST_TOPIC,
TopicTypeEnum.DWD_SYS_LOG
}).map(TopicTypeEnum::createKafkaTopic)
.collect(Collectors.toList());
......
eagleEye-flink_kafka/src/main/java/com/flink/processor/impl/UserDailyActivityProcessor.java
......@@ -34,7 +34,8 @@ public class UserDailyActivityProcessor implements JobProcessor{
TopicTypeEnum.ODS_PC_EVENT_LOG,
TopicTypeEnum.ODS_PC_COLLECT_LOG,
TopicTypeEnum.SIMI_USER_LIST_TOPIC,
TopicTypeEnum.ABROAD_SIMI_USER_LIST_TOPIC
TopicTypeEnum.ABROAD_SIMI_USER_LIST_TOPIC,
TopicTypeEnum.DWD_SYS_LOG
}).map(TopicTypeEnum::createKafkaTopic)
.collect(Collectors.toList());
......
eagleEye-flink_kafka/src/main/java/com/flink/util/TimeConvertUtil.java
......@@ -71,8 +71,9 @@ public class TimeConvertUtil {
return dateTime.format(formatter);
}
public static void main(String[] args) {
String aa = parseToStringSSS(1752039403729L);
public static void main(String[] args) throws Exception {
// String aa = parseToStringSSS(1752039403729L);
Long aa =convertToTimestamp("2025-08-24 12:14:06.107");
System.out.println(aa);
}
}
eagleEye-flink_kafka/src/main/java/com/flink/vo/DwdSysLog.java 0 → 100644
package com.flink.vo;
import java.io.Serializable;
import lombok.Data;
import lombok.ToString;
/**
* @author wjs
* @version 创建时间：2025-8-24 20:22:15
* 类说明
*/
@Data
@ToString
public class DwdSysLog implements Serializable{/**
*
*/
private static final long serialVersionUID = 1L;
private String network_ip;
private String network_area_name;
private String unique_id;
private String device_id;
private String device_id_v1;
private String send_type;
private String zone_name;
private String zone_code;
private String zone_type;
private String send_time;
private String app_key;
private String app_type;
private String cid;
private String phone;
private String nick;
private Long waterMarkTime;
}
eagleEye-flink_kafka/src/main/java/com/flink/vo/EventIp.java
......@@ -27,5 +27,9 @@ public class EventIp implements Serializable{
private String appType;
private Long eventTime;
private String createTime;
private String deviceId;
private String uniqueId;
private String network_ip;
private String network_area_name;
private String zone_name;
}
eagleEye-flink_kafka/src/main/java/com/flink/vo/userDailyActivity/BulidDailyParams.java
......@@ -65,7 +65,7 @@ public class BulidDailyParams {
createTime.substring(0, 10), deviceIdInfo.getModel(), deviceIdInfo.getBrand(),
deviceIdInfo.getOsRelease(), deviceIdInfo.getAppVersion(),
TimeConvertUtil.convertToTimestamp(createTime), log.getZone_name(), log.getZone_type(),
log.getZone_code(),getPlatformByAppKey(appKey),null);
log.getZone_code(),getPlatformByAppKey(appKey),null,null,null);
}
// 处理PC设备ID数据
......@@ -99,7 +99,7 @@ public class BulidDailyParams {
return new DailyActivityDeviceInfo(deviceId, deviceId, appKey, deviceId, appType, createTime.substring(0, 10),
pcDeviceInfo.getB3(), pcDeviceInfo.getB2(), pcDeviceInfo.getB4(), log.getApp_version(),
TimeConvertUtil.convertToTimestamp(createTime), log.getZone_name(), log.getZone_type(),
log.getZone_code(),getPlatformByAppKey(appKey),deviceName);
log.getZone_code(),getPlatformByAppKey(appKey),deviceName,null,null);
}
// 处理APP事件数据
......
eagleEye-flink_kafka/src/main/java/com/flink/vo/userDailyActivity/DailyActivityCombinedLog.java
......@@ -39,11 +39,13 @@ public class DailyActivityCombinedLog implements Serializable {
private String platform;
private String deviceName;
private String countryCode;
private String network_ip;
private String network_area_name;
public DailyActivityCombinedLog(String deviceIdV1, String appKey, String appType, String dt, String model,
String brand, String osRelease, String appVersion, String cid, String phone, String nick, String ip,
String areaName, long waterMarkTime, String zoneName, String zoneType, String zoneCode, long firstTime,
long latestTime, String deviceName, String platform,String countryCode) {
long latestTime, String deviceName, String platform,String countryCode,String network_ip,String network_area_name) {
super();
this.deviceIdV1 = deviceIdV1;
this.appKey = appKey;
......@@ -67,5 +69,7 @@ public class DailyActivityCombinedLog implements Serializable {
this.deviceName = deviceName;
this.platform = platform;
this.countryCode = countryCode;
this.network_ip = network_ip;
this.network_area_name = network_area_name;
}
}
eagleEye-flink_kafka/src/main/java/com/flink/vo/userDailyActivity/DailyActivityDeviceInfo.java
......@@ -35,6 +35,8 @@ public class DailyActivityDeviceInfo implements Serializable{
private Long waterMarkTime;
private String platform;
private String deviceName;
private String network_ip;
private String network_area_name;
public DailyActivityDeviceInfo(
String deviceId,
......@@ -52,7 +54,9 @@ public class DailyActivityDeviceInfo implements Serializable{
String zoneType,
String zoneCode,
String platform,
String deviceName
String deviceName,
String network_ip,
String network_area_name
) {
this.deviceId = deviceId;
this.deviceIdV1 = deviceIdV1;
......@@ -70,5 +74,7 @@ public class DailyActivityDeviceInfo implements Serializable{
this.zoneCode = zoneCode;
this.platform = platform;
this.deviceName = deviceName;
this.network_ip = network_ip;
this.network_area_name = network_area_name;
}
}
eagleEye-flink_kafka/src/main/java/com/flink/vo/userDailyActivity/DailyActivityEnrichedLog.java
......@@ -36,7 +36,8 @@ public class DailyActivityEnrichedLog extends DailyActivityCombinedLog implement
baseLog.getPhone(), baseLog.getNick(), baseLog.getIp(),
baseLog.getAreaName(), baseLog.getWaterMarkTime(),
baseLog.getZoneName(), baseLog.getZoneType(), baseLog.getZoneCode(),
baseLog.getFirstTime(), baseLog.getLatestTime(),baseLog.getDeviceName(), baseLog.getPlatform(), baseLog.getCountryCode()
baseLog.getFirstTime(), baseLog.getLatestTime(),baseLog.getDeviceName(), baseLog.getPlatform(), baseLog.getCountryCode(),
baseLog.getNetwork_ip(),baseLog.getNetwork_area_name()
);
this.phoneName = phoneName;
this.networkModel = networkModel;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment