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

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +28560 -1041
245 changed files with 28560 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f2b2741b1c - Show all commits

8
ems-system/src/main/java/com/xzzn/ems/service/impl/DDSDataProcessServiceImpl.java
View File

@ -699,7 +699,7 @@ public class DDSDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
// 其他字段 // 其他字段
dataGF.setPositiveReactiveEnergyEqPlus(StringUtils.getBigDecimal(obj.get("WGDN"))); dataGF.setPositiveReactiveEnergyEqPlus(StringUtils.getBigDecimal(obj.get("WGDN")));
dataGF.setPositiveActiveEnergyEpPlus(StringUtils.getBigDecimal(obj.get("WGDN"))); dataGF.setPositiveActiveEnergyEpPlus(StringUtils.getBigDecimal(obj.get("YGDN")));
dataGF.setCurrentPercent(StringUtils.getBigDecimal(obj.get("DLBB"))); dataGF.setCurrentPercent(StringUtils.getBigDecimal(obj.get("DLBB")));
dataGF.setVoltagePercent(StringUtils.getBigDecimal(obj.get("DYBB"))); dataGF.setVoltagePercent(StringUtils.getBigDecimal(obj.get("DYBB")));
dataGF.setAvgCurrent(StringUtils.getBigDecimal(obj.get("PJDL"))); dataGF.setAvgCurrent(StringUtils.getBigDecimal(obj.get("PJDL")));
@ -771,6 +771,12 @@ public class DDSDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
dataLoad.setPositiveReactiveEnergyEqPlus(StringUtils.getBigDecimal(obj.get("GXWGDDYCC"))); dataLoad.setPositiveReactiveEnergyEqPlus(StringUtils.getBigDecimal(obj.get("GXWGDDYCC")));
dataLoad.setPositiveActiveEnergyEpPlus(StringUtils.getBigDecimal(obj.get("XSYGDDYCC"))); dataLoad.setPositiveActiveEnergyEpPlus(StringUtils.getBigDecimal(obj.get("XSYGDDYCC")));
// 正向反向有功无功电能
dataLoad.setCurrentForwardActiveTotal(StringUtils.getBigDecimal(obj.get("XSYGDDYCC")));
dataLoad.setCurrentReverseActiveTotal(StringUtils.getBigDecimal(obj.get("SFYGDDYCC")));
dataLoad.setCurrentForwardReactiveTotal(StringUtils.getBigDecimal(obj.get("GXWGDDYCC")));
dataLoad.setCurrentReverseReactiveTotal(StringUtils.getBigDecimal(obj.get("RXWGDDYCC")));
dataLoad.setCreateBy("system"); dataLoad.setCreateBy("system");
dataLoad.setCreateTime(DateUtils.getNowDate()); dataLoad.setCreateTime(DateUtils.getNowDate());
dataLoad.setUpdateBy("system"); dataLoad.setUpdateBy("system");

6
ems-system/src/main/java/com/xzzn/ems/service/impl/FXXDataProcessServiceImpl.java
View File

@ -740,6 +740,12 @@ public class FXXDataProcessServiceImpl extends AbstractBatteryDataProcessor impl
dataLoad.setPositiveReactiveEnergyEqPlus(StringUtils.getBigDecimal(obj.get("ZXWGDN"))); dataLoad.setPositiveReactiveEnergyEqPlus(StringUtils.getBigDecimal(obj.get("ZXWGDN")));
dataLoad.setPositiveActiveEnergyEpPlus(StringUtils.getBigDecimal(obj.get("ZXYGDN"))); dataLoad.setPositiveActiveEnergyEpPlus(StringUtils.getBigDecimal(obj.get("ZXYGDN")));
// 正反向有功无功电能
dataLoad.setCurrentForwardActiveTotal(StringUtils.getBigDecimal(obj.get("ZXYGDN")));
dataLoad.setCurrentReverseActiveTotal(StringUtils.getBigDecimal(obj.get("FXYGDN")));
dataLoad.setCurrentForwardReactiveTotal(StringUtils.getBigDecimal(obj.get("ZXWGDN")));
dataLoad.setCurrentReverseReactiveTotal(StringUtils.getBigDecimal(obj.get("FXWGDN")));
dataLoad.setCreateBy("system"); dataLoad.setCreateBy("system");
dataLoad.setCreateTime(DateUtils.getNowDate()); dataLoad.setCreateTime(DateUtils.getNowDate());
dataLoad.setUpdateBy("system"); dataLoad.setUpdateBy("system");

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

