From 7e7fbe6c20432ba65e8501e109d305666ce68afa Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 22 四月 2025 08:42:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java
index f4120fe..39957bb 100644
--- a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java
+++ b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/ind/IndItemApi.java
@@ -1,17 +1,18 @@
package com.iailab.module.data.api.ind;
+import com.iailab.framework.common.pojo.PageResult;
+import com.iailab.module.data.api.ind.dto.ApiIndItemDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
+import com.iailab.module.data.api.ind.dto.ApiIndItemValuePageReqVO;
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.GetMapping;
-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.Set;
/**
* @author PanZhibao
@@ -26,9 +27,21 @@
@GetMapping(PREFIX + "/query-ind/default-value")
@Operation(summary = "查询指标默认值")
- List<ApiIndItemValueDTO> queryIndItemDefaultValue(@RequestParam String itemNo);
+ List<ApiIndItemValueDTO> queryIndItemDefaultValue(@RequestParam("itemNo") String itemNo);
@PostMapping(PREFIX + "/query-ind/history-value")
@Operation(summary = "查询指标历史值")
List<ApiIndItemValueDTO> queryIndItemHistoryValue(@RequestBody ApiIndItemQueryDTO dto);
+
+ @GetMapping(PREFIX + "/info/id/{id}")
+ @Operation(summary = "根据测点编号查询测点信息")
+ ApiIndItemDTO getInfoById(@PathVariable("id") String id);
+
+ @PostMapping(PREFIX + "/info/ids")
+ @Operation(summary = "根据多个id查询指标数据信息")
+ List<ApiIndItemDTO> getInfoByIds(@RequestParam("indIds") Set<String> indIds);
+
+ @PostMapping(PREFIX + "/query-ind-value/page")
+ @Operation(summary = "查询指标历史值分页")
+ PageResult<ApiIndItemValueDTO> queryIndItemValuePage(@RequestBody ApiIndItemValuePageReqVO dto);
}
\ No newline at end of file
--
Gitblit v1.9.3