connection success

pom.xml

@@ -18,123 +18,112 @@
 
     <properties>
         <java.version>1.8</java.version>
-        <jdk.version>8</jdk.version>
-        <com-gct-common-core.version>2.0-SNAPSHOT</com-gct-common-core.version>
-        <com-gct-common-security.version>2.0-SNAPSHOT</com-gct-common-security.version>
-        <com-gct-common-util.version>2.0-SNAPSHOT</com-gct-common-util.version>
-        <commons-io.version>2.8.0</commons-io.version>
-        <org.apache.thrift.version>0.13.0</org.apache.thrift.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <spring-cloud.version>Hoxton.SR3</spring-cloud.version>
+        <spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
+        <mybatis-plus.version>3.3.1</mybatis-plus.version>
+        <mybatis-typehandlers.version>1.0.2</mybatis-typehandlers.version>
+        <mybatis-plus-generator.version>3.3.1.tmp</mybatis-plus-generator.version>
+        <velocity-engine.version>2.2</velocity-engine.version>
+        <swagger.version>1.9.1.RELEASE</swagger.version>
+        <!--        <lombok.version>1.18.16</lombok.version>-->
         <lombok.version>1.16.18</lombok.version>
+        <jwt.version>0.9.1</jwt.version>
+        <web.version>2.3.0.RELEASE</web.version>
+        <security.version>2.3.0.RELEASE</security.version>
+        <redis.version>2.3.0.RELEASE</redis.version>
+        <jedis.version>3.1.0</jedis.version>
+        <fastjson.version>1.2.58</fastjson.version>
         <lombok-maven-plugin.version>1.16.6.1</lombok-maven-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+
     </properties>
 
     <dependencies>
