From 0e9ed190503601a2896fc2f4fc5de2994c9eb776 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 11 四月 2025 09:47:12 +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/ModelController.java | 75 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java
index 1503e7a..41a8562 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java
@@ -11,6 +11,7 @@
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.enums.CommonConstant;
import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,8 +35,14 @@
@Autowired
private MdkApi mdkApi;
+ /**
+ * 负荷移植-负荷移植建议与方案
+ *
+ * @param reqVO
+ * @return
+ */
@PostMapping("/power-transfer")
- @Operation(summary = "异常工况下的负荷移植")
+ @Operation(summary = "负荷移植-负荷移植建议与方案")
public CommonResult<PowerTransferRespVO> scheduleEleLoad(@RequestBody PowerTransferReqVO reqVO) {
log.info("异常工况下的负荷移植");
PowerTransferRespVO result = new PowerTransferRespVO();
@@ -47,35 +54,55 @@
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);
+ if ("1".equals(reqVO.getType())) {
+ // 高炉休风
+ 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);
+ } else if ("2".equals(reqVO.getType())) {
+ // 产线检修
+
+
+ }
log.info("调度方案开始执行，" + JSONObject.toJSONString(dto));
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());
+ String statusCode = mdkScheduleRespDTO.getStatusCode();
+ if (!CommonConstant.MDK_STATUS_100.equals(statusCode)) {
+ log.info("statusCode=" + statusCode);
+ return CommonResult.error(GlobalErrorCodeConstants.UNKNOWN.getCode(), "工序异常，无计算结果");
+ }
- 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")));
+ Map<String, Object> data = mdkScheduleRespDTO.getResult();
+ if ("1".equals(reqVO.getType())) {
+ // 高炉休风
+ 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")));
+
+ } else if ("2".equals(reqVO.getType())) {
+ // 产线检修
+
+ }
} catch (Exception ex) {
ex.printStackTrace();
--
Gitblit v1.9.3