From 79914dabac38d83676ea16ff65da8d941a099285 Mon Sep 17 00:00:00 2001 From: Jay <csj123456> Date: 星期二, 08 十月 2024 10:38:01 +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 | 37 +++++++++++++++++-------------------- 1 files changed, 17 insertions(+), 20 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 185eb18..28e6b4b 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 @@ -5,10 +5,7 @@ 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; @@ -19,34 +16,34 @@ * @createTime 2024年08月19日 */ @FeignClient(name = ApiConstants.NAME) -@Tag(name = "数据测点服务") +@Tag(name = "测点接口") public interface DataPointApi { String PREFIX = ApiConstants.PREFIX + "/point"; - @PostMapping(PREFIX + "/point-no/{pointNo}") - @Operation(summary = "查询测点信息") - ApiPointDTO getPointByNo(@PathVariable("pointNo") String pointNo); + @GetMapping(PREFIX + "/info/no/{pointNo}") + @Operation(summary = "根据测点编号查询测点信息") + ApiPointDTO getInfoByNo(@PathVariable("pointNo") String pointNo); - @PostMapping(PREFIX + "/point-id/{pointId}") - @Operation(summary = "查询测点信息") - ApiPointDTO getPointById(@PathVariable("pointId") String pointId); + @GetMapping(PREFIX + "/info/id/{pointId}") + @Operation(summary = "根据测点ID查询测点信息") + ApiPointDTO getInfoById(@PathVariable("pointId") String pointId); - @PostMapping(PREFIX + "/current") + @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") + @GetMapping(PREFIX + "/query-point/history-value") @Operation(summary = "查询单个测点历史值") - List<ApiPointValueDTO> getValue(@RequestBody ApiPointValueQueryDTO queryDto); + List<ApiPointValueDTO> queryPointHistoryValue(@RequestParam ApiPointValueQueryDTO queryDto); - @PostMapping(PREFIX + "/value/set") - @Operation(summary = "设置单个测点值") - Boolean setValue(@RequestBody ApiPointValueWriteDTO queryDto); + @PutMapping(PREFIX + "/write-point/real-value") + @Operation(summary = "写入单个测点值") + Boolean writePointRealValue(@RequestBody ApiPointValueWriteDTO queryDto); } -- Gitblit v1.9.3