新增云协议设备实时数据功能

2025-09-04 14:00:15 +08:00
parent f88baa52be
commit 1a3e443be1
15 changed files with 398 additions and 150 deletions
--- a/iot-access/access-boot/src/main/java/com/njcn/access/controller/AskDeviceDataController.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/controller/AskDeviceDataController.java
@@ -123,5 +123,17 @@ public class AskDeviceDataController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/askCldRealData")
+    @ApiOperation("询问云前置实时数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "devId", value = "装置id"),
+            @ApiImplicitParam(name = "lineId", value = "监测点id")
+    })
+    public HttpResult<String> askCldRealData(@RequestParam("devId") String devId, @RequestParam("lineId") String lineId){
+        String methodDescribe = getMethodDescribe("askCldRealData");
+        askDeviceDataService.askCldRealData(devId,lineId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }

 }
--- 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,14 +1,17 @@
 package com.njcn.access.listener;

 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.ICsTopicService;
 import com.njcn.access.service.impl.CsDeviceServiceImpl;
 import com.njcn.access.utils.MqttUtil;
+import com.njcn.access.utils.RedisSetUtil;
 import com.njcn.access.utils.SendMessageUtil;
 import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.csdevice.api.*;
@@ -17,6 +20,7 @@ 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.AppUserFeignClient;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.User;
@@ -32,6 +36,7 @@ import java.time.LocalDateTime;
 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;
@@ -46,8 +51,6 @@ import java.util.stream.Collectors;
@Component
 public class RedisKeyExpirationListener extends KeyExpirationEventMessageListener {

-    @Resource
-    private ICsTopicService csTopicService;
    @Resource
    private ICsEquipmentDeliveryService csEquipmentDeliveryService;
    @Resource
@@ -73,9 +76,11 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
    @Resource
    private SendMessageUtil sendMessageUtil;
    @Resource
-    private CsDeviceServiceImpl csDeviceServiceImpl;
-    @Resource
    private CsCommunicateFeignClient csCommunicateFeignClient;
+    @Resource
+    private MqttPublisher publisher;
+    @Resource
+    private RedisSetUtil redisSetUtil;

    private final Object lock = new Object();

@@ -101,6 +106,20 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
            String nDid = expiredKey.split(":")[1];
            executeMainTask(nDid);
        }
+        if(expiredKey.startsWith("cldRtDataOverTime:")){
+            String lineId = expiredKey.split(":")[1];
+            Object redisObject = redisUtil.getObjectByKey("rtDataUserId:"+lineId);
+            if (ObjectUtil.isNotNull(redisObject)) {
+                Set<String> userSet = redisSetUtil.convertToSet(redisObject);
+                userSet.forEach(userId->{
+                    BaseRealDataSet baseRealDataSet = new BaseRealDataSet();
+                    baseRealDataSet.setUserId(userId);
+                    baseRealDataSet.setResult(false);
+                    baseRealDataSet.setContent("设备未响应，超时中断");
+                    publisher.send("/Web/RealData/" + lineId, new Gson().toJson(baseRealDataSet), 1, false);
+                });
+            }
+        }
    }

    //主任务
@@ -118,10 +137,6 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
        logDto.setOperate(nDid +"装置离线");
        sendMessage(nDid);
        //记录装置掉线时间
-//        CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
-//        record.setOfflineTime(LocalDateTime.now());
-//        onlineLogsService.updateById(record);
-        //记录装置掉线时间
        PqsCommunicateDto dto = new PqsCommunicateDto();
        dto.setTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
        dto.setDevId(nDid);
@@ -131,68 +146,6 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
        csLogsFeignClient.addUserLog(logDto);
    }

