init

pom.xml

@@ -66,6 +66,12 @@
             <artifactId>common-security</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>19.3.0.0</version>
+        </dependency>
+
 
         <!--nocas 注册中心依赖-->
         <dependency>

src/main/Test/MyTest.java

@@ -1,18 +1,9 @@
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gct.tool.DataAnalyseToolApplication;
-import com.gct.tool.entity.aoid.AoidDailyYield;
-import com.gct.tool.service.aoid.AoidDailyYieldService;
-import com.gct.tool.service.impl.DataAnalyseService;
-import org.checkerframework.checker.units.qual.A;
 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.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.time.LocalDate;
-
 /**
  * @author xusirui 2022/9/28
  */
@@ -20,16 +11,10 @@ import java.time.LocalDate;
 @RunWith(SpringRunner.class)
 public class MyTest {
 
-    @Autowired
-    DataAnalyseService dataAnalyseService;
-
-    @Autowired
-    AoidDailyYieldService aoidDailyYieldServicel;
-
     @Test
     public void test() {
 //        aoidDailyYieldServicel.list(new QueryWrapper<AoidDailyYield>().eq("prod_date::date",LocalDate.parse("2022-09-27")));
-//        dataAnalyseService.produceLiqAnalyse();
+//        dataAnalyseService.produceLiqAnalyse();n
 
     }
 }

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

@@ -1,9 +1,7 @@
 package com.gct.tool;
 
-import com.gct.tool.service.impl.DataAnalyseService;
 import com.spring4all.swagger.EnableSwagger2Doc;
 import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

src/main/java/com/gct/tool/entity/aoid/AoidDailyYield.java

