From 44d4e6e112cf48a02279ddef714d75a376154ba2 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Fri, 9 Aug 2024 10:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=A8=A1=E5=9E=8B=E6=97=B6=E5=BA=8F?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=88=86=E9=A1=B5=202024=E5=B9=B48=E6=9C=889?=
 =?UTF-8?q?=E6=97=A510:42:38?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thing/model/controller/IotThingModelController.java     | 4 ++--
 .../com/thing/thing/model/service/IotThingModelService.java | 2 +-
 .../thing/model/service/impl/IotThingModelServiceImpl.java  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java
index 38f5602..7e37cb8 100644
--- a/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java
+++ b/modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java
@@ -139,8 +139,8 @@ public class IotThingModelController {
             @Parameter(name = "entityCode",description ="物编码"),
             @Parameter(name = "attrs",description ="属性编码集合")
     })
-    public Result<List<TsKvDTO>> latestData(String entityCode,String attrs,Long startTime,Long endTime) {
-        return new Result<List<TsKvDTO>>().ok(service.latestData(entityCode,attrs,startTime,endTime));
+    public Result<PageData<TsKvDTO>> latestData(String entityCode,String attrs,Long startTime,Long endTime,Integer page,Integer limit) {
+        return new Result<PageData<TsKvDTO>>().ok(service.latestData(entityCode,attrs,startTime,endTime,page,limit));
     }
 
     @GetMapping("getSequenceAttr")
diff --git a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java
index 251bf30..91f9f2e 100644
--- a/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java
+++ b/modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java
@@ -39,7 +39,7 @@ public interface IotThingModelService extends IBaseService<IotThingModelEntity>
 
     PageData<TsKvDTO> getSequenceAttr(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit);
 
-    List<TsKvDTO> latestData(String entityCode, String attrs, Long startTime, Long endTime);
+    PageData<TsKvDTO> latestData(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit);
 
     void saveSequenceAttr(List<TsKvDTO> tsKvDTOS);
 
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 eadad86..9e2341d 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
@@ -246,13 +246,13 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
             tskvList = tsKvService.findPageTsKvByCodeAndAttrs(entityCode, attrList, startTime, endTime, false,page, limit);
         } else {
             // 没有时间参数：查最新值
-            tskvList = tsKvService.findPageTsKvByCodeAndAttrs(entityCode, attrList, null,null, false,page, limit);
+            tskvList = tsKvService.findPageTsKvByCodeAndAttrs(entityCode, attrList, startTime,endTime, false,page, limit);
         }
         return tskvList;
     }
 
     @Override
-    public List<TsKvDTO> latestData(String entityCode, String attrs, Long startTime, Long endTime) {
+    public PageData<TsKvDTO> latestData(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit) {
         Optional<ModelDetailDTO> optional = findByCode(entityCode);
         if (optional.isEmpty()) {
             return null;
@@ -262,7 +262,7 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
         if (StringUtils.isNotBlank(attrs)) {
             attrList.addAll(Arrays.stream(attrs.split(",")).distinct().toList());
         }
-        return tsKvService.findLatestByCodeAndAttrs(entityCode, attrList, false);
+        return  tsKvService.findPageTsKvByCodeAndAttrs(entityCode, attrList, startTime,endTime, false,page, limit);
     }