stroke frequency bug;

add max min current;

src/main/java/com/gct/tools/etlcamelhuge/routeconfig/CamelRestConfiguration.java

@@ -315,23 +315,24 @@ public class CamelRestConfiguration extends RouteBuilder {
                     int hours = (int) ((time2 - time1) / (1000 * 60 * 60));
                     //云平台和采集时间相差要小于4小时
 //                    if (hours < 4 && !"".equals(gtsj) && hours1 < 4) {
-                        z.setZd_init_sgt(gtsj);//位移载荷点
-                        z.setProd_date(time.substring(0,10)+' '+time.substring(11,18));
+                    z.setZd_init_sgt(gtsj);//位移载荷点
+                    z.setProd_date(time.substring(0, 10) + ' ' + time.substring(11, 18));
 //                        z.setSys_date(sysDate);
 //                        z.setIs_well_close(Double.valueOf(jsonObject.getString("minCurrent")) > 0 ? "开井": "关井");
 //                        z.setPressure(0);
-                        if (jsonObject.getString("strokeFrequency") != null) {
-                            z.setStroke(CALUtil.round((Double.valueOf(jsonObject.getString("strokeFrequency"))) * 100) / 100);//冲程，但GTSB_2的冲程是CC字段
-                        }
-                        if (jsonObject.getString("stroke") != null) {
-                            z.setFrequence(CALUtil.round((Double.valueOf(jsonObject.getString("stroke"))) * 100) / 100);//冲次，但GTSB_2的冲次是PJXC字段
-                        }
-                        z.setSxzh(Double.parseDouble(jsonObject.getString("maxLoad")));//最大载荷
-                        z.setXxzh(Double.parseDouble(jsonObject.getString("minLoad")));//最小载荷
-                        z.setWell_common_name(well_id);
-                        z.setMaxCurrent(jsonObject.getDoubleValue("maxCurrent"));
-                        z.setMinCurrent(jsonObject.getDoubleValue("minCurrent"));
+                    if (jsonObject.getString("stroke") != null) {
+                        z.setStroke(CALUtil.round((Double.valueOf(jsonObject.getString("stroke"))) * 100) / 100);
+                    }
+                    if (jsonObject.getString("strokeFrequency") != null) {
+                        z.setFrequence(CALUtil.round((Double.valueOf(jsonObject.getString("strokeFrequency"))) * 100) / 100);
                     }
+
+                    z.setSxzh(Double.parseDouble(jsonObject.getString("maxLoad")));//最大载荷
+                    z.setXxzh(Double.parseDouble(jsonObject.getString("minLoad")));//最小载荷
+                    z.setWell_common_name(well_id);
+                    z.setMaxCurrent(jsonObject.getDoubleValue("maxCurrent"));
+                    z.setMinCurrent(jsonObject.getDoubleValue("minCurrent"));
+                }
 //                System.out.println("step 3 ===="+z);
 //                }
             }
@@ -491,9 +492,9 @@ public class CamelRestConfiguration extends RouteBuilder {
                             aRow.put("frequency", zdjg_well.getFrequence());
                             aRow.put("dyna_create_time", zdjg_well.getProd_date());
                             aRow.put("well_name", zdjg_well.getStroke() == 0 || zdjg_well.getSxzh() == 0 ? "No01" : aRow.get("well_id"));
-                            aRow.put("max_current",zdjg_well.getMaxCurrent());
-                            aRow.put("min_current",zdjg_well.getMinCurrent());
-                            aRow.put("phd",0);
+                            aRow.put("max_current", zdjg_well.getMaxCurrent());
+                            aRow.put("min_current", zdjg_well.getMinCurrent());
+                            aRow.put("phd", 0);
                         })
 //                .log("${body[phd]}"+ "sql" + "${body[well_name]}")
 //                .filter(simple("${body[well_name]} != 'No01'"))