@@ -1,273 +0,0 @@
-package com.gct.tool.entity.aoid;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.stereotype.Component;
-
-import java.io.IOException;
-import java.time.LocalDateTime;
-
-/**
- * @Author: Jyx
- * @Since: 2021/1/28 17:52
- */
-@Data
-@ApiModel(value = "AoidDailyYield对象", description = "量液日产量存储数据")
-@TableName("aoid.aoid_daily_yield")
-public class AoidDailyYield {
-
-    @Component
-    public static class DoubleSerialize extends JsonSerializer {
-        @Override
-        public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException {
-            if (o != null && o instanceof Double) {
-                jsonGenerator.writeNumber(Math.round((Double) o * 100) / 100.0);
-            }
-        }
-    }
-
-    @ApiModelProperty(value = "井号")
-    private String wellCommonName;
-
-    @ApiModelProperty(value = "井Id")
-    private String wellId;
-
-   
-    @ApiModelProperty(value = "日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDateTime prodDate;
-
-    @ApiModelProperty(value = "日期")
-    @TableField(exist = false)
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private LocalDateTime prodDateYesterday;
-
-    //@JsonSerialize(using = DoubleSerialize.class)
-   
-    @ApiModelProperty(value = "日产液量 t(实际产量)")
-    private Double liqProdDaily;
-
-    //@JsonSerialize(using = DoubleSerialize.class)
-   
-    @ApiModelProperty(value = "日产油量 t")
-    private Double oilProdDaily;
-
-    //@JsonSerialize(using = DoubleSerialize.class)
-   
-    @ApiModelProperty(value = "日产水量 t")
-    private Double waterProdDaily;
-
-//    @JsonSerialize(using = DoubleSerialize.class)
-   
-    @ApiModelProperty(value = "日产气量 m^3")
-    private Double gasProdDaily;
-
-//    @JsonSerialize(using = DoubleSerialize.class)
-   
-    @ApiModelProperty(value = "泵效")
-    private Double bx;
-
-   
-    @ApiModelProperty(value = "理论排量")
-    private Double llpl;
-
-   
-    @ApiModelProperty(value = "生产时间")
-    private Integer prodTime;
-
-
-    @ApiModelProperty(value = "产量系数")
-    private Double clxs;
-
-   
-    @JsonSerialize(using = DoubleSerialize.class)
-    @ApiModelProperty(value = "冲程")
-    private Double stroke;
-
-   
-    @JsonSerialize(using = DoubleSerialize.class)
-    @ApiModelProperty(value = "冲次")
-    private Double frequence;
-
-   
-    @ApiModelProperty(value = "含水率 %")
-    private Double waterCut;
-
-   
-    @ApiModelProperty(value = "泵径")
-    private Double bj;
-
-   
-    @ApiModelProperty(value = "泵深")
-    private Double bs;
-
-   
-    @ApiModelProperty(value = "沉没度")
-    private Double cmd;
-
-
-    @ApiModelProperty(value = "油嘴直径")
-    private Double yz;
-
-    @ApiModelProperty(value = "生产时间")
-    private Double scsj;
-
-    @ApiModelProperty(value = "油压")
-    private Double yy;
-
-    @ApiModelProperty(value = "回压")
-    private Double hy;
-
-    @ApiModelProperty(value = "套压")
-    private Double ty;
-
-    @ApiModelProperty(value = "备注")
-    private String bz;
-
-    @ApiModelProperty(value = "是否异常")
-    private Double sfyc;
-
-    @ApiModelProperty(value = "动液面")
-    private Double dym;
-
-    @ApiModelProperty(value = "日志动液面")
-    private Double a2Dym;
-
-    @ApiModelProperty(value = "24小时产液量")
-    private Double rcy2;
-
-    private Double rcu2;
-
-    private Double rcs2;
-
-    @ApiModelProperty(value = "日志产液量")
-    private Double a2LiqProdDaily;
-
-    @ApiModelProperty(value = "日志产油量")
-    private Double a2OilProdDaily;
-
-    @ApiModelProperty(value = "日志产水量")
-    private Double a2WaterProdDaily;
-
-    @ApiModelProperty(value = "计量产液量")
-    private Double testLiquVolDaily;
-
-    private Double a2GasProdDaily;
-
-    private Integer a2ProdTime;
-
-    @ApiModelProperty(value = "日志含水率 %")
-    private Double a2WaterCut;
-
-    @ApiModelProperty(value = "有效功图数")
-    private Integer yxgts;
-
-    @ApiModelProperty(value = "错误功图数")
-    private Integer errorgts;
-
-    private String zdjg;
-
-    @ApiModelProperty(value = "最小电压")
-    private Double djdy;
-
-    @ApiModelProperty(value = "作业区")
-    private String zyq;
-
-    @ApiModelProperty(value = "计量站")
-    private String jlz;
-
-    @ApiModelProperty(value = "平均环境温度")
-    private Double hjwd;
-
-    @ApiModelProperty(value = "仪表电流")
-    private Double ybdl;
-
-    @ApiModelProperty(value = "设备号")
-    private String sbh;
-
-    @ApiModelProperty(value = "信号强度")
-    private Double xhqd;
-
-    @ApiModelProperty(value = "压力仪表的今日压力平均值")
-    private Double yl;
-
-    @ApiModelProperty(value = "日志备注")
-    private String rzbz;
-
-    @ApiModelProperty(value = "水密度")
-    private Double smd;
-
-    @ApiModelProperty(value = "油密度")
-    private Double ymd;
-
-    @ApiModelProperty(value = "汽油比")
-    private Double qyb;
-
-    @ApiModelProperty(value = "无参数配置井")
-    private String notConfigure;
-
-
-    @ApiModelProperty(value = "汇总说明")
-    private String summaryDescription;
-
-
-
-    @TableField(exist = false)
-    private String jq;
-
-    @TableField(exist = false)
-    private String zd;
-
-    @TableField(exist = false)
-    private Double wc;
-
-    @TableField(exist = false)
-    private Double LiqProdDailyYesterday;
-
-    @TableField(exist = false)
-    private String LiqProdDailyQs;
-
-    @TableField(exist = false)
-    private Double A2LiqProdDailyYesterday;
-
-    @TableField(exist = false)
-    private String A2LiqProdDailyQs;
-
-    @TableField(exist = false)
-    private Double wcYesterday;
-
-    @TableField(exist = false)
-    private Double yyYesterday;
-
-    @TableField(exist = false)
-    private String YyQs;
-
-    @TableField(exist = false)
-    private Double tyYesterday;
-
-    @TableField(exist = false)
-    private String TyQs;
-
-    @TableField(exist = false)
-    private String rzbzYesterday;
-
-    @TableField(exist = false)
-    private String wcQs;
-
-    @TableField(exist = false)
-    private String Yesterday;
-
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-    private LocalDateTime createTime;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-    private LocalDateTime updateTime;
-}

src/main/java/com/gct/tool/entity/aoid/AoidSinglegtYield.java

@@ -1,205 +0,0 @@
-package com.gct.tool.entity.aoid;
-
-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;
-import java.util.List;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 王森玉
- * @since 2021-01-31
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "AoidSinglegtYield对象", description = "")
-@TableName(schema = "aoid", value = "aoid_singlegt_yield")
-public class AoidSinglegtYield extends Model<AoidSinglegtYield> {
-
-    private static final long serialVersionUID = 1L;
-
-    private String wellId;
-
-    private String wellCommonName;
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime prodDate;
-
-    private Double stroke;
-
-    private Double frequence;
-
-    private Double bj;
-
-    private Double bs;
-
-    private Double cmd;
-
-    private Double yzzj;
-
-    private Double sxzh;
-
-    private Double xxzh;
-
-    private String sgt;
-
-    private String bgt;
-
-    private String zdjg;
-
-    private Double a2LiqProdDaily;
-    private Double a2OilProdDaily;
-    private Double a2WaterProdDaily;
-
-    private Integer sgtIsLegal;
-    private Integer calIsNormal;
-    private Double liqProdDaily;
-    private Double a2GasProdDaily;
-    private Double a2WaterCut;
-    private String a2Remark;
-    private Integer a2ProdTime;
-
-    private Double oilProdDaily;
-
-    private Double gasProdDaily;
-
-    private Double testLiquVolDaily;
-
-    private String eczdjg;
-
-    private Double bx;
-
-    private Double hsl;
-
-    private Double flag;
-
-    private Double bdxs;
-
-    private Double llpl;
-
-    private Double zcc;
-
-    private Double ycc;
-
-    private Double sjcc;
-
-    private Double yxcc;
-
-    private Double ccss;
-
-    private Double lsss;
-
-    private Double gyss;
-
-    private Double pumpdepth;
-
-    private Double hy;
-
-    private Double yy;
-
-    private Double ty;
-
-    private Double waterProdDaily;
-
-    private Double scsj;
-
-    private Double qyb;
-
-    private Double strokeRatio;
-
-    private Double djdy;
-
-    private Double hjwd;
-
-    private Double ybdl;
-
-    private Double xhqd;
-
-    private String sbh;
-    private Double smd;
-    private Double ymd;
-
-    private Double dym;
-
-    private Double a2Dym;
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-    private LocalDateTime createTime;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "remark")
-    private String remark;
-
-    @TableField(exist = false)
-    private String zdjgfx;
-
-
-    @ApiModelProperty(value = "'实时载荷差'")
-    private Double loadDifference;
-
-    @ApiModelProperty(value = "实时面积")
-    private String area;
-
-    @ApiModelProperty(value = "比对日期")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime comparisonProdDate;
-
-    @ApiModelProperty(value = "比对系数")
-    private Double comparisonCoefficient;
-
-    @ApiModelProperty(value = "比对产量")
-    private Double comparisonYield;
-
-    @ApiModelProperty(value = "比对有效冲程")
-    private String comparisonYxcc;
-
-
-    @ApiModelProperty(value = "比对载荷差")
-    private String comparisonLoadDifference;
-
-    @ApiModelProperty(value = "比对面积")
-    private String comparisonArea;
-
-    @ApiModelProperty(value = "有效冲程差率")
-    private String yxccRate;
-
-    @ApiModelProperty(value = "载荷差率")
-    private String loadDifferenceRate;
-
-    @ApiModelProperty(value = "面积差率")
-    private String areaRate;
-
-    private String measureFlag;
-
-    @ApiModelProperty(value = "是否停井")
-    private String isStopWell;
-
-
-    @ApiModelProperty(value = "参数说明")
-    private String parmExplain;
-
-    @ApiModelProperty(value = "参数标识")
-    private String parmFlag;
-
-    @TableField(exist = false)
-    private List<List<Double>> sgtUp;
-    @Override
-    protected Serializable pkVal() {
-        return this.wellId;
-    }
-
-}

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

