From 3609b03deb6f57e1bef7e906c42166fae3f4ce47 Mon Sep 17 00:00:00 2001 From: mashili Date: Fri, 27 Jun 2025 10:14:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=93=E7=94=B5=E6=B1=A0-=E6=A1=86?= =?UTF-8?q?=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/EmsSiteMonitorController.java | 18 +++++- .../ems/domain/vo/BatteryDataStatsListVo.java | 61 +++++++++++++++++++ .../domain/vo/BatteryDataStatsTemplate.java | 48 +++++++++++++++ .../ems/mapper/EmsDevicesSettingMapper.java | 16 +++++ .../com/xzzn/ems/service/IEmsSiteService.java | 8 +++ .../ems/service/impl/EmsSiteServiceImpl.java | 29 +++++++++ .../mapper/ems/EmsBatteryClusterMapper.xml | 12 ++++ .../mapper/ems/EmsBatteryDataMapper.xml | 54 +++++++++++++++- .../mapper/ems/EmsDevicesSettingMapper.xml | 12 ++++ 9 files changed, 254 insertions(+), 4 deletions(-) create mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java create mode 100644 ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsTemplate.java 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 67a683a..d664700 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 @@ -2,6 +2,7 @@ package com.xzzn.web.controller.ems; import com.xzzn.common.core.controller.BaseController; import com.xzzn.common.core.domain.AjaxResult; +import com.xzzn.ems.service.IEmsSiteService; import com.xzzn.ems.service.ISingleSiteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,6 +18,8 @@ public class EmsSiteMonitorController extends BaseController{ @Autowired private ISingleSiteService iSingleSiteService; + @Autowired + private IEmsSiteService iEmsSiteService; /** * 获取单站首页数据 @@ -78,16 +81,16 @@ public class EmsSiteMonitorController extends BaseController{ @GetMapping("/getStackNameList") public AjaxResult getStackNameList(@RequestParam Long siteId) { - return success(iSingleSiteService.getBMSBatteryCluster(siteId)); + return success(iEmsSiteService.getAllStackInfo(siteId)); } /** * 获取所有电池簇 */ @GetMapping("/getClusterNameList") - public AjaxResult getClusterNameList(@RequestParam Long siteId) + public AjaxResult getClusterNameList(@RequestParam Long stackDeviceId) { - return success(iSingleSiteService.getBMSBatteryCluster(siteId)); + return success(iEmsSiteService.getAllClusterInfo(stackDeviceId)); } /** @@ -98,4 +101,13 @@ public class EmsSiteMonitorController extends BaseController{ { return success(iSingleSiteService.getCoolingDataList(siteId)); } + + /** + * 获取电池簇下面的单体电池数据 + */ + @GetMapping("/getClusterDataInfoList") + public AjaxResult getClusterDataInfoList(@RequestParam Long clusterDeviceId) + { + return success(iEmsSiteService.getClusterDataInfoList(clusterDeviceId)); + } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java new file mode 100644 index 0000000..7990385 --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java @@ -0,0 +1,61 @@ +package com.xzzn.ems.domain.vo; + +import java.util.List; + +/** + * 单站监控-单体电池数据 + * + */ +public class BatteryDataStatsListVo { + /** + * 电压List + */ + private List voltageDataList; + + /** + * 温度List + */ + private List tempDataList; + + /** + * SOCList + */ + private List socDataList; + + /** + * SOHList + */ + private List sohDataList; + + public List getVoltageDataList() { + return voltageDataList; + } + + public void setVoltageDataList(List voltageDataList) { + this.voltageDataList = voltageDataList; + } + + public List getTempDataList() { + return tempDataList; + } + + public void setTempDataList(List tempDataList) { + this.tempDataList = tempDataList; + } + + public List getSocDataList() { + return socDataList; + } + + public void setSocDataList(List socDataList) { + this.socDataList = socDataList; + } + + public List getSohDataList() { + return sohDataList; + } + + public void setSohDataList(List sohDataList) { + this.sohDataList = sohDataList; + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsTemplate.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsTemplate.java new file mode 100644 index 0000000..2c4a21d --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsTemplate.java @@ -0,0 +1,48 @@ +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; + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java index a21507b..5a7f172 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsDevicesSettingMapper.java @@ -1,6 +1,8 @@ package com.xzzn.ems.mapper; import java.util.List; +import java.util.Map; + import com.xzzn.ems.domain.EmsDevicesSetting; /** @@ -58,4 +60,18 @@ public interface EmsDevicesSettingMapper * @return 结果 */ public int deleteEmsDevicesSettingByIds(Long[] ids); + + /** + * 根据site_id获取所有电池堆 + * @param siteId + * @return + */ + public List> getAllStackInfoBySiteId(Long siteId); + + /** + * 根据电池堆id获取所有电池簇 + * @param stackDeviceId + * @return + */ + public List> getAllClusterInfoByStackId(Long stackDeviceId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java index 4ac665c..eff7a91 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/IEmsSiteService.java @@ -1,9 +1,11 @@ package com.xzzn.ems.service; import com.xzzn.ems.domain.EmsSiteSetting; +import com.xzzn.ems.domain.vo.BatteryDataStatsListVo; import com.xzzn.ems.domain.vo.SiteTotalInfoVo; import java.util.List; +import java.util.Map; /** * 站点信息 服务层 @@ -16,4 +18,10 @@ public interface IEmsSiteService public SiteTotalInfoVo getSiteTotalInfo(); + + public List> getAllStackInfo(Long siteId); + + public List> getAllClusterInfo(Long stackDeviceId); + + public BatteryDataStatsListVo getClusterDataInfoList(Long clusterDeviceId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java index 4a9e166..ba12178 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsSiteServiceImpl.java @@ -1,13 +1,16 @@ package com.xzzn.ems.service.impl; import com.xzzn.ems.domain.EmsSiteSetting; +import com.xzzn.ems.domain.vo.BatteryDataStatsListVo; import com.xzzn.ems.domain.vo.SiteTotalInfoVo; +import com.xzzn.ems.mapper.EmsDevicesSettingMapper; import com.xzzn.ems.mapper.EmsSiteSettingMapper; import com.xzzn.ems.service.IEmsSiteService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 站点信息 服务层实现 @@ -19,6 +22,8 @@ public class EmsSiteServiceImpl implements IEmsSiteService @Autowired private EmsSiteSettingMapper emsSiteMapper; + @Autowired + private EmsDevicesSettingMapper emsDevicesMapper; @Override public List getAllSites() { @@ -30,4 +35,28 @@ public class EmsSiteServiceImpl implements IEmsSiteService return emsSiteMapper.getSiteTotalInfo(); } + /** + * 根据site_id获取所有电池堆 + * @param siteId + * @return + */ + @Override + public List> getAllStackInfo(Long siteId) { + return emsDevicesMapper.getAllStackInfoBySiteId(siteId); + } + + @Override + public List> getAllClusterInfo(Long stackDeviceId) { + return emsDevicesMapper.getAllClusterInfoByStackId(stackDeviceId); + } + + /** + * 根据电池堆获取单体柱状数据 + * @param clusterDeviceId + * @return + */ + @Override + public BatteryDataStatsListVo getClusterDataInfoList(Long clusterDeviceId) { + return null; + } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml index 8b061cf..bd4f43c 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml @@ -157,4 +157,16 @@ and t.device_id = tmp.device_id) order by tmp.device_id + + \ No newline at end of file diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml index 456f7a1..ad7ab18 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml @@ -21,10 +21,11 @@ + - 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 + 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, cluster_device_id from ems_battery_data @@ -66,6 +68,7 @@ remark, site_id, device_id, + cluster_device_id, #{batteryPack}, @@ -83,6 +86,7 @@ #{remark}, #{siteId}, #{deviceId}, + #{clusterDeviceId}, @@ -104,6 +108,7 @@ remark = #{remark}, site_id = #{siteId}, device_id = #{deviceId}, + cluster_device_id = #{clusterDeviceId}, where id = #{id} @@ -124,4 +129,51 @@ where site_id = #{siteId} and DATE(data_timestamp) = DATE(NOW()) + + + + \ No newline at end of file diff --git a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml index c90b2c3..a9f4f03 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml @@ -133,4 +133,16 @@ #{id} + + + + \ No newline at end of file