From ad65726388fc99ff95db91b4a8a716362cccedd7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 25 五月 2026 04:32:19 +0800
Subject: [PATCH] feat: 操纵添加LOG注解记录日志

---
 src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java |   50 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index 5c2c09c..3b44724 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -8,10 +8,10 @@
 import com.ruoyi.approve.bean.vo.ApproveProcessVO;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.project.system.domain.SysDept;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -27,7 +27,7 @@
 @RequestMapping("/approveProcess")
 @AllArgsConstructor
 @Tag(name = "瀹℃壒")
-public class ApproveProcessController extends BaseController {
+public class ApproveProcessController {
 
     private IApproveProcessService approveProcessService;
     /**銆�
@@ -35,13 +35,13 @@
      * @return
      */
     @GetMapping("/getDept")
-    public R<?> getDept() {
+    public AjaxResult getDept() {
         Long userId = SecurityUtils.getUserId();
         LoginUser user = SecurityUtils.getLoginUser();
         Long[] deptIds = SecurityUtils.getDeptId();
 
         List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
-        return R.ok(sysDeptList);
+        return AjaxResult.success(sysDeptList);
     }
 
     /**
@@ -49,16 +49,17 @@
      * @param approveProcessVO
      * @return
      */
+    @Log(title = "娣诲姞瀹℃壒", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @Transactional(rollbackFor = Exception.class)
     @Operation(summary = "娣诲姞瀹℃壒")
-    public R<?> add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
+    public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
         if (approveProcessVO == null) {
-            return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+            return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
         }
 
         approveProcessService.addApprove(approveProcessVO);
-        return R.ok(null, "娣诲姞鎴愬姛");
+        return AjaxResult.success("娣诲姞鎴愬姛");
     }
 
     /**
@@ -68,11 +69,11 @@
      */
     @GetMapping("/get")
     @Operation(summary = "瀹℃壒璇︽儏")
-    public R<?> get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
+    public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
         if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
-            return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+            return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
         }
-        return R.ok(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
+        return AjaxResult.success(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
     }
 
     /**
@@ -80,15 +81,16 @@
      * @param approveGetAndUpdateVo
      * @return
      */
+    @Log(title = "鏇存柊瀹℃壒", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     @Transactional(rollbackFor = Exception.class)
     @Operation(summary = "鏇存柊瀹℃壒")
-    public R<?> update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
+    public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
         if (approveGetAndUpdateVo == null) {
-            return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+            return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
         }
         approveProcessService.updateByApproveId(approveGetAndUpdateVo);
-        return R.ok(null, "鎿嶄綔鎴愬姛");
+        return AjaxResult.success("鎿嶄綔鎴愬姛");
     }
     /**
      * 鑾峰彇瀹℃壒鍒楄〃
@@ -96,8 +98,8 @@
      */
     @GetMapping("/list")
     @Operation(summary = "鑾峰彇瀹℃壒鍒楄〃")
-    public R<?> list(Page page, ApproveProcess approveProcess) {
-        return R.ok(approveProcessService.listAll(page, approveProcess));
+    public AjaxResult list(Page page, ApproveProcess approveProcess) {
+        return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
     }
 
     /**
@@ -105,18 +107,20 @@
      * @param ids
      * @return
      */
+    @Log(title = "鍒犻櫎瀹℃壒", businessType = BusinessType.DELETE)
     @DeleteMapping("/deleteIds")
     @Operation(summary = "鍒犻櫎瀹℃壒")
     @Transactional(rollbackFor = Exception.class)
-    public R<?> deleteIds(@RequestBody List<Long> ids) {
+    public AjaxResult deleteIds(@RequestBody List<Long> ids) {
         if (ids == null || ids.size() == 0) {
-            return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
+            return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
         }
         approveProcessService.delApprove(ids);
-        return R.ok(null, "鎿嶄綔鎴愬姛");
+        return AjaxResult.success("鎿嶄綔鎴愬姛");
     }
 
     @Operation(summary = "鍏嚭绠$悊瀵煎嚭")
+    @Log(title = "鍏嚭绠$悊瀵煎嚭", businessType = BusinessType.EXPORT)
     @PostMapping("/exportOne")
     public void exportOne(HttpServletResponse response) {
         List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -127,6 +131,7 @@
     }
 
     @Operation(summary = "璇峰亣绠$悊瀵煎嚭")
+    @Log(title = "璇峰亣绠$悊瀵煎嚭", businessType = BusinessType.EXPORT)
     @PostMapping("/exportTwo")
     public void exportTwo(HttpServletResponse response) {
         List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -137,6 +142,7 @@
     }
 
     @Operation(summary = "鍑哄樊绠$悊瀵煎嚭")
+    @Log(title = "鍑哄樊绠$悊瀵煎嚭", businessType = BusinessType.EXPORT)
     @PostMapping("/exportThree")
     public void exportThree(HttpServletResponse response) {
         List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -147,6 +153,7 @@
     }
 
     @Operation(summary = "鎶ラ攢绠$悊瀵煎嚭")
+    @Log(title = "鎶ラ攢绠$悊瀵煎嚭", businessType = BusinessType.EXPORT)
     @PostMapping("/exportFour")
     public void exportFour(HttpServletResponse response) {
         List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -157,6 +164,7 @@
     }
 
     @Operation(summary = "閲囪喘鐢宠瀵煎嚭")
+    @Log(title = "閲囪喘鐢宠瀵煎嚭", businessType = BusinessType.EXPORT)
     @PostMapping("/exportFive")
     public void exportFive(HttpServletResponse response) {
         List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -167,6 +175,7 @@
     }
 
     @Operation(summary = "鍗忓悓瀹℃壒瀵煎嚭")
+    @Log(title = "鍗忓悓瀹℃壒瀵煎嚭", businessType = BusinessType.EXPORT)
     @PostMapping("/exportZero")
     public void exportZero(HttpServletResponse response) {
         List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()
@@ -177,6 +186,7 @@
     }
 
     @Operation(summary = "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭")
+    @Log(title = "鍗遍櫓浣滀笟瀹℃壒瀵煎嚭", businessType = BusinessType.EXPORT)
     @PostMapping("/exportEight")
     public void exportEight(HttpServletResponse response) {
         List<ApproveProcess> accountExpenses = approveProcessService.list(new LambdaQueryWrapper<ApproveProcess>()

--
Gitblit v1.9.3