@@ -0,0 +1,105 @@
+package com.gct.centralbase.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.lang.reflect.Field;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 采出井井筒状态日数据
+ * </p>
+ *
+ * @author wsy
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="CbPcProWellboreStatusDaily对象", description="采出井井筒状态日数据")
+@TableName("centralbase.cb_pc_pro_wellbore_status_daily")
+public class CbPcProWellboreStatusDaily extends Model<CbPcProWellboreStatusDaily> {
+
+    private static final long serialVersionUID=1L;
+
+    private String wellId;
+
+    @ApiModelProperty(value = "日期")
+    private LocalDateTime prodDate;
+
+    @ApiModelProperty(value = "采出方式")
+    private String oilProdMethod;
+
+    @ApiModelProperty(value = "油嘴 mm")
+    private Double oilNozzle;
+
+    @ApiModelProperty(value = "回压  Mpa")
+    private Double backPres;
+
+    @ApiModelProperty(value = "上行电流")
+    private Double upCurrent;
+
+    @ApiModelProperty(value = "下行电流  A")
+    private Double downCurrent;
+
+    @ApiModelProperty(value = "电泵的三相电流之一 A")
+    private Double elecPumpCurrentA;
+
+    @ApiModelProperty(value = "电泵的三相电流之一")
+    private Double elecPumpCurrentB;
+
+    @ApiModelProperty(value = "电泵的三相电流之一")
+    private Double elecPumpCurrentC;
+
+    @ApiModelProperty(value = "电泵的电压  V")
+    private Double elecPumpVoltage;
+
+    @ApiModelProperty(value = "热采：油气通过油嘴降压后的井口温度 ℃")
+    private Double whTemp;
+
+    @ApiModelProperty(value = "计量站输气干线压力 MPa")
+    private Double mainLinePres;
+
+    @ApiModelProperty(value = " 平均油压 MPa")
+    private Double avgOilPres;
+
+    @ApiModelProperty(value = "平均套压")
+    private Double avgCasingPres;
+
+    @ApiModelProperty(value = "油压")
+    private Double tubingPres;
+
+    @ApiModelProperty(value = "套压")
+    private Double casingPres;
+
+    @ApiModelProperty(value = "抽油杆下深 m")
+    private Double cableSettingDepth;
+
+    @ApiModelProperty(value = "泵深 m")
+    private Double pumpDepth;
+
+    @ApiModelProperty(value = "套管内径 mm")
+    private Double casingInnerDiameter;
+
+    @ApiModelProperty(value = "动液面深度  m")
+    private Double startPumpLiqLevel;
+
+    @ApiModelProperty(value = "抽油井停抽时的液面深度 m")
+    private Double endPumpLiqLevel;
+
+    @ApiModelProperty(value = "沉没度 m")
+    private Double  submergenceDepth;
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+}

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

