xzzn/emsback
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java
#	ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml
This commit is contained in:
dashixiong
2025-06-29 14:04:55 +08:00
parent 747ce8a08d d2824b6087
commit aed3f830f5
6 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryDataStatsListVo.java
View File

@ -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;
}
}

7
ems-system/src/main/java/com/xzzn/ems/mapper/EmsBatteryDataMapper.java
View File

@ -87,6 +87,13 @@ public interface EmsBatteryDataMapper
*/
public List<Map<String, Object>> getDataIdsMap(BatteryClusterDataDetailVo dataVo);
/**
* 根据电池簇设备id获取下面所有单体电池
* @param clusterDeviceId
* @return
*/
public List<BatteryDataStatsListVo> getAllBatteryDataByClusterId(String clusterDeviceId);
int insertEmsBatteryDataList(List<EmsBatteryData> emsBatteryDataList);
}

2
ems-system/src/main/java/com/xzzn/ems/service/ISingleSiteService.java
View File

@ -27,7 +27,7 @@ public interface ISingleSiteService
public List<EmsCoolingData> getCoolingDataList(String siteId);
public BatteryDataStatsListVo getClusterDataInfoList(String clusterDeviceId);
public List<BatteryDataStatsListVo> getClusterDataInfoList(String clusterDeviceId);
public List<AmmeterDataVo> getAmmeterDataList(String siteId);
}

5
ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java
View File

@ -268,8 +268,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
* @return
*/
@Override
public BatteryDataStatsListVo getClusterDataInfoList(String clusterDeviceId) {
BatteryDataStatsListVo batteryDataStatsListVo = new BatteryDataStatsListVo();
public List<BatteryDataStatsListVo> getClusterDataInfoList(String clusterDeviceId) {
List<BatteryDataStatsListVo> batteryDataStatsListVo = new ArrayList<>();
batteryDataStatsListVo = emsBatteryDataMapper.getAllBatteryDataByClusterId(clusterDeviceId);
return batteryDataStatsListVo;
}

18
ems-system/src/main/resources/mapper/ems/EmsBatteryDataMapper.xml
View File

@ -177,6 +177,24 @@
SELECT NULL AS type, NULL AS device_id FROM DUAL WHERE 1=0
</select>
<select id="getAllBatteryDataByClusterId" parameterType="String" resultType="com.xzzn.ems.domain.vo.BatteryDataStatsListVo">
SELECT
update_time as updateTime,
voltage, temperature, soc, soh,
device_id as deviceId
FROM (
SELECT
t.update_time, t.voltage, t.temperature, t.soc, t.soh, t.device_id,
ROW_NUMBER() OVER (
PARTITION BY t.device_id ORDER BY t.update_time DESC
) AS rn
FROM ems_battery_data t
WHERE t.cluster_device_id = #{clusterDeviceId}
) ranked
WHERE rn = 1
</select>
<insert id="insertEmsBatteryDataList" parameterType="java.util.List">
INSERT INTO ems_battery_data (
battery_pack, battery_cluster, battery_cell_id,