代码提交

eagleEye-flink_kafka/src/main/java/com/flink/achieve/doris/DeviceIdLatestAchi.java

@@ -79,6 +79,10 @@ public class DeviceIdLatestAchi extends MultipleSourceCommonBase implements Seri
 				        "user_state",
 				        "nick",
 				        "create_time",
+				        "brand",
+				        "model",
+				        "os_release",
+				        "app_version",
 				        "__DORIS_DELETE_SIGN__"
 			    	},
 			    new DataType[]{
@@ -91,6 +95,10 @@ public class DeviceIdLatestAchi extends MultipleSourceCommonBase implements Seri
 				        DataTypes.STRING(),
 				        DataTypes.STRING(),
 				        DataTypes.TIMESTAMP(3),
+				        DataTypes.STRING(),
+				        DataTypes.STRING(),
+				        DataTypes.STRING(),
+				        DataTypes.STRING(),
 				        DataTypes.INT()
 			        },
 			    "bi.device_id_latest"
@@ -138,7 +146,13 @@ public class DeviceIdLatestAchi extends MultipleSourceCommonBase implements Seri
 						LoadPropertiesFile.getPropertyFileValues("simi.pc.winAppKey"),
 	    				LoadPropertiesFile.getPropertyFileValues("simi.pc.linuxAppKey"),
 	    				LoadPropertiesFile.getPropertyFileValues("simi.pc.macINterAppKey"),
-	    				LoadPropertiesFile.getPropertyFileValues("simi.pc.macArmAppKey"))) {
+	    				LoadPropertiesFile.getPropertyFileValues("simi.pc.macArmAppKey"),
+	    				
+	    				LoadPropertiesFile.getPropertyFileValues("simi.pc.winAppKeyAbroad"),
+	    				LoadPropertiesFile.getPropertyFileValues("simi.pc.linuxAppKeyAbroad"),
+	    				LoadPropertiesFile.getPropertyFileValues("simi.pc.macINterAppKeyAbroad"),
+	    				LoadPropertiesFile.getPropertyFileValues("simi.pc.macArmAppKeyAbroad")
+	    				)) {
 					return null;
 				}
 				return exeRowData(result, detailConfig.getFields());
@@ -380,7 +394,7 @@ public class DeviceIdLatestAchi extends MultipleSourceCommonBase implements Seri
 	}
 	
 	//处理生成设备ID
-	public DeviceId handleData(String value) throws Exception {
+	public static DeviceId handleData(String value) throws Exception {
 		CollectLog log = JSONObject.parseObject(value, new TypeReference<CollectLog>(){});
     	if(null == log) {
     		return null;
@@ -417,11 +431,16 @@ public class DeviceIdLatestAchi extends MultipleSourceCommonBase implements Seri
     	deviceId.setAppType(appType);
     	deviceId.setCreateTime(createTime);
     	deviceId.setCollectTime(TimeConvertUtil.convertToTimestamp(createTime));
+    	
+    	deviceId.setBrand(deviceIdInfo.getBrand());
+    	deviceId.setModel(deviceIdInfo.getModel());
+    	deviceId.setOsRelease(deviceIdInfo.getOsRelease());
+    	deviceId.setAppVersion(deviceIdInfo.getAppVersion());
 		return deviceId;
 	}
 	
 	//处理PC设备ID数据
-	public DeviceId handlePcData(String value) throws Exception {
+	public static DeviceId handlePcData(String value) throws Exception {
 		PcCollectLog log = JSONObject.parseObject(value, new TypeReference<PcCollectLog>(){});
     	if(null == log) {
     		return null;
@@ -471,7 +490,11 @@ public class DeviceIdLatestAchi extends MultipleSourceCommonBase implements Seri
 		row.setField(6, StringData.fromString(result.getUserState()));
 		row.setField(7, StringData.fromString(result.getNick()));
 		row.setField(8, TimestampData.fromLocalDateTime(LocalDateTime.parse(result.getCreateTime(),DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"))));
-		row.setField(9, 0); // __DORIS_DELETE_SIGN__
+		row.setField(9, StringData.fromString(result.getBrand()));
+		row.setField(10, StringData.fromString(result.getModel()));
+		row.setField(11, StringData.fromString(result.getOsRelease()));
+		row.setField(12, StringData.fromString(result.getAppVersion()));
+		row.setField(13, 0); // __DORIS_DELETE_SIGN__
 		return row;
 	}
 }

eagleEye-flink_kafka/src/main/java/com/flink/vo/android/deviceInfo/AndroidA1.java

@@ -49,6 +49,7 @@ public class AndroidA1 implements Serializable{
 	private String b9= "000000000000";
 	private String b14= "000000000000";
 	private D2 d2;
+	private D6 d6;
 	private List<D3> d3;
 	private String c4= "000000000000";
 	public E2 getE2() {
@@ -249,6 +250,12 @@ public class AndroidA1 implements Serializable{
 	public void setD2(D2 d2) {
 		this.d2 = d2;
 	}
+	public D6 getD6() {
+		return d6;
+	}
+	public void setD6(D6 d6) {
+		this.d6 = d6;
+	}
 	public List<D3> getD3() {
 		return d3;
 	}

eagleEye-flink_kafka/src/main/java/com/flink/vo/simi/UserRegistrationReqDto.java

@@ -23,4 +23,6 @@ public class UserRegistrationReqDto extends OpenSimiApiBaseReqDto implements Ser
 
 	//手机号码，需符合E.164国际标准格式
 	private String phoneNumber;
+	
+	public Long updateTime; // 时间戳用于水印
 }

eagleEye-flink_kafka/src/main/resources/application.properties

@@ -13,7 +13,8 @@ doris.driver_class_name=com.mysql.cj.jdbc.Driver
 hdfs.url=hdfs://10.0.0.105:8020/user/ck/
 #hdfs.url=hdfs://140.245.112.44:8020/user/ck/
 
-simiUserInfo.url= https://imadmin.simitalk.com/prod-api/
+#simiUserInfo.url= https://imadmin.simitalk.com/prod-api/
+simiUserInfo.url= https://zterra.simitalk.com/prod-api/
 simiUserInfo.authorization= KhhZAQKaZkfd7p55
 simiUserInfo.key= niiKpP4SXce2zCHZ
 
@@ -32,4 +33,9 @@ abroadChainless.ios.appKey= KJa3A7GA410
 simi.pc.winAppKey: pc1KPjmh951
 simi.pc.linuxAppKey: pcrIjvC5805
 simi.pc.macINterAppKey: pcUXtmMh356
-simi.pc.macArmAppKey: pcrPGB1z531
\ No newline at end of file
+simi.pc.macArmAppKey: pcrPGB1z531
+
+simi.pc.winAppKeyAbroad: pcRIhwh1380
+simi.pc.linuxAppKeyAbroad: pcQmdNl0952
+simi.pc.macINterAppKeyAbroad: pc1etTC6207
+simi.pc.macArmAppKeyAbroad: pcd9Sa8T989
\ No newline at end of file