@@ -0,0 +1,95 @@
+package com.gct.centralbase.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.lang.reflect.Field;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+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;
+
+/**
+ * <p>
+ * 采出井井筒生产日数据
+ * </p>
+ *
+ * @author wsy
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="CbPcProWellboreVolDaily对象", description="采出井井筒生产日数据")
+@TableName("centralbase.cb_pc_pro_wellbore_vol_daily")
+public class CbPcProWellboreVolDaily extends Model<CbPcProWellboreVolDaily> {
+
+    private static final long serialVersionUID=1L;
+
+    private String wellId;
+
+    @ApiModelProperty(value = "日期")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private LocalDateTime prodDate;
+
+    @ApiModelProperty(value = "采出井开井生产小时数 h")
+    private Double prodTime;
+
+    @ApiModelProperty(value = "日产液量 t")
+    private Double liqProdDaily;
+
+    @ApiModelProperty(value = "日产油量 t")
+    private Double oilProdDaily;
+
+    @ApiModelProperty(value = "日产水量 t")
+    private Double waterProdDaily;
+
+    @ApiModelProperty(value = "日产气量 m^3")
+    private Double gasProdDaily;
+
+    @ApiModelProperty(value = "含水率 %")
+    private Double waterCut;
+
+    @ApiModelProperty(value = "含砂率 %")
+    private Double sandContentRatio;
+
+    @ApiModelProperty(value = "气油比 m^3/t")
+    private Double gasOilRatio;
+
+    @ApiModelProperty(value = "气体含硫物量  mg/m^3")
+    private Double gasFluidContent;
+
+    @ApiModelProperty(value = "气体含氯根量mg/L")
+    private Double gasChlorideContent;
+
+    @ApiModelProperty(value = "措施类别")
+    private String stimKeyId;
+
+    @ApiModelProperty(value = "水气比 t/10^4m^3")
+    private Double waterGasRatio;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "六小措施")
+    private String stimContent;
+
+    @ApiModelProperty(value = "水密度")
+    private Double surfaceCrudeWaterDensity;
+
+    @ApiModelProperty(value = "油密度")
+    private Double surfaceCrudeOilDensity;
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+
+}

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

@@ -0,0 +1,122 @@
+package com.gct.centralbase.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+
+import java.lang.reflect.Field;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+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;
+
+/**
+ * <p>
+ * 机采数据 runtime
+ * </p>
+ *
+ * @author wsy
+ * @since 2021-01-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="CbTempWellMechRuntime对象", description="机采数据 runtime")
+@TableName("centralbase.cb_temp_well_mech_runtime")
+//@ShardingJDBCAnnotation()
+public class CbTempWellMechRuntime extends Model<CbTempWellMechRuntime> {
+
+    private static final long serialVersionUID=1L;
+
+    private String wellId;
+
+    @ApiModelProperty(value = "采集日期")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
+    private LocalDateTime prodDate;
+
+
+    @ApiModelProperty(value = "理论排量")
+    private Double theoDischarge;
+
+    @ApiModelProperty(value = "示功图解释代码 区别定义厂家，型号，解码方式等")
+    private String indiDiagramInterpCode;
+
+    @ApiModelProperty(value = "动液面 m")
+    private Double dynamicLiqLevel;
+
+    @ApiModelProperty(value = "静液面 m")
+    private Double staticLiqLev;
+
+    @ApiModelProperty(value = "静压 Mpa")
+    private Double staticPressure;
+
+    @ApiModelProperty(value = "流压 MPa")
+    private Double flowPres;
+
+    @ApiModelProperty(value = "泵径;抽油泵的活塞直径 mm")
+    private Double pumpDiameter;
+
+    @ApiModelProperty(value = "泵深;抽油泵下入深度 m")
+    private Double pumpDepth;
+
+    @ApiModelProperty(value = "泵效;抽油泵的抽油效率 %")
+    private Double pumpEfficiency;
+
+    @ApiModelProperty(value = "转速;螺杆泵的转子每分钟旋转的圈数 rpm")
+    private Double rotateFrequency;
+
+    @ApiModelProperty(value = "冲程;抽油机的冲程 m")
+    private Double strokeLength;
+
+    @ApiModelProperty(value = "冲次;抽油机的冲次 次/min")
+    private Double strokeFrequency;
+
+    @ApiModelProperty(value = "悬点最大载荷;抽油机井悬点承受的最大载荷包括液体重量、杆柱重量等 KN")
+    private Double suspMaxLoad;
+
+    @ApiModelProperty(value = "悬点最小载荷;抽油机井悬点承受的最小载荷，出现在下冲程")
+    private Double suspMinLoad;
+
+    @ApiModelProperty(value = "螺杆泵铭牌排量;螺杆泵每转的理论排量")
+    private Double pumpTagDischarge;
+
+    @ApiModelProperty(value = "代表流压梯度 MPa/m")
+    private Double repPressureGradientFlow;
+
+    @ApiModelProperty(value = "泵型")
+    private String pumpType;
+
+    @ApiModelProperty(value = "电机功率 kw")
+    private Double electromotorPower;
+
+    @ApiModelProperty(value = "电流频率")
+    private Double elecFrequency;
+
+    private LocalDateTime diagramInterpCodeTime;
+
+    @ApiModelProperty(value = "示功图内容")
+    private String sgt;
+
+    @ApiModelProperty(value = "电流 A   A")
+    private Double elecPumpCurrentA;
+
+    private Double elecPumpCurrentB;
+
+    private Double elecPumpCurrentC;
+
+    @ApiModelProperty(value = "电功图")
+    private String dgt;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return null;
+    }
+
+
+
+}

src/main/java/com/gct/tool/entity/excel/LiqAnalyseData.java

@@ -1,68 +0,0 @@
-package com.gct.tool.entity.excel;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.gct.tool.entity.aoid.AoidDailyYield;
-import com.gct.tool.entity.aoid.AoidSinglegtYield;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author xusirui 2022/9/28
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class LiqAnalyseData {
-
-    @ExcelProperty("井号")
-    public String wellId;
-
-    @ExcelProperty("生产日期")
-    public String prodDate;
-
-    @ExcelProperty("日产液")
-    public Double liqProd;
-
-    @ExcelProperty("a2日产液")
-    public Double liqProd2;
-
-    @ExcelProperty("理论日产液")
-    public Double theoryLiqProd;
-
-    @ExcelProperty("误差率")
-    public Double errorRate;
-
-    @ExcelProperty("最大载荷")
-    public Double maxLoadDiff;
-
-    @ExcelProperty("最大理论载荷")
-    public Double maxTheoryLoadDiff;
-
-    @ExcelProperty("最小理论载荷")
-    public Double minTheoryLoadDiff;
-
-    @ExcelProperty("泵深")
-    public Double pumpDepth;
-
-    @ExcelProperty("沉没度")
-    public Double submergenceDegree;
-
-    @ExcelProperty("载荷方差(归一化10处理后计算)")
-    public Double loadDifferenceVariance;
-
-    @ExcelProperty("有效冲程方差(归一化10处理后计算)")
-    public Double effectStrokeVariance;
-
-    @ExcelProperty("分析结果")
-    public String analyseResult;
-
-    @ExcelIgnore
-    AoidDailyYield aoidDailyYield;
-
-    @ExcelIgnore
-    List<AoidSinglegtYield> aoidSinglegtYieldList;
-}

src/main/java/com/gct/tool/entity/excel/SingleGtData.java

@@ -1,38 +0,0 @@
-package com.gct.tool.entity.excel;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-
-/**
- * @author xusirui 2022/11/3
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class SingleGtData {
-
-    @ExcelProperty("井号")
-    public String wellId;
-
-    @ExcelProperty("生产日期")
-    public String prodDate;
-
-    @ExcelProperty("最大载荷")
-    public Double maxLoad;
-
-    @ExcelProperty("最小载荷")
-    public Double minLoad;
-
-    @ExcelProperty("功图")
-    public String workDiagram;
-
-    @ExcelProperty("功图面积")
-    public Double workDiagramArea;
-
-    @ExcelProperty("分析结果")
-    public String analyseResult;
-}

src/main/java/com/gct/tool/mapper/aoid/AoidDailyYieldMapper.java

@@ -1,24 +0,0 @@
-package com.gct.tool.mapper.aoid;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gct.tool.entity.aoid.AoidDailyYield;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @Author: Jyx
- * @Since: 2021/1/28 22:23
- */
-@Mapper
-@DS("aoid")
-public interface AoidDailyYieldMapper extends BaseMapper<AoidDailyYield> {
-
-
-}

