From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
index e0409b5..e0f3ed1 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
@@ -8,7 +8,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 jakarta.servlet.http.HttpServletResponse;
@@ -28,42 +28,42 @@
@GetMapping("/listPage")
@Operation(summary = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, EnergyPeriod energyPeriod) {
+ public R<?> listPage(Page page, EnergyPeriod energyPeriod) {
IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Operation(summary = "鐢ㄧ數鏃舵-鏂板")
@Log(title = "鐢ㄧ數鏃舵-鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody EnergyPeriod energyPeriod) {
+ public R<?> add(@RequestBody EnergyPeriod energyPeriod) {
boolean save = energyPeriodService.save(energyPeriod);
- 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<EnergyPeriod> energyPeriods) {
+ public R<?> addBatch(@RequestBody List<EnergyPeriod> energyPeriods) {
boolean save = energyPeriodService.saveBatch(energyPeriods);
- 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 EnergyPeriod energyPeriod) {
+ public R<?> update(@RequestBody EnergyPeriod energyPeriod) {
boolean update = energyPeriodService.updateById(energyPeriod);
- 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 = energyPeriodService.removeBatchByIds(ids);
- return remove ? AjaxResult.success() : AjaxResult.error("鍒犻櫎澶辫触");
+ return remove ? R.ok() : R.fail("鍒犻櫎澶辫触");
}
--
Gitblit v1.9.3