From c66f3ca48216decddb32a7ad3fdde6bdfe1c055c Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期三, 16 十月 2024 15:31:09 +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/ApiIndItemController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiIndItemController.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiIndItemController.java
index 86b5abf..3fd5980 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiIndItemController.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/ApiIndItemController.java
@@ -2,6 +2,7 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.util.object.ConvertUtils;
+import com.iailab.framework.tenant.core.context.TenantContextHolder;
import com.iailab.module.data.api.ind.dto.ApiIndItemQueryDTO;
import com.iailab.module.data.api.ind.dto.ApiIndItemValueDTO;
import com.iailab.module.data.ind.collection.IndItemCollector;
@@ -16,6 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.security.PermitAll;
+import java.util.ArrayList;
import java.util.List;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -38,8 +40,16 @@
@GetMapping("/query-ind/default-value")
@Operation(summary = "查询指标默认值")
public CommonResult<List<ApiIndItemValueDTO>> queryIndItemDefaultValue(@RequestParam String itemNo) {
+ TenantContextHolder.setTenantId(161L);
List<IndItemValueVO> list = indItemCollector.queryValue(itemNo);
- return success(ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class));
+ List<ApiIndItemValueDTO> dtoList = new ArrayList<>();
+ list.forEach(item -> {
+ ApiIndItemValueDTO dto = new ApiIndItemValueDTO();
+ dto.setDataTime(item.getDataTime());
+ dto.setDataValue(item.getDataValue().doubleValue());
+ dtoList.add(dto);
+ });
+ return success(dtoList);
}
--
Gitblit v1.9.3