From db26e6258cb9afd756777ffc90009da7ff089eb0 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Wed, 7 Aug 2024 09:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=202024?=
 =?UTF-8?q?=E5=B9=B48=E6=9C=887=E6=97=A509:40:45?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysisdata/service/impl/AnalysisDataServiceImpl.java       | 1 +
 .../thing/dictRelation/param/IotThingDictRelationParamDTO.java   | 1 +
 2 files changed, 2 insertions(+)

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 f2913aa..739412b 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
@@ -247,6 +247,7 @@ public class AnalysisDataServiceImpl implements AnalysisDataService {
                                 if(first.isPresent()){
                                     IotThingSourceDTO iotThingSourceDTO = first.get();
                                     relationDTO.setThingAttrUnit(iotThingSourceDTO.getThingAttrUnit());
+                                    relationDTO.setDataDealConfig(iotThingSourceDTO.getDataDealConfig());
                                 }});
                     viewSourceDTO.setDictList(relationDTOList);
                     return viewSourceDTO;
diff --git a/modules/thing/src/main/java/com/thing/thing/dictRelation/param/IotThingDictRelationParamDTO.java b/modules/thing/src/main/java/com/thing/thing/dictRelation/param/IotThingDictRelationParamDTO.java
index d7c4a8d..49efc0d 100644
--- a/modules/thing/src/main/java/com/thing/thing/dictRelation/param/IotThingDictRelationParamDTO.java
+++ b/modules/thing/src/main/java/com/thing/thing/dictRelation/param/IotThingDictRelationParamDTO.java
@@ -77,6 +77,7 @@ public class IotThingDictRelationParamDTO implements Serializable {
     private String dataTreatingMark;
     @Schema(description = "映射子集(子数据列表)")
     private String childConfig;
+    private String dataDealConfig;
     @Schema(description = "是否是模板，1模板，0 非模板(默认)")
     private String templateMark;
     @Schema(description = "物实体ID集合(新增指标)")