新增光伏Mppt相关功能
This commit is contained in:
@ -71,6 +71,8 @@ public interface DeviceTypeConstant {
|
||||
//英博DC/DCMPPT
|
||||
String DCDC = "dcdc";
|
||||
|
||||
String MPPT ="mppt";
|
||||
|
||||
//柴油发电机_济宁微山湖
|
||||
String CF = "cf";
|
||||
|
||||
@ -371,6 +373,8 @@ public interface DeviceTypeConstant {
|
||||
String BMS_MIN_VOL = "bmsMinVol";
|
||||
}
|
||||
|
||||
//mppt 日发起始
|
||||
String PV_DAILY_CHARGE_START = "pvDailyReleaseStart";
|
||||
//日充起始
|
||||
String DAILY_CHARGE_START = "dailyChargeStart";
|
||||
//日放起始
|
||||
|
||||
@ -0,0 +1,101 @@
|
||||
package com.ho.business.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
@Data
|
||||
public class EarningsCalculateMppt implements Serializable {
|
||||
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 分组id(与src_id)
|
||||
*/
|
||||
private Integer groupId;
|
||||
|
||||
/**
|
||||
* 所属id
|
||||
*/
|
||||
private Integer pid;
|
||||
|
||||
/**
|
||||
* 电站id
|
||||
*/
|
||||
private Integer stationId;
|
||||
|
||||
/**
|
||||
* device表中的id字段相连
|
||||
*/
|
||||
private Integer srcId;
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
private Integer deptId;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 日期
|
||||
*/
|
||||
private String day;
|
||||
|
||||
/**
|
||||
* 数据类型: 0:充 1:放
|
||||
*/
|
||||
private Integer type;
|
||||
|
||||
/**
|
||||
* 收益
|
||||
*/
|
||||
private BigDecimal digital;
|
||||
|
||||
/**
|
||||
* 电量
|
||||
*/
|
||||
private BigDecimal elec;
|
||||
|
||||
/**
|
||||
* 费率类型:elec_template_sub表type
|
||||
*/
|
||||
private String rateType;
|
||||
|
||||
/**
|
||||
* 价格
|
||||
*/
|
||||
private BigDecimal price;
|
||||
|
||||
/**
|
||||
* 总充,总放 根据type判断
|
||||
*/
|
||||
private BigDecimal total;
|
||||
|
||||
/**
|
||||
* 收益
|
||||
*/
|
||||
private BigDecimal discharge;
|
||||
|
||||
/**
|
||||
* 电量
|
||||
*/
|
||||
private BigDecimal disElec;
|
||||
|
||||
/**
|
||||
* 费率类型:elec_template_sub表type
|
||||
*/
|
||||
private String disRateType;
|
||||
|
||||
/**
|
||||
* 折扣
|
||||
*/
|
||||
private BigDecimal discount;
|
||||
}
|
||||
@ -52,6 +52,9 @@ public class Station implements Serializable {
|
||||
@ApiModelProperty(value = "额定功率")
|
||||
private BigDecimal ratePower;
|
||||
|
||||
@ApiModelProperty(value = "额定功率(光伏mppt)")
|
||||
private BigDecimal pvPower;
|
||||
|
||||
@ApiModelProperty(value = "sn编号列表")
|
||||
private List<String> snList;
|
||||
|
||||
|
||||
@ -124,6 +124,11 @@ public class StationPutReqVO {
|
||||
|
||||
@ApiModelProperty(value = "是否接入光伏：0代表不接,1代表接入")
|
||||
private Integer inverterFlag;
|
||||
|
||||
@ApiModelProperty(value = "额定功率(mppt)")
|
||||
@Range(max = 999999999, message = "额定功率过大")
|
||||
BigDecimal pvPower;
|
||||
|
||||
//图片地址
|
||||
@ApiModelProperty(value = "图片地址")
|
||||
Integer logoPictureId;
|
||||
|
||||
@ -102,6 +102,10 @@ public class StationReqVO {
|
||||
@ApiModelProperty(value = "是否接入光伏（0默认不接入 1接入）")
|
||||
private Integer inverterFlag;
|
||||
|
||||
@ApiModelProperty(value = "额定功率(mppt)")
|
||||
@Range(max = 999999999, message = "额定功率过大")
|
||||
BigDecimal pvPower;
|
||||
|
||||
@ApiModelProperty(value = "卡号")
|
||||
private String iccId;
|
||||
|
||||
|
||||
@ -88,4 +88,16 @@ public class EarningsCalculateResp {
|
||||
*/
|
||||
private Integer finish;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "月发电量(mppt)")
|
||||
BigDecimal monthReleaseElec;
|
||||
@ApiModelProperty(value = "月收益(mppt)")
|
||||
BigDecimal monthIncone;
|
||||
@ApiModelProperty(value = "累计发电量(mppt)")
|
||||
BigDecimal totalReleaseElec;
|
||||
@ApiModelProperty(value = "累计收益(mppt)")
|
||||
BigDecimal totalIncome;
|
||||
@ApiModelProperty(value = "额定功率(mppt)")
|
||||
BigDecimal pvPower;
|
||||
|
||||
}
|
||||
|
||||
@ -36,4 +36,6 @@ public class AnnualChartValue {
|
||||
@ApiModelProperty(value = "容量")
|
||||
BigDecimal stationCapacity;
|
||||
|
||||
@ApiModelProperty(value = "mppt发电量")
|
||||
BigDecimal release;
|
||||
}
|
||||
|
||||
@ -0,0 +1,37 @@
|
||||
package com.ho.business.vo.resp.iargeScreen;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class AnnualPvOverviewResp {
|
||||
|
||||
//装机容量
|
||||
@ApiModelProperty(value = "装机容量")
|
||||
BigDecimal capacity;
|
||||
|
||||
//电站总数
|
||||
@ApiModelProperty(value = "电站总数")
|
||||
Integer stationNumber;
|
||||
|
||||
@ApiModelProperty(value = "日发电量(mppt)")
|
||||
BigDecimal dailyReleaseElec;
|
||||
|
||||
@ApiModelProperty(value = "年发电量(mppt)")
|
||||
BigDecimal yearReleaseElec;
|
||||
|
||||
@ApiModelProperty(value = "累计发电量(mppt)")
|
||||
BigDecimal totalReleaseElec;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "日收益(mppt)")
|
||||
BigDecimal todayIncone;
|
||||
|
||||
@ApiModelProperty(value = "年收益(mppt)")
|
||||
BigDecimal yearIncone;
|
||||
|
||||
@ApiModelProperty(value = "累计收益(mppt)")
|
||||
BigDecimal totalIncome;
|
||||
}
|
||||
@ -52,4 +52,7 @@ public class Subdata {
|
||||
//年总充（）
|
||||
@ApiModelProperty(value = "总充")
|
||||
BigDecimal charge;
|
||||
|
||||
@ApiModelProperty(value = "mppt总发电量")
|
||||
BigDecimal release;
|
||||
}
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
package com.ho.business.vo.resp.mppt;
|
||||
|
||||
import com.ho.business.vo.DeviceTransfer;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class MpptActiveVo {
|
||||
|
||||
@ApiModelProperty(value = "mppt有功功率")
|
||||
BigDecimal pvActivePower;
|
||||
|
||||
@ApiModelProperty(value = "mppt总发电量")
|
||||
BigDecimal totalRelease;
|
||||
|
||||
@ApiModelProperty(value = "mppt日发电量")
|
||||
BigDecimal dailyReleaseElec;
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.ho.business.vo.resp.mppt;
|
||||
|
||||
import com.ho.business.vo.DeviceTransfer;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class MpptVo {
|
||||
|
||||
@ApiModelProperty(value = "mppt有功功率")
|
||||
DeviceTransfer pvActivePower;
|
||||
@ApiModelProperty(value = "mppt总发电量")
|
||||
DeviceTransfer totalRelease;
|
||||
@ApiModelProperty(value = "mppt 日发电量-起始")
|
||||
DeviceTransfer pvDailyReleaseStart;
|
||||
|
||||
}
|
||||
@ -43,4 +43,18 @@ public class PcsTotalData {
|
||||
@ApiModelProperty(value = "额定容量")
|
||||
BigDecimal rateCapacity;
|
||||
|
||||
//2025-11-13 储能加入mppt模块开发
|
||||
@ApiModelProperty(value = "当前功率(mppt)")
|
||||
BigDecimal pvCurrentPower;
|
||||
@ApiModelProperty(value = "日发电量(mppt)")
|
||||
BigDecimal dailyReleaseElec;
|
||||
@ApiModelProperty(value = "日收益(mppt)")
|
||||
BigDecimal todayIncone;
|
||||
@ApiModelProperty(value = "总发电量(mppt)")
|
||||
BigDecimal totalReleaseElec;
|
||||
@ApiModelProperty(value = "总收益(mppt)")
|
||||
BigDecimal totalIncome;
|
||||
@ApiModelProperty(value = "额定功率(mppt)")
|
||||
BigDecimal pvPower;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user