From 6c1bf03c9c1b87c09c26a04db569e2a091df4d94 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 8 Oct 2024 16:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/access/service/impl/CsDeviceServiceImpl.java  |  2 ++
 .../com/njcn/zlevent/service/impl/FileServiceImpl.java | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git 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
index 486dcf1..5304b24 100644
--- 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
@@ -413,6 +413,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
                     po.setStatus(1);
                     po.setClDid(item.getClDev());
                     po.setDeviceId(vo.getId());
+                    po.setDataSetId(item.getId());
+                    po.setDataModelId(item.getPid());
                     //防止主键重复
                     QueryWrapper<CsLinePO> qw = new QueryWrapper<>();
                     qw.eq("line_id",po.getLineId());
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 3615577..c9948bd 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
@@ -129,10 +129,14 @@ public class FileServiceImpl implements IFileService {
             //todo 目前文件先只处理波形事件的，后续有其他文件再做处理
             String fileName = appFileMessage.getMsg().getName();
             String lsFileName = generalInfo.getBusinessTempPath() + File.separator + fileName.split(StrUtil.SLASH)[fileName.split(StrUtil.SLASH).length - 1];
-            File lsFile =new File(generalInfo.getBusinessTempPath());
+            File lsFile = new File(generalInfo.getBusinessTempPath());
             //如果文件夹不存在则创建
-            if (!lsFile.exists() && !lsFile.isDirectory()) {
-                lsFile .mkdirs();
+            if (!lsFile.exists()) {
+                if (!lsFile.isDirectory()) {
+                    lsFile .mkdirs();
+                } else {
+                    lsFile.createNewFile();
+                }
             }
             //获取缓存的文件信息
             Object fileInfo = redisUtil.getObjectByKey(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileName));