From a6d6489c0477a9dfb8cd10cfea9004ebe4bdb66e Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 21 四月 2025 17:43:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java
index f48c1bf..39ca218 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java
@@ -4,6 +4,9 @@
import com.iailab.framework.common.util.date.DateUtils;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.ansteel.api.dto.*;
+import com.iailab.module.ansteel.coking.dto.CokingOverviewDTO;
+import com.iailab.module.ansteel.coking.dto.CokingTraceIndDTO;
+import com.iailab.module.ansteel.coking.dto.CokingTraceSuggestDTO;
import com.iailab.module.ansteel.coking.dto.*;
import com.iailab.module.ansteel.coking.entity.*;
import com.iailab.module.ansteel.coking.service.*;
@@ -57,7 +60,7 @@
private CokingProdDayService cokingProdDayService;
@Autowired
- private CokingTraceEnergyService cokingTraceEnergyService;
+ private CokingOverviewService cokingOverviewService;
@Autowired
private CokingTraceSuggestService cokingTraceSuggestService;
@@ -113,10 +116,10 @@
}
- @GetMapping("/trace-energy/list")
- @Operation(summary = "焦化工序-能耗整体情况")
- public CommonResult<Map<String, List<CokingTraceEnergyDTO>>> getEnergyConsumptionList(@RequestParam Map<String, Object> params) {
- Map<String, List<CokingTraceEnergyDTO>> result = cokingTraceEnergyService.list(params);
+ @GetMapping("/overview/list")
+ @Operation(summary = "各工序-概况")
+ public CommonResult<Map<String,List<CokingOverviewDTO>>> getOverviewList(@RequestParam Map<String, Object> params) {
+ Map<String,List<CokingOverviewDTO>> result = cokingOverviewService.list(params);
return success(result);
}
--
Gitblit v1.9.3