物模型更新

2024年8月12日09:04:39

modules/thing/src/main/java/com/thing/thing/model/controller/IotThingModelController.java

@@ -143,6 +143,16 @@ public class IotThingModelController {
         return new Result<PageData<TsKvDTO>>().ok(service.latestData(entityCode,attrs,startTime,endTime,page,limit));
     }
 
+    @GetMapping("latestList")
+    @Operation(summary="获取code在时序数据库中的时序属性")
+    @Parameters({
+            @Parameter(name = "entityCode",description ="物编码"),
+            @Parameter(name = "attrs",description ="属性编码集合")
+    })
+    public Result<List<TsKvDTO>> latestList(String entityCode,String attrs) {
+        return new Result<List<TsKvDTO>>().ok(service.latestList(entityCode,attrs));
+    }
+
     @GetMapping("getSequenceAttr")
     @Operation(summary="获取code在时序数据库中的时序属性")
     @Parameters({

modules/thing/src/main/java/com/thing/thing/model/service/IotThingModelService.java

@@ -41,6 +41,8 @@ public interface IotThingModelService extends IBaseService<IotThingModelEntity>
 
     PageData<TsKvDTO> latestData(String entityCode, String attrs, Long startTime, Long endTime,Integer page,Integer limit);
 
+    List<TsKvDTO> latestList(String entityCode, String attrs);
+
     void saveSequenceAttr(List<TsKvDTO> tsKvDTOS);
 
     void deleteSequenceAttr(List<TsKvDTO> tsKvDTOS);

modules/thing/src/main/java/com/thing/thing/model/service/impl/IotThingModelServiceImpl.java

@@ -265,6 +265,20 @@ public class IotThingModelServiceImpl extends BaseServiceImpl<IotThingModelMappe
         return  tsKvService.findPageLatestByCodesAndAttrs(Lists.newArrayList(entityCode), attrList, false,page, limit);
     }
 
+    @Override
+    public List<TsKvDTO> latestList(String entityCode, String attrs) {
+        Optional<ModelDetailDTO> optional = findByCode(entityCode);
+        if (optional.isEmpty()) {
+            return null;
+        }
+        //获取时序属性
+        List<String> attrList = Lists.newArrayList();
+        if (StringUtils.isNotBlank(attrs)) {
+            attrList.addAll(Arrays.stream(attrs.split(",")).distinct().toList());
+        }
+        return  tsKvService.findLatestByCodeAndAttrs(entityCode, attrList, false);
+    }
+
 
     @Override
     public void saveSequenceAttr(List<TsKvDTO> tsKvDTOS) {