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/waterrecord/controller/WaterRecordController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
index be3933b..b22de49 100644
--- a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
+++ b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
@@ -6,7 +6,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 com.ruoyi.waterrecord.pojo.WaterRecord;
import com.ruoyi.waterrecord.service.WaterRecordService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -35,34 +35,34 @@
@GetMapping("/listPage")
@Log(title = "鐢ㄦ按绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, WaterRecord waterRecord){
+ public R<?> listPage(Page page, WaterRecord waterRecord){
IPage<WaterRecord> listPage = waterRecordService.listPage(page, waterRecord);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Log(title = "鐢ㄦ按绠＄悊-鏂板", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody WaterRecord waterRecord){
+ public R<?> add(@RequestBody WaterRecord waterRecord){
boolean save = waterRecordService.save(waterRecord);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
@Log(title = "鐢ㄦ按绠＄悊-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody WaterRecord waterRecord){
+ public R<?> update(@RequestBody WaterRecord waterRecord){
boolean update = waterRecordService.updateById(waterRecord);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Log(title = "鐢ㄦ按绠＄悊-鍒犻櫎", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
- 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 delete = waterRecordService.removeBatchByIds(ids);
- return delete ? AjaxResult.success() : AjaxResult.error();
+ return delete ? R.ok() : R.fail();
}
/**
@@ -71,7 +71,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 waterRecordService.importData(file);
}
--
Gitblit v1.9.3