峰平谷 数据 采集

jeecg-module-gather/src/main/java/org/jeecg/modules/dataRepository/entity/PointData.java

@@ -54,6 +54,7 @@ public class PointData  implements Serializable {
     public PointData() {
     }
 
+    // 采集存储数据
     public PointData(DevicePoint point, String freq, String dataText, Date time) {
         this.pointId = point.getId();
         this.deviceId = point.getDeviceId();

jeecg-module-gather/src/main/java/org/jeecg/modules/gatherData/entity/FpgGatherData.java

@@ -1,11 +1,14 @@
 package org.jeecg.modules.gatherData.entity;
 
 import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.modules.devicePoint.entity.DevicePoint;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
@@ -80,4 +83,8 @@ public class FpgGatherData implements Serializable {
 	@Dict(dicCode = "fpg_type")
     @ApiModelProperty(value = "峰平谷类型")
     private java.lang.String fpgType;
+
+
+    @ApiModelProperty(value = "采集时间")
+    private Date time;
 }

jeecg-module-gather/src/main/java/org/jeecg/modules/gatherData/entity/FpgStatiscsModelData.java

@@ -0,0 +1,123 @@
+package org.jeecg.modules.gatherData.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: 峰平谷数据采集
+ * @Author: jeecg-boot
+ * @Date:   2024-10-28
+ * @Version: V1.0
+ */
+@Data
+public class FpgStatiscsModelData{
+
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**采集点ID*/
+    @ApiModelProperty(value = "采集点ID")
+    private String devicePointId;
+	/**区域ID*/
+    @ApiModelProperty(value = "区域ID")
+    private String deviceRegionId;
+	/**设备id*/
+    @ApiModelProperty(value = "设备id")
+    private String deviceInformationId;
+    /**产生费用*/
+    @ApiModelProperty(value = "产生费用")
+    private BigDecimal amount;
+	/**运行时长*/
+    @ApiModelProperty(value = "运行时长")
+    private BigDecimal ingTime;
+	/**运行总功率*/
+    @ApiModelProperty(value = "运行总功率")
+    private BigDecimal power;
+    /**尖总功率*/
+    @ApiModelProperty(value = "尖总功率")
+    private BigDecimal topsPower;
+    /**峰总功率*/
+    @ApiModelProperty(value = "峰总功率")
+    private BigDecimal peaksPower;
+    /**平总功率*/
+    @ApiModelProperty(value = "平总功率")
+    private BigDecimal flatPower;
+    /**谷总功率*/
+    @ApiModelProperty(value = "谷总功率")
+    private BigDecimal valleysPower;
+    /**尖运行时长*/
+    @ApiModelProperty(value = "尖运行时长")
+    private BigDecimal topsIngTime;
+    /**峰运行时长*/
+    @ApiModelProperty(value = "峰运行时长")
+    private BigDecimal peaksIngTime;
+    /**平运行时长*/
+    @ApiModelProperty(value = "平运行时长")
+    private BigDecimal flatIngTime;
+    /**谷运行时长*/
+    @ApiModelProperty(value = "谷运行时长")
+    private BigDecimal valleysIngTime;
+    /**尖运行时长*/
+    @ApiModelProperty(value = "尖产生费用")
+    private BigDecimal topsAmount;
+    /**峰运行时长*/
+    @ApiModelProperty(value = "峰产生费用")
+    private BigDecimal peaksAmount;
+    /**平运行时长*/
+    @ApiModelProperty(value = "平产费用")
+    private BigDecimal flatAmount;
+    /**产生费用*/
+    @ApiModelProperty(value = "谷产费用")
+    private BigDecimal valleysAmount;
+    /**尖单价电费*/
+    @ApiModelProperty(value = "尖单价电费")
+    private BigDecimal topsPrice;
+    /**峰单价电费*/
+    @ApiModelProperty(value = "峰单价电费")
+    private BigDecimal peaksPrice;
+    /**平单价电费*/
+    @ApiModelProperty(value = "平单价电费")
+    private BigDecimal flatPrice;
+    /**谷单价电费*/
+    @ApiModelProperty(value = "谷单价电费")
+    private BigDecimal valleysPrice;
+    /**尖占比%*/
+    @ApiModelProperty(value = "尖占比%")
+    private BigDecimal topsProportion;
+    /**峰占比%*/
+    @ApiModelProperty(value = "峰占比%")
+    private BigDecimal peaksProportion;
+    /**平占比%*/
+    @ApiModelProperty(value = "平占比%")
+    private BigDecimal flatProportion;
+    /**谷占比%*/
+    @ApiModelProperty(value = "谷占比%")
+    private BigDecimal valleysProportion;
+    /**班次*/
+    @ApiModelProperty(value = "班次")
+    private String classs;
+    /**日期*/
+    @ApiModelProperty(value = "日期")
+    private String dates;
+    /**创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    // 峰平谷精益模型数据统计
+    public void fpgStatisticsModelData(FpgStatiscsModelData fpgGather, String fpgType, String classs, BigDecimal amount, String dates, Date createTime, Date updateTime) {
+        // 基础信息配置
+        this.deviceRegionId = fpgGather.getDeviceRegionId(); // 区域id
+        this.deviceInformationId = fpgGather.getDeviceInformationId(); // 设备id
+        this.devicePointId = fpgGather.getDevicePointId(); // 采集点id
+        this.ingTime = fpgGather.getIngTime(); // 运行时常
+        this.power = fpgGather.getPower();
+        this.classs = classs;
+        this.amount = amount;
+        this.dates = dates;
+        this.createTime = createTime;
+        this.updateTime = updateTime;
+
+    }
+}