Browse Source

对于位移没有数据,所有数据都在载荷中的特殊数据做特别处理

gxt 3 years ago
parent
commit
3027080e6e

+ 21 - 0
src/main/java/com/gct/tools/etlcamelhuge/routeconfig/CamelJDBCCofRealTimeConfiguration.java

@@ -13,8 +13,10 @@ import javax.annotation.Resource;
13
 import java.math.BigDecimal;
13
 import java.math.BigDecimal;
14
 import java.time.LocalDateTime;
14
 import java.time.LocalDateTime;
15
 import java.time.format.DateTimeFormatter;
15
 import java.time.format.DateTimeFormatter;
16
+import java.util.ArrayList;
16
 import java.util.Arrays;
17
 import java.util.Arrays;
17
 import java.util.HashMap;
18
 import java.util.HashMap;
19
+import java.util.List;
18
 
20
 
19
 /**
21
 /**
20
  * class name: CamelJDBCCofRealTimeConfiguration.java
22
  * class name: CamelJDBCCofRealTimeConfiguration.java
@@ -125,6 +127,25 @@ public class CamelJDBCCofRealTimeConfiguration  {
125
                         aRow.put("susp_max_load",susp_max_load);
127
                         aRow.put("susp_max_load",susp_max_load);
126
                         aRow.put("susp_min_load",susp_min_load);
128
                         aRow.put("susp_min_load",susp_min_load);
127
                     }
129
                     }
130
+                    //对于位移没有数据,所有数据都在载荷中的特殊数据做特别处理
131
+                    if ((aRow.get("displacement") == null || aRow.get("displacement").equals("")) && (aRow.get("disp_load") != null && !aRow.get("disp_load").equals(""))){
132
+                        String disp_load = aRow.get("disp_load").toString().replaceAll(";", ",");
133
+                        Double[][] doubles = SGTUtil.encodeToDoubleArray(disp_load);
134
+                        aRow.put("sgt", SGTUtil.encodeToString(doubles));
135
+                        String[] split = disp_load.split(",");
136
+                        List<String> list = new ArrayList<>();
137
+                        for (int i = 0; i < split.length; i++) {
138
+                            if (i%2 != 0){
139
+                                BigDecimal bigDecimal = new  BigDecimal(split[i]).divide(new BigDecimal("100.0"));
140
+                                list.add(bigDecimal.toString());
141
+                            }
142
+                        }
143
+                        String[] loads = list.toArray(new String[0]);
144
+                        Double susp_max_load = max(loads);
145
+                        Double susp_min_load = min(loads);
146
+                        aRow.put("susp_max_load",susp_max_load);
147
+                        aRow.put("susp_min_load",susp_min_load);
148
+                    }
128
                     if (aRow.get("stroke") == null) aRow.put("stroke", "0.0");
149
                     if (aRow.get("stroke") == null) aRow.put("stroke", "0.0");
129
                     if (aRow.get("frequency") == null) aRow.put("frequency", "0.0");
150
                     if (aRow.get("frequency") == null) aRow.put("frequency", "0.0");
130
                     if (aRow.get("susp_max_load") == null) aRow.put("susp_max_load", "0.0");
151
                     if (aRow.get("susp_max_load") == null) aRow.put("susp_max_load", "0.0");

+ 0 - 7
src/main/java/com/gct/tools/etlcamelhuge/routeconfig/CamelJDBCConfiguration.java

@@ -27,13 +27,6 @@ import java.time.LocalDateTime;
27
 import java.time.format.DateTimeFormatter;
27
 import java.time.format.DateTimeFormatter;
28
 import java.util.*;
28
 import java.util.*;
29
 
29
 
30
-@Data
31
-class LogMessage{
32
-    String id;
33
-    LocalDateTime date;
34
-    Object data;
35
-    String msg;
36
-}
37
 /**
30
 /**
38
  * class name: CamelJDBCConfiguration
31
  * class name: CamelJDBCConfiguration
39
  *
32
  *