+
+        <!-- Spring Cloud Hoxton -->
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>3.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>3.5.0</version>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-dependencies</artifactId>
+            <version>${spring-cloud.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
         </dependency>
+        <!-- Spring Cloud Alibaba -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+            <version>${spring-cloud-alibaba.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
         </dependency>
+        <!--mybatis-plus-->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-quartz</artifactId>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatis-plus.version}</version>
         </dependency>
-        <!--common核心包依赖-->
+        <!--这个必须引用 因为使用mybatis-plus LocalDataTime问题-->
         <dependency>
-            <groupId>com.gct.common.core</groupId>
-            <artifactId>common-core</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-typehandlers-jsr310</artifactId>
+            <version>${mybatis-typehandlers.version}</version>
         </dependency>
+        <!--代码生成模式插件  3.0.3以后需要手动设置依赖-->
+
+        <!--代码生成模板-->
+        <!--PG driver-->
         <dependency>
-            <groupId>com.gct.common.util</groupId>
-            <artifactId>common-util</artifactId>
-            <version>3.0-SNAPSHOT</version>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.18</version>
         </dependency>
-        <!--common 安全包-->
+        <!--jdbc starter-->
         <dependency>
-            <groupId>com.gct.common.security</groupId>
-            <artifactId>common-security</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
         </dependency>
+        <!--open feign-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-
-
-        <!--nocas 注册中心依赖-->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!--web 依赖-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <!--lombok-->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <optional>true</optional>
+            <version>${lombok.version}</version>
         </dependency>
-        <!-- 与数据库操作相关依赖 -->
+        <!--quartz-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jdbc</artifactId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
         </dependency>
-        <!-- postgresql -->
-        <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
+        <!--swagger-->
         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>42.2.18</version>
+            <groupId>com.spring4all</groupId>
+            <artifactId>swagger-spring-boot-starter</artifactId>
+            <version>${swagger.version}</version>
         </dependency>
-
-        <!--文件上传相关-->
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
-        <!-- spring security -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>${fastjson.version}</version>
         </dependency>
-        <!--junit测试-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-test</artifactId>
+            <version>2.3.0.RELEASE</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.kstyrc</groupId>
-            <artifactId>embedded-redis</artifactId>
-            <version>0.6</version>
-            <scope>compile</scope>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
     </dependencies>
     <dependencyManagement>
         <dependencies>
@@ -198,8 +187,8 @@
                     设置为only complie 或者build一下就可以运行annotation processor了
                     平常走默认值即可-->
                     <!--                    <proc>only</proc>-->
-                    <source>${jdk.version}</source>
-                    <target>${jdk.version}</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                     <encoding>utf-8</encoding>
                 </configuration>
             </plugin>

src/main/Test/MyTest.java

@@ -1,8 +1,14 @@
+import com.alibaba.fastjson.JSONObject;
 import com.gct.tool.DataAnalyseToolApplication;
+import com.gct.tool.entity.sql.QueryBody;
+import com.gct.tool.service.LoadBaseDataService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
 /**
  * @author xusirui 2022/9/28
@@ -11,10 +17,25 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 public class MyTest {
 
+    @Autowired
+    LoadBaseDataService loadBaseDataService;
+
+//    @Autowired
+//    CbPcProWellboreVolDailyMapper cbPcProWellboreVolDailyMapper;
+
     @Test
     public void test() {
-//        aoidDailyYieldServicel.list(new QueryWrapper<AoidDailyYield>().eq("prod_date::date",LocalDate.parse("2022-09-27")));
-//        dataAnalyseService.produceLiqAnalyse();n
+        loadBaseDataService.loadCdWellSource();
+//        cbPcProWellboreVolDailyMapper.selectList(new QueryWrapper<>());
+    }
+
+    @Test
+    public void test2() {
+        MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
+        body.add("dataRanges","TL");
+    }
 
+    public static void main(String[] args) {
+        System.out.println(JSONObject.toJSONString(new QueryBody().body));
     }
 }

src/main/java/com/gct/tool/DataAnalyseToolApplication.java

@@ -1,15 +1,13 @@
 package com.gct.tool;
 
-import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
-@MapperScan("com.gct.tool.mapper*")//要扫描的dao包
-@EnableSwagger2Doc //启用swagger注解
-@EnableConfigurationProperties
+@EnableFeignClients
+@MapperScan("com.gct.tool.mapper*")
 public class DataAnalyseToolApplication {
 
     public static void main(String[] args) {
@@ -17,3 +15,4 @@ public class DataAnalyseToolApplication {
     }
 
 }
+

src/main/java/com/gct/tool/config/DataBankTokenInterceptor.java

@@ -0,0 +1,25 @@
+package com.gct.tool.config;
+
+import com.alibaba.fastjson.JSONObject;
+import com.gct.tool.feign.DataBankClient;
+import com.gct.tool.feign.DataBankTokenClient;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Controller;
+
+@Component
+public class DataBankTokenInterceptor implements RequestInterceptor {
+
+    @Autowired
+    DataBankTokenClient tokenClient;
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        if (requestTemplate.url().contains("token"))return;
+        String jso = tokenClient.getToken("client_credentials", "b7511da5-6116-46d5-ad4b-01d5952c0d81", "v3r6f8a7qsj1fc80li0kcept");
+        JSONObject body = JSONObject.parseObject(jso);
+        requestTemplate.header("Authorization","Bearer "+body.getString("access_token"));//请求头添加token
+    }
+}

src/main/java/com/gct/tool/config/FeignConfig.java

@@ -1,53 +0,0 @@
-package com.gct.tool.config;
-
-
-import feign.RequestInterceptor;
-import feign.RequestTemplate;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
-
-
-/**
- * feign 调用配置，统一添加token请求头
- * @author: NewMeanning
- * @create: 2021-01-29 00:10
- **/
-@Slf4j
-@Configuration
-public class FeignConfig implements RequestInterceptor, EnvironmentAware {
-
-    private static String token;
-
-    private static Environment env;
-
-    @Override
-    public void apply(RequestTemplate requestTemplate) {
-        requestTemplate.header("token",token);//请求头添加token
-    }
-
-    @Override
-    public void setEnvironment(Environment environment) {
-        //获取配置的认证中心主机地址  todo 升级为自动从Nacos中读取，目前这里读取不到
-        this.env = environment;
-        List<String> hostList = Arrays.asList(this.env.getProperty("auth.hostList").split(","));
-        //手动获取RestTemplate 实例
-        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
-        applicationContext.register(RestTemplate.class);
-        applicationContext.refresh();
-        RestTemplate restTemplate= (RestTemplate) applicationContext.getBean("restTemplate");
-        //自定义轮询方式负载
-        int index = ThreadLocalRandom.current().nextInt(hostList.size());
-        String url = "http://"+hostList.get(index)+"/token";
-        token = restTemplate.getForObject(url,String.class);
-//        log.info("token:{}",token);
-    }
-}

src/main/java/com/gct/tool/entity/centralbase/CbCdWellSource.java

@@ -1,125 +0,0 @@
-package com.gct.tool.entity.centralbase;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 单井基础信息
- * </p>
- *
- * @author wsy
- * @since 2021-01-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="CbCdWellSource对象", description="单井基础信息")
-@TableName("centralbase.cb_cd_well_source")
-public class CbCdWellSource extends Model<CbCdWellSource> {
-
-    private static final long serialVersionUID=1L;
-
-    @ApiModelProperty(value = "井id")
-    private String wellId;
-
-    @ApiModelProperty(value = "通用井名")
-    private String wellCommonName;
-
-    @ApiModelProperty(value = "标准井名")
-    private String wellLegalName;
-
-    @ApiModelProperty(value = "井型")
-    private String reason;
-
-    @ApiModelProperty(value = "井别")
-    private String wellPurpose;
-
-    @ApiModelProperty(value = "投产措施;投产措施;0：无措施正常投产，1：压力投产，2：酸化投产")
-    private Integer pStartProdStitum;
-
-    @ApiModelProperty(value = "目的层")
-    private String targetFormation;
-
-    @ApiModelProperty(value = "开钻日期;钻井日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-    private LocalDateTime spudDate;
-
-    @ApiModelProperty(value = "机构ID;井所属的组织机构ID")
-    private String orgId;
-
-    @ApiModelProperty(value = "构造单元ID;井所属的构造单元ID")
-    private String structId;
-
-    @ApiModelProperty(value = "油气单元ID;井所属的油气单元ID")
-    private String oilfieldId;
-
-    @ApiModelProperty(value = "物探工区ID;井所属的物探工区ID")
-    private String expAreaId;
-
-    @ApiModelProperty(value = "组合单元ID")
-    private String groupUnitId;
-
-    @ApiModelProperty(value = "站库ID")
-    private String stationId;
-
-    @ApiModelProperty(value = "纬度")
-    private Double geoLatitude;
-
-    @ApiModelProperty(value = "经度")
-    private Double geoLongitude;
-
-    @ApiModelProperty(value = "坐标参照")
-    private String geoOffsetReference;
-
-    @ApiModelProperty(value = "横坐标;向东偏离位置，对应大地坐标Y")
-    private Double geoOffsetEast;
-
-    @ApiModelProperty(value = "纵坐标;向北偏离位置，对应大地坐标X")
-    private Double geoOffsetNorth;
-
-    @ApiModelProperty(value = "备注")
-    private String remarks;
-
-    @ApiModelProperty(value = "是否是斜井，填写Y或N")
-    private String isDeviated;
-
-    @ApiModelProperty(value = "井身质量")
-    private String endStatus;
-
-    @ApiModelProperty(value = "生产层段名称")
-    private String completionName;
-
-    @ApiModelProperty(value = "生产区块名称")
-    @TableField("PRODUCING_AREA_name")
-    private String producingAreaName;
-
-    @ApiModelProperty(value = "生产层段顶部垂深")
-    private Double topTvd;
-
-    @ApiModelProperty(value = "生产层段底部垂深")
-    private Double bottomTvd;
-
-    @ApiModelProperty(value = "完井层位ID")
-    private String completionId;
-
-    @ApiModelProperty(value = "井站名称|站库名称")
-    private String stationName;
-
-
-    @Override
-    protected Serializable pkVal() {
-        return null;
-    }
-
-}

src/main/java/com/gct/tool/entity/centralbase/CbPcProWellboreStatusDaily.java

@@ -1,4 +1,4 @@
-package com.gct.centralbase.entity;
+package com.gct.tool.entity.centralbase;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/com/gct/tool/entity/centralbase/CbPcProWellboreVolDaily.java

@@ -1,4 +1,4 @@
-package com.gct.centralbase.entity;
+package com.gct.tool.entity.centralbase;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

src/main/java/com/gct/tool/entity/centralbase/CbTempWellMechRuntime.java

@@ -1,4 +1,4 @@
-package com.gct.centralbase.entity;
+package com.gct.tool.entity.centralbase;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;

src/main/java/com/gct/tool/entity/sql/QueryBody.java

@@ -0,0 +1,89 @@
+package com.gct.tool.entity.sql;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Data
+@AllArgsConstructor
+public class QueryBody {
+
+    public Map<String, Object> body;
+    private List<String> dataRegions;
+    private Filter filter;
+
+    public Map<String,Object> toJsonMap(){
+        return JSONObject.parseObject(JSON.toJSONString(this));
+    }
+
+    public QueryBody() {
+        dataRegions = new ArrayList<>();
+        filter = new Filter();
+
+    }
+
+    public QueryBody select(String... column) {
+        dataRegions.addAll(Arrays.stream(column).collect(Collectors.toList()));
+        return this;
+    }
+
+    private QueryBody parse(String column, String value, String symbol) {
+        SubFilter subFilter = new SubFilter();
+        subFilter.key = column;
+        subFilter.singleValue = value;
+        subFilter.logic = "AND";
+        subFilter.symbol = symbol;
+        filter.subFilter.add(subFilter);
+        return this;
+    }
+
+    public QueryBody eq(String column, String value) {
+        return parse(column, value, "=");
+    }
+
+    public QueryBody gt(String column, String value) {
+        return parse(column, value, ">");
+    }
+
+    public QueryBody ge(String column, String value) {
+        return parse(column, value, ">=");
+    }
+
+    public QueryBody lt(String column, String value) {
+        return parse(column, value, "<");
+    }
+
+    public QueryBody le(String column, String value) {
+        return parse(column, value, "<=");
+    }
+}
+
+@Data
+@AllArgsConstructor
+class Filter {
+    public Filter() {
+        key = "";
+        logic = "AND";
+        subFilter = new ArrayList<>();
+    }
+
+    String key;
+    String logic;
+    List<SubFilter> subFilter;
+
+}
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class SubFilter {
+    String key;
+    String logic;
+    String symbol;
+    String singleValue;
+}

src/main/java/com/gct/tool/feign/DataBankClient.java

@@ -0,0 +1,22 @@
+package com.gct.tool.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import com.gct.tool.config.DataBankTokenInterceptor;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@FeignClient(url = "tlmdatabank.tlm.pcep.cloud", name = "databank-client", path = "/api/dde/",configuration = DataBankTokenInterceptor.class)
+public interface DataBankClient {
+
+    @PostMapping(value = "masterdataservice/CD_WELL")
+    JSONObject getCdWellData(@RequestBody Map query, @RequestParam int page,@RequestParam int size,@RequestParam String identity);
+
+    /*
+    http://tlmdatabank.tlm.pcep.cloud/api/dde/
+     */
+    @PostMapping(value = "governdataservice/struct/OP_PRO_COMPLETION_VOL_DAILY/query")
+    JSONObject getVolDailyData(@RequestBody Map query, @RequestParam int page,@RequestParam int size,@RequestParam String identity);
+
+}

src/main/java/com/gct/tool/feign/DataBankTokenClient.java

@@ -0,0 +1,14 @@
+package com.gct.tool.feign;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@FeignClient(url = "tlmdatabank.tlm.pcep.cloud", name = "databank-token-client", path = "uaa/oauth/")
+public interface DataBankTokenClient {
+
+    @PostMapping(value = "token")
+    public String getToken(@RequestParam("grant_type") String grantType,@RequestParam("client_id") String clientId,@RequestParam("client_secret") String clientSecret);
+}

src/main/java/com/gct/tool/mapper/centralbase/CbPcProWellboreStatusDailyMapper.java

@@ -1,7 +1,7 @@
 package com.gct.tool.mapper.centralbase;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gct.centralbase.entity.CbPcProWellboreStatusDaily;
+import com.gct.tool.entity.centralbase.CbPcProWellboreStatusDaily;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/gct/tool/mapper/centralbase/CbPcProWellboreStatusDailyMapper.xml

@@ -1,48 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gct.centralbase.mapper.CbPcProWellboreStatusDailyMapper">
+<mapper namespace="com.gct.tool.mapper.centralbase.CbPcProWellboreStatusDailyMapper">
 
-    <cache flushInterval="6000000" size="5096"/>
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gct.centralbase.entity.CbPcProWellboreStatusDaily">
-        <result column="well_id" property="wellId"/>
-        <result column="prod_date" property="prodDate"/>
-        <result column="oil_prod_method" property="oilProdMethod"/>
-        <result column="oil_nozzle" property="oilNozzle"/>
-        <result column="back_pres" property="backPres"/>
-        <result column="up_current" property="upCurrent"/>
-        <result column="down_current" property="downCurrent"/>
-        <result column="elec_pump_current_a" property="elecPumpCurrentA"/>
-        <result column="elec_pump_current_b" property="elecPumpCurrentB"/>
-        <result column="elec_pump_current_c" property="elecPumpCurrentC"/>
-        <result column="elec_pump_voltage" property="elecPumpVoltage"/>
-        <result column="wh_temp" property="whTemp"/>
-        <result column="main_line_pres" property="mainLinePres"/>
-        <result column="avg_oil_pres" property="avgOilPres"/>
-        <result column="avg_casing_pres" property="avgCasingPres"/>
-        <result column="tubing_pres" property="tubingPres"/>
-        <result column="casing_pres" property="casingPres"/>
-        <result column="cable_setting_depth" property="cableSettingDepth"/>
-        <result column="pump_depth" property="pumpDepth"/>
-        <result column="casing_inner_diameter" property="casingInnerDiameter"/>
-        <result column="start_pump_liq_level" property="startPumpLiqLevel"/>
-        <result column="end_pump_liq_level" property="endPumpLiqLevel"/>
-        <result column="submergence_depth" property="submergenceDepth"/>
-    </resultMap>
-    <select id="getA2DataForCalProduction" resultMap="BaseResultMap">
-        select *
-        from centralbase.cb_pc_pro_wellbore_status_daily
-        where well_id = #{wellId}
-          and (prod_date::timestamp between  #{prodDate}::timestamp - INTERVAL '2 day' and #{prodDate}::timestamp)
-        order by prod_date desc limit 1
-    </select>
-    <select id="getWellBoreStatusDaily" parameterType="string"
-            resultType="com.gct.centralbase.entity.CbPcProWellboreStatusDaily">
-        select *
-        from centralbase.cb_pc_pro_wellbore_status_daily
-        where well_id = #{wellId}
-          and (prod_date::timestamp between  #{prodDate}::timestamp - INTERVAL '2 day' and #{prodDate}::timestamp)
-        order by prod_date desc limit 1
-    </select>
 </mapper>

src/main/java/com/gct/tool/mapper/centralbase/CbPcProWellboreVolDailyMapper.java

@@ -3,7 +3,7 @@ package com.gct.tool.mapper.centralbase;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gct.centralbase.entity.CbPcProWellboreVolDaily;
+import com.gct.tool.entity.centralbase.CbPcProWellboreVolDaily;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/gct/tool/mapper/centralbase/CbPcProWellboreVolDailyMapper.xml

@@ -1,74 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gct.centralbase.mapper.CbPcProWellboreVolDailyMapper">
+<mapper namespace="com.gct.tool.mapper.centralbase.CbPcProWellboreVolDailyMapper">
 
-    <cache flushInterval="6000000" size="5096"/>
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gct.centralbase.entity.CbPcProWellboreVolDaily">
-        <result column="well_id" property="wellId"/>
-        <result column="prod_date" property="prodDate"/>
-        <result column="prod_time" property="prodTime"/>
-        <result column="liq_prod_daily" property="liqProdDaily"/>
-        <result column="oil_prod_daily" property="oilProdDaily"/>
-        <result column="water_prod_daily" property="waterProdDaily"/>
-        <result column="gas_prod_daily" property="gasProdDaily"/>
-        <result column="water_cut" property="waterCut"/>
-        <result column="sand_content_ratio" property="sandContentRatio"/>
-        <result column="gas_oil_ratio" property="gasOilRatio"/>
-        <result column="gas_fluid_content" property="gasFluidContent"/>
-        <result column="gas_chloride_content" property="gasChlorideContent"/>
-        <result column="stim_key_id" property="stimKeyId"/>
-        <result column="water_gas_ratio" property="waterGasRatio"/>
-        <result column="remarks" property="remarks"/>
-        <result column="stim_content" property="stimContent"/>
-    </resultMap>
-    <resultMap id="map2" type="com.gct.centralbase.entity.CbPcProWellboreVolDaily">
-        <result column="well_id" property="wellId"/>
-        <result column="prod_date" property="prodDate"/>
-        <result column="prod_time" property="prodTime"/>
-        <result column="liq_prod_daily" property="liqProdDaily"/>
-        <result column="oil_prod_daily" property="oilProdDaily"/>
-        <result column="water_prod_daily" property="waterProdDaily"/>
-        <result column="gas_prod_daily" property="gasProdDaily"/>
-        <result column="water_cut" property="waterCut"/>
-        <result column="sand_content_ratio" property="sandContentRatio"/>
-        <result column="gas_oil_ratio" property="gasOilRatio"/>
-        <result column="gas_fluid_content" property="gasFluidContent"/>
-        <result column="gas_chloride_content" property="gasChlorideContent"/>
-        <result column="stim_key_id" property="stimKeyId"/>
-        <result column="water_gas_ratio" property="waterGasRatio"/>
-        <result column="remarks" property="remarks"/>
-        <result column="stim_content" property="stimContent"/>
-        <result column="org_id" property="orgId"/>
-    </resultMap>
-    <select id="getWellBoreVolDaily" parameterType="string"
-            resultType="com.gct.centralbase.entity.CbPcProWellboreVolDaily">
-        select *
-        from centralbase.cb_pc_pro_wellbore_vol_daily
-        where well_id = #{wellId}
-          and (prod_date::timestamp between  #{prodDate}::timestamp - INTERVAL '2 day' and #{prodDate}::timestamp)
-        order by prod_date desc limit 1
-    </select>
-    <select id="getA2DataForCalVolDaily" parameterType="string" resultMap="BaseResultMap">
-
-        select *
-        from centralbase.cb_pc_pro_wellbore_vol_daily
-        where well_id = #{wellName}
-          and (prod_date::timestamp between  #{dataTime}::timestamp - INTERVAL '2 day' and #{dataTime}::timestamp)
-        order by prod_date desc limit 1
-    </select>
-
-    <!--<select id="getCbPcProWellBoreVolDaily" resultMap="BaseResultMap">
-        select centralbase.cb_pc_pro_wellbore_vol_daily.*, centralbase.cb_cd_well_source.org_id as org_id
-        from centralbase.cb_pc_pro_wellbore_vol_daily,
-             centralbase.cb_cd_well_source
-        where prod_date::date = #{prodDate}:: timestamp :: date
-          and cb_pc_pro_wellbore_vol_daily.well_id = cb_cd_well_source.well_id
-            limit #{pageSize} offset (#{curPage}-1)*#{pageSize}
-    </select>-->
-
-    <select id="getCbPcProWellBoreVolDaily" resultType="java.util.Map">
-        ${sql}
-    </select>
 </mapper>

src/main/java/com/gct/tool/quartztask/LoadBaseDataTask.java

@@ -1,45 +1,23 @@
 package com.gct.tool.quartztask;
 
+import com.gct.tool.service.LoadBaseDataService;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.quartz.QuartzJobBean;
 import org.springframework.web.client.RestTemplate;
 
 /**
  * @author xusirui 2023/7/9
  */
-public class LoadBaseDataTask extends QuartzJobBean {\
+public class LoadBaseDataTask extends QuartzJobBean {
 
-    RestTemplate restTemplate;
-
-    public LoadBaseDataTask(){
-        AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext();
-        applicationContext.register(RestTemplate.class);
-        applicationContext.refresh();
-        restTemplate= (RestTemplate) applicationContext.getBean("restTemplate");
-    }
-
-    public String getToken(){
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        HttpEntity request1 = new HttpEntity<>(request, headers);
-        log.info("请求报文：{}",request);
-
-        ResponseEntity<String> jsonObjectResponseEntity = restTemplate.postForEntity(url, request1, String.class);
-        String resp = jsonObjectResponseEntity.getBody();
-        log.info("响应报文：{}",resp);
-
-    }
+    @Autowired
+    LoadBaseDataService loadBaseDataService;
 
 
     @Override
     protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
 
-
     }
 }

src/main/java/com/gct/tool/service/BaseResourceService.java

@@ -0,0 +1,66 @@
+package com.gct.tool.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ResourceUtils;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class BaseResourceService {
+
+    private List<String> wellIds;
+
+    private Map<String,String> urlMap;
+
+    public List<String> getWellIds() {
+        return wellIds;
+    }
+
+    public Map<String,String> getUrlMap(){
+        return urlMap;
+    };
+
+    private void readWellId(){
+        try {
+            FileInputStream fs = new FileInputStream( ResourceUtils.getFile("classpath:well.txt"));
+            BufferedReader br = new BufferedReader(new InputStreamReader(fs));
+            String wellIdString = br.readLine();
+            wellIds = Arrays.stream(wellIdString.split(",")).collect(Collectors.toList());
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("读取井号文件失败，程序退出");
+            System.exit(0);
+        }
+    }
+
+    private void readUrl(){
+        try {
+            urlMap = new HashMap<>();
+            FileInputStream fs = new FileInputStream( ResourceUtils.getFile("classpath:url.txt"));
+            BufferedReader br = new BufferedReader(new InputStreamReader(fs));
+            String urlStr;
+            while ((urlStr= br.readLine())!=null){
+                String[] split = urlStr.split(",");
+                urlMap.put(split[0],split[1]);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("读取URL文件失败，程序退出");
+            System.exit(0);
+        }
+    }
+
+    public BaseResourceService(){
+        readWellId();
+        readUrl();
+    }
+}

src/main/java/com/gct/tool/service/LoadBaseDataService.java

@@ -0,0 +1,66 @@
+package com.gct.tool.service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.gct.tool.entity.sql.QueryBody;
+import com.gct.tool.feign.DataBankClient;
+import com.gct.tool.feign.DataBankTokenClient;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.SQLOutput;
+import java.util.*;
+
+@Service
+@Slf4j
+public class LoadBaseDataService {
+
+    final String identity = "CDF03A45C9BF4D9B85155364FAAEE08C14D85F6D51774A59GMXF6MBQG4ZDOKZXL4YF6KZSGEZGEKZWMBQTMKZVL43WCYJVG4XWCMLDGUXT22DKO43TAZ3CMYXXEL3AMFWWWN3ROFXGEZZSONYDAMBTGEYTKLRVGEZTONZXFYXTAMBSF4YDAMQ";
+
+    @Autowired
+    BaseResourceService baseResourceService;
+
+    @Autowired
+    DataBankClient dataBankClient;
+    @Autowired
+    DataBankTokenClient tokenClient;
+
+    private void printMap(Object o,boolean isPrintNull,Set<String>filterSet){
+        ((Map)o).forEach((k,v)->{
+            if ((isPrintNull || Objects.nonNull(v))&&(Objects.isNull(filterSet)|| filterSet.contains(k)))
+                System.out.printf("%s:%s\n",k,v);
+        });
+    }
+    /**
+     * @return
+     */
+    public void loadCdWellSource() {
+        List<String> wellIds = baseResourceService.getWellIds();
+//        wellIds = wellIds.subList(0, 1);
+        Set<String> filterSet = new HashSet<>();
+        filterSet.addAll(Arrays.asList("WELL_ID", "WELL_COMMON_NAME", "WELL_LEGAL_NAME"));
+        wellIds.forEach(wellId -> {
+            QueryBody queryBody = new QueryBody();
+            queryBody.select("TL").eq("WELL_LEGAL_NAME", wellId);
+            JSONObject object = dataBankClient.getCdWellData(queryBody.toJsonMap(), 0, 10, identity);
+            System.out.println(object);
+            JSONArray array = object.getJSONObject("resultData").getJSONArray("content");
+//            ((Map) array.get(0)).forEach((k,v)-> System.out.printf(k+","));
+            System.out.println("");
+            array.forEach(o -> {
+                printMap(o,false,null);
+//                System.out.printf("%s,%s\n",((Map) o).get("WELL_LEGAL_NAME"),((Map) o).get("WELL_ID"));
+            });
+        });
+    }
+
+    public void loadVolDailyData(){
+
+    }
+
+    public void loadStatusDailyData(){
+
+    }
+
+}

src/main/java/com/gct/tool/service/centralbase/CbCdWellSourceService.java

@@ -1,20 +0,0 @@
-package com.gct.tool.service.centralbase;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gct.tool.entity.centralbase.CbCdWellSource;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 单井基础信息 服务类
- * </p>
- *
- * @author wsy
- * @since 2021-01-19
- */
-public interface CbCdWellSourceService extends IService<CbCdWellSource> {
-
-    public Map<String, List<String>> divideWellByWorkArea();
-}

src/main/java/com/gct/tool/service/centralbase/CbCdWellSourceServiceImpl.java

@@ -1,33 +0,0 @@
-package com.gct.tool.service.centralbase;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gct.tool.entity.centralbase.CbCdWellSource;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 单井基础信息 服务实现类
- * </p>
- *
- * @author wsy
- * @since 2021-01-19
- */
-@Service
-public class CbCdWellSourceServiceImpl extends ServiceImpl<CbCdWellSourceMapper, CbCdWellSource> implements CbCdWellSourceService {
-
-    @Override
-    public Map<String, List<String>> divideWellByWorkArea() {
-        Map<String,List<String>> map = new HashMap<>();
-        this.list().forEach(cbCdWellSource -> {
-            String workArea = cbCdWellSource.getStationId().split("@")[0];
-            map.putIfAbsent(workArea,new ArrayList<>());
-            map.get(workArea).add(cbCdWellSource.getWellId());
-        });
-        return map;
-    }
-}

src/main/resources/application-pro.yml

@@ -6,7 +6,6 @@ server:
 logging:
   level:
     root: info
-
 management:
   endpoints:
     web:
@@ -14,6 +13,8 @@ management:
         include: '*'
 
 spring:
+  #  autoconfigure:
+  #    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   cloud:
     ## 指定nacos server地址
     nacos:
@@ -21,22 +22,19 @@ spring:
         server-addr: 10.79.32.183
 
   datasource:
-    dynamic:
-      primary: aoid
-      strict: true
-      datasource:
-#        a2:
-#          type: com.zaxxer.hikari.HikariDataSource
-#          url: jdbc:postgresql://10.79.32.183:54321/calliquid
-#          username: root
-#          password: 123456
-#          driver-class-name: oracle.jdbc.driver.OracleDriver
-        centralbase:
-          type: com.zaxxer.hikari.HikariDataSource
-          url: jdbc:postgresql://10.79.32.183:54321/database
-          username: root
-          password: 123456
-          driver-class-name: org.postgresql.Driver
+    #        a2:
+    #          type: com.zaxxer.hikari.HikariDataSource
+    #          url: jdbc:postgresql://10.79.32.183:54321/calliquid
+    #          username: root
+    #          password: 123456
+    #          driver-class-name: oracle.jdbc.driver.OracleDriver
+
+    type: com.zaxxer.hikari.HikariDataSource
+    url: jdbc:postgresql://10.79.32.183:54321/database
+    username: root
+    password: 123456
+    driver-class-name: org.postgresql.Driver
+
 
   application:
     name: data-analyse-tool

src/main/resources/url.txt

@@ -0,0 +1,2 @@
+cd_well,http://tlmdatabank.tlm.pcep.cloud/api/dde/masterdataservice/CD_WELL
+vol_daily,http://tlmdatabank.tlm.pcep.cloud/api/dde/governdataservice/struct/OP_PRO_COMPLETION_VOL_DAILY/query

src/main/resources/well.txt

@@ -0,0 +1 @@
+HD4-25T,HD1-27-2H,HD4-9-1H,HD10-1-5H,HD115H,HD4-51H,HD10-3-H1,HD4-52H,HD1-14H,HD10-1-1H,HD111H,HD405H,HD1-17H,HD4-9-3,HD1-12H,HD171C,HD1-23-1H,HD11-5-4H,LN4,DH1-H17,DH1-H8