src/main/java/com/gct/tool/mapper/aoid/AoidDailyYieldMapper.xml

@@ -1,55 +0,0 @@
-<?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.tool.mapper.aoid.AoidDailyYieldMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gct.tool.entity.aoid.AoidDailyYield">
-        <result column="well_common_name" property="wellCommonName" />
-        <result column="well_id" property="wellId" />
-        <result column="prod_date" property="prodDate" />
-        <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="bx" property="bx" />
-        <result column="llpl" property="llpl" />
-        <result column="prod_time" property="prodTime" />
-        <result column="clxs" property="clxs" />
-        <result column="stroke" property="stroke" />
-        <result column="frequence" property="frequence" />
-        <result column="water_cut" property="waterCut" />
-        <result column="bj" property="bj" />
-        <result column="bs" property="bs" />
-        <result column="cmd" property="cmd" />
-        <result column="yz" property="yz" />
-        <result column="scsj" property="scsj" />
-        <result column="yy" property="yy" />
-        <result column="hy" property="hy" />
-        <result column="ty" property="ty" />
-        <result column="bz" property="bz" />
-        <result column="sfyc" property="sfyc" />
-        <result column="dym" property="dym" />
-        <result column="rcy2" property="rcy2" />
-        <result column="rcu2" property="rcu2" />
-        <result column="rcs2" property="rcs2" />
-        <result column="a2_liq_prod_daily" property="a2LiqProdDaily" />
-        <result column="a2_oil_prod_daily" property="a2OilProdDaily" />
-        <result column="a2_water_prod_daily" property="a2WaterProdDaily" />
-        <result column="a2_gas_prod_daily" property="a2GasProdDaily" />
-        <result column="a2_water_cut" property="a2WaterCut" />
-        <result column="a2_prod_time" property="a2ProdTime" />
-        <result column="yxgts" property="yxgts" />
-        <result column="errorgts" property="errorgts" />
-        <result column="zdjg" property="zdjg" />
-        <result column="djdy" property="djdy" />
-        <result column="zyq" property="zyq" />
-        <result column="jlz" property="jlz" />
-        <result column="hjwd" property="hjwd" />
-        <result column="ybdl" property="ybdl" />
-        <result column="sbh" property="sbh" />
-        <result column="xhqd" property="xhqd" />
-        <result column="yl" property="yl" />
-        <result column="rzbz" property="rzbz" />
-    </resultMap>
-
-</mapper>

