by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加报警数据websocket 消息推送

Browse Source
This commit is contained in:
15683799673
2025-09-13 09:01:39 +08:00
parent 7a6557ab3d
commit d2799a280c
6 changed files with 153 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/EventAlarmReportServiceImpl.java
View File

@@ -13,8 +13,8 @@ import org.dromara.property.api.RemoteAttendanceService;
import org.dromara.property.api.RemoteFloorService;
import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
import org.dromara.property.api.domain.vo.RemoteFloorVo;
import org.dromara.sis.domain.entity.SisAlarmEvents;
import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
import org.dromara.sis.domain.entity.SisAlarmEvents;
import org.dromara.sis.domain.enums.ControlTypeEnum;
import org.dromara.sis.domain.enums.EventSmallTypeEnum;
import org.dromara.sis.domain.enums.RosterTypeEnum;

26
ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventsServiceImpl.java
View File

@@ -23,14 +23,16 @@ import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.property.api.RemoteAttendanceService;
import org.dromara.property.api.domain.vo.RemoteAttendanceUserGroupVo;
import org.dromara.resource.api.RemoteFileService;
import org.dromara.resource.api.RemoteWebSocketMessageService;
import org.dromara.resource.api.domain.RemoteFile;
import org.dromara.resource.api.domain.WebSocketMsgType;
import org.dromara.sis.domain.bo.SisAlarmEventsBo;
import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo;
import org.dromara.sis.domain.entity.SisAlarmEventAttachments;
import org.dromara.sis.domain.entity.SisAlarmEventProcess;
import org.dromara.sis.domain.entity.SisAlarmEvents;
import org.dromara.sis.domain.entity.SisDeviceManage;
import org.dromara.sis.domain.bo.SisAlarmEventsBo;
import org.dromara.sis.domain.bo.alarm.AlarmAssignmentBo;
import org.dromara.sis.domain.bo.alarm.AlarmCompleteBo;
import org.dromara.sis.domain.enums.AlarmStatus;
import org.dromara.sis.domain.enums.EventBigTypeEnum;
import org.dromara.sis.domain.enums.EventSmallTypeEnum;
@@ -44,6 +46,9 @@ import org.dromara.sis.service.ISisDeviceManageService;
import org.dromara.system.api.RemoteDictService;
import org.dromara.system.api.domain.vo.RemoteDictDataVo;
import org.dromara.system.api.model.LoginUser;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -58,7 +63,7 @@ import java.util.*;
@Slf4j
@RequiredArgsConstructor
@Service
public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService, ApplicationContextAware {
private final SisAlarmEventsMapper baseMapper;
private final ISisDeviceManageService deviceManageService;
@@ -71,6 +76,9 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
private RemoteAttendanceService remoteAttendanceService;
@DubboReference
private RemoteDictService remoteDictService;
@DubboReference
private RemoteWebSocketMessageService webSocketMessageService;
/**
* 查询告警
@@ -303,8 +311,16 @@ public class SisAlarmEventsServiceImpl implements ISisAlarmEventsService {
process.setTenantId(sisAlarmEvents.getTenantId());
Boolean insert = alarmEventProcessService.insert(process);
log.info("事件处理信息写入完成,result= {}", insert);
//TODO 推送到执行客户端
// 进行消息推送
webSocketMessageService.publishMessage(List.of(bo.getSolveId()), WebSocketMsgType.ALARM_MSG, sisAlarmEvents);
return true;
}
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
}
@Override