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 1/3] =?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;

From 313ff9afc5945651389296a088b22949bf5ee6aa Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Fri, 9 Aug 2024 16:56:31 +0800
Subject: [PATCH 2/3] =?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

---
 .../thing/thing/group/service/impl/IotGroupInfoServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java
index c3db89a..a20df93 100644
--- a/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/group/service/impl/IotGroupInfoServiceImpl.java
@@ -473,6 +473,7 @@ public class IotGroupInfoServiceImpl extends BaseServiceImpl<IotGroupInfoMapper,
         groupInfoEntity.setThumbnailUrl(dto.getThumbnailUrl());
         groupInfoEntity.setIsDefault(dto.getIsDefault());
         groupInfoEntity.setRemark(dto.getRemark());
+        groupInfoEntity.setSort(dto.getSort());
         updateById(groupInfoEntity);
     }
 

From b61ccfc320fcfbbf400abc41cbce7195adfd9a3e Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Fri, 9 Aug 2024 17:01:58 +0800
Subject: [PATCH 3/3] =?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

---
 .../thing/model/service/impl/IotThingModelServiceImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java
index 9e2341d..cddcbc3 100644
--- a/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java
@@ -262,7 +262,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
         if (StringUtils.isNotBlank(attrs)) {
             attrList.addAll(Arrays.stream(attrs.split(",")).distinct().toList());
         }
-        return  tsKvService.findPageTsKvByCodeAndAttrs(entityCode, attrList, startTime,endTime, false,page, limit);
+        return  tsKvService.findPageLatestByCodesAndAttrs(Lists.newArrayList(entityCode), attrList, false,page, limit);
     }