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 | 10 ++++++++--
src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java | 3 +++
src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java | 10 ++++++++++
src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java | 2 +-
src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java | 3 +++
src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java | 2 +-
src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java | 19 +++++++++++++++++++
7 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
index b6bd886..1316d94 100644
--- a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
@@ -77,16 +77,22 @@
/*******************************************姹囨�荤粺璁�*****************************************************************************************************************************************************************************/
@GetMapping("/statistics")
- @ApiOperation("鑳借�楃粺璁�---鎸夋棩鏈堝勾姹囨�荤粺璁�")
+ @ApiOperation("鑳借�楃鐞�---鑳借�楃粺璁�")
public R statistics(EnergyStatisticsVo energyStatisticsVo) {
return R.ok(energyConsumptionDetailService.statistics(energyStatisticsVo));
}
@GetMapping("/account")
- @ApiOperation("鑳借�楁垚鏈牳绠�---鎸夋棩鏈堟眹鎬荤粺璁�")
+ @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));
+ }
+
}
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
index 8a5bf97..efdaa07 100644
--- a/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
@@ -8,7 +8,7 @@
import java.util.List;
@Data
-@ApiModel("鑳借�楁垚鏈牳绠�---鎸夋棩鏈堟眹鎬荤粺璁�")
+@ApiModel("鎴愭湰鏍哥畻---鑳借�楁垚鏈牳绠�")
public class EnergyAccountDto {
@ApiModelProperty("鎬昏兘鑰楁垚鏈�")
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java
new file mode 100644
index 0000000..a84b10f
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java
@@ -0,0 +1,19 @@
+package com.ruoyi.energy.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel("鍐崇瓥鍒嗘瀽---鑳借�楀崟鑰�")
+public class EnergyCollectDto {
+
+ @ApiModelProperty("鑳借�楃被鍨嬪崰姣�")
+ private List<EnergyConsumptionTypeDto> energyConsumptionTypeProportion;
+
+
+}
diff --git a/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java b/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java
index f4f5ee9..e6ab3e7 100644
--- a/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java
+++ b/src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java
@@ -9,7 +9,7 @@
import java.util.Map;
@Data
-@ApiModel("鑳借�楃粺璁�---鎸夋棩鏈堝勾姹囨�荤粺璁＄殑鑳借�楁暟鎹�")
+@ApiModel("鑳借�楃鐞�---鑳借�楃粺璁�")
public class EnergyStatisticsDto {
@ApiModelProperty("鎬昏�楃敤閲�")
diff --git a/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java b/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
index 6d263c2..eb11b94 100644
--- a/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
+++ b/src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.energy.dto.EnergyAccountDto;
+import com.ruoyi.energy.dto.EnergyCollectDto;
import com.ruoyi.energy.dto.EnergyConsumptionDetailDto;
import com.ruoyi.energy.dto.EnergyStatisticsDto;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
@@ -32,4 +33,6 @@
EnergyStatisticsDto statistics(EnergyStatisticsVo energyStatisticsVo);
EnergyAccountDto account(EnergyStatisticsVo energyStatisticsVo);
+
+ EnergyCollectDto collectEnergy(EnergyStatisticsVo energyStatisticsVo);
}
diff --git a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
index 4dabac8..58dc509 100644
--- a/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
+++ b/src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java
@@ -151,4 +151,14 @@
energyAccountDto.setEnergyConsumptionDetailDtoList(energyConsumptionDetailDtoList);
return energyAccountDto;
}
+
+ @Override
+ public EnergyCollectDto collectEnergy(EnergyStatisticsVo energyStatisticsVo) {
+ EnergyCollectDto energyCollectDto = new EnergyCollectDto();
+ //鑳借�楀崟鑰楁暟鎹�
+ List<EnergyConsumptionTypeDto> energyConsumptionTypeDtos=energyConsumptionDetailMapper.energyConsumptionTypeProportion(energyStatisticsVo);
+ energyCollectDto.setEnergyConsumptionTypeProportion(energyConsumptionTypeDtos);
+ //鑳借�楀崟鑰楄秼鍔�(寰呭疄鐜�)
+ return energyCollectDto;
+ }
}
diff --git a/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java b/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
index ce29efc..cf59db0 100644
--- a/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
+++ b/src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
@@ -26,4 +26,7 @@
//鑳借�楀満鏅�(鍔炲叕/鐢熶骇)
private String type;
+
+ //鑳借�楃被鍨�(姘�/鐢�/姘�)
+ private String energyName;
}
--
Gitblit v1.9.3