From dc99e8a28673af16796bdd434d7f47b434b6a4d6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 27 三月 2026 18:18:42 +0800
Subject: [PATCH] 决策分析---能耗单耗
---
src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
index 22ef516..1316d94 100644
--- a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
@@ -3,10 +3,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
-import com.ruoyi.energy.pojo.Energy;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
import com.ruoyi.energy.service.EnergyConsumptionDetailService;
-import com.ruoyi.energy.service.EnergyService;
+import com.ruoyi.energy.vo.EnergyStatisticsVo;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
@@ -55,11 +54,13 @@
@Log(title = "鑳借�楁妱琛ㄦ槑缁�-瀵煎叆", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
+ @ApiOperation("鑳借�楁妱琛ㄦ槑缁�-瀵煎叆")
public R importData(MultipartFile file) throws Exception {
return energyConsumptionDetailService.importData(file);
}
@PostMapping("/downloadTemplate")
+ @ApiOperation("鑳借�楁妱琛�-涓嬭浇妯℃澘")
@Log(title = "鑳借�楁妱琛�-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
public void downloadTemplate(HttpServletResponse response) {
ExcelUtil<EnergyConsumptionDetailDto> util = new ExcelUtil<EnergyConsumptionDetailDto>(EnergyConsumptionDetailDto.class);
@@ -73,4 +74,25 @@
energyConsumptionDetailService.export(response);
}
+ /*******************************************姹囨�荤粺璁�*****************************************************************************************************************************************************************************/
+
+ @GetMapping("/statistics")
+ @ApiOperation("鑳借�楃鐞�---鑳借�楃粺璁�")
+ public R statistics(EnergyStatisticsVo energyStatisticsVo) {
+ return R.ok(energyConsumptionDetailService.statistics(energyStatisticsVo));
+ }
+
+ @GetMapping("/account")
+ @ApiOperation("鎴愭湰鏍哥畻---鑳借�楁垚鏈牳绠�")
+ public R account(EnergyStatisticsVo energyStatisticsVo) {
+ energyStatisticsVo.setType(null);
+ return R.ok(energyConsumptionDetailService.account(energyStatisticsVo));
+ }
+
+ @GetMapping("/collectEnergy")
+ @ApiOperation("鍐崇瓥鍒嗘瀽---鑳借�楀崟鑰�")
+ public R collectEnergy(EnergyStatisticsVo energyStatisticsVo) {
+ return R.ok(energyConsumptionDetailService.collectEnergy(energyStatisticsVo));
+ }
+
}
--
Gitblit v1.9.3