xzzn/emsback
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改site_id & device_id

Browse Source
This commit is contained in:
mashili
2025-06-29 10:55:05 +08:00
parent 177e235c0e
commit d1aa8dbd2c
50 changed files with 2142 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ems-system/src/main/java/com/xzzn/ems/domain/EmsAlarmRecords.java
View File

@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
* 告警记录对象 ems_alarm_records
*
* @author xzzn
* @date 2025-06-17
* @date 2025-06-29
*/
public class EmsAlarmRecords extends BaseEntity
{
@ -48,11 +48,11 @@ public class EmsAlarmRecords extends BaseEntity
/** 站点id */
@Excel(name = "站点id")
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
@Excel(name = "设备唯一标识符")
private Long deviceId;
private String deviceId;
/** 设备名称，用于标识设备 */
@Excel(name = "设备名称，用于标识设备")
@ -128,22 +128,22 @@ public class EmsAlarmRecords extends BaseEntity
return status;
}
public void setSiteId(Long siteId)
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public Long getSiteId()
public String getSiteId()
{
return siteId;
}
public void setDeviceId(Long deviceId)
public void setDeviceId(String deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public String getDeviceId()
{
return deviceId;
}

31
ems-system/src/main/java/com/xzzn/ems/domain/EmsAmmeterData.java
View File

@ -12,13 +12,13 @@ import com.xzzn.common.annotation.Excel;
* 总数据对象 ems_ammeter_data
*
* @author xzzn
* @date 2025-06-27
* @date 2025-06-29
*/
public class EmsAmmeterData extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
/** */
private Long id;
/** 数据更新时间 */
@ -34,6 +34,10 @@ public class EmsAmmeterData extends BaseEntity
@Excel(name = "总 (kWh)")
private BigDecimal totalKwh;
/** 尖 (kWh) */
@Excel(name = "尖 (kWh)")
private BigDecimal sharpKwh;
/** 峰 (kWh) */
@Excel(name = "峰 (kWh)")
private BigDecimal peakKwh;
@ -48,11 +52,11 @@ public class EmsAmmeterData extends BaseEntity
/** 站点id */
@Excel(name = "站点id")
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
@Excel(name = "设备唯一标识符")
private Long deviceId;
private String deviceId;
public void setId(Long id)
{
@ -94,6 +98,16 @@ public class EmsAmmeterData extends BaseEntity
return totalKwh;
}
public void setSharpKwh(BigDecimal sharpKwh)
{
this.sharpKwh = sharpKwh;
}
public BigDecimal getSharpKwh()
{
return sharpKwh;
}
public void setPeakKwh(BigDecimal peakKwh)
{
this.peakKwh = peakKwh;
@ -124,22 +138,22 @@ public class EmsAmmeterData extends BaseEntity
return valleyKwh;
}
public void setSiteId(Long siteId)
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public Long getSiteId()
public String getSiteId()
{
return siteId;
}
public void setDeviceId(Long deviceId)
public void setDeviceId(String deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public String getDeviceId()
{
return deviceId;
}
@ -151,6 +165,7 @@ public class EmsAmmeterData extends BaseEntity
.append("dataUpdateTime", getDataUpdateTime())
.append("category", getCategory())
.append("totalKwh", getTotalKwh())
.append("sharpKwh", getSharpKwh())
.append("peakKwh", getPeakKwh())
.append("flatKwh", getFlatKwh())
.append("valleyKwh", getValleyKwh())

509
ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryCluster.java
View File

@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
* 电池簇数据对象 ems_battery_cluster
*
* @author xzzn
* @date 2025-06-22
* @date 2025-06-29
*/
public class EmsBatteryCluster extends BaseEntity
{
@ -74,11 +74,143 @@ public class EmsBatteryCluster extends BaseEntity
/** 站点id */
@Excel(name = "站点id")
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
@Excel(name = "设备唯一标识符")
private Long deviceId;
private String deviceId;
/** 堆设备id */
@Excel(name = "堆设备id")
private String stackDeviceId;
/** 允许充电最大功率 */
@Excel(name = "允许充电最大功率")
private BigDecimal maxAllowedChargePower;
/** 允许放电最大功率 */
@Excel(name = "允许放电最大功率")
private BigDecimal maxAllowedDischargePower;
/** 允许充电最大电压 */
@Excel(name = "允许充电最大电压")
private BigDecimal maxAllowedChargeVoltage;
/** 允许放电最大电压 */
@Excel(name = "允许放电最大电压")
private BigDecimal maxAllowedDischargeVoltage;
/** 允许充电最大电流 */
@Excel(name = "允许充电最大电流")
private BigDecimal maxAllowedChargeCurrent;
/** 允许放电最大电流 */
@Excel(name = "允许放电最大电流")
private BigDecimal maxAllowedDischargeCurrent;
/** 组电压 */
@Excel(name = "组电压")
private BigDecimal batteryPackVoltage;
/** 组电流 */
@Excel(name = "组电流")
private BigDecimal batteryPackCurrent;
/** 模块温度 */
@Excel(name = "模块温度")
private BigDecimal batteryPackTemp;
/** 组SOC */
@Excel(name = "组SOC")
private BigDecimal batteryPackSoc;
/** 组SOH */
@Excel(name = "组SOH")
private BigDecimal batteryPackSoh;
/** 组绝缘电阻 */
@Excel(name = "组绝缘电阻")
private BigDecimal batteryPackInsulationResistance;
/** 平均单体电压 */
@Excel(name = "平均单体电压")
private BigDecimal avgCellVoltage;
/** 平均单体温度 */
@Excel(name = "平均单体温度")
private BigDecimal avgCellTemp;
/** 最高单体电压 */
@Excel(name = "最高单体电压")
private BigDecimal maxCellVoltage;
/** 最高单体电压对应点号 */
@Excel(name = "最高单体电压对应点号")
private Long maxCellVoltageId;
/** 最低单体电压 */
@Excel(name = "最低单体电压")
private BigDecimal minCellVoltage;
/** 最低单体电压对应点号 */
@Excel(name = "最低单体电压对应点号")
private Long minCellVoltageId;
/** 最高单体温度 */
@Excel(name = "最高单体温度")
private BigDecimal maxCellTemp;
/** 最高单体温度对应点号 */
@Excel(name = "最高单体温度对应点号")
private Long maxCellTempId;
/** 最低单体温度 */
@Excel(name = "最低单体温度")
private BigDecimal minCellTemp;
/** 最低单体温度对应点号 */
@Excel(name = "最低单体温度对应点号")
private Long minCellTempId;
/** 最高单体SOC */
@Excel(name = "最高单体SOC")
private BigDecimal maxCellSoc;
/** 最高单体SOC对应点号 */
@Excel(name = "最高单体SOC对应点号")
private Long maxCellSocId;
/** 最低单体SOC */
@Excel(name = "最低单体SOC")
private BigDecimal minCellSoc;
/** 最低单体SOC对应点号 */
@Excel(name = "最低单体SOC对应点号")
private Long minCellSocId;
/** 最高单体SOH */
@Excel(name = "最高单体SOH")
private BigDecimal maxCellSoh;
/** 最高单体SOH对应点号 */
@Excel(name = "最高单体SOH对应点号")
private Long maxCellSohId;
/** 最低单体SOH */
@Excel(name = "最低单体SOH")
private BigDecimal minCellSoh;
/** 最低单体SOH对应点号 */
@Excel(name = "最低单体SOH对应点号")
private Long minCellSohId;
/** 单次累计充电电量 */
@Excel(name = "单次累计充电电量")
private BigDecimal totalChargeEnergy;
/** 单次累计放电电量 */
@Excel(name = "单次累计放电电量")
private BigDecimal totalDischargeEnergy;
public void setId(Long id)
{
@ -220,26 +352,356 @@ public class EmsBatteryCluster extends BaseEntity
return currentSoc;
}
public void setSiteId(Long siteId)
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public Long getSiteId()
public String getSiteId()
{
return siteId;
}
public void setDeviceId(Long deviceId)
public void setDeviceId(String deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public String getDeviceId()
{
return deviceId;
}
public void setStackDeviceId(String stackDeviceId)
{
this.stackDeviceId = stackDeviceId;
}
public String getStackDeviceId()
{
return stackDeviceId;
}
public void setMaxAllowedChargePower(BigDecimal maxAllowedChargePower)
{
this.maxAllowedChargePower = maxAllowedChargePower;
}
public BigDecimal getMaxAllowedChargePower()
{
return maxAllowedChargePower;
}
public void setMaxAllowedDischargePower(BigDecimal maxAllowedDischargePower)
{
this.maxAllowedDischargePower = maxAllowedDischargePower;
}
public BigDecimal getMaxAllowedDischargePower()
{
return maxAllowedDischargePower;
}
public void setMaxAllowedChargeVoltage(BigDecimal maxAllowedChargeVoltage)
{
this.maxAllowedChargeVoltage = maxAllowedChargeVoltage;
}
public BigDecimal getMaxAllowedChargeVoltage()
{
return maxAllowedChargeVoltage;
}
public void setMaxAllowedDischargeVoltage(BigDecimal maxAllowedDischargeVoltage)
{
this.maxAllowedDischargeVoltage = maxAllowedDischargeVoltage;
}
public BigDecimal getMaxAllowedDischargeVoltage()
{
return maxAllowedDischargeVoltage;
}
public void setMaxAllowedChargeCurrent(BigDecimal maxAllowedChargeCurrent)
{
this.maxAllowedChargeCurrent = maxAllowedChargeCurrent;
}
public BigDecimal getMaxAllowedChargeCurrent()
{
return maxAllowedChargeCurrent;
}
public void setMaxAllowedDischargeCurrent(BigDecimal maxAllowedDischargeCurrent)
{
this.maxAllowedDischargeCurrent = maxAllowedDischargeCurrent;
}
public BigDecimal getMaxAllowedDischargeCurrent()
{
return maxAllowedDischargeCurrent;
}
public void setBatteryPackVoltage(BigDecimal batteryPackVoltage)
{
this.batteryPackVoltage = batteryPackVoltage;
}
public BigDecimal getBatteryPackVoltage()
{
return batteryPackVoltage;
}
public void setBatteryPackCurrent(BigDecimal batteryPackCurrent)
{
this.batteryPackCurrent = batteryPackCurrent;
}
public BigDecimal getBatteryPackCurrent()
{
return batteryPackCurrent;
}
public void setBatteryPackTemp(BigDecimal batteryPackTemp)
{
this.batteryPackTemp = batteryPackTemp;
}
public BigDecimal getBatteryPackTemp()
{
return batteryPackTemp;
}
public void setBatteryPackSoc(BigDecimal batteryPackSoc)
{
this.batteryPackSoc = batteryPackSoc;
}
public BigDecimal getBatteryPackSoc()
{
return batteryPackSoc;
}
public void setBatteryPackSoh(BigDecimal batteryPackSoh)
{
this.batteryPackSoh = batteryPackSoh;
}
public BigDecimal getBatteryPackSoh()
{
return batteryPackSoh;
}
public void setBatteryPackInsulationResistance(BigDecimal batteryPackInsulationResistance)
{
this.batteryPackInsulationResistance = batteryPackInsulationResistance;
}
public BigDecimal getBatteryPackInsulationResistance()
{
return batteryPackInsulationResistance;
}
public void setAvgCellVoltage(BigDecimal avgCellVoltage)
{
this.avgCellVoltage = avgCellVoltage;
}
public BigDecimal getAvgCellVoltage()
{
return avgCellVoltage;
}
public void setAvgCellTemp(BigDecimal avgCellTemp)
{
this.avgCellTemp = avgCellTemp;
}
public BigDecimal getAvgCellTemp()
{
return avgCellTemp;
}
public void setMaxCellVoltage(BigDecimal maxCellVoltage)
{
this.maxCellVoltage = maxCellVoltage;
}
public BigDecimal getMaxCellVoltage()
{
return maxCellVoltage;
}
public void setMaxCellVoltageId(Long maxCellVoltageId)
{
this.maxCellVoltageId = maxCellVoltageId;
}
public Long getMaxCellVoltageId()
{
return maxCellVoltageId;
}
public void setMinCellVoltage(BigDecimal minCellVoltage)
{
this.minCellVoltage = minCellVoltage;
}
public BigDecimal getMinCellVoltage()
{
return minCellVoltage;
}
public void setMinCellVoltageId(Long minCellVoltageId)
{
this.minCellVoltageId = minCellVoltageId;
}
public Long getMinCellVoltageId()
{
return minCellVoltageId;
}
public void setMaxCellTemp(BigDecimal maxCellTemp)
{
this.maxCellTemp = maxCellTemp;
}
public BigDecimal getMaxCellTemp()
{
return maxCellTemp;
}
public void setMaxCellTempId(Long maxCellTempId)
{
this.maxCellTempId = maxCellTempId;
}
public Long getMaxCellTempId()
{
return maxCellTempId;
}
public void setMinCellTemp(BigDecimal minCellTemp)
{
this.minCellTemp = minCellTemp;
}
public BigDecimal getMinCellTemp()
{
return minCellTemp;
}
public void setMinCellTempId(Long minCellTempId)
{
this.minCellTempId = minCellTempId;
}
public Long getMinCellTempId()
{
return minCellTempId;
}
public void setMaxCellSoc(BigDecimal maxCellSoc)
{
this.maxCellSoc = maxCellSoc;
}
public BigDecimal getMaxCellSoc()
{
return maxCellSoc;
}
public void setMaxCellSocId(Long maxCellSocId)
{
this.maxCellSocId = maxCellSocId;
}
public Long getMaxCellSocId()
{
return maxCellSocId;
}
public void setMinCellSoc(BigDecimal minCellSoc)
{
this.minCellSoc = minCellSoc;
}
public BigDecimal getMinCellSoc()
{
return minCellSoc;
}
public void setMinCellSocId(Long minCellSocId)
{
this.minCellSocId = minCellSocId;
}
public Long getMinCellSocId()
{
return minCellSocId;
}
public void setMaxCellSoh(BigDecimal maxCellSoh)
{
this.maxCellSoh = maxCellSoh;
}
public BigDecimal getMaxCellSoh()
{
return maxCellSoh;
}
public void setMaxCellSohId(Long maxCellSohId)
{
this.maxCellSohId = maxCellSohId;
}
public Long getMaxCellSohId()
{
return maxCellSohId;
}
public void setMinCellSoh(BigDecimal minCellSoh)
{
this.minCellSoh = minCellSoh;
}
public BigDecimal getMinCellSoh()
{
return minCellSoh;
}
public void setMinCellSohId(Long minCellSohId)
{
this.minCellSohId = minCellSohId;
}
public Long getMinCellSohId()
{
return minCellSohId;
}
public void setTotalChargeEnergy(BigDecimal totalChargeEnergy)
{
this.totalChargeEnergy = totalChargeEnergy;
}
public BigDecimal getTotalChargeEnergy()
{
return totalChargeEnergy;
}
public void setTotalDischargeEnergy(BigDecimal totalDischargeEnergy)
{
this.totalDischargeEnergy = totalDischargeEnergy;
}
public BigDecimal getTotalDischargeEnergy()
{
return totalDischargeEnergy;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -264,6 +726,39 @@ public class EmsBatteryCluster extends BaseEntity
.append("remark", getRemark())
.append("siteId", getSiteId())
.append("deviceId", getDeviceId())
.append("stackDeviceId", getStackDeviceId())
.append("maxAllowedChargePower", getMaxAllowedChargePower())
.append("maxAllowedDischargePower", getMaxAllowedDischargePower())
.append("maxAllowedChargeVoltage", getMaxAllowedChargeVoltage())
.append("maxAllowedDischargeVoltage", getMaxAllowedDischargeVoltage())
.append("maxAllowedChargeCurrent", getMaxAllowedChargeCurrent())
.append("maxAllowedDischargeCurrent", getMaxAllowedDischargeCurrent())
.append("batteryPackVoltage", getBatteryPackVoltage())
.append("batteryPackCurrent", getBatteryPackCurrent())
.append("batteryPackTemp", getBatteryPackTemp())
.append("batteryPackSoc", getBatteryPackSoc())
.append("batteryPackSoh", getBatteryPackSoh())
.append("batteryPackInsulationResistance", getBatteryPackInsulationResistance())
.append("avgCellVoltage", getAvgCellVoltage())
.append("avgCellTemp", getAvgCellTemp())
.append("maxCellVoltage", getMaxCellVoltage())
.append("maxCellVoltageId", getMaxCellVoltageId())
.append("minCellVoltage", getMinCellVoltage())
.append("minCellVoltageId", getMinCellVoltageId())
.append("maxCellTemp", getMaxCellTemp())
.append("maxCellTempId", getMaxCellTempId())
.append("minCellTemp", getMinCellTemp())
.append("minCellTempId", getMinCellTempId())
.append("maxCellSoc", getMaxCellSoc())
.append("maxCellSocId", getMaxCellSocId())
.append("minCellSoc", getMinCellSoc())
.append("minCellSocId", getMinCellSocId())
.append("maxCellSoh", getMaxCellSoh())
.append("maxCellSohId", getMaxCellSohId())
.append("minCellSoh", getMinCellSoh())
.append("minCellSohId", getMinCellSohId())
.append("totalChargeEnergy", getTotalChargeEnergy())
.append("totalDischargeEnergy", getTotalDischargeEnergy())
.toString();
}
}

16
ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryData.java
View File

@ -12,13 +12,13 @@ import com.xzzn.common.annotation.Excel;
* 单体电池实时数据对象 ems_battery_data
*
* @author xzzn
* @date 2025-06-28
* @date 2025-06-29
*/
public class EmsBatteryData extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
/** */
private Long id;
/** 电池堆 */
@ -56,7 +56,7 @@ public class EmsBatteryData extends BaseEntity
/** 站点id */
@Excel(name = "站点id")
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
@Excel(name = "设备唯一标识符")
@ -64,7 +64,7 @@ public class EmsBatteryData extends BaseEntity
/** 簇设备id */
@Excel(name = "簇设备id")
private Long clusterDeviceId;
private String clusterDeviceId;
public void setId(Long id)
{
@ -156,12 +156,12 @@ public class EmsBatteryData extends BaseEntity
return dataTimestamp;
}
public void setSiteId(Long siteId)
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public Long getSiteId()
public String getSiteId()
{
return siteId;
}
@ -176,12 +176,12 @@ public class EmsBatteryData extends BaseEntity
return deviceId;
}
public void setClusterDeviceId(Long clusterDeviceId)
public void setClusterDeviceId(String clusterDeviceId)
{
this.clusterDeviceId = clusterDeviceId;
}
public Long getClusterDeviceId()
public String getClusterDeviceId()
{
return clusterDeviceId;
}

494
ems-system/src/main/java/com/xzzn/ems/domain/EmsBatteryStack.java
View File

@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
* 电池堆数据对象 ems_battery_stack
*
* @author xzzn
* @date 2025-06-22
* @date 2025-06-29
*/
public class EmsBatteryStack extends BaseEntity
{
@ -74,11 +74,139 @@ public class EmsBatteryStack extends BaseEntity
/** 站点id */
@Excel(name = "站点id")
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
@Excel(name = "设备唯一标识符")
private Long deviceId;
private String deviceId;
/** 允许充电最大功率 */
@Excel(name = "允许充电最大功率")
private BigDecimal maxAllowedChargePower;
/** 允许放电最大功率 */
@Excel(name = "允许放电最大功率")
private BigDecimal maxAllowedDischargePower;
/** 允许充电最大电压 */
@Excel(name = "允许充电最大电压")
private BigDecimal maxAllowedChargeVoltage;
/** 允许放电最大电压 */
@Excel(name = "允许放电最大电压")
private BigDecimal maxAllowedDischargeVoltage;
/** 允许充电最大电流 */
@Excel(name = "允许充电最大电流")
private BigDecimal maxAllowedChargeCurrent;
/** 允许放电最大电流 */
@Excel(name = "允许放电最大电流")
private BigDecimal maxAllowedDischargeCurrent;
/** 组电压 */
@Excel(name = "组电压")
private BigDecimal batteryPackVoltage;
/** 组电流 */
@Excel(name = "组电流")
private BigDecimal batteryPackCurrent;
/** 模块温度 */
@Excel(name = "模块温度")
private BigDecimal batteryPackTemp;
/** 组SOC */
@Excel(name = "组SOC")
private BigDecimal batteryPackSoc;
/** 组SOH */
@Excel(name = "组SOH")
private BigDecimal batteryPackSoh;
/** 组绝缘电阻 */
@Excel(name = "组绝缘电阻")
private BigDecimal batteryPackInsulationResistance;
/** 平均单体电压 */
@Excel(name = "平均单体电压")
private BigDecimal avgCellVoltage;
/** 平均单体温度 */
@Excel(name = "平均单体温度")
private BigDecimal avgCellTemp;
/** 最高单体电压 */
@Excel(name = "最高单体电压")
private BigDecimal maxCellVoltage;
/** 最高单体电压对应点号 */
@Excel(name = "最高单体电压对应点号")
private Long maxCellVoltageId;
/** 最低单体电压 */
@Excel(name = "最低单体电压")
private BigDecimal minCellVoltage;
/** 最低单体电压对应点号 */
@Excel(name = "最低单体电压对应点号")
private Long minCellVoltageId;
/** 最高单体温度 */
@Excel(name = "最高单体温度")
private BigDecimal maxCellTemp;
/** 最高单体温度对应点号 */
@Excel(name = "最高单体温度对应点号")
private Long maxCellTempId;
/** 最低单体温度 */
@Excel(name = "最低单体温度")
private BigDecimal minCellTemp;
/** 最低单体温度对应点号 */
@Excel(name = "最低单体温度对应点号")
private Long minCellTempId;
/** 最高单体SOC */
@Excel(name = "最高单体SOC")
private BigDecimal maxCellSoc;
/** 最高单体SOC对应点号 */
@Excel(name = "最高单体SOC对应点号")
private Long maxCellSocId;
/** 最低单体SOC */
@Excel(name = "最低单体SOC")
private BigDecimal minCellSoc;
/** 最低单体SOC对应点号 */
@Excel(name = "最低单体SOC对应点号")
private Long minCellSocId;
/** 最高单体SOH */
@Excel(name = "最高单体SOH")
private BigDecimal maxCellSoh;
/** 最高单体SOH对应点号 */
@Excel(name = "最高单体SOH对应点号")
private Long maxCellSohId;
/** 最低单体SOH */
@Excel(name = "最低单体SOH")
private BigDecimal minCellSoh;
/** 最低单体SOH对应点号 */
@Excel(name = "最低单体SOH对应点号")
private Long minCellSohId;
/** 单次累计充电电量 */
@Excel(name = "单次累计充电电量")
private BigDecimal totalChargeEnergy;
/** 单次累计放电电量 */
@Excel(name = "单次累计放电电量")
private BigDecimal totalDischargeEnergy;
public void setId(Long id)
{
@ -220,26 +348,346 @@ public class EmsBatteryStack extends BaseEntity
return currentSoc;
}
public void setSiteId(Long siteId)
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public Long getSiteId()
public String getSiteId()
{
return siteId;
}
public void setDeviceId(Long deviceId)
public void setDeviceId(String deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public String getDeviceId()
{
return deviceId;
}
public void setMaxAllowedChargePower(BigDecimal maxAllowedChargePower)
{
this.maxAllowedChargePower = maxAllowedChargePower;
}
public BigDecimal getMaxAllowedChargePower()
{
return maxAllowedChargePower;
}
public void setMaxAllowedDischargePower(BigDecimal maxAllowedDischargePower)
{
this.maxAllowedDischargePower = maxAllowedDischargePower;
}
public BigDecimal getMaxAllowedDischargePower()
{
return maxAllowedDischargePower;
}
public void setMaxAllowedChargeVoltage(BigDecimal maxAllowedChargeVoltage)
{
this.maxAllowedChargeVoltage = maxAllowedChargeVoltage;
}
public BigDecimal getMaxAllowedChargeVoltage()
{
return maxAllowedChargeVoltage;
}
public void setMaxAllowedDischargeVoltage(BigDecimal maxAllowedDischargeVoltage)
{
this.maxAllowedDischargeVoltage = maxAllowedDischargeVoltage;
}
public BigDecimal getMaxAllowedDischargeVoltage()
{
return maxAllowedDischargeVoltage;
}
public void setMaxAllowedChargeCurrent(BigDecimal maxAllowedChargeCurrent)
{
this.maxAllowedChargeCurrent = maxAllowedChargeCurrent;
}
public BigDecimal getMaxAllowedChargeCurrent()
{
return maxAllowedChargeCurrent;
}
public void setMaxAllowedDischargeCurrent(BigDecimal maxAllowedDischargeCurrent)
{
this.maxAllowedDischargeCurrent = maxAllowedDischargeCurrent;
}
public BigDecimal getMaxAllowedDischargeCurrent()
{
return maxAllowedDischargeCurrent;
}
public void setBatteryPackVoltage(BigDecimal batteryPackVoltage)
{
this.batteryPackVoltage = batteryPackVoltage;
}
public BigDecimal getBatteryPackVoltage()
{
return batteryPackVoltage;
}
public void setBatteryPackCurrent(BigDecimal batteryPackCurrent)
{
this.batteryPackCurrent = batteryPackCurrent;
}
public BigDecimal getBatteryPackCurrent()
{
return batteryPackCurrent;
}
public void setBatteryPackTemp(BigDecimal batteryPackTemp)
{
this.batteryPackTemp = batteryPackTemp;
}
public BigDecimal getBatteryPackTemp()
{
return batteryPackTemp;
}
public void setBatteryPackSoc(BigDecimal batteryPackSoc)
{
this.batteryPackSoc = batteryPackSoc;
}
public BigDecimal getBatteryPackSoc()
{
return batteryPackSoc;
}
public void setBatteryPackSoh(BigDecimal batteryPackSoh)
{
this.batteryPackSoh = batteryPackSoh;
}
public BigDecimal getBatteryPackSoh()
{
return batteryPackSoh;
}
public void setBatteryPackInsulationResistance(BigDecimal batteryPackInsulationResistance)
{
this.batteryPackInsulationResistance = batteryPackInsulationResistance;
}
public BigDecimal getBatteryPackInsulationResistance()
{
return batteryPackInsulationResistance;
}
public void setAvgCellVoltage(BigDecimal avgCellVoltage)
{
this.avgCellVoltage = avgCellVoltage;
}
public BigDecimal getAvgCellVoltage()
{
return avgCellVoltage;
}
public void setAvgCellTemp(BigDecimal avgCellTemp)
{
this.avgCellTemp = avgCellTemp;
}
public BigDecimal getAvgCellTemp()
{
return avgCellTemp;
}
public void setMaxCellVoltage(BigDecimal maxCellVoltage)
{
this.maxCellVoltage = maxCellVoltage;
}
public BigDecimal getMaxCellVoltage()
{
return maxCellVoltage;
}
public void setMaxCellVoltageId(Long maxCellVoltageId)
{
this.maxCellVoltageId = maxCellVoltageId;
}
public Long getMaxCellVoltageId()
{
return maxCellVoltageId;
}
public void setMinCellVoltage(BigDecimal minCellVoltage)
{
this.minCellVoltage = minCellVoltage;
}
public BigDecimal getMinCellVoltage()
{
return minCellVoltage;
}
public void setMinCellVoltageId(Long minCellVoltageId)
{
this.minCellVoltageId = minCellVoltageId;
}
public Long getMinCellVoltageId()
{
return minCellVoltageId;
}
public void setMaxCellTemp(BigDecimal maxCellTemp)
{
this.maxCellTemp = maxCellTemp;
}
public BigDecimal getMaxCellTemp()
{
return maxCellTemp;
}
public void setMaxCellTempId(Long maxCellTempId)
{
this.maxCellTempId = maxCellTempId;
}
public Long getMaxCellTempId()
{
return maxCellTempId;
}
public void setMinCellTemp(BigDecimal minCellTemp)
{
this.minCellTemp = minCellTemp;
}
public BigDecimal getMinCellTemp()
{
return minCellTemp;
}
public void setMinCellTempId(Long minCellTempId)
{
this.minCellTempId = minCellTempId;
}
public Long getMinCellTempId()
{
return minCellTempId;
}
public void setMaxCellSoc(BigDecimal maxCellSoc)
{
this.maxCellSoc = maxCellSoc;
}
public BigDecimal getMaxCellSoc()
{
return maxCellSoc;
}
public void setMaxCellSocId(Long maxCellSocId)
{
this.maxCellSocId = maxCellSocId;
}
public Long getMaxCellSocId()
{
return maxCellSocId;
}
public void setMinCellSoc(BigDecimal minCellSoc)
{
this.minCellSoc = minCellSoc;
}
public BigDecimal getMinCellSoc()
{
return minCellSoc;
}
public void setMinCellSocId(Long minCellSocId)
{
this.minCellSocId = minCellSocId;
}
public Long getMinCellSocId()
{
return minCellSocId;
}
public void setMaxCellSoh(BigDecimal maxCellSoh)
{
this.maxCellSoh = maxCellSoh;
}
public BigDecimal getMaxCellSoh()
{
return maxCellSoh;
}
public void setMaxCellSohId(Long maxCellSohId)
{
this.maxCellSohId = maxCellSohId;
}
public Long getMaxCellSohId()
{
return maxCellSohId;
}
public void setMinCellSoh(BigDecimal minCellSoh)
{
this.minCellSoh = minCellSoh;
}
public BigDecimal getMinCellSoh()
{
return minCellSoh;
}
public void setMinCellSohId(Long minCellSohId)
{
this.minCellSohId = minCellSohId;
}
public Long getMinCellSohId()
{
return minCellSohId;
}
public void setTotalChargeEnergy(BigDecimal totalChargeEnergy)
{
this.totalChargeEnergy = totalChargeEnergy;
}
public BigDecimal getTotalChargeEnergy()
{
return totalChargeEnergy;
}
public void setTotalDischargeEnergy(BigDecimal totalDischargeEnergy)
{
this.totalDischargeEnergy = totalDischargeEnergy;
}
public BigDecimal getTotalDischargeEnergy()
{
return totalDischargeEnergy;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -264,6 +712,38 @@ public class EmsBatteryStack extends BaseEntity
.append("remark", getRemark())
.append("siteId", getSiteId())
.append("deviceId", getDeviceId())
.append("maxAllowedChargePower", getMaxAllowedChargePower())
.append("maxAllowedDischargePower", getMaxAllowedDischargePower())
.append("maxAllowedChargeVoltage", getMaxAllowedChargeVoltage())
.append("maxAllowedDischargeVoltage", getMaxAllowedDischargeVoltage())
.append("maxAllowedChargeCurrent", getMaxAllowedChargeCurrent())
.append("maxAllowedDischargeCurrent", getMaxAllowedDischargeCurrent())
.append("batteryPackVoltage", getBatteryPackVoltage())
.append("batteryPackCurrent", getBatteryPackCurrent())
.append("batteryPackTemp", getBatteryPackTemp())
.append("batteryPackSoc", getBatteryPackSoc())
.append("batteryPackSoh", getBatteryPackSoh())
.append("batteryPackInsulationResistance", getBatteryPackInsulationResistance())
.append("avgCellVoltage", getAvgCellVoltage())
.append("avgCellTemp", getAvgCellTemp())
.append("maxCellVoltage", getMaxCellVoltage())
.append("maxCellVoltageId", getMaxCellVoltageId())
.append("minCellVoltage", getMinCellVoltage())
.append("minCellVoltageId", getMinCellVoltageId())
.append("maxCellTemp", getMaxCellTemp())
.append("maxCellTempId", getMaxCellTempId())
.append("minCellTemp", getMinCellTemp())
.append("minCellTempId", getMinCellTempId())
.append("maxCellSoc", getMaxCellSoc())
.append("maxCellSocId", getMaxCellSocId())
.append("minCellSoc", getMinCellSoc())
.append("minCellSocId", getMinCellSocId())
.append("maxCellSoh", getMaxCellSoh())
.append("maxCellSohId", getMaxCellSohId())
.append("minCellSoh", getMinCellSoh())
.append("minCellSohId", getMinCellSohId())
.append("totalChargeEnergy", getTotalChargeEnergy())
.append("totalDischargeEnergy", getTotalDischargeEnergy())
.toString();
}
}

16
ems-system/src/main/java/com/xzzn/ems/domain/EmsCoolingData.java
View File

@ -11,13 +11,13 @@ import com.xzzn.common.annotation.Excel;
* 冷却系统参数对象 ems_cooling_data
*
* @author xzzn
* @date 2025-06-25
* @date 2025-06-29
*/
public class EmsCoolingData extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
/** */
private Long id;
/** 系统名称，如1#液冷 */
@ -58,11 +58,11 @@ public class EmsCoolingData extends BaseEntity
/** 站点id */
@Excel(name = "站点id")
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
@Excel(name = "设备唯一标识符")
private Long deviceId;
private String deviceId;
public void setId(Long id)
{
@ -164,22 +164,22 @@ public class EmsCoolingData extends BaseEntity
return lowTempAlarmPoint;
}
public void setSiteId(Long siteId)
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public Long getSiteId()
public String getSiteId()
{
return siteId;
}
public void setDeviceId(Long deviceId)
public void setDeviceId(String deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public String getDeviceId()
{
return deviceId;
}

23
ems-system/src/main/java/com/xzzn/ems/domain/EmsDevicesSetting.java
View File

@ -11,7 +11,7 @@ import com.xzzn.common.annotation.Excel;
* Modbus设备配置对象 ems_devices_setting
*
* @author xzzn
* @date 2025-06-24
* @date 2025-06-29
*/
public class EmsDevicesSetting extends BaseEntity
{
@ -84,12 +84,16 @@ public class EmsDevicesSetting extends BaseEntity
/** 站点id */
@Excel(name = "站点id")
private Long siteId;
private String siteId;
/** 通信状态 */
@Excel(name = "通信状态")
private String communicationStatus;
/** 设备唯一标识符 */
@Excel(name = "设备唯一标识符")
private String deviceId;
public void setId(Long id)
{
this.id = id;
@ -250,12 +254,12 @@ public class EmsDevicesSetting extends BaseEntity
return updatedAt;
}
public void setSiteId(Long siteId)
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public Long getSiteId()
public String getSiteId()
{
return siteId;
}
@ -270,6 +274,16 @@ public class EmsDevicesSetting extends BaseEntity
return communicationStatus;
}
public void setDeviceId(String deviceId)
{
this.deviceId = deviceId;
}
public String getDeviceId()
{
return deviceId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -291,6 +305,7 @@ public class EmsDevicesSetting extends BaseEntity
.append("updatedAt", getUpdatedAt())
.append("siteId", getSiteId())
.append("communicationStatus", getCommunicationStatus())
.append("deviceId", getDeviceId())
.toString();
}
}

316
ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsBranchData.java
View File

@ -11,13 +11,13 @@ import com.xzzn.common.annotation.Excel;
* pcs支路数据对象 ems_pcs_branch_data
*
* @author xzzn
* @date 2025-06-24
* @date 2025-06-29
*/
public class EmsPcsBranchData extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
/** */
private Long id;
/** 放电状态 */
@ -38,16 +38,96 @@ public class EmsPcsBranchData extends BaseEntity
/** 站点id */
@Excel(name = "站点id")
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
@Excel(name = "设备唯一标识符")
private Long deviceId;
private String deviceId;
/** 支路id */
@Excel(name = "支路id")
private Long branchId;
/** 电网U相电压 */
@Excel(name = "电网U相电压")
private BigDecimal gridUVoltage;
/** 电网V相电压 */
@Excel(name = "电网V相电压")
private BigDecimal gridVVoltage;
/** 电网W相电压 */
@Excel(name = "电网W相电压")
private BigDecimal gridWVoltage;
/** 输出U相电流 */
@Excel(name = "输出U相电流")
private BigDecimal outputUCurrent;
/** 输出V相电流 */
@Excel(name = "输出V相电流")
private BigDecimal outputVCurrent;
/** 输出W相电流 */
@Excel(name = "输出W相电流")
private BigDecimal outputWCurrent;
/** 视在功率 */
@Excel(name = "视在功率")
private BigDecimal apparentPower;
/** 有功功率 */
@Excel(name = "有功功率")
private BigDecimal activePower;
/** 无功功率 */
@Excel(name = "无功功率")
private BigDecimal reactivePower;
/** 功率因数 */
@Excel(name = "功率因数")
private BigDecimal powerFactor;
/** 频率 */
@Excel(name = "频率")
private BigDecimal frequency;
/** 内部温度 */
@Excel(name = "内部温度")
private BigDecimal internalTemp;
/** U相IGBT温度 */
@Excel(name = "U相IGBT温度")
private BigDecimal uIgbtTemp;
/** V相IGBT温度 */
@Excel(name = "V相IGBT温度")
private BigDecimal vIgbtTemp;
/** W相IGBT温度 */
@Excel(name = "W相IGBT温度")
private BigDecimal wIgbtTemp;
/** 并离网状态 */
@Excel(name = "并离网状态")
private String gridStatus;
/** 可用功率 */
@Excel(name = "可用功率")
private BigDecimal availablePower;
/** 总负载比 */
@Excel(name = "总负载比")
private BigDecimal totalLoadRatio;
/** 交流漏电流 */
@Excel(name = "交流漏电流")
private BigDecimal acLeakageCurrent;
/** 绝缘阻抗 */
@Excel(name = "绝缘阻抗")
private BigDecimal insulationResistance;
public void setId(Long id)
{
this.id = id;
@ -98,22 +178,22 @@ public class EmsPcsBranchData extends BaseEntity
return dcCurrent;
}
public void setSiteId(Long siteId)
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public Long getSiteId()
public String getSiteId()
{
return siteId;
}
public void setDeviceId(Long deviceId)
public void setDeviceId(String deviceId)
{
this.deviceId = deviceId;
}
public Long getDeviceId()
public String getDeviceId()
{
return deviceId;
}
@ -128,6 +208,206 @@ public class EmsPcsBranchData extends BaseEntity
return branchId;
}
public void setGridUVoltage(BigDecimal gridUVoltage)
{
this.gridUVoltage = gridUVoltage;
}
public BigDecimal getGridUVoltage()
{
return gridUVoltage;
}
public void setGridVVoltage(BigDecimal gridVVoltage)
{
this.gridVVoltage = gridVVoltage;
}
public BigDecimal getGridVVoltage()
{
return gridVVoltage;
}
public void setGridWVoltage(BigDecimal gridWVoltage)
{
this.gridWVoltage = gridWVoltage;
}
public BigDecimal getGridWVoltage()
{
return gridWVoltage;
}
public void setOutputUCurrent(BigDecimal outputUCurrent)
{
this.outputUCurrent = outputUCurrent;
}
public BigDecimal getOutputUCurrent()
{
return outputUCurrent;
}
public void setOutputVCurrent(BigDecimal outputVCurrent)
{
this.outputVCurrent = outputVCurrent;
}
public BigDecimal getOutputVCurrent()
{
return outputVCurrent;
}
public void setOutputWCurrent(BigDecimal outputWCurrent)
{
this.outputWCurrent = outputWCurrent;
}
public BigDecimal getOutputWCurrent()
{
return outputWCurrent;
}
public void setApparentPower(BigDecimal apparentPower)
{
this.apparentPower = apparentPower;
}
public BigDecimal getApparentPower()
{
return apparentPower;
}
public void setActivePower(BigDecimal activePower)
{
this.activePower = activePower;
}
public BigDecimal getActivePower()
{
return activePower;
}
public void setReactivePower(BigDecimal reactivePower)
{
this.reactivePower = reactivePower;
}
public BigDecimal getReactivePower()
{
return reactivePower;
}
public void setPowerFactor(BigDecimal powerFactor)
{
this.powerFactor = powerFactor;
}
public BigDecimal getPowerFactor()
{
return powerFactor;
}
public void setFrequency(BigDecimal frequency)
{
this.frequency = frequency;
}
public BigDecimal getFrequency()
{
return frequency;
}
public void setInternalTemp(BigDecimal internalTemp)
{
this.internalTemp = internalTemp;
}
public BigDecimal getInternalTemp()
{
return internalTemp;
}
public void setuIgbtTemp(BigDecimal uIgbtTemp)
{
this.uIgbtTemp = uIgbtTemp;
}
public BigDecimal getuIgbtTemp()
{
return uIgbtTemp;
}
public void setvIgbtTemp(BigDecimal vIgbtTemp)
{
this.vIgbtTemp = vIgbtTemp;
}
public BigDecimal getvIgbtTemp()
{
return vIgbtTemp;
}
public void setwIgbtTemp(BigDecimal wIgbtTemp)
{
this.wIgbtTemp = wIgbtTemp;
}
public BigDecimal getwIgbtTemp()
{
return wIgbtTemp;
}
public void setGridStatus(String gridStatus)
{
this.gridStatus = gridStatus;
}
public String getGridStatus()
{
return gridStatus;
}
public void setAvailablePower(BigDecimal availablePower)
{
this.availablePower = availablePower;
}
public BigDecimal getAvailablePower()
{
return availablePower;
}
public void setTotalLoadRatio(BigDecimal totalLoadRatio)
{
this.totalLoadRatio = totalLoadRatio;
}
public BigDecimal getTotalLoadRatio()
{
return totalLoadRatio;
}
public void setAcLeakageCurrent(BigDecimal acLeakageCurrent)
{
this.acLeakageCurrent = acLeakageCurrent;
}
public BigDecimal getAcLeakageCurrent()
{
return acLeakageCurrent;
}
public void setInsulationResistance(BigDecimal insulationResistance)
{
this.insulationResistance = insulationResistance;
}
public BigDecimal getInsulationResistance()
{
return insulationResistance;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -144,6 +424,26 @@ public class EmsPcsBranchData extends BaseEntity
.append("siteId", getSiteId())
.append("deviceId", getDeviceId())
.append("branchId", getBranchId())
.append("gridUVoltage", getGridUVoltage())
.append("gridVVoltage", getGridVVoltage())
.append("gridWVoltage", getGridWVoltage())
.append("outputUCurrent", getOutputUCurrent())
.append("outputVCurrent", getOutputVCurrent())
.append("outputWCurrent", getOutputWCurrent())
.append("apparentPower", getApparentPower())
.append("activePower", getActivePower())
.append("reactivePower", getReactivePower())
.append("powerFactor", getPowerFactor())
.append("frequency", getFrequency())
.append("internalTemp", getInternalTemp())
.append("uIgbtTemp", getuIgbtTemp())
.append("vIgbtTemp", getvIgbtTemp())
.append("wIgbtTemp", getwIgbtTemp())
.append("gridStatus", getGridStatus())
.append("availablePower", getAvailablePower())
.append("totalLoadRatio", getTotalLoadRatio())
.append("acLeakageCurrent", getAcLeakageCurrent())
.append("insulationResistance", getInsulationResistance())
.toString();
}
}

8
ems-system/src/main/java/com/xzzn/ems/domain/EmsPcsData.java
View File

@ -12,7 +12,7 @@ import com.xzzn.common.annotation.Excel;
* PCS数据对象 ems_pcs_data
*
* @author xzzn
* @date 2025-06-28
* @date 2025-06-29
*/
public class EmsPcsData extends BaseEntity
{
@ -124,7 +124,7 @@ public class EmsPcsData extends BaseEntity
/** 站点id */
@Excel(name = "站点id")
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
@Excel(name = "设备唯一标识符")
@ -450,12 +450,12 @@ public class EmsPcsData extends BaseEntity
return dcCurrent;
}
public void setSiteId(Long siteId)
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public Long getSiteId()
public String getSiteId()
{
return siteId;
}

19
ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java
View File

@ -12,7 +12,7 @@ import com.xzzn.common.annotation.Excel;
* 站点对象 ems_site_setting
*
* @author xzzn
* @date 2025-06-20
* @date 2025-06-29
*/
public class EmsSiteSetting extends BaseEntity
{
@ -50,6 +50,10 @@ public class EmsSiteSetting extends BaseEntity
@Excel(name = "装机功率")
private BigDecimal installPower;
/** 站点id */
@Excel(name = "站点id")
private String siteId;
public void setId(Long id)
{
this.id = id;
@ -130,6 +134,16 @@ public class EmsSiteSetting extends BaseEntity
return installPower;
}
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public String getSiteId()
{
return siteId;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -146,6 +160,7 @@ public class EmsSiteSetting extends BaseEntity
.append("updateBy", getUpdateBy())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("siteId", getSiteId())
.toString();
}
}
}

