首页-装机容量+功率

This commit is contained in:
2025-06-25 12:40:04 +08:00
parent 46e0b94571
commit 0d6b712e46
6 changed files with 84 additions and 22 deletions

View File

@ -42,6 +42,14 @@ public class EmsSiteSetting extends BaseEntity
@Excel(name = "经度")
private BigDecimal longitude;
/** 装机容量 */
@Excel(name = "装机容量")
private BigDecimal installCapacity;
/** 装机功率 */
@Excel(name = "装机功率")
private BigDecimal installPower;
public void setId(Long id)
{
this.id = id;
@ -102,6 +110,26 @@ public class EmsSiteSetting extends BaseEntity
return longitude;
}
public void setInstallCapacity(BigDecimal installCapacity)
{
this.installCapacity = installCapacity;
}
public BigDecimal getInstallCapacity()
{
return installCapacity;
}
public void setInstallPower(BigDecimal installPower)
{
this.installPower = installPower;
}
public BigDecimal getInstallPower()
{
return installPower;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -111,6 +139,8 @@ public class EmsSiteSetting extends BaseEntity
.append("runningTime", getRunningTime())
.append("latitude", getLatitude())
.append("longitude", getLongitude())
.append("installCapacity", getInstallCapacity())
.append("installPower", getInstallPower())
.append("remark", getRemark())
.append("createBy", getCreateBy())
.append("updateBy", getUpdateBy())
@ -118,4 +148,4 @@ public class EmsSiteSetting extends BaseEntity
.append("updateTime", getUpdateTime())
.toString();
}
}
}

View File

@ -15,12 +15,12 @@ public class SiteTotalInfoVo {
/**
* 装机功率MW
*/
private BigDecimal installedPower;
private BigDecimal installPower;
/**
* 装机容量MW
*/
private BigDecimal installedCap;
private BigDecimal installCapacity;
/**
* 总充电量MWH
@ -56,28 +56,28 @@ public class SiteTotalInfoVo {
this.totalChargedCap = totalChargedCap;
}
public BigDecimal getInstalledCap() {
return installedCap;
public BigDecimal getInstallCapacity() {
return installCapacity;
}
public void setInstalledCap(BigDecimal installedCap) {
this.installedCap = installedCap;
public void setInstallCapacity(BigDecimal installCapacity) {
this.installCapacity = installCapacity;
}
public BigDecimal getInstalledPower() {
return installedPower;
public BigDecimal getInstallPower() {
return installPower;
}
public void setInstalledPower(BigDecimal installedPower) {
this.installedPower = installedPower;
public void setInstallPower(BigDecimal installPower) {
this.installPower = installPower;
}
@Override
public String toString() {
return "SiteVo{" +
"siteNum=" + siteNum +
", installedPower=" + installedPower +
", installedCap=" + installedCap +
", installedPower=" + installPower +
", installedCap=" + installCapacity +
", totalChargedCap=" + totalChargedCap +
", totalDischargedCap=" + totalDischargedCap +
'}';

View File

@ -2,6 +2,7 @@ package com.xzzn.ems.mapper;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import com.xzzn.ems.domain.EmsPcsData;
import com.xzzn.ems.domain.vo.ElectricIndexList;
@ -98,4 +99,10 @@ public interface EmsPcsDataMapper
* @return
*/
public List<PcsDetailInfoVo> getPcsDetailInfoBySiteId(Long siteId);
/**
* 获取总充+总放
* @return
*/
public Map<String, BigDecimal> getPcsTotalChargeData();
}

View File

@ -13,9 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.*;
/**
* 首页看板+站点地图 服务层实现
@ -36,7 +34,14 @@ public class HomePageServiceImpl implements IHomePageService
@Override
public SiteTotalInfoVo getSiteTotalInfo() {
return emsSiteService.getSiteTotalInfo();
SiteTotalInfoVo siteTotalInfoVo = new SiteTotalInfoVo();
siteTotalInfoVo = emsSiteService.getSiteTotalInfo();
// 获取总充+总放
Map<String,BigDecimal> pcsMap = new HashMap<>();
pcsMap = emsPcsDataMapper.getPcsTotalChargeData();
siteTotalInfoVo.setTotalChargedCap(pcsMap.get("totalChargedCap"));
siteTotalInfoVo.setTotalDischargedCap(pcsMap.get("totalDischargedCap"));
return siteTotalInfoVo;
}
// 单站点基本信息
@ -48,14 +53,16 @@ public class HomePageServiceImpl implements IHomePageService
// 站点基本信息
EmsSiteSetting emsSite = emsSiteMapper.selectEmsSiteSettingById(siteId);
if (emsSite != null) {
// 装机功率+装机容量
singleSiteBaseInfo.setSiteName(emsSite.getSiteName());
singleSiteBaseInfo.setInstalledCap(emsSite.getInstallCapacity());
singleSiteBaseInfo.setInstalledPower(emsSite.getInstallPower());
String[] siteLocation = new String[2];
siteLocation[0] = emsSite.getLongitude() == null ? "" : emsSite.getLongitude().toString();
siteLocation[1] = emsSite.getLatitude() == null ? "" : emsSite.getLatitude().toString();
singleSiteBaseInfo.setSiteLocation(siteLocation);//站点位置
singleSiteBaseInfo.setSiteAddress(emsSite.getSiteAddress());
singleSiteBaseInfo.setRunningTime(DateUtils.parseDateToStr("yyyy-MM-dd",emsSite.getRunningTime()));//投运时间
// 装机功率+装机容量 待定
// 七天放电数据统计
List<SiteMonitorDataVo> siteMonitorDataVoList = emsPcsDataMapper.getPcsDataBySiteId(siteId);
singleSiteBaseInfo.setSevenDayDisChargeStats(siteMonitorDataVoList);