From 43237b4a932bca9541fd73e50c3377fb568331c9 Mon Sep 17 00:00:00 2001 From: mashili Date: Thu, 19 Jun 2025 19:00:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7-=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E8=BF=90=E8=A1=8C=E5=A4=B4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/EmsSiteMonitorController.java | 9 ++ .../domain/vo/SiteMonitorRuningInfoVo.java | 80 +---------- .../xzzn/ems/mapper/EmsBatteryDataMapper.java | 69 ++++++++++ .../com/xzzn/ems/mapper/EmsPcsDataMapper.java | 10 ++ .../xzzn/ems/service/ISingleSiteService.java | 4 +- .../service/impl/SingleSiteServiceImpl.java | 29 ++-- .../mapper/ems/EmsBatteryDataMapper.xml | 127 ++++++++++++++++++ .../resources/mapper/ems/EmsPcsDataMapper.xml | 9 ++ 8 files changed, 248 insertions(+), 89 deletions(-) create mode 100644 ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java create mode 100644 ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml diff --git a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java index 22ef4d2..c5ae4d6 100644 --- a/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java +++ b/ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsSiteMonitorController.java @@ -26,4 +26,13 @@ public class EmsSiteMonitorController extends BaseController{ { return success(iSingleSiteService.getSiteMonitorDataVo(siteId)); } + + /** + * 单站监控-设备监控-实时运行头部数据 + */ + @GetMapping("/runingHeadInfo") + public AjaxResult getRuningHeadInfo(@RequestParam Long siteId) + { + return success(iSingleSiteService.getSiteRuningHeadInfo(siteId)); + } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningInfoVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningInfoVo.java index baf0fab..6a3928e 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningInfoVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorRuningInfoVo.java @@ -4,40 +4,10 @@ import java.math.BigDecimal; import java.util.List; /** - * 单站监控-设备监控-实时运行数据 + * 单站监控-设备监控-实时运行曲线数据 * */ public class SiteMonitorRuningInfoVo { - /** - * 实时有功功率 - */ - private BigDecimal totalActivePower; - - /** - * 实时无功功率 - */ - private BigDecimal totalReactivePower; - - /** - * 电池簇SOC - */ - private BigDecimal soc; - - /** - * 电池堆SOH - */ - private BigDecimal soh; - - /** - * 今日充电量 - */ - private BigDecimal dayChargedCap; - - /** - * 今日放电量 - */ - private BigDecimal dayDisChargedCap; - /** * 储能功率list */ @@ -58,54 +28,6 @@ public class SiteMonitorRuningInfoVo { */ private List batteryAveTempList; - public BigDecimal getTotalActivePower() { - return totalActivePower; - } - - public void setTotalActivePower(BigDecimal totalActivePower) { - this.totalActivePower = totalActivePower; - } - - public BigDecimal getTotalReactivePower() { - return totalReactivePower; - } - - public void setTotalReactivePower(BigDecimal totalReactivePower) { - this.totalReactivePower = totalReactivePower; - } - - public BigDecimal getSoc() { - return soc; - } - - public void setSoc(BigDecimal soc) { - this.soc = soc; - } - - public BigDecimal getSoh() { - return soh; - } - - public void setSoh(BigDecimal soh) { - this.soh = soh; - } - - public BigDecimal getDayChargedCap() { - return dayChargedCap; - } - - public void setDayChargedCap(BigDecimal dayChargedCap) { - this.dayChargedCap = dayChargedCap; - } - - public BigDecimal getDayDisChargedCap() { - return dayDisChargedCap; - } - - public void setDayDisChargedCap(BigDecimal dayDisChargedCap) { - this.dayDisChargedCap = dayDisChargedCap; - } - public List getEnergyStoragePowList() { return energyStoragePowList; } diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java new file mode 100644 index 0000000..4eae06d --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java @@ -0,0 +1,69 @@ +package com.xzzn.ems.mapper; + +import java.util.List; +import com.xzzn.ems.domain.EmsBatteryData; +import org.apache.ibatis.annotations.Mapper; + +/** + * 单体电池实时数据Mapper接口 + * + * @author xzzn + * @date 2025-06-19 + */ +public interface EmsBatteryDataMapper +{ + /** + * 查询单体电池实时数据 + * + * @param id 单体电池实时数据主键 + * @return 单体电池实时数据 + */ + public EmsBatteryData selectEmsBatteryDataById(Long id); + + /** + * 查询单体电池实时数据列表 + * + * @param emsBatteryData 单体电池实时数据 + * @return 单体电池实时数据集合 + */ + public List selectEmsBatteryDataList(EmsBatteryData emsBatteryData); + + /** + * 新增单体电池实时数据 + * + * @param emsBatteryData 单体电池实时数据 + * @return 结果 + */ + public int insertEmsBatteryData(EmsBatteryData emsBatteryData); + + /** + * 修改单体电池实时数据 + * + * @param emsBatteryData 单体电池实时数据 + * @return 结果 + */ + public int updateEmsBatteryData(EmsBatteryData emsBatteryData); + + /** + * 删除单体电池实时数据 + * + * @param id 单体电池实时数据主键 + * @return 结果 + */ + public int deleteEmsBatteryDataById(Long id); + + /** + * 批量删除单体电池实时数据 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmsBatteryDataByIds(Long[] ids); + + /** + * 根据siteId查询站点电池实时数据 + * @param siteId + * @return + */ + public EmsBatteryData getBatteryDataBySiteId(Long siteId); +} 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 da8b9ce..820c95f 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,8 +2,11 @@ package com.xzzn.ems.mapper; import java.math.BigDecimal; import java.util.List; + +import com.xzzn.ems.domain.EmsBatteryData; import com.xzzn.ems.domain.EmsPcsData; import com.xzzn.ems.domain.vo.SiteMonitorDataVo; +import com.xzzn.ems.domain.vo.SiteMonitorRuningHeadInfoVo; /** * PCS数据Mapper接口 @@ -74,4 +77,11 @@ public interface EmsPcsDataMapper * @return */ public BigDecimal getGridNrtPower(Long siteId); + + /** + * 根据站点获取设备监控的实时运行头信息 + * @param siteId + * @return + */ + public SiteMonitorRuningHeadInfoVo getSiteRunningHeadInfo(Long siteId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java b/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java index 318d623..c857eb7 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java @@ -1,7 +1,7 @@ package com.xzzn.ems.service; import com.xzzn.ems.domain.vo.SiteMonitorHomeVo; -import com.xzzn.ems.domain.vo.SiteMonitorRuningInfoVo; +import com.xzzn.ems.domain.vo.SiteMonitorRuningHeadInfoVo; /** * 单点监控 服务层 @@ -13,5 +13,5 @@ public interface ISingleSiteService public SiteMonitorHomeVo getSiteMonitorDataVo(Long siteId); - public SiteMonitorRuningInfoVo getSiteRuningInfo(Long siteId); + public SiteMonitorRuningHeadInfoVo getSiteRuningHeadInfo(Long siteId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java index 77e1de5..301778a 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java @@ -1,12 +1,10 @@ package com.xzzn.ems.service.impl; -import com.xzzn.common.utils.DateUtils; import com.xzzn.common.utils.StringUtils; -import com.xzzn.ems.domain.vo.SiteMonitorDataVo; -import com.xzzn.ems.domain.vo.SiteMonitorHomeAlarmVo; -import com.xzzn.ems.domain.vo.SiteMonitorHomeVo; -import com.xzzn.ems.domain.vo.SiteMonitorRuningInfoVo; +import com.xzzn.ems.domain.EmsBatteryData; +import com.xzzn.ems.domain.vo.*; import com.xzzn.ems.mapper.EmsAlarmRecordsMapper; +import com.xzzn.ems.mapper.EmsBatteryDataMapper; import com.xzzn.ems.mapper.EmsPcsDataMapper; import com.xzzn.ems.service.ISingleSiteService; import org.springframework.beans.factory.annotation.Autowired; @@ -14,7 +12,6 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.Calendar; -import java.util.Date; import java.util.List; /** @@ -27,6 +24,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { private EmsPcsDataMapper emsPcsDataMapper; @Autowired private EmsAlarmRecordsMapper emsAlarmRecordsMapper; + @Autowired + private EmsBatteryDataMapper emsBatteryDataMapper; @Override public SiteMonitorHomeVo getSiteMonitorDataVo(Long siteId) { @@ -88,8 +87,22 @@ public class SingleSiteServiceImpl implements ISingleSiteService { } @Override - public SiteMonitorRuningInfoVo getSiteRuningInfo(Long siteId) { - return null; + public SiteMonitorRuningHeadInfoVo getSiteRuningHeadInfo(Long siteId) { + SiteMonitorRuningHeadInfoVo siteMonitorRuningHeadInfoVo = new SiteMonitorRuningHeadInfoVo(); + + if (siteId != null) { + // 实时有功功率/实时无功功率/今日充电量/今日放电量 + siteMonitorRuningHeadInfoVo = emsPcsDataMapper.getSiteRunningHeadInfo(siteId); + // 电池簇SOC + // 电池堆SOH + EmsBatteryData emsBatteryData = emsBatteryDataMapper.getBatteryDataBySiteId(siteId); + if (emsBatteryData != null) { + siteMonitorRuningHeadInfoVo.setSoc(emsBatteryData.getSoc()); + siteMonitorRuningHeadInfoVo.setSoh(emsBatteryData.getSoh()); + } + } + + return siteMonitorRuningHeadInfoVo; } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml new file mode 100644 index 0000000..456f7a1 --- /dev/null +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, battery_pack, battery_cluster, battery_cell_id, voltage, temperature, soc, soh, data_timestamp, create_by, create_time, update_by, update_time, remark, site_id, device_id from ems_battery_data + + + + + + + + insert into ems_battery_data + + battery_pack, + battery_cluster, + battery_cell_id, + voltage, + temperature, + soc, + soh, + data_timestamp, + create_by, + create_time, + update_by, + update_time, + remark, + site_id, + device_id, + + + #{batteryPack}, + #{batteryCluster}, + #{batteryCellId}, + #{voltage}, + #{temperature}, + #{soc}, + #{soh}, + #{dataTimestamp}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + #{siteId}, + #{deviceId}, + + + + + update ems_battery_data + + battery_pack = #{batteryPack}, + battery_cluster = #{batteryCluster}, + battery_cell_id = #{batteryCellId}, + voltage = #{voltage}, + temperature = #{temperature}, + soc = #{soc}, + soh = #{soh}, + data_timestamp = #{dataTimestamp}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + site_id = #{siteId}, + device_id = #{deviceId}, + + where id = #{id} + + + + delete from ems_battery_data where id = #{id} + + + + delete from ems_battery_data where id in + + #{id} + + + + + \ No newline at end of file diff --git a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml index 3dc15e6..aff5485 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsPcsDataMapper.xml @@ -222,4 +222,13 @@ where site_id = #{siteId} + \ No newline at end of file