-    //主任务
-    //1.装置心跳断连
-    //2.MQTT客户端不在线
-//    private void executeMainTask(String nDid, String version) {
-//        ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
-//        log.info("{}->装置离线", nDid);
-//        DeviceLogDTO logDto = new DeviceLogDTO();
-//        logDto.setUserName("运维管理员");
-//        logDto.setLoginName("njcnyw");
-//        //判断mqtt
-//        String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
-//        boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
-//        //心跳异常，但是客户端在线，则发送接入请求
-//        if (mqttClient) {
-//            csDeviceService.devAccessAskTemplate(nDid,version,1);
-//            redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
-//            try {
-//                Thread.sleep(5000);
-//                Object object = redisUtil.getObjectByKey("online" + nDid);
-//                if (Objects.nonNull(object)) {
-//                    scheduler.shutdown();
-//                    logDto.setOperate(nDid + "客户端在线重连成功");
-//                } else {
-//                    //装置下线
-//                    csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
-//                    //装置调整为注册状态
-//                    csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
-//                    logDto.setOperate(nDid +"装置离线");
-//                    sendMessage(nDid);
-//
-//                    //记录装置掉线时间
-//                    CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
-//                    record.setOfflineTime(LocalDateTime.now());
-//                    onlineLogsService.updateById(record);
-//
-//                    scheduler.shutdown();
-//                }
-//            } catch (InterruptedException e) {
-//                scheduler.shutdown();
-//                throw new RuntimeException(e);
-//            }
-//            csLogsFeignClient.addUserLog(logDto);
-//        }
-//        //客户端不在线则修改装置状态，进入定时任务
-//        else {
-//            //装置下线
-//            csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
-//            //装置调整为注册状态
-//            csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.REGISTERED.getCode());
-//            logDto.setOperate(nDid +"主任务执行失败，装置下线");
-//            csLogsFeignClient.addUserLog(logDto);
-//            sendMessage(nDid);
-//
-//            //记录装置掉线时间
-//            CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
-//            record.setOfflineTime(LocalDateTime.now());
-//            onlineLogsService.updateById(record);
-//
-//            scheduler.shutdown();
-//        }
-//    }
-
    private void startScheduledTask(ScheduledExecutorService scheduler, String nDid, String version) {
        synchronized (lock) {
            //判断是否推送消息
--- a/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java
@@ -203,8 +203,7 @@ public class AutoAccessTimer implements ApplicationRunner {
 //            }
 //        };
 //        //第一次执行的时间为120s，然后在前一个任务执行完毕后，等待120s再执行下一个任务
-////        scheduler.scheduleWithFixedDelay(task, AUTO_TIME, AUTO_TIME, TimeUnit.SECONDS);
-//        scheduler.scheduleWithFixedDelay(task, 10, 10, TimeUnit.SECONDS);
+//        scheduler.scheduleWithFixedDelay(task, AUTO_TIME, AUTO_TIME, TimeUnit.SECONDS);
 //    }
 //
 //    public void accessDev(List<CsEquipmentDeliveryPO> list) {
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/AskDeviceDataService.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/AskDeviceDataService.java
@@ -21,4 +21,6 @@ public interface AskDeviceDataService {
     * 实时数据请求报文
     */
    void askRealData(String nDid, Integer idx, Integer size);
+
+    void askCldRealData(String devId, String lineId);
 }
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java
@@ -11,6 +11,8 @@ import com.njcn.access.pojo.dto.ReqAndResDto;
 import com.njcn.access.service.AskDeviceDataService;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
+import com.njcn.mq.message.RealDataMessage;
+import com.njcn.mq.template.RealDataMessageTemplate;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
 import lombok.RequiredArgsConstructor;
@@ -32,6 +34,7 @@ public class AskDeviceDataServiceImpl implements AskDeviceDataService {
    private final MqttPublisher publisher;
    private final CsTopicFeignClient csTopicFeignClient;
    private final RedisUtil redisUtil;
+    private final RealDataMessageTemplate realDataMessageTemplate;
    private static Integer mid = 1;
    private static Integer range = 51200;

@@ -209,6 +212,16 @@ public class AskDeviceDataServiceImpl implements AskDeviceDataService {
        redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
    }

+    @Override
+    public void askCldRealData(String devId, String lineId) {
+        RealDataMessage realDataMessage = new RealDataMessage();
+        realDataMessage.setDevSeries(devId);
+        realDataMessage.setLine(lineId);
+        realDataMessage.setRealData(true);
+        realDataMessage.setSoeData(true);
+        realDataMessage.setLimit(20);
+        realDataMessageTemplate.sendMember(realDataMessage);
+    }

    public Object getDeviceMid(String nDid) {
        return redisUtil.getObjectByKey(AppRedisKey.DEVICE_MID + nDid);
--- a/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
@@ -726,7 +726,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
                }
            }
            publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(getJson(mid,TypeEnum.TYPE_5.getCode())), 1, false);
-            redisUtil.saveByKeyWithExpire("startFile:" + nDid, null, 60L);
+//            redisUtil.saveByKeyWithExpire("startFile:" + nDid, null, 60L);
            result = true;
        } catch (Exception e) {
            DeviceLogDTO logDto = new DeviceLogDTO();