src/main/java/com/gct/tool/mapper/aoid/AoidSinglegtYieldMapper.java

@@ -1,17 +0,0 @@
-package com.gct.tool.mapper.aoid;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.gct.tool.entity.aoid.AoidSinglegtYield;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Lloyd
- * @since 2021-01-31
- */
-@Mapper
-public interface AoidSinglegtYieldMapper extends BaseMapper<AoidSinglegtYield> {
-}

src/main/java/com/gct/tool/mapper/aoid/AoidSinglegtYieldMapper.xml

@@ -1,63 +0,0 @@
-<?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.tool.mapper.aoid.AoidSinglegtYieldMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gct.tool.entity.aoid.AoidSinglegtYield">
-        <id column="well_id" property="wellId" />
-        <result column="well_common_name" property="wellCommonName" />
-        <result column="prod_date" property="prodDate" />
-        <result column="stroke" property="stroke" />
-        <result column="frequence" property="frequence" />
-        <result column="bj" property="bj" />
-        <result column="bs" property="bs" />
-        <result column="cmd" property="cmd" />
-        <result column="yzzj" property="yzzj" />
-        <result column="sxzh" property="sxzh" />
-        <result column="xxzh" property="xxzh" />
-        <result column="sgt" property="sgt" />
-        <result column="bgt" property="bgt" />
-        <result column="zdjg" property="zdjg" />
-        <result column="liq_prod_daily" property="liqProdDaily" />
-        <result column="oil_prod_daily" property="oilProdDaily" />
-        <result column="gas_prod_daily" property="gasProdDaily" />
-        <result column="eczdjg" property="eczdjg" />
-        <result column="bx" property="bx" />
-        <result column="hsl" property="hsl" />
-        <result column="flag" property="flag" />
-        <result column="bdxs" property="bdxs" />
-        <result column="llpl" property="llpl" />
-        <result column="zcc" property="zcc" />
-        <result column="ycc" property="ycc" />
-        <result column="sjcc" property="sjcc" />
-        <result column="yxcc" property="yxcc" />
-        <result column="ccss" property="ccss" />
-        <result column="lsss" property="lsss" />
-        <result column="gyss" property="gyss" />
-        <result column="pumpdepth" property="pumpdepth" />
-        <result column="hy" property="hy" />
-        <result column="yy" property="yy" />
-        <result column="ty" property="ty" />
-        <result column="water_prod_daily" property="waterProdDaily" />
-        <result column="scsj" property="scsj" />
-        <result column="qyb" property="qyb" />
-        <result column="stroke_ratio" property="strokeRatio" />
-        <result column="djdy" property="djdy" />
-        <result column="hjwd" property="hjwd" />
-        <result column="ybdl" property="ybdl" />
-        <result column="xhqd" property="xhqd" />
-        <result column="sbh" property="sbh" />
-        <result column="a2_liq_prod_daily" property="a2LiqProdDaily" />
-        <result column="a2_oil_prod_daily" property="a2OilProdDaily" />
-        <result column="a2_water_prod_daily" property="a2WaterProdDaily" />
-        <result column="a2_gas_prod_daily" property="a2GasProdDaily" />
-        <result column="a2_remark" property="a2Remark" />
-        <result column="a2_prod_time" property="a2ProdTime" />
-        <result column="a2_water_cut" property="a2WaterCut" />
-        <result column="sgt_is_legal" property="sgtIsLegal" />
-        <result column="cal_is_normal" property="calIsNormal" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-</mapper>

