From 9c9e6a5e192e38ed45497baab2ce4b7b9a216985 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期二, 29 四月 2025 11:29:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/ModelController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 9278972..cbfcd6d 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
@@ -64,8 +64,8 @@
Map<String, String> dynamicSettings = new HashMap<>();
Integer[] xiufengOrder = {
reqVO.getBfg(),
- reqVO.getStart(),
reqVO.getNow() == null ? Integer.parseInt(nowH) : reqVO.getNow(),
+ reqVO.getStart(),
reqVO.getMins()};
dynamicSettings.put("xiufeng_order", JSONArray.toJSONString(xiufengOrder));
dynamicSettings.put("jiaohua_BFG_down", reqVO.getLimit().toString());
@@ -89,12 +89,14 @@
}
Map<String, Object> data = mdkScheduleRespDTO.getResult();
+ // String fakeData = "{\"houbanAdvice\":[1000.0,150.0,16.97],\"2#LFAdvice\":[1000.0,150.0,11.8],\"1#2#zhiyangAdvice\":[1000.0,150.0,3.0],\"shaojieAdvice\":[1000.0,150.0,8.25],\"CCPPAdvice\":[1000.0,150.0,47.3],\"demand\":[34.4,0.0,3.0,0.0,0.0],\"rezhaAdvice\":[1000.0,150.0,45.86],\"best_total_power\":129.27,\"bfg_gap\":377924.37,\"zhongbanAdvice\":[1000.0,150.0,4.12],\"3#zhiyangAdvice\":[1000.0,150.0,25.3],\"cog_gap\":[800.0,59113.58],\"baihuiAdvice\":[1000.0,150.0,1.0],\"1#LFAdvice\":[1000.0,150.0,15.98]}";
+ // Map<String, Object> data = JSONObject.parseObject(fakeData, Map.class);
switch (TransferTypeEnum.getEumByCode(reqVO.getType())) {
case XF:
// 高炉休风
result.setBestTotalPower(DecimalUtil.toBigDecimal(data.get("best_total_power")));//负荷调整总量
result.setBfgGap(DecimalUtil.toBigDecimal(data.get("bfg_gap")));//煤气送管网缺口
- result.setDemand(DecimalUtil.toBigDecimal(data.get("demand")));//需量缺口
+ result.setDemand(data.get("demand"));//需量缺口
result.setCogGapTime(data.get("cog_gap") == null ? 0 : DecimalUtil.toBigDecimal(data.get("cog_gap"), 0).intValue()); //焦化减高炉煤气-时间
result.setCogGapAmount(data.get("cog_gap") == null ? 0 : DecimalUtil.toBigDecimal(data.get("cog_gap"), 1).intValue());//焦化减高炉煤气-数量
--
Gitblit v1.9.3