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-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 6e1afbd..c0f3c5b 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
@@ -3,7 +3,6 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.pojo.PageResult;
import com.iailab.framework.common.util.date.DateUtils;
-import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.framework.excel.core.util.ExcelUtils;
import com.iailab.module.data.api.dto.DeviceValueDTO;
import com.iailab.module.data.api.dto.IndexQueryDTO;
@@ -12,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;
@@ -19,8 +19,6 @@
import com.iailab.module.data.common.ApiDataQueryDTO;
import com.iailab.module.data.common.ApiDataValueDTO;
import com.iailab.module.data.common.utils.ApiSecurityUtils;
-import com.iailab.module.data.ind.collection.IndItemCollector;
-import com.iailab.module.data.ind.item.vo.IndItemValueVO;
import com.iailab.module.data.plan.item.entity.PlanItemEntity;
import com.iailab.module.data.plan.item.service.PlanItemService;
import com.iailab.module.data.plan.item.vo.PlanItemValueExportVO;
@@ -70,9 +68,6 @@
@Autowired
private IndItemApi indItemApi;
-
- @Autowired
- private IndItemCollector indItemCollector;
@Autowired
private PlanItemService planItemService;
@@ -172,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);
}
@@ -326,4 +322,11 @@
return success(data);
}
+ @PermitAll
+ @PostMapping("/query-ind-value/page")
+ @Operation(summary = "查询指标数据值分页")
+ public CommonResult<PageResult<ApiIndItemValueDTO>> queryIndItemValuePage(@RequestBody ApiIndItemValuePageReqVO dto) {
+ return success(indItemApi.queryIndItemValuePage(dto));
+ }
+
}
--
Gitblit v1.9.3