From fc7ebc6bf97d7c4a4a8911c7a5d7cadcbda24719 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期四, 12 六月 2025 17:41:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/DataPointApi.java | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/DataPointApi.java b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/DataPointApi.java index 1daa923..b412633 100644 --- a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/DataPointApi.java +++ b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/DataPointApi.java @@ -33,7 +33,7 @@ @PostMapping(PREFIX + "/info/ids") @Operation(summary = "根据多个测点ID查询测点信息") - List<ApiPointDTO> getInfoByIds(@RequestParam("pointNos") Set<String> pointIds); + List<ApiPointDTO> getInfoByIds(@RequestBody Set<String> pointIds); @PostMapping(PREFIX + "/query-points/real-value") @Operation(summary = "查询多个测点当前值") @@ -49,7 +49,19 @@ @PostMapping(PREFIX + "/query-point/max-value") @Operation(summary = "查询最大值") - Object queryPointMaxValue(@RequestBody ApiPointValueQueryDTO queryDto); + Map<String, Object> queryPointMaxValue(@RequestBody ApiPointValueQueryDTO queryDto); + + @PostMapping(PREFIX + "/query-point/max-time-value") + @Operation(summary = "查询最大值(带时间)") + Map<String, Object> queryPointMaxTimeValue(@RequestBody ApiPointValueQueryDTO queryDto); + + @PostMapping(PREFIX + "/query-point/max-value-range") + @Operation(summary = "查询最大值") + Map<String, Object> queryPointMaxValueRange(@RequestBody ApiPointValueQueryDTO queryDto); + + @PostMapping(PREFIX + "/query-point/min-value-range") + @Operation(summary = "查询最小值") + Map<String, Object> queryPointMinValueRange(@RequestBody ApiPointValueQueryDTO queryDto); @PutMapping(PREFIX + "/write-point/real-value") @Operation(summary = "写入单个测点值") @@ -58,4 +70,12 @@ @PostMapping(PREFIX + "/query-math-point/current-value") @Operation(summary = "根据计算点编号查询测点集合") PageResult<ApiPointDTO> queryMathPointCurrentValue(@RequestBody ApiPointPageReqVO reqVO); -} + + @PostMapping(PREFIX + "/query-point-bad-history/page") + @Operation(summary = "查询测点异常历史分页") + PageResult<ApiPointBadHistoryDTO> queryPointBadHistoryPage(@RequestBody ApiPointBadHistoryPageReqVO reqVO); + + @PostMapping(PREFIX + "/query-point/count") + @Operation(summary = "获取点位个数") + String getPointTotalCount(@RequestBody ApiPointCountReqVO reqVO); +} \ No newline at end of file -- Gitblit v1.9.3