From 2debc39d13bdce031221294b19750eea8ed53d49 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期四, 26 六月 2025 16:00:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
index 4a7fe68..c276401 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java
@@ -1,15 +1,21 @@
package com.iailab.module.ansteel.api.controller.admin;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.module.ansteel.api.dto.*;
import com.iailab.module.ansteel.api.service.DataService;
+import com.iailab.module.data.api.point.DataPointApi;
+import com.iailab.module.data.api.point.dto.ApiPointValueWriteDTO;
+import com.iailab.module.model.api.mcs.dto.PreDataBarLineReqVO;
import com.iailab.module.model.api.mcs.dto.PreDataSingleChartReqVO;
import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestReqVO;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-
import java.util.*;
import static com.iailab.framework.common.pojo.CommonResult.success;
@@ -26,6 +32,9 @@
@Autowired
private DataService dataService;
+ @Autowired
+ private DataPointApi dataPointApi;
+
@GetMapping("/power-run-state/list")
@Operation(summary = "发电厂机组运行情况")
public CommonResult<List<PowerRunStateDTO>> getPowerRunState(@RequestParam Map<String, Object> params) {
@@ -37,6 +46,13 @@
@Operation(summary = "预测数据图表")
public CommonResult<PreDataChartRespVO> getPreDataChart(@RequestBody PreDataSingleChartReqVO reqVO) {
PreDataChartRespVO respVO = dataService.getPreDataChart(reqVO);
+ return CommonResult.success(respVO);
+ }
+
+ @PostMapping("/predict-data/chartsByOutIds")
+ @Operation(summary = "根据outId查询预测数据")
+ public CommonResult<List<PreDataViewSimpleDTO>> getPreDataByOutIds(@RequestBody PreDataBarLineReqVO reqVO) {
+ List<PreDataViewSimpleDTO> respVO = dataService.getPreDataByOutIds(reqVO);
return CommonResult.success(respVO);
}
@@ -59,5 +75,39 @@
return success(dataService.ignoreSuggest(ReqVO));
}
+ @GetMapping("/data/history-value")
+ @Operation(summary = "指标/测点历史数据")
+ public CommonResult<List<Object[]>> getHistoryValue(@RequestParam Map<String, Object> params) {
+ return success(dataService.getHistoryValue(params));
+ }
+
+ @PostMapping("/datas/history-value")
+ @Operation(summary = "多个指标/测点历史数据")
+ public CommonResult<Map<String,List<Object[]>>> getDatasHistoryValue(@RequestBody Map<String, Object> params) {
+ Map<String,List<Object[]>> result = new HashMap<>();
+ if (!params.containsKey("datas") || StringUtils.isBlank(params.get("datas").toString())) {
+ return success(result);
+ }
+ JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(params.get("datas")));
+ for (Object data : jsonArray) {
+ Map<String, Object> param = new HashMap<>();
+ JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(data));
+ param.put("dataType",jsonObject.get("dataType"));
+ param.put("dataNo",jsonObject.get("dataNo"));
+ param.put("startTime",params.get("startTime"));
+ param.put("endTime",params.get("endTime"));
+ List<Object[]> historyValue = dataService.getHistoryValue(param);
+ result.put(jsonObject.get("dataNo").toString(),historyValue);
+ }
+ return success(result);
+ }
+
+ @PostMapping("/write-point-value")
+ @Operation(summary = "写入测点值")
+ public CommonResult writePointRealValue(@RequestBody ApiPointValueWriteDTO writeDTO) {
+ dataPointApi.writePointRealValue(writeDTO);
+ return success();
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3