From 0b62b61eaba22186417e8171c86ecf6e20d1def1 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期一, 21 四月 2025 17:49:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/CokingController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 e945f45..4ffecf8 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
@@ -3,7 +3,7 @@
import com.iailab.framework.common.pojo.CommonResult;
import com.iailab.framework.common.util.object.ConvertUtils;
import com.iailab.module.ansteel.api.dto.*;
-import com.iailab.module.ansteel.coking.dto.CokingTraceEnergyDTO;
+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.entity.*;
@@ -49,7 +49,7 @@
private CokingProdDayService cokingProdDayService;
@Autowired
- private CokingTraceEnergyService cokingTraceEnergyService;
+ private CokingOverviewService cokingOverviewService;
@Autowired
private CokingTraceSuggestService cokingTraceSuggestService;
@@ -96,10 +96,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