From 5c6d05b30778649b2bd53396f4e61afaa71b317a Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 8 Nov 2024 14:06:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BDbug?=
 =?UTF-8?q?=E6=B6=88=E7=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../access/service/impl/AskDeviceDataServiceImpl.java     | 1 +
 .../com/njcn/zlevent/service/impl/FileServiceImpl.java    | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git 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
index 2c047ab..1f72c2d 100644
--- 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
@@ -100,6 +100,7 @@ public class AskDeviceDataServiceImpl implements AskDeviceDataService {
         } catch (Exception e) {
             redisUtil.delete("fileDowning:"+nDid);
             redisUtil.delete("fileCheck"+nDid+name);
+            redisUtil.delete("fileDownUserId"+nDid+name);
             throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOAD_ERROR);
         }
         return result;
diff --git a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/FileServiceImpl.java b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/FileServiceImpl.java
index 78fa6ad..06fafef 100644
--- a/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/FileServiceImpl.java
+++ b/iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/FileServiceImpl.java
@@ -31,6 +31,7 @@ import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
+import com.njcn.user.api.UserFeignClient;
 import com.njcn.zlevent.param.CsEventParam;
 import com.njcn.zlevent.pojo.dto.FileInfoDto;
 import com.njcn.zlevent.pojo.dto.FileStreamDto;
@@ -262,8 +263,13 @@ public class FileServiceImpl implements IFileService {
                         }
                     }
                 }
+                String userIndex = redisUtil.getObjectByKey("fileDownUserId"+appFileMessage.getId()+appFileMessage.getMsg().getName()).toString();
                 //推送mqtt
-                String json = "{fileName:"+appFileMessage.getMsg().getName()+",allStep:"+appFileMessage.getMsg().getFrameTotal()+",nowStep:"+ appFileMessage.getMsg().getFrameCurr() +"}";
+                String json = "{fileName:" + appFileMessage.getMsg().getName()
+                        + ",allStep:" + appFileMessage.getMsg().getFrameTotal()
+                        + ",nowStep:" + appFileMessage.getMsg().getFrameCurr()
+                        + ",userId:" + userIndex
+                        +"}";
                 publisher.send("/Web/Progress/" + appFileMessage.getId(), new Gson().toJson(json), 1, false);
                 if (!Objects.isNull(filePath)){
                     redisUtil.saveByKeyWithExpire("downloadFilePath:" + appFileMessage.getId() + appFileMessage.getMsg().getName(),filePath,60L);