From 5a46fc75e47ce9a838270024da24405f9673b814 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期二, 24 六月 2025 15:52:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dlindusit.com:53929/r/ansteel
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/DataController.java | 131 +++++++++++++++++++++----------------------
1 files changed, 65 insertions(+), 66 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 eb6529e..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,29 +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.exception.enums.GlobalErrorCodeConstants;
import com.iailab.framework.common.pojo.CommonResult;
-import com.iailab.module.ansteel.api.dto.PlanDataChartReqVO;
-import com.iailab.module.ansteel.api.dto.PowerRunStateDTO;
-import com.iailab.module.ansteel.api.dto.PreDataChartRespVO;
-import com.iailab.module.ansteel.api.service.DataApi;
-import com.iailab.module.ansteel.api.vo.PowerTransferDetRespVO;
-import com.iailab.module.ansteel.api.vo.PowerTransferReqVO;
-import com.iailab.module.ansteel.common.utils.DecimalUtil;
-import com.iailab.module.ansteel.api.vo.PowerTransferRespVO;
-import com.iailab.module.api.mcs.AnSteelApi;
-import com.iailab.module.api.mcs.dto.PowerRunStateDTO;
-import com.iailab.module.api.mcs.dto.PreDataChartRespVO;
+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.mdk.MdkApi;
-import com.iailab.module.model.api.mdk.dto.MdkScheduleReqDTO;
-import com.iailab.module.model.api.mdk.dto.MdkScheduleRespDTO;
+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;
@@ -38,77 +30,84 @@
public class DataController {
@Autowired
- private DataApi dataApi;
+ private DataService dataService;
@Autowired
- private MdkApi mdkApi;
+ private DataPointApi dataPointApi;
@GetMapping("/power-run-state/list")
@Operation(summary = "发电厂机组运行情况")
public CommonResult<List<PowerRunStateDTO>> getPowerRunState(@RequestParam Map<String, Object> params) {
- List<PowerRunStateDTO> list = dataApi.getPowerRunState();
+ List<PowerRunStateDTO> list = dataService.getPowerRunState();
return success(list);
}
@PostMapping("/predict-data/charts")
@Operation(summary = "预测数据图表")
public CommonResult<PreDataChartRespVO> getPreDataChart(@RequestBody PreDataSingleChartReqVO reqVO) {
- PreDataChartRespVO respVO = dataApi.getPreDataChart(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);
}
@PostMapping("/plan-data/charts")
@Operation(summary = "计划数据图表")
public CommonResult<Map<String, Object>> getPlanDataChart(@RequestBody PlanDataChartReqVO reqVO) {
- Map<String, Object> tMap = dataApi.getPlanDataChart(reqVO);
+ Map<String, Object> tMap = dataService.getPlanDataChart(reqVO);
return CommonResult.success(tMap);
}
- @PostMapping("/schedule/power-transfer")
- @Operation(summary = "异常工况下的负荷移植")
- public CommonResult<PowerTransferRespVO> scheduleEleLoad(@RequestBody PowerTransferReqVO reqVO) {
- PowerTransferRespVO result = new PowerTransferRespVO();
- List<PowerTransferDetRespVO> adviceList = new ArrayList<>();
- try {
- log.info("PowerTransferReqVO=" + JSONObject.toJSONString(reqVO));
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.SECOND,0);
- calendar.set(Calendar.MILLISECOND,0);
- MdkScheduleReqDTO dto = new MdkScheduleReqDTO();
- dto.setScheduleTime(calendar.getTime());
- dto.setScheduleCode("AnSteelpowertransfer");
- Map<String, String> dynamicSettings = new HashMap<>();
- Integer[] xiufengOrder = {reqVO.getBfg(),
- reqVO.getStart(),
- reqVO.getMins()};
- dynamicSettings.put("xiufeng_order", JSONArray.toJSONString(xiufengOrder));
- dynamicSettings.put("jiaohua_BFG_down", reqVO.getLimit().toString());
- dto.setDynamicSettings(dynamicSettings);
- MdkScheduleRespDTO mdkScheduleRespDTO = mdkApi.doSchedule(dto);
- log.info("调度方案执行完成，" + mdkScheduleRespDTO);
-
- Map<String, Object> data = mdkScheduleRespDTO.getResult();
- result.setBestTotalPower(DecimalUtil.toBigDecimal(data.get("best_total_power")));
- result.setBfgAdvice(DecimalUtil.toBigDecimal(data.get("BFGAdvice")));
- result.setDemandAdvice(DecimalUtil.toBigDecimal(data.get("DemandAdvice")));
- result.setJiaohuaAdviceTime(DecimalUtil.toBigDecimal(data.get("jiaohuaAdvice"), 0).intValue());
- result.setJiaohuaAdviceAmount(DecimalUtil.toBigDecimal(data.get("jiaohuaAdvice"), 1).intValue());
-
- adviceList.add(DecimalUtil.toPowerTransferDetRespVO("中板工序", data.get("zhongabnAdvice")));
- adviceList.add(DecimalUtil.toPowerTransferDetRespVO("厚板工序", data.get("houbanAdvice")));
- adviceList.add(DecimalUtil.toPowerTransferDetRespVO("热轧工序", data.get("rezhaAdvice")));
- adviceList.add(DecimalUtil.toPowerTransferDetRespVO("白灰工序", data.get("baihuiAdvice")));
- adviceList.add(DecimalUtil.toPowerTransferDetRespVO("3#制氧机", data.get("zhiyangAdvice")));
- adviceList.add(DecimalUtil.toPowerTransferDetRespVO("1#LF炉", data.get("1LFAdvice")));
- adviceList.add(DecimalUtil.toPowerTransferDetRespVO("2#LF炉", data.get("2LFAdvice")));
- adviceList.add(DecimalUtil.toPowerTransferDetRespVO("B系列烧结", data.get("shaojieAdvice")));
- adviceList.add(DecimalUtil.toPowerTransferDetRespVO("CCPP", data.get("CCPPAdvice")));
-
- } catch (Exception ex) {
- ex.printStackTrace();
- return CommonResult.error(GlobalErrorCodeConstants.UNKNOWN.getCode(), ex.getMessage());
- }
- return CommonResult.success(result);
+ @PostMapping("/schedule-suggest/use-suggest")
+ @Operation(summary = "采纳建议")
+ public CommonResult<Boolean> useSuggest(@RequestBody StAlarmAndSuggestReqVO ReqVO) {
+ return success(dataService.useSuggest(ReqVO));
}
+ @PostMapping("/schedule-suggest/ignore-suggest")
+ @Operation(summary = "忽略建议")
+ public CommonResult<Boolean> ignoreSuggest(@RequestBody StAlarmAndSuggestReqVO ReqVO) {
+ 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