From a12f7820cfb5a8b5fc8d9a71b2466f1e2ac8ce78 Mon Sep 17 00:00:00 2001 From: mashili Date: Tue, 29 Jul 2025 18:28:17 +0800 Subject: [PATCH] =?UTF-8?q?DDS=E7=9B=91=E6=8E=A7=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ems/mapper/EmsDevicesSettingMapper.java | 2 +- .../impl/DDSDataProcessServiceImpl.java | 46 ++++++++----------- .../ems/service/impl/EmsSiteServiceImpl.java | 2 +- .../service/impl/SingleSiteServiceImpl.java | 14 +++--- .../mapper/ems/EmsDevicesSettingMapper.xml | 5 +- 5 files changed, 33 insertions(+), 36 deletions(-) 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 66f78af..80fa7cc 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 @@ -66,7 +66,7 @@ public interface EmsDevicesSettingMapper * @param parentId * @return */ - public List> getDeviceInfoByParentId(String parentId); + public List> getDeviceInfoByParentId(@Param("siteId")String siteId, @Param("parentId")String parentId); /** * 根据site_id和device_category获取指定设备信息 diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java index 7aecc73..8e6d4e9 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java @@ -299,8 +299,8 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService { List dataList = new ArrayList<>(dataMap.values()); emsBatteryDataMapper.insertEmsBatteryDataList(new ArrayList<>(dataList)); - redisCache.deleteList(RedisKeyConstants.BATTERY + SITE_ID + "_" +deviceId); - redisCache.setCacheList(RedisKeyConstants.BATTERY + SITE_ID + "_" +deviceId, dataList); + redisCache.deleteList(RedisKeyConstants.BATTERY + SITE_ID + "_" + "BMSC01"); + redisCache.setCacheList(RedisKeyConstants.BATTERY + SITE_ID + "_" + "BMSC01" , dataList); } // 批量处理每日最新数据 if (dailyList != null && dailyList.size() > 0) { @@ -522,32 +522,26 @@ public class DDSDataProcessServiceImpl implements IDDSDataProcessService { Map> records = processDataPrefix(JSON.parseObject(dataJson, new TypeReference>() {})); List list = new ArrayList<>(); - //PCS支路 - for (Map.Entry> record : records.entrySet()) { - String recordId = record.getKey(); - Map fields = record.getValue(); + EmsPcsBranchData data = new EmsPcsBranchData(); + data.setDeviceId(deviceId); + data.setSiteId(SITE_ID); + data.setGridStatus(GridStatus.GRID.getCode()); - EmsPcsBranchData data = new EmsPcsBranchData(); - data.setDeviceId(deviceId); - data.setGridStatus(GridStatus.GRID.getCode()); - - data.setGridUVoltage(StringUtils.getBigDecimal(fields.get("DWXDYUAB"))); - data.setGridVVoltage(StringUtils.getBigDecimal(fields.get("DWXDYUBC"))); - data.setGridWVoltage(StringUtils.getBigDecimal(fields.get("DWXDYUCA"))); - data.setOutputUCurrent(StringUtils.getBigDecimal(fields.get("PCSJLDLIA"))); - data.setOutputVCurrent(StringUtils.getBigDecimal(fields.get("PCSJLDLIB"))); - data.setOutputWCurrent(StringUtils.getBigDecimal(fields.get("PCSJLDLIC"))); - - data.setBranchId(recordId); - list.add(data); - } - if (list.size() > 0 ) { - emsPcsBranchDataMapper.insertPcsBranchDataList(list); - - redisCache.setCacheObject(RedisKeyConstants.BRANCH + SITE_ID + "_" +deviceId, list); - - } + data.setGridUVoltage(StringUtils.getBigDecimal(records.get("DWXDYUAB"))); + data.setGridVVoltage(StringUtils.getBigDecimal(records.get("DWXDYUBC"))); + data.setGridWVoltage(StringUtils.getBigDecimal(records.get("DWXDYUCA"))); + data.setOutputUCurrent(StringUtils.getBigDecimal(records.get("PCSJLDLIA"))); + data.setOutputVCurrent(StringUtils.getBigDecimal(records.get("PCSJLDLIB"))); + data.setOutputWCurrent(StringUtils.getBigDecimal(records.get("PCSJLDLIC"))); + data.setBranchId("DY1"); + data.setCreateBy("system"); + data.setCreateTime(DateUtils.getNowDate()); + data.setUpdateBy("system"); + data.setUpdateTime(DateUtils.getNowDate()); + list.add(data); + emsPcsBranchDataMapper.insertPcsBranchDataList(list); + redisCache.setCacheObject(RedisKeyConstants.BRANCH + SITE_ID + "_" +deviceId, list); } private void meteGFDataProcess(String deviceId, String dataJson) { 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 c73f716..1aee491 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 @@ -53,7 +53,7 @@ public class EmsSiteServiceImpl implements IEmsSiteService */ @Override public List> getAllClusterInfo(String parentId) { - return emsDevicesMapper.getDeviceInfoByParentId(parentId); + return emsDevicesMapper.getDeviceInfoByParentId(null,parentId); } /** 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 398a063..4e0d25b 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 @@ -260,7 +260,7 @@ public class SingleSiteServiceImpl implements ISingleSiteService { private void getBMSClusterListInfo(String siteId, String stackId, BMSOverViewVo bmsOverViewVo) { List batteryDataList = new ArrayList(); - List> clusterIds = emsDevicesSettingMapper.getDeviceInfoByParentId(stackId); + List> clusterIds = emsDevicesSettingMapper.getDeviceInfoByParentId(siteId, stackId); for (Map clusterDevice : clusterIds) { BMSBatteryDataList bmsBatteryDataList= new BMSBatteryDataList(); // 从redis取单个簇的详细数据 @@ -313,21 +313,21 @@ public class SingleSiteServiceImpl implements ISingleSiteService { voltageData.setDataName(CLUSTER_DATA_VOLTAGE); voltageData.setAvgData(clusterData.getAvgCellVoltage()); voltageData.setMaxData(clusterData.getMaxCellVoltage()); - voltageData.setMaxDataID(clusterData.getMaxCellVoltageId().toString()); + voltageData.setMaxDataID(clusterData.getMaxCellVoltageId() == null ? null : clusterData.getMaxCellVoltageId().toString()); voltageData.setMinData(clusterData.getMinCellVoltage()); - voltageData.setMinDataID(clusterData.getMinCellVoltageId().toString()); + voltageData.setMinDataID(clusterData.getMinCellVoltageId() == null ? null : clusterData.getMinCellVoltageId().toString()); tempData.setDataName(CLUSTER_DATA_TEP); tempData.setAvgData(clusterData.getAvgCellTemp()); tempData.setMaxData(clusterData.getMaxCellTemp()); - tempData.setMaxDataID(clusterData.getMaxCellTempId().toString()); + tempData.setMaxDataID(clusterData.getMaxCellTempId() == null ? null : clusterData.getMaxCellTempId().toString()); tempData.setMinData(clusterData.getMinCellTemp()); - tempData.setMinDataID(clusterData.getMinCellTempId().toString()); + tempData.setMinDataID(clusterData.getMinCellTempId() == null ? null : clusterData.getMinCellTempId().toString()); socData.setDataName(CLUSTER_DATA_SOC); socData.setAvgData(clusterData.getCurrentSoc()); socData.setMaxData(clusterData.getMaxCellSoc()); - socData.setMaxDataID(clusterData.getMaxCellSocId().toString()); + socData.setMaxDataID(clusterData.getMaxCellSocId() == null ? null : clusterData.getMaxCellSocId().toString()); socData.setMinData(clusterData.getMinCellSoc()); - socData.setMinDataID(clusterData.getMinCellSocId().toString()); + socData.setMinDataID(clusterData.getMinCellSocId() == null ? null : clusterData.getMinCellSocId().toString()); clusterDataList.add(voltageData); clusterDataList.add(tempData); diff --git a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml index df9a946..750d7db 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsDevicesSettingMapper.xml @@ -161,7 +161,10 @@