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-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
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 cac9a87..f518b5b 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
@@ -11,6 +11,7 @@
import com.iailab.module.data.api.ind.IndItemApi;
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.api.plan.PlanItemApi;
import com.iailab.module.data.api.plan.dto.ApiPlanDataDTO;
import com.iailab.module.data.api.point.DataPointApi;
@@ -166,7 +167,8 @@
if (!PointDataTypeEnum.BOOLEAN.getCode().equals(dataType)) {
BigDecimal decValue = new BigDecimal(value.toString());
if (PointDataTypeEnum.FLOAT.getCode().equals(dataType)) {
- return decValue.setScale(2, BigDecimal.ROUND_HALF_UP);
+ // return decValue.setScale(2, BigDecimal.ROUND_HALF_UP);
+ return value;
} else if (PointDataTypeEnum.INT.getCode().equals(dataType)) {
decValue = decValue.setScale(0, BigDecimal.ROUND_HALF_UP);
}
@@ -320,4 +322,27 @@
return success(data);
}
+ @PermitAll
+ @PostMapping("/query-ind-value/page")
+ @Operation(summary = "查询指标数据值分页")
+ public CommonResult<PageResult<ApiIndItemValueDTO>> queryIndItemValuePage(@RequestBody ApiIndItemValuePageReqVO dto) {
+ return success(indItemApi.queryIndItemValuePage(dto));
+ }
+
+ @PermitAll
+ @PostMapping("/query-point-bad-history/page")
+ @Operation(summary = "根据计算点编号查询测点集合")
+ public CommonResult<PageResult<ApiPointBadHistoryDTO>> queryPointBadHistoryPage(@RequestBody ApiPointBadHistoryPageReqVO reqVO) {
+ PageResult<ApiPointBadHistoryDTO> data = dataPointApi.queryPointBadHistoryPage(reqVO);
+ return success(data);
+ }
+
+ @PermitAll
+ @PostMapping("/query-point/count")
+ @Operation(summary = "根据计算点编号查询测点集合")
+ public CommonResult<String> getPointTotalCount(@RequestBody ApiPointCountReqVO reqVO) {
+ String count = dataPointApi.getPointTotalCount(reqVO);
+ return success(count);
+ }
+
}
--
Gitblit v1.9.3