设备指纹实时数据清洗增加传入数据源类型

qg-data-service/src/main/java/cn/quantgroup/qgdataservice/service/tidb/DeviceFingerInfoCleaningService.java

@@ -228,12 +228,12 @@ public class DeviceFingerInfoCleaningService {
                     paramList.add(list);
 
                 } catch (Exception e) {
-                    log.error("设备指纹清洗异常, uuid: {} , ka: {} , type: {} , param: {} ", uuid, ka, type, JSON.toJSONString(mobileFingerPrintDataRow));
+                    log.error("设备指纹清洗异常, uuid: {} , ka: {} , type: {} , param: {} ", uuid, ka, type, JSON.toJSONString(mobileFingerPrintDataRow), e);
                 }
 
                 JdbcExecuters.prepareBatchUpdate(Constant.SQL.DEVICE_FINGERS_INFOS, paramList, type);
 
-                log.info("充值记录清洗完成, uuid: {} , 入库大小: {} , type: {} , ka: {} , 耗时: {} ", uuid, 1, type, ka, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
+                log.info("设备指纹清洗完成, uuid: {} , 入库大小: {} , type: {} , ka: {} , 耗时: {} ", uuid, 1, type, ka, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
 
             }
 
@@ -242,7 +242,7 @@ public class DeviceFingerInfoCleaningService {
     }
 
     //把所有json都放在一个大的json里，去掉子json
-    public static JSONObject flatJson(JSONObject jsonObject) {
+    private static JSONObject flatJson(JSONObject jsonObject) {
         JSONObject result = new JSONObject();
         Set<String> keySet = jsonObject.keySet();
         for (String key : keySet) {
@@ -261,7 +261,7 @@ public class DeviceFingerInfoCleaningService {
         return result;
     }
 
-    public static void cleanColumn(JSONObject jsonObject) {
+    private static void cleanColumn(JSONObject jsonObject) {
         if (jsonObject != null) {
             String networkType = jsonObject.getString("networkType");
             networkType = StringUtils.isBlank(networkType) || "NaN".equalsIgnoreCase(networkType) ? UNEXPECTED
@@ -396,7 +396,7 @@ public class DeviceFingerInfoCleaningService {
         }
     }
 
-    public static String formatString(String str) {
+    private static String formatString(String str) {
         try {
             if (str.contains(".") && str.split("\\.", -1)[1].length() > 6) {
                 str = format.format(Double.valueOf(str));
@@ -407,7 +407,7 @@ public class DeviceFingerInfoCleaningService {
         return str;
     }
 
-    public static void combineColumn(JSONObject jsonObject) {
+    private static void combineColumn(JSONObject jsonObject) {
 //        String cpuABI = jsonObject.getString("cpuABI");
 //        String cpuABI2 = jsonObject.getString("cpuABI2");
 //        if (StringUtils.isBlank(cpuABI) && StringUtils.isNotBlank(cpuABI2)) {
@@ -551,7 +551,7 @@ public class DeviceFingerInfoCleaningService {
     }
 
 
-    public static String dealResolution(String resolution) {
+    private static String dealResolution(String resolution) {
         String[] values = resolution.split("\\*");
         if (values.length == 2) {
             try {
@@ -564,7 +564,7 @@ public class DeviceFingerInfoCleaningService {
         return UNEXPECTED;
     }
 
-    public static String dealCpuArchitecture(String cpuArchitecture) {
+    private static String dealCpuArchitecture(String cpuArchitecture) {
         cpuArchitecture = cpuArchitecture.trim();
         if (cpuArchitecture.startsWith("ARMv")) {
             return "Armv";
@@ -575,7 +575,7 @@ public class DeviceFingerInfoCleaningService {
         }
     }
 
-    public static String dealTimeZone(String timeZone) {
+    private static String dealTimeZone(String timeZone) {
         if (timeZone.trim().startsWith("GMT+08:00")) {
             return "beijingStandardTime";
         } else {
@@ -583,7 +583,7 @@ public class DeviceFingerInfoCleaningService {
         }
     }
 
-    public static String dealTotalStorage(String totalStorage) {
+    private static String dealTotalStorage(String totalStorage) {
         String total = "";
         try {
             if (totalStorage.contains("k") || totalStorage.contains("K")) {
@@ -607,7 +607,7 @@ public class DeviceFingerInfoCleaningService {
         return total;
     }
 
-    public static String dealBrand(String brand) {
+    private static String dealBrand(String brand) {
         brand = brand.trim();
         if (brand.startsWith("Apple") || brand.startsWith("apple") || brand.startsWith("iPhone") || brand.startsWith("iphone")) {
             return "Apple";
@@ -628,7 +628,7 @@ public class DeviceFingerInfoCleaningService {
         return "Other";
     }
 
-    public static String dealTotalSys(String totalSys) {
+    private static String dealTotalSys(String totalSys) {
         String total = "";
         try {
             if (totalSys.contains("k") || totalSys.contains("K")) {

qg-data-service/src/main/java/cn/quantgroup/qgdataservice/service/tidb/OperatorInfoCleaningService.java

@@ -776,7 +776,7 @@ public class OperatorInfoCleaningService {
                     sqls.add(list);
 
                 } catch (Exception e) {
-                    log.error("充值记录清洗异常, uuid: {} , ka: {} , param: {} ", uuid, ka, JSON.toJSONString(phonePaymentDataRow));
+                    log.error("充值记录清洗异常, uuid: {} , ka: {} , param: {} ", uuid, ka, JSON.toJSONString(phonePaymentDataRow), e);
                 }
 
                 int size = JdbcExecuters.batchExecute(sqls, Constant.SQL.PHONE_RECHARGE_INFOS);