From 6edb193e45e5ff2252d544100b7bf14b2efcc1d4 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 14 一月 2025 15:03:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/iailab-plat
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java | 4 ++--
iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/dto/ApiPointDTO.java | 1 +
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java | 11 ++++-------
iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/DataPointApi.java | 2 +-
iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/dto/ApiPointPageReqVO.java | 19 +++++++++++++++++++
5 files changed, 27 insertions(+), 10 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 917915f..3f820a6 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
@@ -53,5 +53,5 @@
@GetMapping(PREFIX + "/info/nos/{pointNo}")
@Operation(summary = "根据计算点编号查询测点集合")
- PageResult<ApiPointDTO> getPageByNo(@PathVariable("pointNo") String pointNo);
+ PageResult<ApiPointDTO> getPageByNo(@RequestBody ApiPointPageReqVO reqVO);
}
diff --git a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/dto/ApiPointDTO.java b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/dto/ApiPointDTO.java
index da5269e..40f9fa2 100644
--- a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/dto/ApiPointDTO.java
+++ b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/dto/ApiPointDTO.java
@@ -1,5 +1,6 @@
package com.iailab.module.data.api.point.dto;
+import com.iailab.framework.common.pojo.PageParam;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
diff --git a/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/dto/ApiPointPageReqVO.java b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/dto/ApiPointPageReqVO.java
new file mode 100644
index 0000000..38728e9
--- /dev/null
+++ b/iailab-module-data/iailab-module-data-api/src/main/java/com/iailab/module/data/api/point/dto/ApiPointPageReqVO.java
@@ -0,0 +1,19 @@
+package com.iailab.module.data.api.point.dto;
+
+import com.iailab.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @author lirm
+ * @Description
+ * @createTime 2025年01月14日
+ */
+@Schema(description = "")
+@Data
+public class ApiPointPageReqVO extends PageParam {
+
+ @Schema(description = "测点编码", required = true)
+ private String pointNo;
+
+}
\ No newline at end of file
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
index 3611905..77e2bd1 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java
@@ -15,10 +15,7 @@
import com.iailab.module.data.api.plan.PlanItemApi;
import com.iailab.module.data.api.plan.dto.ApiPlanDataDTO;
import com.iailab.module.data.api.point.DataPointApi;
-import com.iailab.module.data.api.point.dto.ApiPointDTO;
-import com.iailab.module.data.api.point.dto.ApiPointValueDTO;
-import com.iailab.module.data.api.point.dto.ApiPointValueQueryDTO;
-import com.iailab.module.data.api.point.dto.ApiPointsValueQueryDTO;
+import com.iailab.module.data.api.point.dto.*;
import com.iailab.module.data.common.ApiDataQueryDTO;
import com.iailab.module.data.common.ApiDataValueDTO;
import com.iailab.module.data.common.utils.ApiSecurityUtils;
@@ -330,10 +327,10 @@
}
@PermitAll
- @GetMapping("/query-points/info")
+ @PostMapping("/query-points/info")
@Operation(summary = "根据计算点编号查询测点集合")
- public CommonResult<PageResult<ApiPointDTO>> queryPageByNo(@RequestParam String pointNo) {
- PageResult<ApiPointDTO> data = dataPointApi.getPageByNo(pointNo);
+ public CommonResult<PageResult<ApiPointDTO>> queryPageByNo(@RequestBody ApiPointPageReqVO reqVO) {
+ PageResult<ApiPointDTO> data = dataPointApi.getPageByNo(reqVO);
return success(data);
}
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
index aca9940..758b8b9 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/point/DataPointApiImpl.java
@@ -139,8 +139,8 @@
}
@Override
- public PageResult<ApiPointDTO> getPageByNo(String pointNo) {
- DaPointDTO daPointDTO = daPointService.getSimpleInfoByNo(pointNo);
+ public PageResult<ApiPointDTO> getPageByNo(ApiPointPageReqVO reqVO) {
+ DaPointDTO daPointDTO = daPointService.getSimpleInfoByNo(reqVO.getPointNo());
DaMathPointDTO daMathPointDTO = daMathPointService.getByPoint(daPointDTO.getId());
String[] pointNos = daMathPointDTO.getExpression().split("[-+]+");
HashMap<Integer, String> map = new HashMap<>();
--
Gitblit v1.9.3