From d709e8a7117704ac4717db5201e40964b90d4791 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 16:17:03 +0800
Subject: [PATCH] Merge dev_pro_河南鹤壁 into dev_山西_晋和园_pro
---
src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
index 135198f..7fe7c33 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
@@ -3,8 +3,9 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.GasTankWarning;
import com.ruoyi.procurementrecord.service.GasTankWarningService;
import jakarta.servlet.http.HttpServletResponse;
@@ -16,31 +17,34 @@
@RestController
@RequestMapping("/gasTankWarning")
@AllArgsConstructor
-public class GasTankWarningController extends BaseController {
+public class GasTankWarningController {
private GasTankWarningService gasTankWarningService;
@GetMapping("/listPage")
- public R<?> listPage(Page page, GasTankWarning gasTankWarning) {
- return R.ok(gasTankWarningService.listPage(page, gasTankWarning));
+ public AjaxResult listPage(Page page, GasTankWarning gasTankWarning) {
+ return AjaxResult.success(gasTankWarningService.listPage(page, gasTankWarning));
}
+ @Log(title = "鏂板姘旂摱棰勮", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public R<?> add(@RequestBody GasTankWarning gasTankWarning) {
- return R.ok(gasTankWarningService.save(gasTankWarning));
+ public AjaxResult add(@RequestBody GasTankWarning gasTankWarning) {
+ return AjaxResult.success(gasTankWarningService.save(gasTankWarning));
}
+ @Log(title = "淇敼姘旂摱棰勮", businessType = BusinessType.UPDATE)
@PostMapping("update")
- public R<?> update(@RequestBody GasTankWarning gasTankWarning) {
- return R.ok(gasTankWarningService.updateById(gasTankWarning));
+ public AjaxResult update(@RequestBody GasTankWarning gasTankWarning) {
+ return AjaxResult.success(gasTankWarningService.updateById(gasTankWarning));
}
+ @Log(title = "鍒犻櫎姘旂摱棰勮", businessType = BusinessType.DELETE)
@DeleteMapping("delete")
- public R<?> delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return R.ok(gasTankWarningService.removeByIds(ids));
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return AjaxResult.success(gasTankWarningService.removeByIds(ids));
}
- //瀵煎嚭
+ @Log(title = "瀵煎嚭姘旂摱棰勮", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, @RequestParam(name = "ids", required = false) List<Long> ids) {
gasTankWarningService.export(response, ids);
--
Gitblit v1.9.3