feat(零碳): 长庆

1.长庆演示首页功能开发,新增采油厂统计信息查询接口,添加线上接口并完成接口冒烟测试;
2.长庆演示首页功能开发,新增线路图查询接口,添加线上接口并完成接口冒烟测试;
3.长庆演示首页功能开发,新增线路详情查询接口,添加线上接口并完成接口冒烟测试;
4.对接第三方接口,完成获取井场日累计数据接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;
5.对接第三方接口,完成获取第三方单井平均有功功率接口调用,创建数据表,同时生成对应代码,开发定时任务及对外接口,完成第三方数据接入及系统展示功能,添加线上接口文档并完成接口及定时任务冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C10-task/pps-core-task/src/main/java/pps/core/task/constant/TaskConstant.java

@@ -23,6 +23,11 @@ public class TaskConstant {
      */
     public static final String HALF_HOUR_ZERO = "0 0/30 * * * ?";
 
+    /**
+     * 一小时一次
+     */
+    public static final String HOUR_ZERO = "0 0 * * * ?";
+
     /**
      * 每周一 00:00:00
      */

C10-task/pps-core-task/src/main/java/pps/core/task/job/ThirdWellAvgActivePowerJob.java

+package pps.core.task.job;
+
+import pps.core.task.constant.TaskConstant;
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.data.XServiceResult;
+import xstartup.service.job.XJob;
+import xstartup.service.job.annotation.XCronTrigger;
+
+/**
+ * 第三方单井平均有功功率定时任务
+ *
+ * @author ZWT
+ * @date 2024/04/01 17:01
+ */
+@XText("第三方单井平均有功功率定时任务")
+@XService
+public class ThirdWellAvgActivePowerJob implements XJob {
+
+    /**
+     * 一小时一次
+     *
+     * @param xContext x上下文
+     * @return {@link XServiceResult}
+     */
+    @XCronTrigger(value = TaskConstant.HOUR_ZERO)
+    @Override
+    public XServiceResult execute(XContext xContext) {
+
+        return null;
+    }
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/ThirdWellAvgActivePowerEnt.java

+package pps.core.prediction.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 第三方单井平均有功功率
+ *
+ * @author ZWT
+ * @date 2024/04/01
+ */
+@Data
+@TableName("third_well_avg_active_power")
+public class ThirdWellAvgActivePowerEnt implements Serializable {
+    @XText("ID")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @XText("井号")
+    @TableField
+    private String wellNumber;
+
+    @XText("采集时间")
+    @TableField
+    private Date inputTime;
+
+    @XText("平均有功功率(KW)")
+    @TableField
+    private BigDecimal avgActivePower;
+
+    @XText("来源系统")
+    @TableField
+    private String systemSource;
+
+    @XText("入库日期")
+    @TableField
+    private Date saveDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/entity/ThirdWellAvgActivePowerView.java

+package pps.core.prediction.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 第三方单井平均有功功率
+ *
+ * @author ZWT
+ * @date 2024/04/01
+ */
+@Data
+public class ThirdWellAvgActivePowerView implements Serializable {
+    @XText("ID")
+    @TableField
+    private Long id;
+
+    @XText("井号")
+    @TableField
+    private String wellNumber;
+
+    @XText("采集时间")
+    @TableField
+    private Date inputTime;
+
+    @XText("平均有功功率(KW)")
+    @TableField
+    private BigDecimal avgActivePower;
+
+    @XText("来源系统")
+    @TableField
+    private String systemSource;
+
+    @XText("入库日期")
+    @TableField
+    private Date saveDate;
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/ThirdWellAvgActivePowerMapper.java

+package pps.core.prediction.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import pps.core.prediction.entity.ThirdWellAvgActivePowerEnt;
+
+/**
+ * 第三方单井平均有功功率
+ *
+ * @author ZWT
+ * @date 2024/04/01
+ */
+@Repository(value = "pps.core.prediction.mapper.ThirdWellAvgActivePowerMapper")
+public interface ThirdWellAvgActivePowerMapper extends BaseMapper<ThirdWellAvgActivePowerEnt> {
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/mapper/ThirdWellAvgActivePowerViewMapper.java

+package pps.core.prediction.mapper;
+
+import org.springframework.stereotype.Repository;
+import pps.core.prediction.entity.ThirdWellAvgActivePowerView;
+
+import java.util.List;
+
+/**
+ * 第三方单井平均有功功率
+ *
+ * @author ZWT
+ * @date 2024/04/01
+ */
+@Repository(value = "pps.core.prediction.mapper.ThirdWellAvgActivePowerViewMapper")
+public interface ThirdWellAvgActivePowerViewMapper {
+    ThirdWellAvgActivePowerView selectOne(ThirdWellAvgActivePowerView record);
+
+    List<ThirdWellAvgActivePowerView> selectList(ThirdWellAvgActivePowerView record);
+}

C12-prediction/pps-core-prediction/src/main/java/pps/core/prediction/service/data/third_well_avg_active_power/GetThirdWellAvgActivePowerOutput.java

+package pps.core.prediction.service.data.third_well_avg_active_power;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.Data;
+import xstartup.annotation.XText;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 第三方单井平均有功功率
+ *
+ * @author ZWT
+ * @date 2024/04/01
+ */
+@Data
+public class GetThirdWellAvgActivePowerOutput {
+
+    @XText("井号")
+    @JSONField(name = "welL_NAME")
+    private String wellNumber;
+
+    @XText("采集时间")
+    @JSONField(name = "inputtime")
+    private Date inputTime;
+
+    @XText("平均有功功率(KW)")
+    @JSONField(name = "avG_ACTIVE_POWER")
+    private BigDecimal avgActivePower;
+}
\ No newline at end of file

C12-prediction/pps-core-prediction/src/main/resources/mybatis/mapper/pps/core/prediction/ThirdWellAvgActivePowerViewMapper.xml

+<?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="pps.core.prediction.mapper.ThirdWellAvgActivePowerViewMapper">
+    <resultMap id="BaseResultMap" type="pps.core.prediction.entity.ThirdWellAvgActivePowerView">
+        <id column="id" property="id" jdbcType="BIGINT"/>
+        <result column="well_number" property="wellNumber" jdbcType="VARCHAR"/>
+        <result column="input_time" property="inputTime" jdbcType="DATE"/>
+        <result column="avg_active_power" property="avgActivePower" jdbcType="DECIMAL"/>
+        <result column="system_source" property="systemSource" jdbcType="VARCHAR"/>
+        <result column="save_date" property="saveDate" jdbcType="DATE"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        id
+        ,
+    well_number,
+    input_time,
+    avg_active_power,
+    system_source,
+    save_date
+    </sql>
+    <select id="selectOne" parameterType="pps.core.prediction.entity.ThirdWellAvgActivePowerView"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from third_well_avg_active_power
+        where
+        id=#{id}
+    </select>
+    <select id="selectList" parameterType="pps.core.prediction.entity.ThirdWellAvgActivePowerView"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from third_well_avg_active_power
+        where
+        id=#{id}
+    </select>
+</mapper>
\ No newline at end of file

D03-deploy/deploy-pps-all/src/main/java/app/DeployPpsAllApplication.java

@@ -37,6 +37,7 @@ public class DeployPpsAllApplication {
         startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdActivePowerJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdCurrentWellConditionJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdPhotovoltaicPowerJob.class));
+        startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdWellAvgActivePowerJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdDailyAccumulationJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(EnergyConsumptionAnalysisJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));

D03-deploy/deploy-pps-all/src/main/resources/deploy-pps-all.app.properties

@@ -53,6 +53,7 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
   pps.core.task.job.ThirdActivePowerJob,\
   pps.core.task.job.ThirdCurrentWellConditionJob,\
   pps.core.task.job.ThirdPhotovoltaicPowerJob,\
+  pps.core.task.job.ThirdWellAvgActivePowerJob,\
   pps.core.task.job.ThirdDailyAccumulationJob,\
   pps.core.task.job.EnergyConsumptionAnalysisJob,\
   pps.core.task.job.PlantPredictedPowerLongTermDataJob,\

D03-deploy/deploy-pps-task/src/main/java/app/DeployPpsTaskApplication.java

@@ -38,6 +38,7 @@ public class DeployPpsTaskApplication {
         startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdActivePowerJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdCurrentWellConditionJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdPhotovoltaicPowerJob.class));
+        startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdWellAvgActivePowerJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdDailyAccumulationJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(EnergyConsumptionAnalysisJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));

D03-deploy/deploy-pps-task/src/main/resources/deploy-pps-task.app.properties

@@ -15,6 +15,7 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
   pps.core.task.job.ThirdActivePowerJob,\
   pps.core.task.job.ThirdCurrentWellConditionJob,\
   pps.core.task.job.ThirdPhotovoltaicPowerJob,\
+  pps.core.task.job.ThirdWellAvgActivePowerJob,\
   pps.core.task.job.ThirdDailyAccumulationJob,\
   pps.core.task.job.EnergyConsumptionAnalysisJob,\
   pps.core.task.job.PlantPredictedPowerLongTermDataJob