From 0d6b712e46fd778a01643a6cfcec749f8dd4be3a Mon Sep 17 00:00:00 2001 From: mashili Date: Wed, 25 Jun 2025 12:40:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E8=A3=85=E6=9C=BA=E5=AE=B9?= =?UTF-8?q?=E9=87=8F+=E5=8A=9F=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xzzn/ems/domain/EmsSiteSetting.java | 32 ++++++++++++++++++- .../xzzn/ems/domain/vo/SiteTotalInfoVo.java | 24 +++++++------- .../com/xzzn/ems/mapper/EmsPcsDataMapper.java | 7 ++++ .../ems/service/impl/HomePageServiceImpl.java | 17 +++++++--- .../resources/mapper/ems/EmsPcsDataMapper.xml | 8 +++++ .../mapper/ems/EmsSiteSettingMapper.xml | 18 ++++++++--- 6 files changed, 84 insertions(+), 22 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java index a251214..6143a21 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsSiteSetting.java @@ -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(); } -} +} \ No newline at end of file diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteTotalInfoVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteTotalInfoVo.java index 496c483..462ccb7 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteTotalInfoVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteTotalInfoVo.java @@ -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 + '}'; diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java index 99d6e2b..55dd7b5 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPcsDataMapper.java @@ -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 getPcsDetailInfoBySiteId(Long siteId); + + /** + * 获取总充+总放 + * @return + */ + public Map getPcsTotalChargeData(); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java index 7a8c3b0..b563b98 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/HomePageServiceImpl.java @@ -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 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 siteMonitorDataVoList = emsPcsDataMapper.getPcsDataBySiteId(siteId); singleSiteBaseInfo.setSevenDayDisChargeStats(siteMonitorDataVoList); diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml index 7a34a77..1746e64 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml @@ -235,6 +235,14 @@ where site_id = #{siteId} + + @@ -30,6 +32,8 @@ and running_time = #{runningTime} and latitude = #{latitude} and longitude = #{longitude} + and install_capacity = #{installCapacity} + and install_power = #{installPower} @@ -46,6 +50,8 @@ running_time, latitude, longitude, + install_capacity, + install_power, remark, create_by, update_by, @@ -58,6 +64,8 @@ #{runningTime}, #{latitude}, #{longitude}, + #{installCapacity}, + #{installPower}, #{remark}, #{createBy}, #{updateBy}, @@ -74,6 +82,8 @@ running_time = #{runningTime}, latitude = #{latitude}, longitude = #{longitude}, + install_capacity = #{installCapacity}, + install_power = #{installPower}, remark = #{remark}, create_by = #{createBy}, update_by = #{updateBy}, @@ -96,8 +106,8 @@ \ No newline at end of file