From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
index fad06fa..92b16ce 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
@@ -16,7 +16,7 @@
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @RestController
@@ -41,6 +41,14 @@
         return save ? AjaxResult.success() : AjaxResult.error();
     }
 
+    @PostMapping("/addBatch")
+    @ApiOperation("鐢ㄧ數鏃舵-鎵归噺鏂板")
+    @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("鐢ㄧ數鏃舵-淇敼")
     @Log(title = "鐢ㄧ數鏃舵-淇敼", businessType = BusinessType.UPDATE)

--
Gitblit v1.9.3