diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java index 0d9f65f..7c2c8aa 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java @@ -165,7 +165,7 @@ public class EventServiceImpl implements IEventService { } //推送事件逻辑处理 && cs_event_user入库 for (AppEventMessage.DataArray item : dataArray) { - sendEventUtils.sendUser(1,item.getType(),po.getId(),item.getName(),eventTime,appEventMessage.getId(),id); + sendEventUtils.sendUser(1,item.getType(),po.getId(),item.getName(),eventTime,id); } } catch (Exception e) { CsEventLogs csEventLogs = new CsEventLogs(); diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java index 1759706..59bfb83 100644 --- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java +++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java @@ -80,11 +80,11 @@ public class SendEventUtils { * @param devId 设备id * @param eventName 事件名称 * @param eventTime 事件发生事件 - * @param ndid 设备ndid * @param id 事件id */ @Transactional(rollbackFor = Exception.class) - public void sendUser(Integer eventType,String type,String devId, String eventName, LocalDateTime eventTime, String ndid, String id) { + public void sendUser(Integer eventType,String type,String devId, String eventName, LocalDateTime eventTime, String id) { + int code; List users = new ArrayList<>(); List devCodeList = new ArrayList<>(); List csEventSendMsgList = new ArrayList<>(); @@ -97,6 +97,7 @@ public class SendEventUtils { if (eventType == 1){ switch (type) { case "1": + code = 2; //设备自身事件 不推送给用户,推送给业务管理 users = appUserFeignClient.getAdminInfo().getData(); noticeUserDto.setPushClientId(Collections.singletonList(users.get(0).getDevCode())); @@ -109,6 +110,7 @@ public class SendEventUtils { result.add(csEventUser); break; case "2": + code = 0; //暂态事件 users = getEventUser(devId); devCodeList = users.stream().map(User::getDevCode).collect(Collectors.toList()); @@ -125,6 +127,7 @@ public class SendEventUtils { }); break; case "3": + code = 1; //稳态事件 users = getEventUser(devId); devCodeList = users.stream().map(User::getDevCode).collect(Collectors.toList()); @@ -141,13 +144,14 @@ public class SendEventUtils { }); break; default: + code = 0; break; } //获取台账信息 DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData(); content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生" + eventName; noticeUserDto.setContent(content); - payload.setType(Integer.parseInt(type)); + payload.setType(code); payload.setPath("/pages/message/message?type="+payload.getType()); noticeUserDto.setPayload(payload); }