From e7a52d9e21eddb8ff94fb2b0ac95e4d7da541ed2 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期三, 11 六月 2025 17:22:40 +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 | 22 +++++++++++++++++++--- 1 files changed, 19 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 3f820a6..b271fb0 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 = "查询多个测点当前值") @@ -47,11 +47,27 @@ @Operation(summary = "查询单个测点历史值") List<ApiPointValueDTO> queryPointHistoryValue(@RequestBody ApiPointValueQueryDTO queryDto); + @PostMapping(PREFIX + "/query-point/max-value") + @Operation(summary = "查询最大值") + 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 = "写入单个测点值") Boolean writePointRealValue(@RequestBody ApiPointValueWriteDTO queryDto); - @GetMapping(PREFIX + "/info/nos/{pointNo}") + @PostMapping(PREFIX + "/query-math-point/current-value") @Operation(summary = "根据计算点编号查询测点集合") - PageResult<ApiPointDTO> getPageByNo(@RequestBody ApiPointPageReqVO reqVO); + PageResult<ApiPointDTO> queryMathPointCurrentValue(@RequestBody ApiPointPageReqVO reqVO); } -- Gitblit v1.9.3