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 | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 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 88f676e..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
@@ -1,17 +1,16 @@
package com.iailab.module.data.api.point;
+import com.iailab.framework.common.pojo.PageResult;
import com.iailab.module.data.api.point.dto.*;
import com.iailab.module.data.enums.ApiConstants;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* @author PanZhibao
@@ -19,30 +18,64 @@
* @createTime 2024年08月19日
*/
@FeignClient(name = ApiConstants.NAME)
-@Tag(name = "数据测点服务")
+@Tag(name = "测点接口")
public interface DataPointApi {
String PREFIX = ApiConstants.PREFIX + "/point";
- @PostMapping(PREFIX + "/point/{pointNo}")
- @Operation(summary = "查询测点信息")
- ApiPointDTO getPoint(@PathVariable("pointNo") String pointNo);
+ @GetMapping(PREFIX + "/info/no/{pointNo}")
+ @Operation(summary = "根据测点编号查询测点信息")
+ ApiPointDTO getInfoByNo(@PathVariable("pointNo") String pointNo);
- @PostMapping(PREFIX + "/current")
+ @GetMapping(PREFIX + "/info/id/{pointId}")
+ @Operation(summary = "根据测点ID查询测点信息")
+ ApiPointDTO getInfoById(@PathVariable("pointId") String pointId);
+
+ @PostMapping(PREFIX + "/info/ids")
+ @Operation(summary = "根据多个测点ID查询测点信息")
+ List<ApiPointDTO> getInfoByIds(@RequestBody Set<String> pointIds);
+
+ @PostMapping(PREFIX + "/query-points/real-value")
@Operation(summary = "查询多个测点当前值")
- Map<String, Object> pointsCurrent(@RequestParam("pointNos") List<String> pointNos);
+ Map<String, Object> queryPointsRealValue(@RequestParam("pointNos") List<String> pointNos);
- @PostMapping(PREFIX + "/history")
+ @PostMapping(PREFIX + "/query-points/history-value")
@Operation(summary = "查询多个测点历史值")
- Map<String, List<Map<String, Object>>> pointsHistory(@RequestBody ApiPointsValueQueryDTO queryDto);
+ Map<String, List<Map<String, Object>>> queryPointsHistoryValue(@RequestBody ApiPointsValueQueryDTO queryDto);
- @PostMapping(PREFIX + "/value/get")
+ @PostMapping(PREFIX + "/query-point/history-value")
@Operation(summary = "查询单个测点历史值")
- List<ApiPointValueDTO> getValue(@RequestBody ApiPointValueQueryDTO queryDto);
+ List<ApiPointValueDTO> queryPointHistoryValue(@RequestBody ApiPointValueQueryDTO queryDto);
- @PostMapping(PREFIX + "/value/set")
- @Operation(summary = "设置单个测点值")
- Boolean setValue(@RequestBody ApiPointValueWriteDTO 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);
+
+ @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