src/main/java/com/gct/tool/service/aoid/AoidDailyYieldService.java

@@ -1,8 +0,0 @@
-package com.gct.tool.service.aoid;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gct.tool.entity.aoid.AoidDailyYield;
-
-public interface AoidDailyYieldService extends IService<AoidDailyYield> {
-
-}

src/main/java/com/gct/tool/service/aoid/AoidDailyYieldServiceImpl.java

@@ -1,14 +0,0 @@
-package com.gct.tool.service.aoid;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gct.tool.entity.aoid.AoidDailyYield;
-import com.gct.tool.mapper.aoid.AoidDailyYieldMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class AoidDailyYieldServiceImpl extends ServiceImpl<AoidDailyYieldMapper, AoidDailyYield> implements AoidDailyYieldService{
-
-
-}

src/main/java/com/gct/tool/service/aoid/AoidSinglegtYieldService.java

@@ -1,8 +0,0 @@
-package com.gct.tool.service.aoid;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.gct.tool.entity.aoid.AoidSinglegtYield;
-
-public interface AoidSinglegtYieldService extends IService<AoidSinglegtYield> {
-
-}

src/main/java/com/gct/tool/service/aoid/AoidSinglegtYieldServiceImpl.java

@@ -1,19 +0,0 @@
-package com.gct.tool.service.aoid;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gct.tool.entity.aoid.AoidSinglegtYield;
-import com.gct.tool.mapper.aoid.AoidSinglegtYieldMapper;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author 王森玉
- * @since 2021-01-31
- */
-@Service
-public class AoidSinglegtYieldServiceImpl extends ServiceImpl<AoidSinglegtYieldMapper, AoidSinglegtYield> implements AoidSinglegtYieldService {
-
-}

src/main/java/com/gct/tool/service/impl/DataAnalyseService.java

