| src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/energy/dto/EnergyCollectDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/energy/service/EnergyConsumptionDetailService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/energy/service/impl/EnergyConsumptionDetailServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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)); } } src/main/java/com/ruoyi/energy/dto/EnergyAccountDto.java
@@ -8,7 +8,7 @@ import java.util.List; @Data @ApiModel("è½èææ¬æ ¸ç®---ææ¥ææ±æ»ç»è®¡") @ApiModel("ææ¬æ ¸ç®---è½èææ¬æ ¸ç®") public class EnergyAccountDto { @ApiModelProperty("æ»è½èææ¬") 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; } src/main/java/com/ruoyi/energy/dto/EnergyStatisticsDto.java
@@ -9,7 +9,7 @@ import java.util.Map; @Data @ApiModel("è½èç»è®¡---ææ¥æå¹´æ±æ»ç»è®¡çè½èæ°æ®") @ApiModel("è½è管ç---è½èç»è®¡") public class EnergyStatisticsDto { @ApiModelProperty("æ»èç¨é") 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); } 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; } } src/main/java/com/ruoyi/energy/vo/EnergyStatisticsVo.java
@@ -26,4 +26,7 @@ //è½èåºæ¯(åå ¬/ç产) private String type; //è½èç±»å(æ°´/çµ/æ°) private String energyName; }