fix

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

@@ -67,7 +67,7 @@ public class CamelRestConfiguration extends RouteBuilder {
     }
 
 
-    public void getCurrentTimeParams(String wellId, String wellName) throws Exception {
+    public void getCurrentTimeParams(String wellId, String wellName,String date) throws Exception {
 
         Map<String, Double> map = new HashMap<>();
 
@@ -92,17 +92,16 @@ public class CamelRestConfiguration extends RouteBuilder {
         map.put("totalPower", Double.valueOf("".equals(getParams(wellId + totalPower)) ? "0" : getParams(wellId + totalPower)));
         map.put("casePress", Double.valueOf("".equals(getParams(wellId + casePress)) ? "0" : getParams(wellId + casePress)));
         map.put("oilPress", Double.valueOf("".equals(getParams(wellId + oilPress)) ? "0" : getParams(wellId + oilPress)));
-        insertCurrentTimeParams(map, wellName);
+        insertCurrentTimeParams(map, wellName,date);
 
 
     }
 
-    public void insertCurrentTimeParams(Map<String, Double> map, String wellName) {
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
-        String dateNow = df.format(new java.util.Date());
+    public void insertCurrentTimeParams(Map<String, Double> map, String wellName,String date) {
+
         JdbcTemplate jdbcTemplate = new JdbcTemplate(baseDataSource);
         String sql = "INSERT INTO centralbase.cb_pc_current_time_params (well_name, prod_date,a_current, b_current, c_current, a_press, b_press, c_press, no_total_power, total_power, case_press, oil_press) " +
-                "VALUES ('" + wellName + "','" + dateNow + "'," + (map.get("ACurrent") == 0 ? null : map.get("ACurrent")) + "," + (map.get("BCurrent") == 0 ? null : map.get("BCurrent")) + "," + (map.get("CCurrent") == 0 ? null : map.get("CCurrent")) + "," + (map.get("APress") == 0 ? null : map.get("APress")) + "," + (map.get("BPress") == 0 ? null : map.get("BPress")) + ","
+                "VALUES ('" + wellName + "','" + date + "'," + (map.get("ACurrent") == 0 ? null : map.get("ACurrent")) + "," + (map.get("BCurrent") == 0 ? null : map.get("BCurrent")) + "," + (map.get("CCurrent") == 0 ? null : map.get("CCurrent")) + "," + (map.get("APress") == 0 ? null : map.get("APress")) + "," + (map.get("BPress") == 0 ? null : map.get("BPress")) + ","
                 + (map.get("CPress") == 0 ? null : map.get("CPress")) + "," + (map.get("noTotalPower") == 0 ? null : map.get("noTotalPower")) + "," + (map.get("totalPower") == 0 ? null : map.get("totalPower")) + "," + (map.get("casePress") == 0 ? null : map.get("casePress")) + "," + (map.get("oilPress") == 0 ? null : map.get("oilPress")) + ")  ON CONFLICT (well_name,prod_date)  DO NOTHING;";
         if (accessWellMap.get(wellName) != null)
             jdbcTemplate.update(sql);
@@ -361,7 +360,7 @@ public class CamelRestConfiguration extends RouteBuilder {
 
         getAccessWell();
         JSONObject body = new JSONObject();
-
+        Map<String,String> map = new HashMap<>();
         restConfiguration()
                 .component("servlet")
                 .host("11.72.128.71");
@@ -375,6 +374,8 @@ public class CamelRestConfiguration extends RouteBuilder {
                             HashMap<String, Object> aRow = in.getBody(HashMap.class);
                             in.setHeader("id", aRow.get("data"));
                             in.setHeader("date", getDate());
+
+                            map.put("date",in.getHeader("date").toString());
                         })
                 .setBody(simple("${in.header.id}"))
 
@@ -383,7 +384,7 @@ public class CamelRestConfiguration extends RouteBuilder {
                             Message in = exchange.getIn();
                             HashMap<String, Object> aRow = in.getBody(HashMap.class);
                             if (aRow.get("typeName").toString().indexOf("油井") > 0) {
-                                getCurrentTimeParams(aRow.get("id").toString(), aRow.get("code").toString());
+                                getCurrentTimeParams(aRow.get("id").toString(), aRow.get("code").toString(),map.get("date"));
                                 Double phd = "".equals(loadPhdDate(aRow.get("id").toString())) ? 0 : Double.valueOf(loadPhdDate(aRow.get("id").toString()));
                                 ZDJG_WELL zdjg_well = loadGtData(aRow.get("id") + "/analyse/功图数据", aRow.get("code").toString(), "2021-08-17");
                                 aRow.put("sgt", zdjg_well.getZd_init_sgt());//null