From d4af88c55fcd15b8501b159822bb615b2dd16841 Mon Sep 17 00:00:00 2001 From: houwei Date: Thu, 24 Oct 2024 09:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E6=B3=A8=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../das/modules/data/controller/DataController.java | 6 +++--- .../com/das/modules/data/service/DataService.java | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/das/src/main/java/com/das/modules/data/controller/DataController.java b/das/src/main/java/com/das/modules/data/controller/DataController.java index f312ec6f..edcaecd3 100644 --- a/das/src/main/java/com/das/modules/data/controller/DataController.java +++ b/das/src/main/java/com/das/modules/data/controller/DataController.java @@ -29,7 +29,7 @@ public class DataController { /** * 实时数据查询 - * @param param 查询数据请求体 + * @param param 查询条件 * @return redis数据 */ @PostMapping("/snapshot") @@ -43,8 +43,8 @@ public class DataController { /** * 历史区间数据查询 - * @param param - * @return + * @param param 查询条件 + * @return TD数据库数据 */ @PostMapping("/history") public R>>> queryTimeSeriesValues(@RequestBody @Valid TSValueQueryParam param) { diff --git a/das/src/main/java/com/das/modules/data/service/DataService.java b/das/src/main/java/com/das/modules/data/service/DataService.java index 4cd55fdc..d91de72a 100644 --- a/das/src/main/java/com/das/modules/data/service/DataService.java +++ b/das/src/main/java/com/das/modules/data/service/DataService.java @@ -35,7 +35,11 @@ public class DataService { @Autowired private DataServiceImpl dataService; - // 读取实时数据快照 + /** + * 读取实时数据快照 + * @param paramList 设备id及设备属性列表 + * @return + */ public Map> querySnapshotValues(List paramList) { long start = System.currentTimeMillis(); Map> result = new HashMap<>(paramList.size()); @@ -80,7 +84,11 @@ public class DataService { return finalResult; } - + /** + * 历史区间数据查询 + * @param param 查询条件 + * @return TD数据库数据 + */ public Map>> queryTimeSeriesValues(TSValueQueryParam param) { if (CollectionUtil.isEmpty(param.getDevices()) || (param.getStartTime() == null && param.getEndTime() == null)) { throw new ServiceException("必要参数缺失");