From 9d71b9bf1ec9e8597da70582f9eb7df580f3d58b Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:42:18 +0800
Subject: [PATCH] yys

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
index 5dc5686..dedd340 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
@@ -6,6 +6,7 @@
 import com.ruoyi.basic.pojo.Customer;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.device.pojo.DeviceLedger;
+import com.ruoyi.equipmentenergyconsumption.dto.EquipmentEnergyConsumptionDto;
 import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
 import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -14,12 +15,14 @@
 import com.ruoyi.framework.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -93,8 +96,11 @@
     @PostMapping("/export")
     @ApiOperation("瀵煎嚭璁惧鑳借��")
     public void export(HttpServletResponse response) {
+        Page page = new Page<>(-1,-1);
+        EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
+        IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
         ExcelUtil<EquipmentEnergyConsumption> util = new ExcelUtil<EquipmentEnergyConsumption>(EquipmentEnergyConsumption.class);
-        util.exportExcel(response, null , "瀹㈡埛妗f鏁版嵁");
+        util.exportExcel(response, listPage.getRecords() , "瀵煎嚭璁惧鑳借��");
     }
 
     @GetMapping("/listPageByTrend")
@@ -105,6 +111,26 @@
         return AjaxResult.success(listPage);
     }
 
+    /**
+     * 瀵煎嚭鑳芥簮瓒嬪娍
+     */
+    @Log(title = "瀵煎嚭鑳芥簮瓒嬪娍", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportTwo")
+    @ApiOperation("瀵煎嚭鑳芥簮瓒嬪娍")
+    public void exportTwo(HttpServletResponse response) {
+        Page page = new Page<>(-1,-1);
+        EquipmentEnergyConsumption equipmentEnergyConsumption = new EquipmentEnergyConsumption();
+        IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
+        List<EquipmentEnergyConsumptionDto> list = new ArrayList<>();
+        listPage.getRecords().forEach(item -> {
+            EquipmentEnergyConsumptionDto dto = new EquipmentEnergyConsumptionDto();
+            BeanUtils.copyProperties(item, dto);
+            list.add(dto);
+        });
+        ExcelUtil<EquipmentEnergyConsumptionDto> util = new ExcelUtil<EquipmentEnergyConsumptionDto>(EquipmentEnergyConsumptionDto.class);
+        util.exportExcel(response, list , "瀵煎嚭鑳芥簮瓒嬪娍");
+    }
+
 
 
 }

--
Gitblit v1.9.3