物模型时序属性分页

2024年8月9日10:42:38

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")

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);
 

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);
     }