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/waterrecord/controller/WaterRecordController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
index a963aa1..b22de49 100644
--- a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
+++ b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
@@ -6,18 +6,19 @@
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.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -25,43 +26,43 @@
* @date : 2025/8/11 10:08
*/
@RestController
-@Api(tags = "鐢ㄦ按绠＄悊")
+@Tag(name = "鐢ㄦ按绠＄悊")
@RequestMapping("/waterRecord")
+@AllArgsConstructor
public class WaterRecordController extends BaseController {
- @Autowired
private WaterRecordService waterRecordService;
@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();
}
/**
@@ -69,8 +70,8 @@
*/
@Log(title = "瀵煎叆鐢ㄦ按绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
- @ApiOperation("瀵煎叆鐢ㄦ按绠＄悊")
- public AjaxResult importData(MultipartFile file) throws Exception {
+ @Operation(summary = "瀵煎叆鐢ㄦ按绠＄悊")
+ public R<?> importData(MultipartFile file) throws Exception {
return waterRecordService.importData(file);
}
@@ -79,7 +80,7 @@
*/
@Log(title = "瀵煎嚭鐢ㄦ按绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- @ApiOperation("瀵煎嚭鐢ㄦ按绠＄悊")
+ @Operation(summary = "瀵煎嚭鐢ㄦ按绠＄悊")
public void export(HttpServletResponse response) {
Page page = new Page(-1,-1);
WaterRecord waterRecord = new WaterRecord();
--
Gitblit v1.9.3