|
@@ -17,6 +17,7 @@ import javax.annotation.Resource;
|
17
|
17
|
import javax.sql.DataSource;
|
18
|
18
|
import java.math.BigDecimal;
|
19
|
19
|
import java.time.LocalDateTime;
|
|
20
|
+import java.util.ArrayList;
|
20
|
21
|
import java.util.Arrays;
|
21
|
22
|
import java.util.List;
|
22
|
23
|
import java.util.Map;
|
|
@@ -160,6 +161,24 @@ public class GtController {
|
160
|
161
|
map.put("susp_max_load",susp_max_load);
|
161
|
162
|
map.put("susp_min_load",susp_min_load);
|
162
|
163
|
}
|
|
164
|
+ if ((map.get("displacement") == null || map.get("displacement").equals("")) && (map.get("disp_load") != null && !map.get("disp_load").equals(""))){
|
|
165
|
+ String disp_load = map.get("disp_load").toString().replaceAll(";", ",");
|
|
166
|
+ Double[][] doubles = SGTUtil.encodeToDoubleArray(disp_load);
|
|
167
|
+ map.put("sgt", SGTUtil.encodeToString(doubles));
|
|
168
|
+ String[] split = disp_load.split(",");
|
|
169
|
+ List<String> listLoad = new ArrayList<>();
|
|
170
|
+ for (int i = 0; i < split.length; i++) {
|
|
171
|
+ if (i%2 != 0){
|
|
172
|
+ BigDecimal bigDecimal = new BigDecimal(split[i]).divide(new BigDecimal("100.0"));
|
|
173
|
+ listLoad.add(bigDecimal.toString());
|
|
174
|
+ }
|
|
175
|
+ }
|
|
176
|
+ String[] loads = listLoad.toArray(new String[0]);
|
|
177
|
+ Double susp_max_load = max(loads);
|
|
178
|
+ Double susp_min_load = min(loads);
|
|
179
|
+ map.put("susp_max_load",susp_max_load);
|
|
180
|
+ map.put("susp_min_load",susp_min_load);
|
|
181
|
+ }
|
163
|
182
|
if (map.get("stroke") == null) map.put("stroke", "0.0");
|
164
|
183
|
if (map.get("frequency") == null) map.put("frequency", "0.0");
|
165
|
184
|
if (map.get("susp_max_load") == null) map.put("susp_max_load", "0.0");
|