From e255bafbe42f82a053cf6afe8030f7d033053164 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期二, 14 一月 2025 14:27:47 +0800
Subject: [PATCH] 根据计算点编号查询测点集合
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/api/controller/admin/ApiDataController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 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 3ed05e1..3611905 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
@@ -1,10 +1,11 @@
package com.iailab.module.data.api.controller.admin;
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.framework.tenant.core.context.TenantContextHolder;
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;
@@ -14,6 +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;
@@ -39,7 +41,6 @@
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
@@ -282,8 +283,8 @@
@PostMapping("/export-plan/history-value")
@Operation(summary = "导出计划数据")
public void exportPlanHistoryValue(HttpServletResponse response, HttpServletRequest
- request, @RequestBody ApiDataQueryDTO dto) throws IOException {
- //apiSecurityUtils.validate(request);
+ request, @RequestBody ApiDataQueryDTO dto) throws Exception {
+ apiSecurityUtils.validate(request);
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.MILLISECOND, 0);
calendar.set(Calendar.SECOND, 0);
@@ -306,8 +307,9 @@
@PermitAll
@GetMapping("/query-ind/default-value")
@Operation(summary = "查询指标默认值")
- public CommonResult<List<ApiIndItemValueDTO>> queryIndItemDefaultValue(@RequestParam String itemNo) {
- TenantContextHolder.setTenantId(161L);
+ 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 -> {
@@ -326,4 +328,13 @@
List<IndItemValueVO> list = indItemCollector.queryValue(dto.getItemNo(), dto.getStart(), dto.getEnd());
return success(ConvertUtils.sourceToTarget(list, ApiIndItemValueDTO.class));
}
+
+ @PermitAll
+ @GetMapping("/query-points/info")
+ @Operation(summary = "根据计算点编号查询测点集合")
+ public CommonResult<PageResult<ApiPointDTO>> queryPageByNo(@RequestParam String pointNo) {
+ PageResult<ApiPointDTO> data = dataPointApi.getPageByNo(pointNo);
+ return success(data);
+ }
+
}
--
Gitblit v1.9.3