Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(alarm): 修复报警服务中的消息发送逻辑

Browse Source 
- 移除注释掉的appNotificationService调用代码
- 修复事件服务中消息发送参数的条件判断逻辑
- 更新设备模型服务中监测点模板生成逻辑，支持不同设备类型
- 修复心跳服务中设备离线通知逻辑，暂时关闭消息发送功能
- 添加对直接连接设备和便携式设备的特殊处理逻辑
- 优化监测点名称生成规则，增加输出侧监测点支持
This commit is contained in:
xy
2026-07-14 14:42:53 +08:00
parent c6f46cc319
commit 3c369d0244
4 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java
View File

@@ -21,7 +21,6 @@ import com.njcn.system.pojo.po.EleEpdPqd;
import com.njcn.system.pojo.po.SysDicTreePO;
import com.njcn.zlevent.mapper.CsEventMapper;
import com.njcn.zlevent.pojo.po.CsEventLogs;
//import com.njcn.zlevent.service.AppNotificationService;
import com.njcn.zlevent.service.ICsAlarmService;
import com.njcn.zlevent.service.ICsEventLogsService;
import com.njcn.zlevent.service.ICsEventService;
@@ -138,11 +137,9 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsEventMapper, CsEventPO> im
if (Objects.isNull(item.getCode())){
msgSendParam.setEventName(item.getName());
msgSendFeignClient.appMsgSend(msgSendParam);
// appNotificationService.sendAppNotification(2,item.getType(),po.getId(),item.getName(),eventTime,id,po.getNdid(),null,null,null);
} else {
msgSendParam.setEventName(item.getCode());
msgSendFeignClient.appMsgSend(msgSendParam);
// appNotificationService.sendAppNotification(2,item.getType(),po.getId(),item.getCode(),eventTime,id,po.getNdid(),null, null,null);
//更新字典信息
EleEpdPqd eleEpdPqd = epdFeignClient.findByName(item.getName()).getData();
EleEpdPqdParam.EleEpdPqdUpdateParam updateParam = new EleEpdPqdParam.EleEpdPqdUpdateParam();

26
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
View File

@@ -247,18 +247,20 @@ public class EventServiceImpl implements IEventService {
}
}
}
MsgSendParam msgSendParam = new MsgSendParam();
msgSendParam.setEventType(1);
msgSendParam.setType("2");
msgSendParam.setDevId(po.getId());
msgSendParam.setEventName(item.getName());
msgSendParam.setEventTime(eventTime);
msgSendParam.setId(id);
msgSendParam.setNDid(po.getNdid());
msgSendParam.setAmplitude(amplitude);
msgSendParam.setPersistTime(persistTime);
msgSendParam.setDropZone(dropZone);
msgSendFeignClient.appMsgSend(msgSendParam);
if (Objects.equals(item.getType(),"2")){
MsgSendParam msgSendParam = new MsgSendParam();
msgSendParam.setEventType(1);
msgSendParam.setType("2");
msgSendParam.setDevId(po.getId());
msgSendParam.setEventName(item.getName());
msgSendParam.setEventTime(eventTime);
msgSendParam.setId(id);
msgSendParam.setNDid(po.getNdid());
msgSendParam.setAmplitude(amplitude);
msgSendParam.setPersistTime(persistTime);
msgSendParam.setDropZone(dropZone);
msgSendFeignClient.appMsgSend(msgSendParam);
}
//如果是暂降事件，则异步发送短信
if (Objects.equals(item.getName(), "Evt_Sys_DipStr")) {
MsgSendParam msgSendParam2 = new MsgSendParam();