@ -48,6 +48,11 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
pvFactor.put("021_DDS_01", new BigDecimal("-0.001")); pvFactor.put("021_DDS_01", new BigDecimal("-0.001"));
pvFactor.put("default", BigDecimal.ONE); // Convert to Basic Latin pvFactor.put("default", BigDecimal.ONE); // Convert to Basic Latin
} }
// 初始化List，存储指定的电表deviceId
List<String> ammeterDeviceIds = Arrays.asList(
"LOAD", "METE", "METEGF"
);
@Autowired @Autowired
private EmsPcsDataMapper emsPcsDataMapper; private EmsPcsDataMapper emsPcsDataMapper;
@Autowired @Autowired
@ -638,47 +643,35 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
for (Map<String, Object> ammeterDevice : ammeterIdList) { for (Map<String, Object> ammeterDevice : ammeterIdList) {
String ammeterId = ammeterDevice.get("id").toString(); String ammeterId = ammeterDevice.get("id").toString();
if (!ammeterDeviceIds.contains(ammeterId)) {
continue;
}
// 从redis取总表详细数据 // 从redis取总表详细数据
EmsAmmeterData ammeterData = redisCache.getCacheObject(RedisKeyConstants.AMMETER + siteId + "_" +ammeterId); EmsAmmeterData ammeterData = redisCache.getCacheObject(RedisKeyConstants.AMMETER + siteId + "_" +ammeterId);
AmmeterDataVo ammeterLoadDataVo = new AmmeterDataVo(); AmmeterDataVo ammeterDataVo = new AmmeterDataVo();
ammeterLoadDataVo.setDeviceName(ammeterDevice.get("deviceName").toString()); ammeterDataVo.setDeviceName(ammeterDevice.get("deviceName").toString());
ammeterLoadDataVo.setDeviceId(ammeterDevice.get("id").toString()); ammeterDataVo.setDeviceId(ammeterDevice.get("id").toString());
ammeterLoadDataVo.setEmsCommunicationStatus(ammeterDevice.get("communicationStatus") == null? "" : ammeterDataVo.setEmsCommunicationStatus(ammeterDevice.get("communicationStatus") == null? "" :
ammeterDevice.get("communicationStatus").toString()); ammeterDevice.get("communicationStatus").toString());
// 设置表数据 // 设置表数据
dealAmmeterLoadData(ammeterData,ammeterLoadDataVo); dealAmmeterData(ammeterData,ammeterDataVo);
ammeterResponse.add(ammeterLoadDataVo); ammeterResponse.add(ammeterDataVo);
} }
return ammeterResponse; return ammeterResponse;
} }
private void dealAmmeterMeteData(EmsAmmeterData ammeterData, AmmeterMeteDataVo ammeterMeteDataVo) { private void dealAmmeterData(EmsAmmeterData ammeterData, AmmeterDataVo ammeterDataVo) {
if (ammeterData != null) { if (ammeterData != null) {
// 数据更新时间 ammeterDataVo.setActivePower(ammeterData.getTotalActivePower());
ammeterMeteDataVo.setDataUpdateTime(ammeterData.getDataUpdateTime()); ammeterDataVo.setReactivePower(ammeterData.getTotalReactivePower());
ammeterDataVo.setForwardActive(ammeterData.getCurrentForwardActiveTotal());
List<MeteDataDetailInfo> meteDataDetailInfos = new ArrayList<>(); ammeterDataVo.setForwardReactive(ammeterData.getCurrentForwardReactiveTotal());
// 拼接数据 ammeterDataVo.setReverseActive(ammeterData.getCurrentReverseActiveTotal());
// a相 ammeterDataVo.setReverseReactive(ammeterData.getCurrentReverseReactiveTotal());
MeteDataDetailInfo meteDataDetailInfo1 = new MeteDataDetailInfo(); ammeterDataVo.setActiveEnergy(ammeterData.getPositiveActiveEnergyEpPlus());
meteDataDetailInfo1.setCategory(AmmeterCategory.A_POWER.getInfo()); ammeterDataVo.setReactiveEnergy(ammeterData.getPositiveReactiveEnergyEqPlus());
meteDataDetailInfo1.setActivePower(ammeterData.getPhaseAActivePower()); ammeterDataVo.setDataUpdateTime(ammeterData.getDataUpdateTime());
meteDataDetailInfo1.setReactivePower(ammeterData.getPhaseAReactivePower());
meteDataDetailInfos.add(meteDataDetailInfo1);
// b相
MeteDataDetailInfo meteDataDetailInfo2 = new MeteDataDetailInfo();
meteDataDetailInfo2.setCategory(AmmeterCategory.B_POWER.getInfo());
meteDataDetailInfo2.setActivePower(ammeterData.getPhaseBActivePower());
meteDataDetailInfo2.setReactivePower(ammeterData.getPhaseBReactivePower());
meteDataDetailInfos.add(meteDataDetailInfo2);
// c相
MeteDataDetailInfo meteDataDetailInfo3 = new MeteDataDetailInfo();
meteDataDetailInfo3.setCategory(AmmeterCategory.C_POWER.getInfo());
meteDataDetailInfo3.setActivePower(ammeterData.getPhaseCActivePower());
meteDataDetailInfo3.setReactivePower(ammeterData.getPhaseCReactivePower());
meteDataDetailInfos.add(meteDataDetailInfo3);
ammeterMeteDataVo.setMeteDataDetailInfo(meteDataDetailInfos);
} }
} }