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

设备监控页面-设备告警铃铛数由查询告警点位数据改为查询设备故障告警

Browse Source
This commit is contained in:
zq
2026-01-27 17:54:11 +08:00
parent d19f07c4e8
commit eeccd19f0a
1 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -488,10 +488,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
List<PcsBranchInfo> pcsBranchInfoList = new ArrayList<>(); List<PcsBranchInfo> pcsBranchInfoList = new ArrayList<>();
processBranchDataInfo(siteId,pcsId,pcsBranchInfoList); processBranchDataInfo(siteId,pcsId,pcsBranchInfoList);
pcsDetailInfoVo.setPcsBranchInfoList(pcsBranchInfoList); pcsDetailInfoVo.setPcsBranchInfoList(pcsBranchInfoList);
// // 报警个数 // 报警个数
// int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId,pcsId); int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId,pcsId);
// 告警设备点位个数 // // 告警设备点位个数
int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, pcsId, DeviceCategory.PCS.getCode()); // int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, pcsId, DeviceCategory.PCS.getCode());
pcsDetailInfoVo.setAlarmNum(alarmNum); pcsDetailInfoVo.setAlarmNum(alarmNum);
pcsDetailInfoVo.setDeviceStatus(pcsDevice.get("deviceStatus") == null ? "" : pcsDevice.get("deviceStatus").toString()); pcsDetailInfoVo.setDeviceStatus(pcsDevice.get("deviceStatus") == null ? "" : pcsDevice.get("deviceStatus").toString());
@ -541,8 +541,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
bmsOverViewVo.setBatteryDataList(batteryDataLists); bmsOverViewVo.setBatteryDataList(batteryDataLists);
} }
// 告警设备点位个数 // 报警个数
int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, stackId, DeviceCategory.STACK.getCode()); int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, stackId);
// // 告警设备点位个数
// int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, stackId, DeviceCategory.STACK.getCode());
bmsOverViewVo.setAlarmNum(alarmNum); bmsOverViewVo.setAlarmNum(alarmNum);
// 处理枚举匹配字段 // 处理枚举匹配字段
@ -604,8 +606,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
dealWithBatteryClusterData(clusterData,clusterDataList); dealWithBatteryClusterData(clusterData,clusterDataList);
bmsBatteryClusterVo.setBatteryDataList(clusterDataList); bmsBatteryClusterVo.setBatteryDataList(clusterDataList);
} }
// 告警设备点位个数 // 报警个数
int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, clusterId, DeviceCategory.CLUSTER.getCode()); int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, clusterId);
// // 告警设备点位个数
// int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, clusterId, DeviceCategory.CLUSTER.getCode());
bmsBatteryClusterVo.setAlarmNum(alarmNum); bmsBatteryClusterVo.setAlarmNum(alarmNum);
// 处理枚举匹配字段 // 处理枚举匹配字段
@ -661,8 +665,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
EmsCoolingData coolingData = redisCache.getCacheObject(RedisKeyConstants.COOLING + siteId + "_" + coolingId); EmsCoolingData coolingData = redisCache.getCacheObject(RedisKeyConstants.COOLING + siteId + "_" + coolingId);
if (coolingData != null) { if (coolingData != null) {
BeanUtils.copyProperties(coolingData, dataViewVo); BeanUtils.copyProperties(coolingData, dataViewVo);
// 告警设备点位个数 // 报警个数
int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, coolingId, DeviceCategory.COOLING.getCode()); int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, coolingId);
// // 告警设备点位个数
// int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, coolingId, DeviceCategory.COOLING.getCode());
dataViewVo.setAlarmNum(alarmNum); dataViewVo.setAlarmNum(alarmNum);
} }
@ -750,8 +756,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
String ammeterId = ammeterDevice.get("id").toString(); String ammeterId = ammeterDevice.get("id").toString();
// 从redis取总表详细数据 // 从redis取总表详细数据
EmsAmmeterData ammeterData = redisCache.getCacheObject(RedisKeyConstants.AMMETER + siteId + "_" +ammeterId); EmsAmmeterData ammeterData = redisCache.getCacheObject(RedisKeyConstants.AMMETER + siteId + "_" +ammeterId);
// 告警设备点位个数 // 报警个数
int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, ammeterId, DeviceCategory.AMMETER.getCode()); int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, ammeterId);
// // 告警设备点位个数
// int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, ammeterId, DeviceCategory.AMMETER.getCode());
AmmeterDataVo ammeterDataVo = new AmmeterDataVo(); AmmeterDataVo ammeterDataVo = new AmmeterDataVo();
ammeterDataVo.setDeviceName(ammeterDevice.get("deviceName").toString()); ammeterDataVo.setDeviceName(ammeterDevice.get("deviceName").toString());
@ -852,8 +860,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
if (dhData != null) { if (dhData != null) {
BeanUtils.copyProperties(dhData, dhDataVo); BeanUtils.copyProperties(dhData, dhDataVo);
} }
// 告警设备点位个数 // 报警个数
int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, dhDeviceId, DeviceCategory.DH.getCode()); int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, dhDeviceId);
// // 告警设备点位个数
// int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, dhDeviceId, DeviceCategory.DH.getCode());
dhDataVo.setAlarmNum(alarmNum); dhDataVo.setAlarmNum(alarmNum);
// 处理枚举匹配字段 // 处理枚举匹配字段
@ -884,8 +894,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
if (xfData != null) { if (xfData != null) {
BeanUtils.copyProperties(xfData, xfDataVo); BeanUtils.copyProperties(xfData, xfDataVo);
xfDataVo.setDataUpdateTime(xfData.getDataTimestamp()); xfDataVo.setDataUpdateTime(xfData.getDataTimestamp());
// 告警设备点位个数 // 报警个数
int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, xfDeviceId, DeviceCategory.XF.getCode()); int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, xfDeviceId);
// // 告警设备点位个数
// int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, xfDeviceId, DeviceCategory.XF.getCode());
xfDataVo.setAlarmNum(alarmNum); xfDataVo.setAlarmNum(alarmNum);
} }
xfDataVo.setEmsCommunicationStatus(xfDevice.get("communicationStatus") == null ? "" : xfDevice.get("communicationStatus").toString()); xfDataVo.setEmsCommunicationStatus(xfDevice.get("communicationStatus") == null ? "" : xfDevice.get("communicationStatus").toString());
@ -912,8 +924,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
EmsEmsData emsData = redisCache.getCacheObject(RedisKeyConstants.EMS + siteId + "_" + emsDeviceId); EmsEmsData emsData = redisCache.getCacheObject(RedisKeyConstants.EMS + siteId + "_" + emsDeviceId);
if (emsData != null) { if (emsData != null) {
BeanUtils.copyProperties(emsData, emsDataVo); BeanUtils.copyProperties(emsData, emsDataVo);
// 告警设备点位个数 // 报警个数
int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, emsDeviceId, DeviceCategory.EMS.getCode()); int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId, emsDeviceId);
// // 告警设备点位个数
// int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, emsDeviceId, DeviceCategory.EMS.getCode());
emsDataVo.setAlarmNum(alarmNum); emsDataVo.setAlarmNum(alarmNum);
} }