bj,dym 重复导入不是最新问题解决-2

src/main/java/com/gct/tools/etlcamelhuge/controller/BaseDataController.java

@@ -58,7 +58,8 @@ public class BaseDataController {
                 sql = "insert into centralbase.cb_pc_pro_wellbore_status_daily(well_id,prod_date,oil_prod_method,oil_nozzle,back_pres,tubing_pres,casing_pres,pump_depth) " +
                         "values (?,?,?,?,?,?,?,?)";
                 insertCount = insertBaseDataSourceOfStatusDaily(sql, map);
-                List<Map<String, Object>> dymIsNotNUllList = selectA2DataOfNotIsNullDYM();
+                sql = "select jh , rq , dym from centralbase.cb_pc_pro_wellbore_status_daily where  (jh,rq) in (SELECT  jh,max(rq) rq  FROM DBA01 WHERE dym is not null and to_date('"+date+"','yyyy-MM-dd') group by jh)";
+                List<Map<String, Object>> dymIsNotNUllList = selectA2DataOfNotIsNullDYMOrBJ(sql);
                 for (Map<String, Object> stringObjectMap : dymIsNotNUllList) {
                     sql = "update centralbase.cb_pc_pro_wellbore_status_daily set start_pump_liq_level = '" + stringObjectMap.get("DYM") + "' where well_id = '" + stringObjectMap.get("JH") + "' and prod_date::date  = '" + stringObjectMap.get("RQ") + "' ";
                     updateDYMCount = updateBaseDataSourceOfStatusDaily(sql) + updateDYMCount;
@@ -77,8 +78,8 @@ public class BaseDataController {
                     sql = " update centralbase.cb_pc_pro_wellbore_status_daily set submergence_depth = '" + stringObjectMap.get("submergence_depth") + "' where well_id = '" + stringObjectMap.get("well_id") + "' and prod_date  = '" + stringObjectMap.get("prod_date") + "' ";
                     updateCMDCount = updateBaseDataSourceOfStatusDaily(sql) + updateCMDCount;
                 }
-                sql = " SELECT  distinct jh,max(rq),bj FROM DBA01 WHERE dym is not null group by jh,dym ";
-                List<Map<String, Object>> oilNozzleList = selectBaseDataSourceStatusDaily(sql);
+                sql = "select jh , rq , bj from centralbase.cb_pc_pro_wellbore_status_daily where  (jh,rq) in (SELECT  jh,max(rq) rq  FROM DBA01 WHERE bj is not null and to_date('"+date+"','yyyy-MM-dd') group by jh)";
+                List<Map<String, Object>> oilNozzleList = selectA2DataOfNotIsNullDYMOrBJ(sql);
                 for (Map<String, Object> stringObjectMap : oilNozzleList) {
                     sql = " update centralbase.cb_pc_pro_wellbore_status_daily set oil_nozzle = '" + stringObjectMap.get("BJ") + "' where well_id ='" + stringObjectMap.get("JH") + "' and prod_date='" + stringObjectMap.get("RQ") + "' ";
                     updateOLiNozzleCount = updateBaseDataSourceOfStatusDaily(sql) + updateOLiNozzleCount;
@@ -104,9 +105,8 @@ public class BaseDataController {
         return jdbcTemplate.update(sql, map.get("JH"), map.get("RQ"), map.get("CYFS"), map.get("YZ"), map.get("HYSX"), map.get("YYSX"), map.get("BS"), map.get("DYM"));
     }
 
-    public List<Map<String, Object>> selectA2DataOfNotIsNullDYM() {
+    public List<Map<String, Object>> selectA2DataOfNotIsNullDYMOrBJ(String sql) {
         jdbcTemplate = new JdbcTemplate(oracleDataSource);
-        String sql = "SELECT  distinct jh,max(rq),dym FROM DBA01 WHERE dym is not null group by jh,dym";
         return jdbcTemplate.queryForList(sql);
     }
 

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

@@ -161,7 +161,7 @@ public class CamelJDBCCofRealTimeConfiguration  {
                         .log("${header.date}"+" routeId:insert-runtimeAndSendToMQ ->  centralbase.cb_temp_well_mech_runtime insert data failed ${body}")
                         .end();
 
-               from("timer:mytimer-update-avg-mech_daily?period=1800000")
+               from("timer:mytimer-update-avg-mech_daily?period=3600000")
                         .routeId("update-avg-mech_daily")
                         .setHeader("date", constant(getDate()))
                         .setBody(simple("select well_id,avg(stroke_length) stroke_length  ,avg(stroke_frequency) stroke_frequency from centralbase.cb_temp_well_mech_runtime where prod_date::date='${header.date}' group by well_id"))

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

@@ -172,35 +172,35 @@ public class CamelJDBCConfiguration {
                         .end();
 
 
-                from("timer:mytimer-update-statusDaily-DYM?period=1800000")
+                from("timer:mytimer-update-statusDaily-DYM?period=3600000")
                         .routeId("update-statusDaily-DYM")
-                        .setHeader("date", constant(getDate() + " 00:00:00"))
-                        .setBody(simple("SELECT  distinct jh,max(rq),dym FROM DBA01 WHERE dym is not null group by jh,dym"))
+                        .setHeader("date", constant(getDate()))
+                        .setBody(simple("select jh , rq , dym from centralbase.cb_pc_pro_wellbore_status_daily where  (jh,rq) in (SELECT  jh,max(rq) rq  FROM DBA01 WHERE dym is not null and to_date('${header.date}','yyyy-MM-dd') group by jh)"))
                         .to("jdbc:oracle")
                         .split(body())
-                        .setBody(simple("update centralbase.cb_pc_pro_wellbore_status_daily set start_pump_liq_level = '${body[DYM]}',dym_date ='${body[RQ]}'  where well_id = '${body[JH]}' and prod_date::date  = '${header.date}' and dym_date < '${body[RQ]}' "))
+                        .setBody(simple("update centralbase.cb_pc_pro_wellbore_status_daily set start_pump_liq_level = '${body[DYM]}'  where well_id = '${body[JH]}' and prod_date::date  = '${header.date}' "))
                         .doTry()
                         .to("jdbc:centralbase")
                         .doCatch(Exception.class)
                         .log("${header.date}"+" routeId:update-statusDaily-DYM ->  centralbase.cb_pc_pro_wellbore_status_daily update data failed")
                         .end();
                 //因为数据库有可能会查出多条数据,现在的做法时,在数据库中增加两个个字段,用来记录BJ和DYM 的更新时间 ,只有获取到的时间大于数据库中存储的时间时,才会更新,并且该字段也会更新
-                from("timer:mytimer-update-statusDaily-BJ?period=1800000")
+                from("timer:mytimer-update-statusDaily-BJ?period=3600000")
                         .routeId("update-statusDaily-BJ")
-                        .setHeader("date", constant(getDate() + " 00:00:00"))
-                        .setBody(simple("SELECT  distinct jh,max(rq),bj FROM DBA01 WHERE bj is not null group by jh,bj"))
+                        .setHeader("date", constant(getDate()))
+                        .setBody(simple("select jh , rq , bj from centralbase.cb_pc_pro_wellbore_status_daily where  (jh,rq) in (SELECT  jh,max(rq) rq  FROM DBA01 WHERE bj is not null and to_date('${header.date}','yyyy-MM-dd') group by jh)"))
                         .to("jdbc:oracle")
                         .split(body()).process(exchange -> {
                             HashMap body = exchange.getIn().getBody(HashMap.class);
                         })
-                        .setBody(simple("update centralbase.cb_pc_pro_wellbore_status_daily set oil_nozzle = '${body[BJ]}',bj_date = '${body[RQ]}' where well_id = '${body[JH]}' and prod_date::date  = '${header.date}' and bj_date < '${body[RQ]}'  "))
+                        .setBody(simple("update centralbase.cb_pc_pro_wellbore_status_daily set oil_nozzle = '${body[BJ]}' where well_id = '${body[JH]}' and prod_date::date  = '${header.date}'  "))
                         .doTry()
                         .to("jdbc:centralbase")
                         .doCatch(Exception.class)
                         .log("${header.date}"+" routeId:update-statusDaily-BJ ->  centralbase.cb_pc_pro_wellbore_status_daily update data failed")
                         .end();
 
-                from("timer:mytimer-update-statusDaily-submergenceDepth?period=1800000")
+                from("timer:mytimer-update-statusDaily-submergenceDepth?period=3600000")
                         .routeId("update-statusDaily-submergenceDepth")
                         .setHeader("date", constant(getDate() + " 00:00:00"))
                         .setBody(simple("select well_id,prod_date,start_pump_liq_level,pump_depth from centralbase.cb_pc_pro_wellbore_status_daily where prod_date = '${header.date}' "))

src/main/resources/application.yml

@@ -91,7 +91,7 @@ spring:
         ## 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
         max-lifetime: 1800000
         ## 数据库连接超时时间,默认30秒，即30000
-        connection-timeout: 30000
+        connection-timeout: 60000
 
 management:
   info: