zd bug fix

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

@@ -168,7 +168,10 @@ public class CamelJDBCConfiguration {
                         .split(body())
                         .split(body()).process(exchange -> {
                             HashMap<String, Object> body = exchange.getIn().getBody(HashMap.class);
-                            String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+                            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                            String format = LocalDateTime.now().format(df);
+                            String yesterday = LocalDateTime.now().minusDays(1).format(df);
+                            body.put("yesterday", yesterday);
                             if (body.get("well_common_name") == null || body.get("well_common_name").equals("")) {
                                 body.put("remarks","暂无井信息");
                                 body.put("error_id",0);
@@ -182,9 +185,14 @@ public class CamelJDBCConfiguration {
                                 body.put("error_id",1);
                                 body.put("updateTime",format);
                             }
+
                         })
                         //之前在数据导入时没有自动填写入最后更新时间,会导致新加入的数据无法自动导入
-                        .setBody(simple("update centralbase.sys_access_well_control set well_common_name='${body[well_common_name]}',org_id='${body[org_id]}',update_time = '${body[updateTime]}'::timestamp,sgt_last_time='${body[updateTime]}', remarks ='${body[remarks]}' ,error_id ='${body[error_id]}' where well_id ='${body[well_id]}' "))
+                        .setBody(simple("update centralbase.sys_access_well_control set well_common_name='${body[well_common_name]}'," +
+                                "org_id='${body[org_id]}',update_time = '${body[updateTime]}'::timestamp,sgt_last_time='${body[updateTime]}', " +
+                                "remarks ='${body[remarks]}' ,error_id ='${body[error_id]}' " +
+                                "where well_id ='${body[well_id]} and " +
+                                "(sgt_last_time is null or sgt_last_time<'${body[yesterday]}'::timestamp)"))
                         .to("jdbc:centralbase")
                         .end();
 

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

@@ -8,4 +8,5 @@ package com.gct.tools.etlcamelhuge.routeconfig;
  * @since 2021/5/17 下午4:14
  */
 public class CamelRocketMQConfiguration {
+
 }

src/main/resources/application.yml

@@ -14,7 +14,7 @@ spring:
       type: com.zaxxer.hikari.HikariDataSource
       jdbc-url: jdbc:postgresql://10.72.143.2:54321/database
       username: root
-      password: 123456
+      password: StarDouble*2121
       driver-class-name: org.postgresql.Driver
       hikari:
         ## 连接池名字
@@ -34,7 +34,7 @@ spring:
     ds2:
       ## Hikari连接池的设置 Hikari 时间单位都是毫秒
       type: com.zaxxer.hikari.HikariDataSource
-      jdbc-url: jdbc:oracle:thin:@11.71.15.28:1521:oracycn2
+      jdbc-url: jdbc:oracle:thin:@11.71.15.28:1521/oracycn
       username: ZD_FGD
       password: ZJGSDDS#2014ZD
       driver-class-name: oracle.jdbc.driver.OracleDriver
@@ -100,7 +100,7 @@ spring:
     ds5:
       ## Hikari连接池的设置 Hikari 时间单位都是毫秒
       type: com.zaxxer.hikari.HikariDataSource
-      jdbc-url: jdbc:oracle:thin:@11.71.15.28:1521:oracycn2
+      jdbc-url: jdbc:oracle:thin:@11.71.15.28:1521/oracycn
       username: ZD_A2USER
       password: ZDcyc#zjk3832758
       driver-class-name: oracle.jdbc.driver.OracleDriver

src/test/java/com/gct/tools/etlcamelhuge/EtlCamelHugeApplicationTests.java

@@ -1,7 +1,5 @@
 package com.gct.tools.etlcamelhuge;
 
-import com.gct.tools.etlcamelhuge.MQ.MessageProducer;
-import com.gct.tools.etlcamelhuge.entity.DiagnoseMsg;
 import com.gct.tools.etlcamelhuge.routeconfig.CamelJDBCConfiguration;
 import lombok.Data;
 import org.junit.jupiter.api.Test;
@@ -10,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.annotation.Resource;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.time.LocalDate;
@@ -20,7 +17,7 @@ import java.util.Arrays;
 import java.util.List;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = EtlCamelHugeApplication.class)
+@SpringBootTest
 class EtlCamelHugeApplicationTests {
 
    /* @Autowired
@@ -162,13 +159,6 @@ class EtlCamelHugeApplicationTests {
     public static void main(String args[]) throws Exception {
         System.out.println(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
     }
-    @Resource(name = "diagnoseMessageProducer")
-    private MessageProducer producer;
 
-    @Test
-    public void testProducer(){
-        producer.send(new DiagnoseMsg("xx1","asdf","0","2225-12-12 12:12:56"
-                ,"123.,2,3,2,31.2.31.23.0","dfasdf",12,12));
-    }
 
 }