From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro

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

diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
index d401a99..c18d5f7 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
@@ -12,7 +12,7 @@
 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 com.ruoyi.framework.web.domain.R;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.AllArgsConstructor;
@@ -41,50 +41,50 @@
     @GetMapping("/listPage")
     @Operation(summary = "璁惧鑳借��-鍒嗛〉鏌ヨ")
     @Log(title = "璁惧鑳借��-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
+    public R<?> listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
         IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
-        return AjaxResult.success(listPage);
+        return R.ok(listPage);
     }
 
     @GetMapping("/deviceList")
     @Operation(summary = "璁惧鍙拌处-鏌ヨ")
     @Log(title = "璁惧鍙拌处-鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult deviceList(DeviceLedger deviceLedger) {
+    public R<?> deviceList(DeviceLedger deviceLedger) {
         List<DeviceLedger> listPage = equipmentEnergyConsumptionService.deviceList(deviceLedger);
-        return AjaxResult.success(listPage);
+        return R.ok(listPage);
     }
 
     @PostMapping("/add")
     @Operation(summary = "璁惧鑳借��-鏂板")
     @Log(title = "璁惧鑳借��-鏂板", businessType = BusinessType.INSERT)
-    public AjaxResult add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
+    public R<?> add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
         boolean save = equipmentEnergyConsumptionService.save(equipmentEnergyConsumption);
-        return save ? AjaxResult.success() : AjaxResult.error();
+        return save ? R.ok() : R.fail();
     }
 
     @PostMapping("/addBatch")
     @Operation(summary = "璁惧鑳借��-鎵归噺鏂板")
     @Log(title = "璁惧鑳借��-鎵归噺鏂板", businessType = BusinessType.INSERT)
-    public AjaxResult addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
+    public R<?> addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
         boolean save = equipmentEnergyConsumptionService.saveBatch(list);
-        return save ? AjaxResult.success() : AjaxResult.error();
+        return save ? R.ok() : R.fail();
     }
 
     @PostMapping("/update")
     @Operation(summary = "璁惧鑳借��-淇敼")
     @Log(title = "璁惧鑳借��-淇敼", businessType = BusinessType.UPDATE)
-    public AjaxResult update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
+    public R<?> update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
         boolean update = equipmentEnergyConsumptionService.updateById(equipmentEnergyConsumption);
-        return update ? AjaxResult.success() : AjaxResult.error();
+        return update ? R.ok() : R.fail();
     }
 
     @DeleteMapping("/delete")
     @Operation(summary = "璁惧鑳借��-鍒犻櫎")
     @Log(title = "璁惧鑳借��-鍒犻櫎", businessType = BusinessType.DELETE)
-    public AjaxResult delete(@RequestBody List<Long> ids) {
-        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+    public R<?> delete(@RequestBody List<Long> ids) {
+        if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         boolean remove = equipmentEnergyConsumptionService.removeBatchByIds(ids);
-        return remove ? AjaxResult.success() : AjaxResult.error();
+        return remove ? R.ok() : R.fail();
     }
 
     /**
@@ -93,7 +93,7 @@
     @Log(title = "瀵煎叆璁惧鑳借��", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
     @Operation(summary = "瀵煎叆璁惧鑳借��")
-    public AjaxResult importData(MultipartFile file) throws Exception {
+    public R<?> importData(MultipartFile file) throws Exception {
         return equipmentEnergyConsumptionService.importData(file);
     }
 
@@ -114,9 +114,9 @@
     @GetMapping("/listPageByTrend")
     @Operation(summary = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ")
     @Log(title = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
+    public R<?> listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
         IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
-        return AjaxResult.success(listPage);
+        return R.ok(listPage);
     }
 
     /**

--
Gitblit v1.9.3