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

modbus读取本地设备数据增加告警逻辑

Browse Source
This commit is contained in:
zq
2025-12-24 16:19:04 +08:00
parent 90e9b004b4
commit 18ff0100b9
7 changed files with 201 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,11 @@
package com.xzzn.ems.service;
import java.util.List;
import com.xzzn.ems.domain.EmsAlarmRecords;
import com.xzzn.ems.domain.vo.AlarmRecordListRequestVo;
import com.xzzn.ems.domain.vo.AlarmRecordListResponseVo;
import java.util.List;
/**
* 告警记录Service接口
*
@ -98,4 +99,6 @@ public interface IEmsAlarmRecordsService
// 处理本地端同步的保护策略告警信息
public void dealSyncData(String content, String operateType);
public void addDeviceOfflineRecord(String siteId, String deviceNumber);
}

46
ems-system/src/main/java/com/xzzn/ems/service/impl/DeviceDataProcessServiceImpl.java
View File

@ -31,7 +31,25 @@ import com.xzzn.ems.domain.*;
import com.xzzn.ems.domain.vo.EnergyPriceTimeRange;
import com.xzzn.ems.domain.vo.EnergyPriceVo;
import com.xzzn.ems.enums.DeviceMatchTable;
import com.xzzn.ems.mapper.*;
import com.xzzn.ems.mapper.EmsAmmeterDataMapper;
import com.xzzn.ems.mapper.EmsBatteryClusterMapper;
import com.xzzn.ems.mapper.EmsBatteryDataMapper;
import com.xzzn.ems.mapper.EmsBatteryDataMinutesMapper;
import com.xzzn.ems.mapper.EmsBatteryGroupMapper;
import com.xzzn.ems.mapper.EmsBatteryStackMapper;
import com.xzzn.ems.mapper.EmsClusterAlarmDataMapper;
import com.xzzn.ems.mapper.EmsCoolingAlarmDataMapper;
import com.xzzn.ems.mapper.EmsCoolingDataMapper;
import com.xzzn.ems.mapper.EmsDailyChargeDataMapper;
import com.xzzn.ems.mapper.EmsDailyEnergyDataMapper;
import com.xzzn.ems.mapper.EmsDevicesSettingMapper;
import com.xzzn.ems.mapper.EmsDhDataMapper;
import com.xzzn.ems.mapper.EmsEmsDataMapper;
import com.xzzn.ems.mapper.EmsPcsAlarmDataMapper;
import com.xzzn.ems.mapper.EmsPcsBranchDataMapper;
import com.xzzn.ems.mapper.EmsPcsDataMapper;
import com.xzzn.ems.mapper.EmsStackAlarmDataMapper;
import com.xzzn.ems.mapper.EmsXfDataMapper;
import com.xzzn.ems.service.IDeviceDataProcessService;
import com.xzzn.ems.service.IEmsAlarmRecordsService;
import com.xzzn.ems.service.IEmsDeviceSettingService;
@ -557,21 +575,31 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
}
}
/**
*
* @param pointMatchList 字段匹配规则列表
* @param obj 原始数据Map
* @param entity 目标Java对象
* @param pointEnumMatchMap 枚举匹配规则
*/
private void saveDeviceData(List<EmsPointMatch> pointMatchList, Map<String, Object> obj,
Object entity, Map<String, List<EmsPointEnumMatch>> pointEnumMatchMap) {
Map<String, String> pointMatchMap = pointMatchList.stream()
.collect(Collectors.toMap(
data -> StringUtils.toCamelCase(data.getMatchField()),
EmsPointMatch::getDataPoint,
(existing, replacement) -> replacement));
data -> StringUtils.toCamelCase(data.getMatchField()), // 源字段名转为驼峰
EmsPointMatch::getDataPoint, // 获取目标点位名
(existing, replacement) -> replacement)); // 处理重复键
Field[] fields = entity.getClass().getDeclaredFields();
for (Field field : fields) {
String fieldName = field.getName();
if (pointMatchMap.containsKey(fieldName)) {
field.setAccessible(true);
// 处理匹配的字段名，并设置值
field.setAccessible(true); // 允许访问私有字段
try {
// 1. 从原始数据中获取匹配值
Object matchValue = obj.get(pointMatchMap.get(fieldName));
//匹配枚举值转换
// 2. 处理枚举值转换
List<EmsPointEnumMatch> pointEnumMatchList = pointEnumMatchMap.get(fieldName);
if (CollectionUtils.isNotEmpty(pointEnumMatchList)) {
Object finalMatchValue = matchValue;
@ -581,6 +609,8 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
matchValue = enumMatch.get().getEnumCode();
}
}
// 3. 类型转换
Class<?> fieldType = field.getType();
if (String.class.equals(fieldType)) {
matchValue = StringUtils.getString(matchValue);
@ -591,6 +621,8 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
} else if (Integer.class.equals(fieldType)) {
matchValue = MapUtils.getInteger(obj, pointMatchMap.get(fieldName));
}
// 4. 设置字段值
field.set(entity, matchValue);
} catch (IllegalAccessException e) {
log.warn("deviceDataProcess 设置字段值时出错", e);
@ -1001,7 +1033,7 @@ public class DeviceDataProcessServiceImpl extends AbstractBatteryDataProcessor i
if (!deviceId.contains(SiteDevice.METEGF.name()) && !deviceId.contains(SiteDevice.METE0.name())) {
// 处理储能电表-METE每日充放电数据
EmsAmmeterData yestData = dealDailyChargeDate(siteId, deviceId, dataMete);
dealDailyChargeDate(siteId, deviceId, dataMete);
// 处理储能电表-METE每日数据(尖、峰、平、谷差值)
// if (SiteEnum.FX.getCode().equals(siteId)) {

32
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsAlarmRecordsServiceImpl.java
View File

@ -1,9 +1,5 @@
package com.xzzn.ems.service.impl;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import com.alibaba.fastjson2.JSON;
import com.xzzn.common.constant.RedisKeyConstants;
import com.xzzn.common.core.domain.entity.SysUser;
@ -14,17 +10,26 @@ import com.xzzn.common.enums.TicketStatus;
import com.xzzn.common.utils.DateUtils;
import com.xzzn.common.utils.StringUtils;
import com.xzzn.ems.domain.EmsAlarmMatchData;
import com.xzzn.ems.domain.EmsAlarmRecords;
import com.xzzn.ems.domain.EmsTicket;
import com.xzzn.ems.domain.vo.AlarmRecordListRequestVo;
import com.xzzn.ems.domain.vo.AlarmRecordListResponseVo;
import com.xzzn.ems.mapper.EmsAlarmMatchDataMapper;
import com.xzzn.ems.mapper.EmsAlarmRecordsMapper;
import com.xzzn.ems.mapper.EmsTicketMapper;
import com.xzzn.ems.service.IEmsAlarmRecordsService;
import com.xzzn.system.mapper.SysUserMapper;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xzzn.ems.mapper.EmsAlarmRecordsMapper;
import com.xzzn.ems.domain.EmsAlarmRecords;
import com.xzzn.ems.service.IEmsAlarmRecordsService;
/**
* 告警记录Service业务层处理
@ -308,5 +313,18 @@ public class EmsAlarmRecordsServiceImpl implements IEmsAlarmRecordsService
}
}
@Override
public void addDeviceOfflineRecord(String siteId, String deviceId) {
EmsAlarmRecords emsAlarmRecords = redisCache.getCacheObject(RedisKeyConstants.MODBUS_OFFLINE_ALARM_RECORD + siteId + "_" + deviceId);
if (emsAlarmRecords != null) {
return;
}
emsAlarmRecords = createAlarmAtPcs(siteId, deviceId,"modbus连接设备失败", AlarmLevelStatus.EMERGENCY.getCode());
emsAlarmRecordsMapper.insertEmsAlarmRecords(emsAlarmRecords);
// 存redis-防止重复插入-有效期一天
redisCache.setCacheObject(RedisKeyConstants.MODBUS_OFFLINE_ALARM_RECORD + siteId + "_" + deviceId, emsAlarmRecords,1, TimeUnit.DAYS);
}
}