From fa3428b4bb32179a42d5618357c22fe2695716ae Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期三, 22 四月 2026 13:58:23 +0800
Subject: [PATCH] 修改全局的注入方式
---
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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..0bddae6 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,15 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+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 jakarta.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -29,10 +33,9 @@
@RestController
@Api(tags = "璁惧鑳借��")
@RequestMapping("/equipmentEnergyConsumption")
+@AllArgsConstructor
public class EquipmentEnergyConsumptionController extends BaseController {
-
- @Autowired
private EquipmentEnergyConsumptionService equipmentEnergyConsumptionService;
@GetMapping("/listPage")
@@ -56,6 +59,14 @@
@Log(title = "璁惧鑳借��-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
boolean save = equipmentEnergyConsumptionService.save(equipmentEnergyConsumption);
+ return save ? AjaxResult.success() : AjaxResult.error();
+ }
+
+ @PostMapping("/addBatch")
+ @ApiOperation("璁惧鑳借��-鎵归噺鏂板")
+ @Log(title = "璁惧鑳借��-鎵归噺鏂板", businessType = BusinessType.INSERT)
+ public AjaxResult addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
+ boolean save = equipmentEnergyConsumptionService.saveBatch(list);
return save ? AjaxResult.success() : AjaxResult.error();
}
@@ -93,8 +104,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 , "瀹㈡埛妗ｆ鏁版嵁");
+ util.exportExcel(response, listPage.getRecords() , "瀵煎嚭璁惧鑳借��");
}
@GetMapping("/listPageByTrend")
@@ -105,6 +119,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