From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/project/system/controller/SysPostController.java | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
index 652ab30..45c5bcc 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
@@ -3,6 +3,7 @@
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -17,14 +18,14 @@
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.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.domain.SysPost;
import com.ruoyi.project.system.service.ISysPostService;
/**
* 宀椾綅淇℃伅鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@RestController
@@ -48,7 +49,7 @@
/**
* 瀵煎嚭宀椾綅鍒楄〃
*/
-
+
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:post:export')")
@PostMapping("/export")
@@ -64,9 +65,9 @@
*/
@PreAuthorize("@ss.hasPermi('system:post:query')")
@GetMapping(value = "/{postId}")
- public R<?> getInfo(@PathVariable Long postId)
+ public AjaxResult getInfo(@PathVariable Long postId)
{
- return R.ok(postService.selectPostById(postId));
+ return success(postService.selectPostById(postId));
}
/**
@@ -75,19 +76,18 @@
@PreAuthorize("@ss.hasPermi('system:post:add')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysPost post)
+ public AjaxResult add(@Validated @RequestBody SysPost post)
{
if (!postService.checkPostNameUnique(post))
{
- return R.fail("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
+ return error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
}
else if (!postService.checkPostCodeUnique(post))
{
- return R.fail("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
+ return error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
}
post.setCreateBy(getUsername());
- postService.insertPost(post);
- return R.ok();
+ return toAjax(postService.insertPost(post));
}
/**
@@ -96,19 +96,18 @@
@PreAuthorize("@ss.hasPermi('system:post:edit')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysPost post)
+ public AjaxResult edit(@Validated @RequestBody SysPost post)
{
if (!postService.checkPostNameUnique(post))
{
- return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
+ return error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
}
else if (!postService.checkPostCodeUnique(post))
{
- return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
+ return error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
}
post.setUpdateBy(getUsername());
- postService.updatePost(post);
- return R.ok();
+ return toAjax(postService.updatePost(post));
}
/**
@@ -117,19 +116,18 @@
@PreAuthorize("@ss.hasPermi('system:post:remove')")
@Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{postIds}")
- public R<?> remove(@PathVariable Long[] postIds)
+ public AjaxResult remove(@PathVariable Long[] postIds)
{
- postService.deletePostByIds(postIds);
- return R.ok();
+ return toAjax(postService.deletePostByIds(postIds));
}
/**
* 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
*/
@GetMapping("/optionselect")
- public R<?> optionselect()
+ public AjaxResult optionselect()
{
List<SysPost> posts = postService.selectPostAll();
- return R.ok(posts);
+ return success(posts);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3