@@ -1,145 +0,0 @@
-package com.gct.tool.service.impl;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gct.common.util.SGTUtil;
-import com.gct.tool.entity.aoid.AoidSinglegtYield;
-import com.gct.tool.entity.excel.LiqAnalyseData;
-import com.gct.tool.entity.excel.SingleGtData;
-import com.gct.tool.service.aoid.AoidDailyYieldService;
-import com.gct.tool.service.aoid.AoidSinglegtYieldService;
-import com.gct.tool.service.centralbase.CbCdWellSourceService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.ApplicationArguments;
-import org.springframework.boot.ApplicationRunner;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.stereotype.Service;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author xusirui 2022/9/28
- */
-@Service
-public class DataAnalyseService implements ApplicationRunner {
-
-    @Value("${gt-total}")
-    Integer gtTotal;
-
-    @Value("${begin-date}")
-    String beginDate;
-
-    @Value("${end-date}")
-    String endDate;
-
-    @Autowired
-    AoidDailyYieldService aoidDailyYieldService;
-
-    @Autowired
-    CbCdWellSourceService cbCdWellSourceService;
-
-    @Autowired
-    AoidSinglegtYieldService aoidSinglegtYieldService;
-
-    private final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-
-    private final String excelFileBasePath = System.getProperty("user.dir") + "/.excel/";
-
-    public DataAnalyseService() {
-        File file = new File(excelFileBasePath);
-        if (!file.exists()) file.mkdirs();
-    }
-
-    public void produceLiqAnalyseTotal(){
-        for(LocalDate date = LocalDate.parse(beginDate);date.isBefore(LocalDate.parse(endDate));date = date.plusMonths(1)){
-            produceLiqAnalyseMonth(date);
-        }
-    }
-
-    public List<String> readWellIds(){
-        try{
-            ClassPathResource resource = new ClassPathResource("wellIds.txt");
-            BufferedReader br = new BufferedReader(new InputStreamReader(resource.getInputStream()));
-            String wellId;
-            List<String> wellIds = new ArrayList<>();
-            while ((wellId = br.readLine())!=null){
-                wellIds.add(wellId);
-            }
-            return wellIds;
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        return new ArrayList<>();
-    }
-
-    public void produceLiqAnalyseMonth(LocalDate beginDate) {
-        String fileName = excelFileBasePath + "功图数据-" + beginDate.format(DateTimeFormatter.ofPattern("yyyy-MM")) + ".xlsx";
-        File file = new File(fileName);
-        if (!file.exists()) {
-            try {
-                file.createNewFile();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        ExcelWriter excelWriter = EasyExcel.write(fileName, SingleGtData.class).build();
-        List<String> wellIds = readWellIds();
-        for (LocalDate date = beginDate;date.isBefore(beginDate.plusMonths(1));date = date.plusDays(1)){
-            System.out.println(date.format(DateTimeFormatter.ISO_LOCAL_DATE));
-            final LocalDate produceDate = date;
-                WriteSheet writeSheet = EasyExcel.writerSheet("第二采油作业区").build();
-                List<SingleGtData> singleGtDatas = aoidSinglegtYieldService.list(new QueryWrapper<AoidSinglegtYield>()
-                        .eq("prod_date::date", produceDate)
-                        .in("well_id",wellIds))
-                        .stream()
-                        .filter(aoidSinglegtYield -> aoidSinglegtYield.getSgtIsLegal() == 1)
-                        .map(aoidSinglegtYield -> {
-                            SingleGtData singleGtData = new SingleGtData();
-                            singleGtData.setProdDate(aoidSinglegtYield.getProdDate().format(formatter));
-                            singleGtData.setWorkDiagram(aoidSinglegtYield.getSgt());
-                            double[][] sgt = SGTUtil.encodeToUseArray(aoidSinglegtYield.getSgt());
-                            double[] maxLoadP = Arrays.stream(sgt).max(Comparator.comparingDouble(x -> x[1])).get();
-                            double[] minLoadP = Arrays.stream(sgt).min(Comparator.comparingDouble(x -> x[1])).get();
-                            singleGtData.setMaxLoad(maxLoadP[1]);
-                            singleGtData.setMinLoad(minLoadP[1]);
-                            singleGtData.setWellId(aoidSinglegtYield.getWellId());
-                            singleGtData.setAnalyseResult(aoidSinglegtYield.getEczdjg());
-                            double s = 0;
-                            for (int i = 0; i < sgt.length / 2 - 1; i++) {
-                                double h = Math.abs(sgt[i][0] - sgt[i + 1][0]);
-                                double Si = (sgt[i][1] + sgt[i + 1][1]) * h / 2.0;
-                                s += Si;
-                            }
-                            for (int i = sgt.length / 2 - 1; i < sgt.length - 1; i++) {
-                                double h = Math.abs(sgt[i][0] - sgt[i + 1][0]);
-                                double Si = (sgt[i][1] + sgt[i + 1][1]) * h / 2.0;
-                                s -= Si;
-                            }
-                            singleGtData.setWorkDiagramArea(s);
-                            return singleGtData;
-                        }).collect(Collectors.toList());
-                excelWriter.write(singleGtDatas, writeSheet);
-        }
-        excelWriter.finish();
-    }
-
-
-    @Override
-    public void run(ApplicationArguments args) throws Exception {
-        produceLiqAnalyseTotal();
-        System.exit(0);
-    }
-}

src/main/resources/application-pro.yml

@@ -18,22 +18,22 @@ spring:
     ## 指定nacos server地址
     nacos:
       discovery:
-        server-addr: 11.72.128.68
+        server-addr: 10.79.32.183
 
   datasource:
     dynamic:
       primary: aoid
       strict: true
       datasource:
-        aoid:
-          type: com.zaxxer.hikari.HikariDataSource
-          url: jdbc:postgresql://11.72.128.68:54321/calliquid
-          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
         centralbase:
           type: com.zaxxer.hikari.HikariDataSource
-          url: jdbc:postgresql://11.72.128.68:54321/database
+          url: jdbc:postgresql://10.79.32.183:54321/database
           username: root
           password: 123456
           driver-class-name: org.postgresql.Driver
@@ -56,5 +56,5 @@ swagger:
   enabled: true
 
 gt-total: 24
-begin-date: 2022-05-01
-end-date: 2022-11-01
+begin-date: 2022-11-28
+end-date: 2022-12-08

src/main/resources/wellIds.txt

@@ -1,100 +0,0 @@
-0004
-0010
-0016A
-0023
-00251
-00252
-0028
-0030
-0031
-0035
-0036
-0037
-0039
-0041
-00453
-0047
-0051
-0055
-0059
-0064
-0068
-0070
-0073
-0079
-0083
-0084
-0089
-0090
-0095
-0207
-0208
-0209
-0211
-0213
-0218
-0605
-0608
-0616
-0617
-0706
-0708
-0709
-0781
-0912
-0913
-0914
-7601
-7603
-7608
-CH0405
-CH0507
-CH0509
-CH21008
-CH21076
-CH21077
-CH35001
-CH35004
-CH35014
-CH35015
-CH35026
-CH35027
-CH3505
-CH3507
-CH3508
-CH3516
-CH7209
-CH7244
-CHD35007
-h0113
-h0115
-h0117
-h0118
-h0120
-h0124
-h0126
-h0127
-h0128
-h0131
-h0133
-h0143
-h0145
-h0155
-h0156
-h0161
-h0164
-h0169
-h0174
-h0203
-h0225
-h0226
-h0229
-h0239
-h0542
-h0546
-h0549
-h0552
-h0554
-h0558
-h0559
-h0570