From 0f5b900cae3de0f7cfc7212e8a871831ecb56465 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期五, 18 四月 2025 14:01:35 +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, 12 insertions(+), 0 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 9d3cfe9..734b866 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,6 +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.entity.*;
import com.iailab.module.ansteel.coking.service.*;
import io.swagger.v3.oas.annotations.Operation;
@@ -45,6 +46,9 @@
@Autowired
private CokingProdDayService cokingProdDayService;
+ @Autowired
+ private CokingTraceEnergyService cokingTraceEnergyService;
+
@GetMapping("/analy-ind/list")
@Operation(summary = "焦化工序-指标分析")
public CommonResult<List<CokingAnalyIndDTO>> getCokingAnalyIndList(@RequestParam Map<String, Object> params) {
@@ -79,4 +83,12 @@
List<CokingProdDayEntity> list = cokingProdDayService.list(params);
return success(ConvertUtils.sourceToTarget(list, CokingProdDayDTO.class));
}
+
+
+ @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);
+ return success(result);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3