From a01eec9f761ffcc11d42da0a82595e720427dd68 Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期二, 24 六月 2025 23:15:52 +0800 Subject: [PATCH] 望铁关口触发边界 --- ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 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 c26b0bd..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,5 +1,8 @@ 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; @@ -10,6 +13,7 @@ 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.*; @@ -77,6 +81,27 @@ 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) { -- Gitblit v1.9.3