6
ems-system/src/main/java/com/xzzn/ems/domain/vo/AmmeterDataDetailInfo.java
View File

@ -27,7 +27,7 @@ public class AmmeterDataDetailInfo
private BigDecimal valleyKwh;
/** 总表设备Id */
private Long deviceId;
private String deviceId;
/** 数据更新时间 */
private Date updateTime;
@ -80,11 +80,11 @@ public class AmmeterDataDetailInfo
this.category = category;
}
public Long getDeviceId() {
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(Long deviceId) {
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}

12
ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterDataList.java
View File

@ -18,13 +18,13 @@ public class BMSBatteryClusterDataList {
private BigDecimal minData;
/** 单体最小值ID */
private Long minDataID;
private String minDataID;
/** 单体最大值 */
private BigDecimal maxData;
/** 单体最大值ID */
private Long maxDataID;
private String maxDataID;
public String getDataName() {
return dataName;
@ -50,11 +50,11 @@ public class BMSBatteryClusterDataList {
this.minData = minData;
}
public Long getMinDataID() {
public String getMinDataID() {
return minDataID;
}
public void setMinDataID(Long minDataID) {
public void setMinDataID(String minDataID) {
this.minDataID = minDataID;
}
@ -66,11 +66,11 @@ public class BMSBatteryClusterDataList {
this.maxData = maxData;
}
public Long getMaxDataID() {
public String getMaxDataID() {
return maxDataID;
}
public void setMaxDataID(Long maxDataID) {
public void setMaxDataID(String maxDataID) {
this.maxDataID = maxDataID;
}
}

12
ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryClusterVo.java
View File

@ -52,10 +52,10 @@ public class BMSBatteryClusterVo {
private BigDecimal currentSoc;
/** 站点id */
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
private Long deviceId;
private String deviceId;
private List<BMSBatteryClusterDataList> batteryDataList;
@ -171,19 +171,19 @@ public class BMSBatteryClusterVo {
this.currentSoc = currentSoc;
}
public Long getSiteId() {
public String getSiteId() {
return siteId;
}
public void setSiteId(Long siteId) {
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public Long getDeviceId() {
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(Long deviceId) {
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}

4
ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSBatteryDataList.java
View File

@ -33,10 +33,10 @@ public class BMSBatteryDataList {
private BigDecimal minTemperature;
/** 换电站id */
private Long siteId;
private String siteId;
/** 堆id */
private Long stackDeviceId;
private String stackDeviceId;
public Long getClusterId() {
return clusterId;

12
ems-system/src/main/java/com/xzzn/ems/domain/vo/BMSOverViewVo.java
View File

@ -52,10 +52,10 @@ public class BMSOverViewVo {
private BigDecimal currentSoc;
/** 站点id */
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
private Long deviceId;
private String deviceId;
private List<BMSBatteryDataList> batteryDataList;
@ -171,19 +171,19 @@ public class BMSOverViewVo {
this.currentSoc = currentSoc;
}
public Long getDeviceId() {
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(Long deviceId) {
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
public Long getSiteId() {
public String getSiteId() {
return siteId;
}
public void setSiteId(Long siteId) {
public void setSiteId(String siteId) {
this.siteId = siteId;
}

12
ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryClusterDataDetailVo.java
View File

@ -8,10 +8,10 @@ import java.math.BigDecimal;
public class BatteryClusterDataDetailVo {
/** 设备id */
private Long siteId;
private String siteId;
/** 电池簇id */
private Long clusterId;
private String clusterId;
/** 电压平均值 */
private BigDecimal avgVoltage;
@ -40,19 +40,19 @@ public class BatteryClusterDataDetailVo {
/** soc最小值 */
private BigDecimal minSoc;
public Long getSiteId() {
public String getSiteId() {
return siteId;
}
public void setSiteId(Long siteId) {
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public Long getClusterId() {
public String getClusterId() {
return clusterId;
}
public void setClusterId(Long clusterId) {
public void setClusterId(String clusterId) {
this.clusterId = clusterId;
}

70
ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java
View File

@ -1,61 +1,65 @@
package com.xzzn.ems.domain.vo;
import java.util.List;
import java.math.BigDecimal;
/**
* 单站监控-单体电池数据
*
*/
public class BatteryDataStatsListVo {
/**
* 电压List
*/
private List<BatteryDataStatsTemplate> voltageDataList;
/** 月份 */
private String dataMonth;
/**
* 温度List
*/
private List<BatteryDataStatsTemplate> tempDataList;
/** 电压 (V) */
private BigDecimal voltage;
/**
* SOCList
*/
private List<BatteryDataStatsTemplate> socDataList;
/** 温度 (℃) */
private BigDecimal temperature;
/**
* SOHList
*/
private List<BatteryDataStatsTemplate> sohDataList;
/** SOC (%) */
private BigDecimal soc;
public List<BatteryDataStatsTemplate> getVoltageDataList() {
return voltageDataList;
/** SOH (%) */
private BigDecimal soh;
public String getDataMonth() {
return dataMonth;
}
public void setVoltageDataList(List<BatteryDataStatsTemplate> voltageDataList) {
this.voltageDataList = voltageDataList;
public void setDataMonth(String dataMonth) {
this.dataMonth = dataMonth;
}
public List<BatteryDataStatsTemplate> getTempDataList() {
return tempDataList;
public BigDecimal getVoltage() {
return voltage;
}
public void setTempDataList(List<BatteryDataStatsTemplate> tempDataList) {
this.tempDataList = tempDataList;
public void setVoltage(BigDecimal voltage) {
this.voltage = voltage;
}
public List<BatteryDataStatsTemplate> getSocDataList() {
return socDataList;
public BigDecimal getTemperature() {
return temperature;
}
public void setSocDataList(List<BatteryDataStatsTemplate> socDataList) {
this.socDataList = socDataList;
public void setTemperature(BigDecimal temperature) {
this.temperature = temperature;
}
public List<BatteryDataStatsTemplate> getSohDataList() {
return sohDataList;
public BigDecimal getSoc() {
return soc;
}
public void setSohDataList(List<BatteryDataStatsTemplate> sohDataList) {
this.sohDataList = sohDataList;
public void setSoc(BigDecimal soc) {
this.soc = soc;
}
public BigDecimal getSoh() {
return soh;
}
public void setSoh(BigDecimal soh) {
this.soh = soh;
}
}

48
ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsTemplate.java
View File

@ -1,48 +0,0 @@
package com.xzzn.ems.domain.vo;
import java.math.BigDecimal;
/**
* 单体电池-数据统计模板
*
*/
public class BatteryDataStatsTemplate {
/**
* 月份
*/
private String dataMonth;
/**
* 数据一
*/
private BigDecimal dataOne;
/**
* 数据二
*/
private BigDecimal dataTwo;
public String getDataMonth() {
return dataMonth;
}
public void setDataMonth(String dataMonth) {
this.dataMonth = dataMonth;
}
public BigDecimal getDataOne() {
return dataOne;
}
public void setDataOne(BigDecimal dataOne) {
this.dataOne = dataOne;
}
public BigDecimal getDataTwo() {
return dataTwo;
}
public void setDataTwo(BigDecimal dataTwo) {
this.dataTwo = dataTwo;
}
}

12
ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsBranchInfo.java
View File

@ -25,10 +25,10 @@ public class PcsBranchInfo
private BigDecimal dcCurrent;
/** 站点id */
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
private Long deviceId;
private String deviceId;
/** 支路id */
private Long branchId;
@ -65,19 +65,19 @@ public class PcsBranchInfo
this.dcCurrent = dcCurrent;
}
public Long getSiteId() {
public String getSiteId() {
return siteId;
}
public void setSiteId(Long siteId) {
public void setSiteId(String siteId) {
this.siteId = siteId;
}
public Long getDeviceId() {
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(Long deviceId) {
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}

12
ems-system/src/main/java/com/xzzn/ems/domain/vo/PcsDetailInfoVo.java
View File

@ -81,29 +81,29 @@ public class PcsDetailInfoVo {
private BigDecimal acFrequency;
/** 站点id */
private Long siteId;
private String siteId;
/** 设备唯一标识符 */
private Long deviceId;
private String deviceId;
/** 设备名称 */
private String deviceName;
private List<PcsBranchInfo> pcsBranchInfoList;
public Long getDeviceId() {
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(Long deviceId) {
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
public Long getSiteId() {
public String getSiteId() {
return siteId;
}
public void setSiteId(Long siteId) {
public void setSiteId(String siteId) {
this.siteId = siteId;
}

2
ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningHeadInfoVo.java → ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRunningHeadInfoVo.java
View File

@ -6,7 +6,7 @@ import java.math.BigDecimal;
* 单站监控-设备监控-实时运行头部行数据
*
*/
public class SiteMonitorRuningHeadInfoVo {
public class SiteMonitorRunningHeadInfoVo {
/**
* 实时有功功率
*/

2
ems-system/src/main/java/com/xzzn/ems/mapper/EmsAlarmRecordsMapper.java
View File

@ -66,7 +66,7 @@ public interface EmsAlarmRecordsMapper
* 根据站点id获取告警记录
*
*/
public List<SiteMonitorHomeAlarmVo> getAlarmRecordsBySiteId(Long siteId);
public List<SiteMonitorHomeAlarmVo> getAlarmRecordsBySiteId(String siteId);
/**
* 获取告警趋势数据

2
ems-system/src/main/java/com/xzzn/ems/mapper/EmsAmmeterDataMapper.java
View File

@ -65,5 +65,5 @@ public interface EmsAmmeterDataMapper
* @param siteId
* @return
*/
public List<AmmeterDataDetailInfo> getAmmeterDetailInfo(Long siteId);
public List<AmmeterDataDetailInfo> getAmmeterDetailInfo(String siteId);
}

4
ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryClusterMapper.java
View File

@ -67,7 +67,7 @@ public interface EmsBatteryClusterMapper
* @param siteId
* @return
*/
public List<BMSBatteryClusterVo> getBMSBatteryCluster(Long siteId);
public List<BMSBatteryClusterVo> getBMSBatteryCluster(String siteId);
/**
* 根据site_di和堆id获取簇数据和单体数据
@ -75,5 +75,5 @@ public interface EmsBatteryClusterMapper
* @param stackDeviceId
* @return
*/
public List<BMSBatteryDataList> getBmsBatteryData(@Param("siteId")Long siteId, @Param("stackDeviceId")Long stackDeviceId);
public List<BMSBatteryDataList> getBmsBatteryData(@Param("siteId")String siteId, @Param("stackDeviceId")String stackDeviceId);
}

4
ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java
View File

@ -70,7 +70,7 @@ public interface EmsBatteryDataMapper
* @param siteId
* @return
*/
public EmsBatteryData getBatteryDataBySiteId(Long siteId);
public EmsBatteryData getBatteryDataBySiteId(String siteId);
/**
* 根据siteId和簇id获取单体数据
@ -78,7 +78,7 @@ public interface EmsBatteryDataMapper
* @param clusterDeviceId
* @return
*/
public BatteryClusterDataDetailVo getBatteryDataByClusterId(@Param("siteId")Long siteId, @Param("clusterDeviceId")Long clusterDeviceId);
public BatteryClusterDataDetailVo getBatteryDataByClusterId(@Param("siteId")String siteId, @Param("clusterDeviceId")String clusterDeviceId);
/**
* 获取最大最小的单体id

2
ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryStackMapper.java
View File

@ -65,5 +65,5 @@ public interface EmsBatteryStackMapper
* @param siteId
* @return
*/
public List<BMSOverViewVo> selectEmsBatteryStackBySiteId(Long siteId);
public List<BMSOverViewVo> selectEmsBatteryStackBySiteId(String siteId);
}

2
ems-system/src/main/java/com/xzzn/ems/mapper/EmsCoolingDataMapper.java
View File

@ -64,5 +64,5 @@ public interface EmsCoolingDataMapper
* @param siteId
* @return
*/
public List<EmsCoolingData> getCoolingDataList(Long siteId);
public List<EmsCoolingData> getCoolingDataList(String siteId);
}

6
ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java
View File

@ -66,19 +66,19 @@ public interface EmsDevicesSettingMapper
* @param siteId
* @return
*/
public List<Map<String, Object>> getAllStackInfoBySiteId(Long siteId);
public List<Map<String, Object>> getAllStackInfoBySiteId(String siteId);
/**
* 根据电池堆id获取所有电池簇
* @param stackDeviceId
* @return
*/
public List<Map<String, Object>> getAllClusterInfoByStackId(Long stackDeviceId);
public List<Map<String, Object>> getAllClusterInfoByStackId(String stackDeviceId);
/**
* 获取设备通信状态
* @param deviceId
* @return
*/
public Map<String, Object> getDeviceStatus(Long deviceId);
public Map<String, Object> getDeviceStatus(String deviceId);
}

6
ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsBranchDataMapper.java
View File

@ -3,13 +3,13 @@ package com.xzzn.ems.mapper;
import java.util.List;
import com.xzzn.ems.domain.EmsPcsBranchData;
import com.xzzn.ems.domain.vo.PcsBranchInfo;
import org.apache.ibatis.annotations.Param;
import io.lettuce.core.dynamic.annotation.Param;
/**
* pcs支路数据Mapper接口
*
* @author xzzn
* @date 2025-06-24
* @date 2025-06-29
*/
public interface EmsPcsBranchDataMapper
{
@ -67,5 +67,5 @@ public interface EmsPcsBranchDataMapper
* @param deviceId
* @return
*/
public List<PcsBranchInfo> getPcsBranchInfoList(@Param("siteId")Long siteId, @Param("deviceId")Long deviceId);
public List<PcsBranchInfo> getPcsBranchInfoList(@Param("siteId")String siteId, @Param("deviceId")String deviceId);
}

10
ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java
View File

@ -8,7 +8,7 @@ import com.xzzn.ems.domain.EmsPcsData;
import com.xzzn.ems.domain.vo.ElectricIndexList;
import com.xzzn.ems.domain.vo.PcsDetailInfoVo;
import com.xzzn.ems.domain.vo.SiteMonitorDataVo;
import com.xzzn.ems.domain.vo.SiteMonitorRuningHeadInfoVo;
import com.xzzn.ems.domain.vo.SiteMonitorRunningHeadInfoVo;
/**
* PCS数据Mapper接口
@ -71,21 +71,21 @@ public interface EmsPcsDataMapper
* @param siteId
* @return
*/
public List<SiteMonitorDataVo> getPcsDataBySiteId(Long siteId);
public List<SiteMonitorDataVo> getPcsDataBySiteId(String siteId);
/**
* 根据站点获取电网实时功率=sum（总交流有功电率）
* @param siteId
* @return
*/
public BigDecimal getGridNrtPower(Long siteId);
public BigDecimal getGridNrtPower(String siteId);
/**
* 根据站点获取设备监控的实时运行头信息
* @param siteId
* @return
*/
public SiteMonitorRuningHeadInfoVo getSiteRunningHeadInfo(Long siteId);
public SiteMonitorRunningHeadInfoVo getSiteRunningHeadInfo(String siteId);
/**
* 获取每月的充电量和放电量
@ -98,7 +98,7 @@ public interface EmsPcsDataMapper
* @param siteId
* @return
*/
public List<PcsDetailInfoVo> getPcsDetailInfoBySiteId(Long siteId);
public List<PcsDetailInfoVo> getPcsDetailInfoBySiteId(String siteId);
/**
* 获取总充+总放

7
ems-system/src/main/java/com/xzzn/ems/mapper/EmsSiteSettingMapper.java
View File

@ -65,4 +65,11 @@ public interface EmsSiteSettingMapper
* @return
*/
public SiteTotalInfoVo getSiteTotalInfo();
/**
* 根据站点id获取站点信息
* @param siteId
* @return
*/
public EmsSiteSetting selectEmsSiteSettingBySiteId(String siteId);
}

4
ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java
View File

@ -18,9 +18,9 @@ public interface IEmsSiteService
public SiteTotalInfoVo getSiteTotalInfo();
public List<Map<String,Object>> getAllStackInfo(Long siteId);
public List<Map<String,Object>> getAllStackInfo(String siteId);
public List<Map<String,Object>> getAllClusterInfo(Long stackDeviceId);
public List<Map<String,Object>> getAllClusterInfo(String stackDeviceId);
}

2
ems-system/src/main/java/com/xzzn/ems/service/IHomePageService.java
View File

@ -13,7 +13,7 @@ public interface IHomePageService
public SiteTotalInfoVo getSiteTotalInfo();
public SingleSiteBaseInfo getSingleSiteBaseInfo(Long siteId);
public SingleSiteBaseInfo getSingleSiteBaseInfo(String siteId);
public HomePageDataViewVo getHomePageDataList();
}

18
ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java
View File

@ -12,22 +12,22 @@ import java.util.List;
public interface ISingleSiteService
{
public SiteMonitorHomeVo getSiteMonitorDataVo(Long siteId);
public SiteMonitorHomeVo getSiteMonitorDataVo(String siteId);
public SiteMonitorRuningHeadInfoVo getSiteRunningHeadInfo(Long siteId);
public SiteMonitorRunningHeadInfoVo getSiteRunningHeadInfo(String siteId);
public SiteMonitorRuningInfoVo getRunningGraph(Long siteId);
public SiteMonitorRuningInfoVo getRunningGraph(String siteId);
public List<PcsDetailInfoVo> getPcsDetailInfo(Long siteId);
public List<PcsDetailInfoVo> getPcsDetailInfo(String siteId);
public List<BMSOverViewVo> getBMSOverView(Long siteId);
public List<BMSOverViewVo> getBMSOverView(String siteId);
public List<BMSBatteryClusterVo> getBMSBatteryCluster(Long siteId);
public List<BMSBatteryClusterVo> getBMSBatteryCluster(String siteId);
public List<EmsCoolingData> getCoolingDataList(Long siteId);
public List<EmsCoolingData> getCoolingDataList(String siteId);
public BatteryDataStatsListVo getClusterDataInfoList(Long clusterDeviceId);
public BatteryDataStatsListVo getClusterDataInfoList(String clusterDeviceId);
public List<AmmeterDataVo> getAmmeterDataList(Long siteId);
public List<AmmeterDataVo> getAmmeterDataList(String siteId);
}

4
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java
View File

@ -40,7 +40,7 @@ public class EmsSiteServiceImpl implements IEmsSiteService
* @return
*/
@Override
public List<Map<String, Object>> getAllStackInfo(Long siteId) {
public List<Map<String, Object>> getAllStackInfo(String siteId) {
return emsDevicesMapper.getAllStackInfoBySiteId(siteId);
}
@ -50,7 +50,7 @@ public class EmsSiteServiceImpl implements IEmsSiteService
* @return
*/
@Override
public List<Map<String, Object>> getAllClusterInfo(Long stackDeviceId) {
public List<Map<String, Object>> getAllClusterInfo(String stackDeviceId) {
return emsDevicesMapper.getAllClusterInfoByStackId(stackDeviceId);
}

18
ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java
View File

@ -46,12 +46,12 @@ public class HomePageServiceImpl implements IHomePageService
// 单站点基本信息
@Override
public SingleSiteBaseInfo getSingleSiteBaseInfo(Long siteId) {
public SingleSiteBaseInfo getSingleSiteBaseInfo(String siteId) {
SingleSiteBaseInfo singleSiteBaseInfo = new SingleSiteBaseInfo();
if (siteId != null) {
if (!StringUtils.isEmpty(siteId)) {
// 站点基本信息
EmsSiteSetting emsSite = emsSiteMapper.selectEmsSiteSettingById(siteId);
EmsSiteSetting emsSite = emsSiteMapper.selectEmsSiteSettingBySiteId(siteId);
if (emsSite != null) {
// 装机功率+装机容量
singleSiteBaseInfo.setSiteName(emsSite.getSiteName());
@ -62,7 +62,8 @@ public class HomePageServiceImpl implements IHomePageService
siteLocation[1] = emsSite.getLatitude() == null ? "" : emsSite.getLatitude().toString();
singleSiteBaseInfo.setSiteLocation(siteLocation);//站点位置
singleSiteBaseInfo.setSiteAddress(emsSite.getSiteAddress());
singleSiteBaseInfo.setRunningTime(DateUtils.parseDateToStr("yyyy-MM-dd",emsSite.getRunningTime()));//投运时间
singleSiteBaseInfo.setRunningTime(emsSite.getRunningTime() == null ? null :
DateUtils.parseDateToStr("yyyy-MM-dd",emsSite.getRunningTime()));//投运时间
// 七天放电数据统计
List<SiteMonitorDataVo> siteMonitorDataVoList = emsPcsDataMapper.getPcsDataBySiteId(siteId);
singleSiteBaseInfo.setSevenDayDisChargeStats(siteMonitorDataVoList);
@ -122,17 +123,14 @@ public class HomePageServiceImpl implements IHomePageService
public HomePageDataViewVo getHomePageDataList() {
HomePageDataViewVo homePageDataViewVo = new HomePageDataViewVo();
// 电量指标
List<ElectricIndexList> electricDataList = new ArrayList();
electricDataList = emsPcsDataMapper.getElectDataList();
List<ElectricIndexList> electricDataList = emsPcsDataMapper.getElectDataList();
homePageDataViewVo.setElecDataList(electricDataList);
// 系统效率
// 告警趋势
List<AlarmTrendList> alarmTrendList = new ArrayList();
alarmTrendList = alarmRecordsMapper.getAlarmTrendList();
List<AlarmTrendList> alarmTrendList = alarmRecordsMapper.getAlarmTrendList();
homePageDataViewVo.setAlarmDataList(alarmTrendList);
// 设备告警占比
List<DeviceAlarmProportionList> deviceAlarmPropList = new ArrayList();
deviceAlarmPropList = alarmRecordsMapper.getDeviceAlarmPropList();
List<DeviceAlarmProportionList> deviceAlarmPropList = alarmRecordsMapper.getDeviceAlarmPropList();
homePageDataViewVo.setDeviceAlarmList(deviceAlarmPropList);
// 告警等级分布
return homePageDataViewVo;

57
ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
View File

@ -46,10 +46,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
private EmsDevicesSettingMapper emsDevicesSettingMapper;
@Override
public SiteMonitorHomeVo getSiteMonitorDataVo(Long siteId) {
public SiteMonitorHomeVo getSiteMonitorDataVo(String siteId) {
SiteMonitorHomeVo siteMonitorHomeVo = new SiteMonitorHomeVo();
if (siteId != null) {
if (!StringUtils.isEmpty(siteId)) {
// 实时告警数据 名称+状态+告警内容
List<SiteMonitorHomeAlarmVo> siteMonitorHomeAlarmVo = emsAlarmRecordsMapper.getAlarmRecordsBySiteId(siteId);
siteMonitorHomeVo.setSiteMonitorHomeAlarmVo(siteMonitorHomeAlarmVo);
@ -106,10 +106,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
// 获取单站监控实时运行头部数据
@Override
public SiteMonitorRuningHeadInfoVo getSiteRunningHeadInfo(Long siteId) {
SiteMonitorRuningHeadInfoVo siteMonitorRunningHeadInfoVo = new SiteMonitorRuningHeadInfoVo();
public SiteMonitorRunningHeadInfoVo getSiteRunningHeadInfo(String siteId) {
SiteMonitorRunningHeadInfoVo siteMonitorRunningHeadInfoVo = new SiteMonitorRunningHeadInfoVo();
if (siteId != null) {
if (!StringUtils.isEmpty(siteId)) {
// 实时有功功率/实时无功功率/今日充电量/今日放电量
siteMonitorRunningHeadInfoVo = emsPcsDataMapper.getSiteRunningHeadInfo(siteId);
// 电池簇SOC
@ -126,9 +126,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
// 获取单站监控实时运行曲线图数据
@Override
public SiteMonitorRuningInfoVo getRunningGraph(Long siteId) {
public SiteMonitorRuningInfoVo getRunningGraph(String siteId) {
SiteMonitorRuningInfoVo siteMonitorRuningInfoVo = new SiteMonitorRuningInfoVo();
if (siteId != null) {
if (!StringUtils.isEmpty(siteId)) {
//储能功率list
//pcs平均温度list
//电池平均soclist
@ -139,17 +139,17 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
// 根据site_id获取pcs详细数据+支路数据
@Override
public List<PcsDetailInfoVo> getPcsDetailInfo(Long siteId) {
public List<PcsDetailInfoVo> getPcsDetailInfo(String siteId) {
List<PcsDetailInfoVo> pcsDetailInfoVoList = new ArrayList<>();
if (siteId != null) {
if (!StringUtils.isEmpty(siteId)) {
// 获取pcs最新数据
pcsDetailInfoVoList = emsPcsDataMapper.getPcsDetailInfoBySiteId(siteId);
if (!CollectionUtils.isEmpty(pcsDetailInfoVoList)) {
for (PcsDetailInfoVo pcsDetailInfoVo : pcsDetailInfoVoList) {
Long deviceId = pcsDetailInfoVo.getDeviceId();
String deviceId = pcsDetailInfoVo.getDeviceId();
// 获取支路最新数据
if (deviceId != null) {
if (!StringUtils.isEmpty(deviceId)) {
List<PcsBranchInfo> pcsBranchInfoList = emsPcsBranchDataMapper.getPcsBranchInfoList(siteId, deviceId);
pcsDetailInfoVo.setPcsBranchInfoList(pcsBranchInfoList);
}
@ -161,17 +161,17 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
// 获取BMS总览数据
@Override
public List<BMSOverViewVo> getBMSOverView(Long siteId) {
public List<BMSOverViewVo> getBMSOverView(String siteId) {
List<BMSOverViewVo> bmsOverViewVoList = new ArrayList<>();
if (siteId != null) {
if (!StringUtils.isEmpty(siteId)) {
// 获取电池堆list
bmsOverViewVoList = emsBatteryStackMapper.selectEmsBatteryStackBySiteId(siteId);
if (!CollectionUtils.isEmpty(bmsOverViewVoList)) {
for (BMSOverViewVo bmsOverViewVo : bmsOverViewVoList) {
// 获取单体电池数据-待确认
Long stackDeviceId = bmsOverViewVo.getDeviceId();
if (stackDeviceId != null) {
String stackDeviceId = bmsOverViewVo.getDeviceId();
if (!StringUtils.isEmpty(stackDeviceId)) {
List<BMSBatteryDataList> batteryDataList = new ArrayList<>();
batteryDataList = emsBatteryClusterMapper.getBmsBatteryData(siteId,stackDeviceId);
bmsOverViewVo.setBatteryDataList(batteryDataList);
@ -184,17 +184,17 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
// 获取BMS电池簇数据
@Override
public List<BMSBatteryClusterVo> getBMSBatteryCluster(Long siteId) {
public List<BMSBatteryClusterVo> getBMSBatteryCluster(String siteId) {
List<BMSBatteryClusterVo> bmsBatteryClusterVoList = new ArrayList<>();
if (siteId != null) {
if (!StringUtils.isEmpty(siteId)) {
bmsBatteryClusterVoList = emsBatteryClusterMapper.getBMSBatteryCluster(siteId);
if (!CollectionUtils.isEmpty(bmsBatteryClusterVoList)) {
for (BMSBatteryClusterVo bmsBatteryClusterVo : bmsBatteryClusterVoList) {
Long clusterDeviceId = bmsBatteryClusterVo.getDeviceId();
String clusterDeviceId = bmsBatteryClusterVo.getDeviceId();
List<BMSBatteryClusterDataList> clusterDataList = new ArrayList<>();
if (clusterDeviceId != null) {
if (!StringUtils.isEmpty(clusterDeviceId)) {
// 获取单体电池数据-平均/最大/最小
BatteryClusterDataDetailVo batteryClusterDataDetailVo = emsBatteryDataMapper.getBatteryDataByClusterId(siteId,clusterDeviceId);
// 处理数据
@ -218,14 +218,14 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
// 设置对应单体id
List<Map<String,Object>> dataIdMapList = emsBatteryDataMapper.getDataIdsMap(batteryClusterDataDetailVo);
Map<String,Long> resultIdMap = new HashMap<>();
Map<String,String> resultIdMap = new HashMap<>();
if (!CollectionUtils.isEmpty(dataIdMapList)) {
resultIdMap = dataIdMapList.stream()
.filter(map -> map.containsKey("type") && map.containsKey("device_id")) // 过滤无效数据
.filter(map -> map.get("type") instanceof String && map.get("device_id") instanceof Number) // 确保类型正确
.collect(Collectors.toMap(
map -> (String) map.get("type"), // 键：type 字段
map -> ((Number) map.get("device_id")).longValue(), // 值：device_id 转为 int
map -> (String) map.get("device_id"), // 值：device_id 转为 int
(existing, replacement) -> existing // 处理键冲突的策略
));
@ -253,9 +253,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
// 获取液冷设备参数
@Override
public List<EmsCoolingData> getCoolingDataList(Long siteId) {
public List<EmsCoolingData> getCoolingDataList(String siteId) {
List<EmsCoolingData> emsCoolingDataList = new ArrayList<>();
if (siteId != null) {
if (!StringUtils.isEmpty(siteId)) {
emsCoolingDataList = emsCoolingDataMapper.getCoolingDataList(siteId);
}
return emsCoolingDataList;
@ -268,8 +268,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
* @return
*/
@Override
public BatteryDataStatsListVo getClusterDataInfoList(Long clusterDeviceId) {
return null;
public BatteryDataStatsListVo getClusterDataInfoList(String clusterDeviceId) {
BatteryDataStatsListVo batteryDataStatsListVo = new BatteryDataStatsListVo();
return batteryDataStatsListVo;
}
/**
@ -278,15 +279,15 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
* @return
*/
@Override
public List<AmmeterDataVo> getAmmeterDataList(Long siteId) {
public List<AmmeterDataVo> getAmmeterDataList(String siteId) {
List<AmmeterDataVo> ammeterDataVos = new ArrayList<>();
AmmeterDataVo ammeterDataVo = new AmmeterDataVo();
if (siteId != null) {
if (!StringUtils.isEmpty(siteId)) {
List<AmmeterDataDetailInfo> ammeterDataDetailInfos = emsAmmeterDataMapper.getAmmeterDetailInfo(siteId);
ammeterDataVo.setAmmeterDataDetailInfos(ammeterDataDetailInfos);
if (!CollectionUtils.isEmpty(ammeterDataDetailInfos)) {
// 获取通信状态
Long deviceId = ammeterDataDetailInfos.get(0).getDeviceId();
String deviceId = ammeterDataDetailInfos.get(0).getDeviceId();
Map<String,Object> map = emsDevicesSettingMapper.getDeviceStatus(deviceId);
ammeterDataVo.setEmsCommunicationStatus(map.get("communication_status").toString());
// 数据更新时间