From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
index ddda227..e0409b5 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
@@ -3,30 +3,30 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.equipmentenergyconsumption.pojo.ElectricityConsumptionArea;
import com.ruoyi.equipmentenergyconsumption.pojo.EnergyPeriod;
import com.ruoyi.equipmentenergyconsumption.service.EnergyPeriodService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
import java.util.List;
@RestController
@RequestMapping("/energyPeriod")
-@Api(tags = "鐢ㄧ數鏃舵")
+@Tag(name = "鐢ㄧ數鏃舵")
+@AllArgsConstructor
public class EnergyPeriodController extends BaseController {
- @Autowired
- private EnergyPeriodService energyPeriodService;
+ private final EnergyPeriodService energyPeriodService;
+
@GetMapping("/listPage")
- @ApiOperation("鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ")
+ @Operation(summary = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult listPage(Page page, EnergyPeriod energyPeriod) {
IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
@@ -34,15 +34,23 @@
}
@PostMapping("/add")
- @ApiOperation("鐢ㄧ數鏃舵-鏂板")
+ @Operation(summary = "鐢ㄧ數鏃舵-鏂板")
@Log(title = "鐢ㄧ數鏃舵-鏂板", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody EnergyPeriod energyPeriod) {
boolean save = energyPeriodService.save(energyPeriod);
return save ? AjaxResult.success() : AjaxResult.error();
}
+ @PostMapping("/addBatch")
+ @Operation(summary = "鐢ㄧ數鏃舵-鎵归噺鏂板")
+ @Log(title = "鐢ㄧ數鏃舵-鎵归噺鏂板", businessType = BusinessType.INSERT)
+ public AjaxResult addBatch(@RequestBody List<EnergyPeriod> energyPeriods) {
+ boolean save = energyPeriodService.saveBatch(energyPeriods);
+ return save ? AjaxResult.success() : AjaxResult.error();
+ }
+
@PostMapping("/update")
- @ApiOperation("鐢ㄧ數鏃舵-淇敼")
+ @Operation(summary = "鐢ㄧ數鏃舵-淇敼")
@Log(title = "鐢ㄧ數鏃舵-淇敼", businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody EnergyPeriod energyPeriod) {
boolean update = energyPeriodService.updateById(energyPeriod);
@@ -50,10 +58,10 @@
}
@DeleteMapping("/delete")
- @ApiOperation("鐢ㄧ數鏃舵-鍒犻櫎")
+ @Operation(summary = "鐢ㄧ數鏃舵-鍒犻櫎")
@Log(title = "鐢ㄧ數鏃舵-鍒犻櫎", businessType = BusinessType.DELETE)
public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = energyPeriodService.removeBatchByIds(ids);
return remove ? AjaxResult.success() : AjaxResult.error("鍒犻櫎澶辫触");
}
@@ -64,10 +72,13 @@
*/
@Log(title = "瀵煎嚭鐢ㄧ數鏃舵", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("瀵煎嚭鐢ㄧ數鏃舵")
+ @Operation(summary = "瀵煎嚭鐢ㄧ數鏃舵")
public void export(HttpServletResponse response) {
+ Page page = new Page(-1, -1);
+ EnergyPeriod energyPeriod = new EnergyPeriod();
+ IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
ExcelUtil<EnergyPeriod> util = new ExcelUtil<EnergyPeriod>(EnergyPeriod.class);
- util.exportExcel(response, null , "鐢ㄧ數鏃舵鏁版嵁");
+ util.exportExcel(response, listPage.getRecords(), "鐢ㄧ數鏃舵鏁版嵁");
}
}
--
Gitblit v1.9.3