diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java index 3b62d33..b9f0c21 100644 --- a/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java +++ b/iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java @@ -1,12 +1,12 @@ package com.njcn.access.listener; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.util.ObjectUtil; import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.github.tocrhz.mqtt.publisher.MqttPublisher; import com.njcn.access.enums.AccessEnum; import com.njcn.access.pojo.dto.NoticeUserDto; -import com.njcn.access.pojo.po.CsDeviceOnlineLogs; import com.njcn.access.service.ICsDeviceOnlineLogsService; import com.njcn.access.service.ICsEquipmentDeliveryService; import com.njcn.access.service.impl.CsDeviceServiceImpl; @@ -15,12 +15,13 @@ import com.njcn.access.utils.RedisSetUtil; import com.njcn.access.utils.SendMessageUtil; import com.njcn.common.pojo.dto.DeviceLogDTO; import com.njcn.csdevice.api.*; +import com.njcn.csdevice.param.DeviceMessageParam; import com.njcn.csdevice.pojo.dto.DevDetailDTO; import com.njcn.csdevice.pojo.dto.PqsCommunicateDto; import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; -import com.njcn.redis.pojo.enums.AppRedisKey; import com.njcn.redis.utils.RedisUtil; import com.njcn.rt.pojo.dto.BaseRealDataSet; +import com.njcn.user.api.AppInfoSetFeignClient; import com.njcn.user.api.AppUserFeignClient; import com.njcn.user.api.UserFeignClient; import com.njcn.user.pojo.po.User; @@ -37,9 +38,6 @@ import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Objects; import java.util.Set; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -81,6 +79,11 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene private MqttPublisher publisher; @Resource private RedisSetUtil redisSetUtil; + @Resource + private AppInfoSetFeignClient appInfoSetFeignClient; + @Resource + private DeviceMessageFeignClient deviceMessageFeignClient; + private final Object lock = new Object(); @@ -153,75 +156,15 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene csLogsFeignClient.addUserLog(logDto); } - private void startScheduledTask(ScheduledExecutorService scheduler, String nDid, String version) { - synchronized (lock) { - //判断是否推送消息 - boolean devModel = equipmentFeignClient.judgeDevModel(nDid).getData(); - if (devModel) { - NoticeUserDto dto = sendOffLine(nDid); - sendMessageUtil.sendEventToUser(dto); - addLogs(dto); - } - String clientName = "NJCN-" + nDid.substring(nDid.length() - 6); - ScheduledFuture future = scheduler.scheduleAtFixedRate(() -> { - log.info(nDid + "执行重连定时任务..."); - DeviceLogDTO logDto = new DeviceLogDTO(); - logDto.setOperate(nDid + "重连定时任务"); - //判断客户端 - boolean mqttClient = mqttUtil.judgeClientOnline(clientName); - if (mqttClient) { - csDeviceService.devAccessAskTemplate(nDid,version,1); - try { - Thread.sleep(5000); - Integer status = csEquipmentDeliveryService.queryEquipmentBynDid(nDid).getRunStatus(); - if (Objects.equals(status,AccessEnum.ONLINE.getCode())){ - logDto.setResult(1); - scheduler.shutdown(); - redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1); - return; - } else { - logDto.setResult(0); - //一个小时未连接上，则推送告警消息 - MAX_WARNING_TIMES++; - if (MAX_WARNING_TIMES == 30 && devModel) { - NoticeUserDto dto2 = sendConnectFail(nDid); - sendMessageUtil.sendEventToUser(dto2); - addLogs(dto2); - } - //记录装置掉线时间 - CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid); - record.setOfflineTime(LocalDateTime.now()); - onlineLogsService.updateById(record); - } - } catch (InterruptedException e) { - throw new RuntimeException(e); - } - } else { - //一个小时未连接上，则推送告警消息 - MAX_WARNING_TIMES++; - if (MAX_WARNING_TIMES == 30 && devModel) { - NoticeUserDto dto2 = sendConnectFail(nDid); - sendMessageUtil.sendEventToUser(dto2); - addLogs(dto2); - } - logDto.setResult(0); - //记录装置掉线时间 - CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid); - record.setOfflineTime(LocalDateTime.now()); - onlineLogsService.updateById(record); - } - csLogsFeignClient.addUserLog(logDto); - }, 0, 2, TimeUnit.MINUTES); - } - } - //判断设备型号发送数据 private void sendMessage(String nDid) { boolean devModel = equipmentFeignClient.judgeDevModel(nDid).getData(); if (devModel) { NoticeUserDto dto = sendOffLine(nDid); - sendMessageUtil.sendEventToUser(dto); - addLogs(dto); + if (CollectionUtil.isNotEmpty(dto.getPushClientId())) { + sendMessageUtil.sendEventToUser(dto); + addLogs(dto); + } } } @@ -236,22 +179,17 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene String dateStr = localDateTime.format(fmt); String content = String.format(devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + dateStr + "离线"); dto.setContent(content); - dto.setPushClientId(getEventUser(po.getId(),true)); - return dto; - } - - //重连失败通知 - private NoticeUserDto sendConnectFail(String nDid) { - NoticeUserDto dto = new NoticeUserDto(); - dto.setTitle("设备接入失败"); - CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(nDid).getData(); - DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(po.getId()).getData(); - DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - LocalDateTime localDateTime = LocalDateTime.now(); - String dateStr = localDateTime.format(fmt); - String content = String.format(devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + dateStr + "多次接入失败"); - dto.setContent(content); - dto.setPushClientId(getEventUser(po.getId(),false)); + //获取设备关联的用户 + List eventUser = deviceMessageFeignClient.getEventUserByDeviceId(po.getId(),true).getData(); + DeviceMessageParam param1 = new DeviceMessageParam(); + param1.setUserList(eventUser); + param1.setEventType(2); + //获取打开推送的用户 + List users = deviceMessageFeignClient.getSendUserByType(param1).getData(); + if (CollectionUtil.isNotEmpty(users)){ + dto.setPushClientId( + users.stream().filter(Objects::nonNull).map(User::getDevCode).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList())); + } return dto; } @@ -263,18 +201,4 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene dto.setOperate(noticeUserDto.getContent()); csLogsFeignClient.addUserLog(dto); } - - /** - * 获取所有需要推送的用户id - */ - public List getEventUser(String devId, boolean isAdmin) { - List adminUser = appUserFeignClient.getAdminInfo().getData(); - List adminList = adminUser.stream().map(User::getId).collect(Collectors.toList()); - if (isAdmin) { - List list = csDeviceUserFeignClient.findUserById(devId).getData(); - adminList.addAll(list); - } - List users = userFeignClient.appuserByIdList(adminList).getData(); - return users.stream().map(User::getDevCode).filter(Objects::nonNull).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList()); - } } 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 6ee0934..bde2b15 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 @@ -4,19 +4,16 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import com.njcn.access.pojo.dto.NoticeUserDto; import com.njcn.access.utils.SendMessageUtil; -import com.njcn.csdevice.api.CsDeviceUserFeignClient; import com.njcn.csdevice.api.CsLedgerFeignClient; +import com.njcn.csdevice.api.DeviceMessageFeignClient; import com.njcn.csdevice.api.EquipmentFeignClient; import com.njcn.csdevice.api.EventLogsFeignClient; +import com.njcn.csdevice.param.DeviceMessageParam; import com.njcn.csdevice.pojo.dto.DevDetailDTO; import com.njcn.csdevice.pojo.po.CsEventSendMsg; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.system.api.EpdFeignClient; -import com.njcn.user.api.AppInfoSetFeignClient; -import com.njcn.user.api.AppUserFeignClient; -import com.njcn.user.api.UserFeignClient; import com.njcn.user.pojo.po.User; -import com.njcn.user.pojo.po.app.AppInfoSet; import com.njcn.zlevent.service.ICsEventUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -40,14 +37,6 @@ import java.util.stream.Collectors; @Component public class SendEventUtils { - @Resource - private UserFeignClient userFeignClient; - @Resource - private AppUserFeignClient appUserFeignClient; - @Resource - private CsDeviceUserFeignClient csDeviceUserFeignClient; - @Resource - private AppInfoSetFeignClient appInfoSetFeignClient; @Resource private EventLogsFeignClient eventLogsFeignClient; @Resource @@ -60,6 +49,8 @@ public class SendEventUtils { private SendMessageUtil sendMessageUtil; @Resource private EquipmentFeignClient equipmentFeignClient; + @Resource + private DeviceMessageFeignClient deviceMessageFeignClient; /** * 事件推送给相关用户 @@ -92,7 +83,7 @@ public class SendEventUtils { case "1": code = 3; //设备自身事件 不推送给用户，推送给业务管理 - eventUser = getEventUser(devId,false); + eventUser = deviceMessageFeignClient.getEventUserByDeviceId(devId,false).getData(); if (CollectionUtil.isNotEmpty(eventUser)) { eventUser.forEach(item->{ CsEventUserPO csEventUser = new CsEventUserPO(); @@ -102,7 +93,10 @@ public class SendEventUtils { result.add(csEventUser); }); - users = getSendUser(eventUser,2); + DeviceMessageParam param1 = new DeviceMessageParam(); + param1.setUserList(eventUser); + param1.setEventType(2); + users = deviceMessageFeignClient.getSendUserByType(param1).getData(); if (CollectionUtil.isNotEmpty(users)){ for (User user : users){ userList.add(user.getDevCode()); @@ -115,7 +109,7 @@ public class SendEventUtils { case "2": code = 0; //暂态事件 - eventUser = getEventUser(devId,true); + eventUser = deviceMessageFeignClient.getEventUserByDeviceId(devId,true).getData(); if (CollectionUtil.isNotEmpty(eventUser)) { eventUser.forEach(item->{ CsEventUserPO csEventUser = new CsEventUserPO(); @@ -124,7 +118,10 @@ public class SendEventUtils { csEventUser.setEventId(id); result.add(csEventUser); }); - users = getSendUser(eventUser,0); + DeviceMessageParam param1 = new DeviceMessageParam(); + param1.setUserList(eventUser); + param1.setEventType(0); + users = deviceMessageFeignClient.getSendUserByType(param1).getData(); if (CollectionUtil.isNotEmpty(users)){ devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList()); noticeUserDto.setPushClientId(devCodeList); @@ -249,60 +246,4 @@ public class SendEventUtils { } } } - - /** - * 获取所有需要推送的用户id - */ - public List getEventUser(String devId,boolean isAdmin) { - List adminUser = appUserFeignClient.getAdminInfo().getData(); - List adminList = adminUser.stream().map(User::getId).collect(Collectors.toList()); - if (isAdmin) { - List list = csDeviceUserFeignClient.findUserById(devId).getData(); - adminList.addAll(list); - } - if (CollectionUtil.isNotEmpty(adminList)) { - adminList = adminList.stream().distinct().collect(Collectors.toList()); - } - return adminList; - } - - - /** - * 获取所有打开推送的用户信息 - */ - public List getSendUser(List userList,Integer type) { - List users = new ArrayList<>(); - List result = new ArrayList<>(); - List appInfoSet = appInfoSetFeignClient.getListById(userList).getData(); - - switch (type) { - case 0: - result = appInfoSet.stream() - .filter(person -> person.getEventInfo() == 1) - .map(AppInfoSet::getUserId).collect(Collectors.toList()); - break; - case 1: - result = appInfoSet.stream() - .filter(person -> person.getHarmonicInfo() == 1) - .map(AppInfoSet::getUserId).collect(Collectors.toList()); - break; - case 2: - result = appInfoSet.stream() - .filter(person -> person.getRunInfo() == 1) - .map(AppInfoSet::getUserId).collect(Collectors.toList()); - break; - case 3: - result = appInfoSet.stream() - .filter(person -> person.getAlarmInfo() == 1) - .map(AppInfoSet::getUserId).collect(Collectors.toList()); - break; - default: - break; - } - if (CollectionUtil.isNotEmpty(result)){ - users = userFeignClient.appuserByIdList(result).getData(); - } - return users; - } - }