From d2824b6087766034e03e94f62f3ef2ca33d62df4 Mon Sep 17 00:00:00 2001 From: mashili Date: Sun, 29 Jun 2025 13:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E7=AB=99=E7=9B=91=E6=8E=A7-=E5=8D=95?= =?UTF-8?q?=E4=BD=93=E7=94=B5=E6=B1=A0=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/EmsSiteMonitorController.java | 10 ++++++-- .../ems/domain/vo/BatteryDataStatsListVo.java | 23 ++++++++++++++----- .../xzzn/ems/mapper/EmsBatteryDataMapper.java | 10 ++++++-- .../xzzn/ems/service/ISingleSiteService.java | 2 +- .../service/impl/SingleSiteServiceImpl.java | 5 ++-- .../mapper/ems/EmsBatteryDataMapper.xml | 18 +++++++++++++++ 6 files changed, 55 insertions(+), 13 deletions(-) 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 f462657..3375e20 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,11 +2,15 @@ package com.xzzn.web.controller.ems; import com.xzzn.common.core.controller.BaseController; import com.xzzn.common.core.domain.AjaxResult; +import com.xzzn.common.core.page.TableDataInfo; +import com.xzzn.ems.domain.vo.BatteryDataStatsListVo; 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.*; +import java.util.List; + /** * * 单站监控 @@ -106,9 +110,11 @@ public class EmsSiteMonitorController extends BaseController{ * 获取电池簇下面的单体电池数据 */ @GetMapping("/getClusterDataInfoList") - public AjaxResult getClusterDataInfoList(@RequestParam String clusterDeviceId) + public TableDataInfo getClusterDataInfoList(@RequestParam String clusterDeviceId) { - return success(iSingleSiteService.getClusterDataInfoList(clusterDeviceId)); + startPage(); + List list = iSingleSiteService.getClusterDataInfoList(clusterDeviceId); + return getDataTable(list); } /** 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 index f71e713..044e150 100644 --- 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 @@ -2,14 +2,15 @@ package com.xzzn.ems.domain.vo; import java.math.BigDecimal; +import java.util.Date; /** * 单站监控-单体电池数据 * */ public class BatteryDataStatsListVo { - /** 月份 */ - private String dataMonth; + /** 单体电池设备id */ + private String deviceId; /** 电压 (V) */ private BigDecimal voltage; @@ -23,12 +24,14 @@ public class BatteryDataStatsListVo { /** SOH (%) */ private BigDecimal soh; - public String getDataMonth() { - return dataMonth; + private Date updateTime; + + public String getDeviceId() { + return deviceId; } - public void setDataMonth(String dataMonth) { - this.dataMonth = dataMonth; + public void setDeviceId(String deviceId) { + this.deviceId = deviceId; } public BigDecimal getVoltage() { @@ -62,4 +65,12 @@ public class BatteryDataStatsListVo { public void setSoh(BigDecimal soh) { this.soh = soh; } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } } 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 index cdaa2b4..a7c0278 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java @@ -4,9 +4,8 @@ import java.util.List; import java.util.Map; import com.xzzn.ems.domain.EmsBatteryData; -import com.xzzn.ems.domain.vo.BMSBatteryClusterDataList; import com.xzzn.ems.domain.vo.BatteryClusterDataDetailVo; -import org.apache.ibatis.annotations.Mapper; +import com.xzzn.ems.domain.vo.BatteryDataStatsListVo; import org.apache.ibatis.annotations.Param; /** @@ -86,4 +85,11 @@ public interface EmsBatteryDataMapper * @return */ public List> getDataIdsMap(BatteryClusterDataDetailVo dataVo); + + /** + * 根据电池簇设备id获取下面所有单体电池 + * @param clusterDeviceId + * @return + */ + public List getAllBatteryDataByClusterId(String clusterDeviceId); } 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 7154a5e..afa0287 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 @@ -27,7 +27,7 @@ public interface ISingleSiteService public List getCoolingDataList(String siteId); - public BatteryDataStatsListVo getClusterDataInfoList(String clusterDeviceId); + public List getClusterDataInfoList(String clusterDeviceId); public List getAmmeterDataList(String 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 2c2c4f6..55b770a 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 @@ -268,8 +268,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService { * @return */ @Override - public BatteryDataStatsListVo getClusterDataInfoList(String clusterDeviceId) { - BatteryDataStatsListVo batteryDataStatsListVo = new BatteryDataStatsListVo(); + public List getClusterDataInfoList(String clusterDeviceId) { + List batteryDataStatsListVo = new ArrayList<>(); + batteryDataStatsListVo = emsBatteryDataMapper.getAllBatteryDataByClusterId(clusterDeviceId); return batteryDataStatsListVo; } diff --git a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml index d47499c..92ce55d 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml @@ -176,4 +176,22 @@ SELECT NULL AS type, NULL AS device_id FROM DUAL WHERE 1=0 + + + \ No newline at end of file