修复一些依赖问题 尝试解决黑油山数据导入

pom.xml

@@ -21,6 +21,16 @@
         <lombok.version>1.16.18</lombok.version>
         <lombok-maven-plugin.version>1.16.6.1</lombok-maven-plugin.version>
     </properties>
+    <repositories>
+        <repository>
+            <id>central</id>
+            <url>https://repo1.maven.org/maven2</url>
+        </repository>
+        <repository>
+            <id>ojdbc</id>
+            <url>https://maven.aliyun.com/repository/central</url>
+        </repository>
+    </repositories>
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -47,9 +57,9 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.oracle</groupId>
+            <groupId>com.oracle.database.jdbc</groupId>
             <artifactId>ojdbc6</artifactId>
-            <version>11.2.0.4.0-atlassian-hosted</version>
+            <version>11.2.0.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -62,12 +72,12 @@
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
-            <version>2.9.0</version>
+            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
-            <version>2.9.0</version>
+            <version>2.10.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

src/main/java/com/gct/tools/etlcamelhuge/EtlCamelHugeApplication.java

@@ -3,10 +3,10 @@ package com.gct.tools.etlcamelhuge;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableAsync;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 @SpringBootApplication
-@EnableSwagger2
+@EnableSwagger2WebMvc
 @EnableAsync
 public class EtlCamelHugeApplication {
     public static void main(String[] args) {

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

@@ -240,12 +240,7 @@ public class CamelJDBCConfiguration /*extends RouteBuilder*/ {
     public String getDate() {
         return LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
     }
-//    public static String getDate()
-//    {
-//        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
-//        String date = df.format(new java.util.Date());// new Date()为获取当前系统时间
-//        return date;
-//    }
+
 
     @Resource(name = "diagnoseMessageProducer")
     private MessageProducer producer;
@@ -271,7 +266,7 @@ public class CamelJDBCConfiguration /*extends RouteBuilder*/ {
             //全部执行完成的大概时间在30-40分钟
             @Override
             public void configure() throws Exception {
-               /* RouteDefinition OrgAndWellSource= (RouteDefinition) from("timer:insert-OrgAndWellSource?period=86400000")
+                RouteDefinition OrgAndWellSource= (RouteDefinition) from("timer:insert-OrgAndWellSource?period=86400000")
                         .routeId("insert-OrgAndWellSource")
                         .setHeader("date", constant(getDate()))
                         .process(exchange -> {
@@ -295,7 +290,7 @@ public class CamelJDBCConfiguration /*extends RouteBuilder*/ {
                         }).end();
                 setMyBody(OrgAndWellSource)
 
-                        .setBody(simple("select distinct a.well_common_name jh, a.org_name_cj zyq, a.GROUP_UNIT_NAME cw, a.station_name zd, a.project_name qk from V_CD_WELL_SOURCE_YC a where a.well_common_name ='${header.well_id}' "))
+                        .setBody(simple("select distinct a.well_common_name jh, a.org_name_cj zyq, a.GROUP_UNIT_NAME cw, a.station_name zd, a.project_name qk from V_CD_WELL_SOURCE_YC_HJ a where a.well_common_name ='${header.well_id}' "))
 //                        .setBody(simple("select  distinct jh,cydmc,zyq,zk,qyrq,sccw,qk,bz from DBA01 where jh ='${header.well_id}' "))
                         .to("jdbc:oracle_A2")
                         .transform()
@@ -452,8 +447,8 @@ public class CamelJDBCConfiguration /*extends RouteBuilder*/ {
                         .setBody(simple("SELECT well_id wellid FROM centralbase.sys_access_well_control where access_status = '1' and error_id = '1' "))
                         .to("jdbc:centralbase")
                         .split(body())
-//                        .setBody(simple("select v.WELL_COMMON_NAME jh,v.PROD_DATE rq,v.OIL_PRODUCTION_METHOD cyfs,v.PUMP_DIAMETER yz,v.BACK_PRES hysx,v.MAX_TUBING_PRES yysx,v.MAX_CASING_PRES tysx,v.PUMP_DEPTH bs from V_PC_PRO_COM_DAILY_CYYC_A2 v  where  v.PROD_DATE = to_date('${header.date}','yyyy-MM-dd')  and  v.WELL_COMMON_NAME = '${body[wellid]}' "))
-                       .setBody(simple("select v.WELL_COMMON_NAME jh,v.PROD_DATE rq,v.OIL_PRODUCTION_METHOD cyfs,v.PUMP_DIAMETER yz,v.BACK_PRES hysx,v.MAX_TUBING_PRES yysx,v.MAX_CASING_PRES tysx,v.PUMP_DEPTH bs from V_PC_PRO_COM_DAILY_CYYC v  where  v.PROD_DATE = to_date('${header.date}','yyyy-MM-dd')  and  v.WELL_COMMON_NAME = '${body[wellid]}' "))
+//                        .setBody(simple("select v.WELL_COMMON_NAME jh,v.PROD_DATE rq,v.OIL_PRODUCTION_METHOD cyfs,v.PUMP_DIAMETER yz,v.BACK_PRES hysx,v.MAX_TUBING_PRES yysx,v.MAX_CASING_PRES tysx,v.PUMP_DEPTH bs from V_PC_PRO_COM_DAILY_HYS_CYYC_A2 v  where  v.PROD_DATE = to_date('${header.date}','yyyy-MM-dd')  and  v.WELL_COMMON_NAME = '${body[wellid]}' "))
+                       .setBody(simple("select v.WELL_COMMON_NAME jh,v.PROD_DATE rq,v.OIL_PRODUCTION_METHOD cyfs,v.PUMP_DIAMETER yz,v.BACK_PRES hysx,v.MAX_TUBING_PRES yysx,v.MAX_CASING_PRES tysx,v.PUMP_DEPTH bs from V_PC_PRO_COM_DAILY_HYS_CYYC v  where  v.PROD_DATE = to_date('${header.date}','yyyy-MM-dd')  and  v.WELL_COMMON_NAME = '${body[wellid]}' "))
                         .to("jdbc:oracle_A2")
                         .split(body()).process(exchange -> {
                     Message in = exchange.getIn();
@@ -490,14 +485,14 @@ public class CamelJDBCConfiguration /*extends RouteBuilder*/ {
                         .setBody(simple("SELECT well_id wellid FROM centralbase.sys_access_well_control where access_status = '1' and error_id = '1' "))
                         .to("jdbc:centralbase")
                         .split(body())
-//                        .setBody(simple("select  WELL_COMMON_NAME jh, PROD_DATE rq,PROD_TIME scsj, LIQ_PROD_DAILY rcyl1,OIL_PROD_DAILY rcyl,GAS_PROD_DAILY rcql,WATER_CUT hs,REMARKS bz from V_PC_PRO_COM_DAILY_CYYC_A2 where prod_date = to_date('${header.date}','yyyy-MM-dd') and WELL_COMMON_NAME = '${body[wellid]}'"))
-//                        .setBody(simple("select  WELL_COMMON_NAME jh, PROD_DATE rq,PROD_TIME scsj, LIQ_PROD_DAILY rcyl1,OIL_PROD_DAILY rcyl,GAS_PROD_DAILY rcql,WATER_CUT hs,REMARKS bz from V_PC_PRO_COM_DAILY_CYYC where prod_date = to_date('${header.date}','yyyy-MM-dd') and WELL_COMMON_NAME = '${body[wellid]}' and LIQ_PROD_DAILY >0 "))
+//                        .setBody(simple("select  WELL_COMMON_NAME jh, PROD_DATE rq,PROD_TIME scsj, LIQ_PROD_DAILY rcyl1,OIL_PROD_DAILY rcyl,GAS_PROD_DAILY rcql,WATER_CUT hs,REMARKS bz from V_PC_PRO_COM_DAILY_HYS_CYYC_A2 where prod_date = to_date('${header.date}','yyyy-MM-dd') and WELL_COMMON_NAME = '${body[wellid]}'"))
+//                        .setBody(simple("select  WELL_COMMON_NAME jh, PROD_DATE rq,PROD_TIME scsj, LIQ_PROD_DAILY rcyl1,OIL_PROD_DAILY rcyl,GAS_PROD_DAILY rcql,WATER_CUT hs,REMARKS bz from V_PC_PRO_COM_DAILY_HYS_CYYC where prod_date = to_date('${header.date}','yyyy-MM-dd') and WELL_COMMON_NAME = '${body[wellid]}' and LIQ_PROD_DAILY >0 "))
                         .setBody(simple("select  WELL_COMMON_NAME jh,\n" +
                                 "                       PROD_DATE rq,\n" +
                                 "                       PROD_TIME scsj,\n" +
-                                "                       (select  sum(LIQ_PROD_DAILY) from V_PC_PRO_COM_DAILY_CYYC where prod_date = to_date('${header.date}','yyyy-MM-dd') and WELL_COMMON_NAME = '${body[wellid]}') rcyl1,\n" +
+                                "                       (select  sum(LIQ_PROD_DAILY) from V_PC_PRO_COM_DAILY_HYS_CYYC where prod_date = to_date('${header.date}','yyyy-MM-dd') and WELL_COMMON_NAME = '${body[wellid]}') rcyl1,\n" +
                                 "                       OIL_PROD_DAILY rcyl,GAS_PROD_DAILY rcql,WATER_CUT hs,REMARKS bz\n" +
-                            "                       from   V_PC_PRO_COM_DAILY_CYYC\n" +
+                            "                       from   V_PC_PRO_COM_DAILY_HYS_CYYC\n" +
                             "                       where prod_date = to_date('${header.date}','yyyy-MM-dd')\n" +
                             "                       and WELL_COMMON_NAME = '${body[wellid]}'  "))
                         .to("jdbc:oracle_A2")
@@ -580,7 +575,7 @@ public class CamelJDBCConfiguration /*extends RouteBuilder*/ {
                         in.setHeader("JH",aRow.get("jh").toString());
                 })
 //                    .setBody(simple("Select t.jh, t.prod_date rq,t.static_pressure jy,t.flow_pres ly,t.pump_diameter bj, t.pump_depth bs,t.pump_efficiency bx,t.rotate_frequency zs,
-// t.stroke_length cc,t.stroke_frequency cs, t.pump_type blx,t.elec_frequency dl,t.dynamic_liq_level dym   FROM V_TEMP_WELL_MECH_ALL t where jh = '${body[JH]}'"))
+// t.stroke_length cc,t.stroke_frequency cs, t.pump_type blx,t.elec_frequency dl,t.dynamic_liq_level dym   FROM V_PC_PRO_COM_DAILY_HYS t where jh = '${body[JH]}'"))
                     .setBody(simple("select  * from ( Select  v.WELL_COMMON_NAME jh, t.prod_date rq,t.static_pressure jy,t.flow_pres ly,t.pump_diameter bj, t.pump_depth bs,t.pump_efficiency bx, t.rotate_frequency zs,t.stroke_length cc,t.stroke_frequency cs, t.pump_type blx,t.elec_frequency dl, t.dynamic_liq_level dym  " +
                             " FROM V_TEMP_WELL_MECH_ALL t inner join V_CD_WELL_SOURCE_YC v on  t.well_id = v.well_id  and  v.WELL_COMMON_NAME = '${body[JH]}' and t.dynamic_liq_level > 0 " +
                             " order by rq desc) where rownum = 1"))
@@ -773,7 +768,7 @@ public class CamelJDBCConfiguration /*extends RouteBuilder*/ {
                         })
                         .doCatch(Exception.class)
                         .log("${header.date}"+" rocketMQ send data faild")
-                        .end();*/
+                        .end();
 
 
                /* from("timer:mytimer12?period=604800000")

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

@@ -25,7 +25,7 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 
-@Configuration
+//@Configuration
 public class CamelRestConfiguration extends RouteBuilder {
 
 
@@ -62,7 +62,7 @@ public class CamelRestConfiguration extends RouteBuilder {
         return string;
     }
 
-    public Expression getDate() {
+    public String getDate() {
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
         String date = df.format(new java.util.Date());// new Date()为获取当前系统时间
         return date;