bug fix ok?

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

@@ -8,15 +8,14 @@ import org.apache.camel.Message;
 import org.apache.camel.builder.RouteBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * class name: CamelJDBCCofRealTimeConfiguration.java
@@ -93,7 +92,7 @@ public class CamelJDBCCofRealTimeConfiguration  {
                     String prod_date = aRow.get("dyna_create_time").toString().split("\\+")[0];
                     aRow.put("dyna_create_time", prod_date);
                     aRow.put("sgt", "");
-                    if (aRow.get("displacement") != null && !aRow.get("displacement").equals("") && aRow.get("disp_load") != null && !aRow.get("disp_load").equals("")) {
+                    if (!StringUtils.isEmpty(aRow.get("displacement")) && !StringUtils.isEmpty(aRow.get("disp_load"))) {
                         String[] displacements = aRow.get("displacement").toString().split(";");//10 四舍五入
                         String[] disp_loads = aRow.get("disp_load").toString().split(";");
                         Double susp_max_load = max(disp_loads);
@@ -113,7 +112,7 @@ public class CamelJDBCCofRealTimeConfiguration  {
                         aRow.put("susp_min_load",susp_min_load);
                     }
                     //对于位移没有数据,所有数据都在载荷中的特殊数据做特别处理
-                    else if ((aRow.get("displacement") == null || aRow.get("displacement").equals("")) && (aRow.get("disp_load") != null && !aRow.get("disp_load").equals(""))){
+                    else if (StringUtils.isEmpty(aRow.get("displacement")) && !StringUtils.isEmpty(aRow.get("disp_load"))){
                         String disp_load = aRow.get("disp_load").toString().replaceAll(";", ",");
                         Double[][] doubles = SGTUtil.encodeToDoubleArray(disp_load);
                         aRow.put("sgt", SGTUtil.encodeToString(doubles));
@@ -131,19 +130,19 @@ public class CamelJDBCCofRealTimeConfiguration  {
                         aRow.put("susp_max_load",susp_max_load);
                         aRow.put("susp_min_load",susp_min_load);
                     }
-                    if (aRow.get("stroke") == null) aRow.put("stroke", "0.0");
-                    if (aRow.get("frequency") == null) aRow.put("frequency", "0.0");
-                    if (aRow.get("susp_max_load") == null) aRow.put("susp_max_load", "0.0");
-                    if (aRow.get("susp_min_load") == null) aRow.put("susp_min_load", "0.0");
-                    if (aRow.get("frequency") != null){
+                    aRow.putIfAbsent("stroke", "0.0");
+                    aRow.putIfAbsent("frequency", "0.0");
+                    aRow.putIfAbsent("susp_max_load", "0.0");
+                    aRow.putIfAbsent("susp_min_load", "0.0");
+                    if (!StringUtils.isEmpty(aRow.get("frequency"))){
                         BigDecimal bd=new BigDecimal(aRow.get("frequency").toString());
-                        double frequency=bd.setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue();
+                        double frequency=bd.setScale(1, RoundingMode.HALF_UP).doubleValue();
                         aRow.put("frequency",frequency);
                     }
-                    if (aRow.get("stroke") != null){
+                    if (!StringUtils.isEmpty(aRow.get("stroke"))){
                         double stroke1 = Double.parseDouble(aRow.get("stroke").toString());
                         BigDecimal bd=new BigDecimal(stroke1);
-                        double stroke=bd.setScale(1,BigDecimal.ROUND_HALF_UP).doubleValue();
+                        double stroke=bd.setScale(1, RoundingMode.HALF_UP).doubleValue();
                         aRow.put("stroke",stroke);
                     }
                             String wellName =aRow.get("well_name").toString();

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

@@ -51,7 +51,7 @@ public class CamelJDBCConfiguration {
 
                 RouteDefinition OrgAndWellSource= (RouteDefinition) from("timer:insert-OrgAndWellSource?period=86400000")
                         .routeId("insert-OrgAndWellSource")
-                        .setHeader("date", constant(getDate()))
+                        .setHeader("date", constant(getDate()+" 00:00:00"))
                         .process(exchange -> {
                             org = 0;
                             orgIdPreList = new HashMap<>();
@@ -71,7 +71,7 @@ public class CamelJDBCConfiguration {
                             orgIdPreList.put(body.get("org_id_pre"),body.get("org_id"));
                         }).end();
                         setMyBody(OrgAndWellSource)
-                       .setBody(simple("select  distinct jh,cydmc,zyq,zk,qyrq,sccw,qk,bz from DBA01 where jh ='${header.well_id}' "))
+                       .setBody(simple("select  distinct jh,cydmc,zyq,zk,qyrq,sccw,qk,bz from DBA01 where rq=to_date('${header.date}','yyyy-mm-dd hh24:mi:ss') and jh ='${header.well_id}'"))
                        .to("jdbc:oracle")
                        .transform()
                        .body((result) -> {
@@ -106,6 +106,8 @@ public class CamelJDBCConfiguration {
                       if(orgIDs.get(org_level3) !=null){
                           aRow.put("org_id",orgIDs.get(org_level3));
                       }
+                      String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                      aRow.putIfAbsent("QYRQ",format);
                   })
                   .setBody(simple("insert into centralbase.cb_cd_well_source (well_id,well_common_name,spud_date,org_id,station_id,station_name,completion_name,PRODUCING_AREA_name,remarks) " +
                                   "select '${body[JH]}','${body[JM]}','${body[QYRQ]}'::timestamp,'${body[org_id]}','${body[station_id]}','${body[ZK]}','${body[SCCW]}','${body[QK]}','${body[BZ]}' " +