From cf7bc2d68e7d86e7d4b896acf1400f534d594daa Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 10 三月 2026 17:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
new file mode 100644
index 0000000..d7db119
--- /dev/null
+++ b/src/main/java/com/ruoyi/energy/controller/EnergyConsumptionDetailController.java
@@ -0,0 +1,85 @@
+package com.ruoyi.energy.controller;
+
+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.dto.EnergyStatisticsDto;
+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.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+
+/**
+ * <p>
+ * 鑳芥簮绫诲瀷-鑳借�楁妱琛ㄦ槑缁� 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-03-10 11:22:20
+ */
+@RestController
+@RequestMapping("/energyConsumptionDetail")
+@Api(tags = "鑳借�楃鐞�-鑳借�楁妱琛ㄦ槑缁�")
+public class EnergyConsumptionDetailController {
+
+ @Autowired
+ private EnergyConsumptionDetailService energyConsumptionDetailService;
+
+ @GetMapping("page")
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ public R page(Page<EnergyConsumptionDetailDto> page, EnergyConsumptionDetailDto energyConsumptionDetailDto) {
+ return R.ok(energyConsumptionDetailService.pageEnergyConsumptionDetail(page, energyConsumptionDetailDto));
+ }
+
+ @ApiOperation("鏂板/淇敼鑳借�楁妱琛�")
+ @PostMapping()
+ public R add(@RequestBody EnergyConsumptionDetail energyConsumptionDetail) {
+ return R.ok(energyConsumptionDetailService.saveOrUpdate(energyConsumptionDetail));
+ }
+
+ @ApiOperation("鍒犻櫎鑳借�楁妱琛�")
+ @DeleteMapping("/{ids}")
+ public R delete(@PathVariable("ids") Long[] ids) {
+ return R.ok(energyConsumptionDetailService.removeBatchByIds(Arrays.asList(ids)));
+ }
+
+ @Log(title = "鑳借�楁妱琛ㄦ槑缁�-瀵煎叆", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public R importData(MultipartFile file) throws Exception {
+ return energyConsumptionDetailService.importData(file);
+ }
+
+ @PostMapping("/downloadTemplate")
+ @Log(title = "鑳借�楁妱琛�-涓嬭浇妯℃澘", businessType = BusinessType.EXPORT)
+ public void downloadTemplate(HttpServletResponse response) {
+ ExcelUtil<EnergyConsumptionDetailDto> util = new ExcelUtil<EnergyConsumptionDetailDto>(EnergyConsumptionDetailDto.class);
+ util.importTemplateExcel(response, "鑳借�楁妱琛ㄦā鐗�");
+ }
+
+ @PostMapping("/export")
+ @ApiOperation("鑳借�楁妱琛�-瀵煎嚭")
+ @Log(title = "鑳借�楁妱琛�-瀵煎嚭", businessType = BusinessType.EXPORT)
+ public void export(HttpServletResponse response) {
+ energyConsumptionDetailService.export(response);
+ }
+
+ /*******************************************姹囨�荤粺璁�*****************************************************************************************************************************************************************************/
+
+ @GetMapping("/statistics")
+ @ApiOperation("鎸夋棩鏈堝勾姹囨�荤粺璁�")
+ public R statistics(EnergyStatisticsDto energyStatisticsDto) {
+ return R.ok(energyConsumptionDetailService.statistics(energyStatisticsDto));
+ }
+
+}
--
Gitblit v1.9.3