From d0d5011558c12337410350642e8c41da211e261b Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期三, 22 一月 2025 14:53:18 +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 | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 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 77e2bd1..6e1afbd 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,13 +3,13 @@
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.BeanUtils;
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;
import com.iailab.module.data.api.dto.echarts.BarLineDTO;
import com.iailab.module.data.api.dto.echarts.SeriesItem;
+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.plan.PlanItemApi;
@@ -67,6 +67,9 @@
@Autowired
private PlanItemApi planItemApi;
+
+ @Autowired
+ private IndItemApi indItemApi;
@Autowired
private IndItemCollector indItemCollector;
@@ -304,33 +307,22 @@
@PermitAll
@GetMapping("/query-ind/default-value")
@Operation(summary = "查询指标默认值")
- public CommonResult<List<ApiIndItemValueDTO>> queryIndItemDefaultValue(HttpServletResponse response, HttpServletRequest
- request,@RequestParam String itemNo) throws Exception {
- apiSecurityUtils.validate(request);
- List<IndItemValueVO> list = indItemCollector.queryValue(itemNo);
- 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);
+ public CommonResult<List<ApiIndItemValueDTO>> queryIndItemDefaultValue(@RequestParam String itemNo) {
+ return success(indItemApi.queryIndItemDefaultValue(itemNo));
}
@PermitAll
- @GetMapping("/query-ind/history-value")
+ @PostMapping("/query-ind/history-value")
@Operation(summary = "查询指标历史值")
- public CommonResult<List<ApiIndItemValueDTO>> queryIndItemHistoryValue(@RequestParam ApiIndItemQueryDTO dto) {
- List<IndItemValueVO> list = indItemCollector.queryValue(dto.getItemNo(), dto.getStart(), dto.getEnd());
- return success(ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class));
+ public CommonResult<List<ApiIndItemValueDTO>> queryIndItemHistoryValue(@RequestBody ApiIndItemQueryDTO dto) {
+ return success(indItemApi.queryIndItemHistoryValue(dto));
}
@PermitAll
- @PostMapping("/query-points/info")
+ @PostMapping("/query-math-point/current-value")
@Operation(summary = "根据计算点编号查询测点集合")
- public CommonResult<PageResult<ApiPointDTO>> queryPageByNo(@RequestBody ApiPointPageReqVO reqVO) {
- PageResult<ApiPointDTO> data = dataPointApi.getPageByNo(reqVO);
+ public CommonResult<PageResult<ApiPointDTO>> queryMathPointCurrentValue(@RequestBody ApiPointPageReqVO reqVO) {
+ PageResult<ApiPointDTO> data = dataPointApi.queryMathPointCurrentValue(reqVO);
return success(data);
}
--
Gitblit v1.9.3