From d387612b07fad8c69db63faf3be89872d3821da9 Mon Sep 17 00:00:00 2001 From: zq Date: Mon, 15 Dec 2025 10:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BF=AE=E6=94=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=8120251120-=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=91=8A=E8=AD=A6=E7=82=B9=E4=BD=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xzzn/common/enums/SiteDevice.java | 5 +++ .../xzzn/ems/mapper/EmsPointMatchMapper.java | 2 +- .../impl/DeviceDataProcessServiceImpl.java | 2 +- .../service/impl/SingleSiteServiceImpl.java | 34 ++++++++++--------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/ems-common/src/main/java/com/xzzn/common/enums/SiteDevice.java b/ems-common/src/main/java/com/xzzn/common/enums/SiteDevice.java index 508213f..958f06a 100644 --- a/ems-common/src/main/java/com/xzzn/common/enums/SiteDevice.java +++ b/ems-common/src/main/java/com/xzzn/common/enums/SiteDevice.java @@ -50,6 +50,11 @@ public enum SiteDevice */ DH, + /** + * 消防 + */ + XF, + /** * 中水冷却 */ diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java index 2e08d80..47a6c9d 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java @@ -169,7 +169,7 @@ public interface EmsPointMatchMapper List selectEmsPointMatchExportList(EmsPointMatch emsPointMatch); - int getDevicePointAlarmNum(@Param("siteId") String siteId, @Param("deviceCategory") String deviceCategory); + int getDevicePointAlarmNum(@Param("siteId") String siteId, @Param("deviceId") String deviceId, @Param("deviceCategory") String deviceCategory); EmsPointMatch selectDeviceStatusPoint(@Param("request") DeviceUpdateRequest request); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java index cf4cde7..5e11f20 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java @@ -179,7 +179,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i || deviceId.contains(SiteDevice.METE.name()) || deviceId.contains(SiteDevice.METE0.name())) { meteDataProcess(siteId, deviceId, jsonData, dataUpdateTime); - } else if (deviceId.contains("XF")) { + } else if (deviceId.contains(SiteDevice.XF.name())) { meteXFProcess(siteId, deviceId, jsonData, dataUpdateTime); } else if (deviceId.contains(SiteDevice.DH.name()) || deviceId.contains(SiteDevice.donghuan.name())) { dhDataProcess(siteId, deviceId, jsonData, dataUpdateTime); 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 c81b63c..81cc6ee 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 @@ -415,8 +415,6 @@ public class SingleSiteServiceImpl implements ISingleSiteService { List pcsDetailInfoVoList = new ArrayList<>(); if (!StringUtils.isEmpty(siteId)) { - // 告警设备个数 - int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, DeviceCategory.PCS.getCode()); // 获取该设备下所有pcs的id List> pcsIds = emsDevicesSettingMapper.getDeviceInfosBySiteIdAndCategory(siteId, DeviceCategory.PCS.getCode()); @@ -437,6 +435,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { pcsDetailInfoVo.setPcsBranchInfoList(pcsBranchInfoList); // // 报警个数 // int alarmNum = emsAlarmRecordsMapper.getDeviceAlarmNum(siteId,pcsId); + // 告警设备点位个数 + int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, pcsId, DeviceCategory.PCS.getCode()); pcsDetailInfoVo.setAlarmNum(alarmNum); pcsDetailInfoVo.setDeviceStatus(pcsDevice.get("deviceStatus") == null ? "" : pcsDevice.get("deviceStatus").toString()); @@ -464,8 +464,6 @@ public class SingleSiteServiceImpl implements ISingleSiteService { public List getBMSOverView(String siteId) { List bmsOverViewVoList = new ArrayList<>(); - // 告警设备个数 - int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, DeviceCategory.STACK.getCode()); // 获取所有电池堆 if (!StringUtils.isEmpty(siteId)) { List> stackIds = emsDevicesSettingMapper.getDeviceInfosBySiteIdAndCategory(siteId, DeviceCategory.STACK.getCode()); @@ -484,6 +482,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService { batteryDataLists = getBMSClusterListInfo(siteId,stackId,null); bmsOverViewVo.setBatteryDataList(batteryDataLists); } + + // 告警设备点位个数 + int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, stackId, DeviceCategory.STACK.getCode()); bmsOverViewVo.setAlarmNum(alarmNum); bmsOverViewVoList.add(bmsOverViewVo); } @@ -523,8 +524,6 @@ public class SingleSiteServiceImpl implements ISingleSiteService { public List getBMSBatteryCluster(String siteId) { List bmsBatteryClusterVoList = new ArrayList<>(); - // 告警设备个数 - int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, DeviceCategory.CLUSTER.getCode()); if (!StringUtils.isEmpty(siteId)) { // 获取所有设备下的电池簇id List> clusterIds = emsDevicesSettingMapper.getDeviceInfosBySiteIdAndCategory(siteId, DeviceCategory.CLUSTER.getCode()); @@ -543,6 +542,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { dealWithBatteryClusterData(clusterData,clusterDataList); bmsBatteryClusterVo.setBatteryDataList(clusterDataList); } + // 告警设备点位个数 + int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, clusterId, DeviceCategory.CLUSTER.getCode()); bmsBatteryClusterVo.setAlarmNum(alarmNum); bmsBatteryClusterVoList.add(bmsBatteryClusterVo); } @@ -585,8 +586,6 @@ public class SingleSiteServiceImpl implements ISingleSiteService { public List getCoolingDataList(String siteId) { List emsCoolingDataList = new ArrayList<>(); - // 告警设备个数 - int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, DeviceCategory.COOLING.getCode()); List> deviceIds = emsDevicesSettingMapper.getDeviceInfosBySiteIdAndCategory(siteId, DeviceCategory.COOLING.getCode()); for (Map deviceId : deviceIds) { CoolingDataViewVo dataViewVo = new CoolingDataViewVo(); @@ -596,6 +595,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { EmsCoolingData coolingData = redisCache.getCacheObject(RedisKeyConstants.COOLING + siteId + "_" + coolingId); if (coolingData != null) { BeanUtils.copyProperties(coolingData, dataViewVo); + // 告警设备点位个数 + int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, coolingId, DeviceCategory.COOLING.getCode()); dataViewVo.setAlarmNum(alarmNum); } @@ -678,8 +679,6 @@ public class SingleSiteServiceImpl implements ISingleSiteService { if (ammeterIdList == null || ammeterIdList.isEmpty()) { return ammeterResponse; } - // 告警设备个数 - int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, DeviceCategory.AMMETER.getCode()); for (Map ammeterDevice : ammeterIdList) { String ammeterId = ammeterDevice.get("id").toString(); if (!ammeterDeviceIds.contains(ammeterId)) { @@ -687,6 +686,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { } // 从redis取总表详细数据 EmsAmmeterData ammeterData = redisCache.getCacheObject(RedisKeyConstants.AMMETER + siteId + "_" +ammeterId); + // 告警设备点位个数 + int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, ammeterId, DeviceCategory.AMMETER.getCode()); AmmeterDataVo ammeterDataVo = new AmmeterDataVo(); ammeterDataVo.setDeviceName(ammeterDevice.get("deviceName").toString()); @@ -773,8 +774,6 @@ public class SingleSiteServiceImpl implements ISingleSiteService { public List getDhDataList(String siteId) { List emsDhDataList = new ArrayList<>(); - // 告警设备个数 - int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, DeviceCategory.DH.getCode()); List> dhDeviceList = emsDevicesSettingMapper.getDeviceInfosBySiteIdAndCategory(siteId, DeviceCategory.DH.getCode()); for (Map dhDevice : dhDeviceList) { DhDataVo dhDataVo = new DhDataVo(); @@ -785,6 +784,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { if (dhData != null) { BeanUtils.copyProperties(dhData, dhDataVo); } + // 告警设备点位个数 + int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, dhDeviceId, DeviceCategory.DH.getCode()); dhDataVo.setAlarmNum(alarmNum); emsDhDataList.add(dhDataVo); } @@ -801,8 +802,6 @@ public class SingleSiteServiceImpl implements ISingleSiteService { List emsXfDataList = new ArrayList<>(); List> xfDeviceList = emsDevicesSettingMapper.getDeviceInfosBySiteIdAndCategory(siteId, DeviceCategory.XF.getCode()); - // 告警设备个数 - int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, DeviceCategory.XF.getCode()); for (Map xfDevice : xfDeviceList) { XfDataVo xfDataVo = new XfDataVo(); xfDataVo.setDeviceName(xfDevice.get("deviceName").toString()); @@ -812,6 +811,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { if (xfData != null) { BeanUtils.copyProperties(xfData, xfDataVo); xfDataVo.setDataUpdateTime(xfData.getDataTimestamp()); + // 告警设备点位个数 + int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, xfDeviceId, DeviceCategory.XF.getCode()); xfDataVo.setAlarmNum(alarmNum); } xfDataVo.setEmsCommunicationStatus(xfDevice.get("communicationStatus") == null ? "" : xfDevice.get("communicationStatus").toString()); @@ -825,8 +826,7 @@ public class SingleSiteServiceImpl implements ISingleSiteService { List emsDataList = new ArrayList<>(); List> xfDeviceList = emsDevicesSettingMapper.getDeviceInfosBySiteIdAndCategory(siteId, DeviceCategory.EMS.getCode()); - // 告警设备个数 - int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, DeviceCategory.EMS.getCode()); + for (Map emsDevice : xfDeviceList) { EmsDataVo emsDataVo = new EmsDataVo(); emsDataVo.setDeviceName(emsDevice.get("deviceName").toString()); @@ -835,6 +835,8 @@ public class SingleSiteServiceImpl implements ISingleSiteService { EmsEmsData emsData = redisCache.getCacheObject(RedisKeyConstants.EMS + siteId + "_" + emsDeviceId); if (emsData != null) { BeanUtils.copyProperties(emsData, emsDataVo); + // 告警设备点位个数 + int alarmNum = emsPointMatchMapper.getDevicePointAlarmNum(siteId, emsDeviceId, DeviceCategory.EMS.getCode()); emsDataVo.setAlarmNum(alarmNum); } emsDataList.add(emsDataVo);