From 4ce04b8cfb67e63815affcc5c4c3d0699f5a5541 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Fri, 9 Aug 2024 16:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=88=86=E6=9E=90=202024?=
 =?UTF-8?q?=E5=B9=B48=E6=9C=889=E6=97=A516:11:29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysisdata/service/impl/AnalysisDataServiceImpl.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java b/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java
index 739412b..faf6003 100644
--- a/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java
@@ -100,8 +100,8 @@ public class AnalysisDataServiceImpl implements AnalysisDataService {
         Map<String, Object> resMap = new HashMap<>();
         //获取数据源信息
         List<IotThingSourceDTO> iotThingSourceList = iotThingSourceService.findAllByFromIdAndThingIdAndConfigType(
-                        monitoringDataReqDTO.getThingRelationList().stream().map(IotThingSourceDTO::getThingId).toList(),
                         null,
+                        monitoringDataReqDTO.getThingRelationList().stream().map(IotThingSourceDTO::getThingId).toList(),
                         monitoringDataReqDTO.getConfigType(),
                         monitoringDataReqDTO.getThingRelationList().stream().map(IotThingSourceDTO::getRootId).toList()
         );
@@ -248,6 +248,7 @@ public class AnalysisDataServiceImpl implements AnalysisDataService {
                                     IotThingSourceDTO iotThingSourceDTO = first.get();
                                     relationDTO.setThingAttrUnit(iotThingSourceDTO.getThingAttrUnit());
                                     relationDTO.setDataDealConfig(iotThingSourceDTO.getDataDealConfig());
+                                    relationDTO.setDataTreatingMark(iotThingSourceDTO.getDataTreatingMark());
                                 }});
                     viewSourceDTO.setDictList(relationDTOList);
                     return viewSourceDTO;