From a50330dde460c33ca05eff3544de2617cd8c2fd6 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 14:03:36 +0800
Subject: [PATCH] feat(approve): 添加操作日志记录并更新跳转路径
---
src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java | 7 +++++++
src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java | 10 +++++++++-
src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java | 2 +-
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java | 4 ++--
src/main/java/com/ruoyi/collaborativeApproval/controller/EnterpriseNewsController.java | 6 ++++++
5 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java b/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
index 0a32725..36dcfc3 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApprovalInstanceController.java
@@ -4,6 +4,8 @@
import com.ruoyi.approve.bean.dto.ApprovalInstanceDto;
import com.ruoyi.approve.bean.vo.ApprovalInstanceVo;
import com.ruoyi.approve.service.ApprovalInstanceService;
+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 io.swagger.v3.oas.annotations.Operation;
@@ -30,23 +32,27 @@
private final ApprovalInstanceService approvalInstanceService;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
+ @Log(title = "瀹℃壒鍒楄〃鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public R listPage(Page<ApprovalInstanceVo> page, ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.listPage(page, approvalInstanceDto);
}
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
+ @Log(title = "瀹℃壒鍒楄〃淇濆瓨", businessType = BusinessType.INSERT)
public R save(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.add(approvalInstanceDto) ? R.ok() : R.fail();
}
@PutMapping("/update")
@Operation(summary = "鏇存柊")
+ @Log(title = "瀹℃壒鍒楄〃鏇存柊", businessType = BusinessType.UPDATE)
public R update(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.update(approvalInstanceDto) ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
+ @Log(title = "瀹℃壒鍒楄〃鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎")
public R delete(@RequestBody List<Long> ids) {
return approvalInstanceService.delete(ids) ? R.ok() : R.fail();
@@ -54,6 +60,7 @@
@Operation(summary = "瀹℃壒")
@PostMapping("/approve")
+ @Log(title = "瀹℃壒鍒楄〃瀹℃壒", businessType = BusinessType.UPDATE)
public R approve(@RequestBody ApprovalInstanceDto approvalInstanceDto) {
return approvalInstanceService.approve(approvalInstanceDto);
}
diff --git a/src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java b/src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java
index 8a9f08c..674d278 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApprovalTemplateController.java
@@ -4,6 +4,9 @@
import com.ruoyi.approve.bean.dto.ApprovalTemplateDto;
import com.ruoyi.approve.bean.vo.ApprovalTemplateVo;
import com.ruoyi.approve.service.ApprovalTemplateService;
+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 io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,30 +27,34 @@
@RequestMapping("/approvalTemplate")
@Tag(name = "瀹℃壒妯℃澘琛�")
@AllArgsConstructor
-public class ApprovalTemplateController {
+public class ApprovalTemplateController extends BaseController {
private final ApprovalTemplateService approvalTemplateService;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
+ @Log(title = "瀹℃壒妯℃澘鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public R listPage(Page<ApprovalTemplateVo> page, ApprovalTemplateDto approvalTemplateDto) {
return R.ok(approvalTemplateService.listPage(page, approvalTemplateDto));
}
@PostMapping("/add")
@Operation(summary = "娣诲姞")
+ @Log(title = "娣诲姞瀹℃壒妯℃澘", businessType = BusinessType.INSERT)
public R add(@RequestBody ApprovalTemplateDto approvalTemplateDto) {
return R.ok(approvalTemplateService.saveApprovalTemplateDto(approvalTemplateDto));
}
@PutMapping("/update")
@Operation(summary = "淇敼")
+ @Log(title = "淇敼瀹℃壒妯℃澘", businessType = BusinessType.UPDATE)
public R update(@RequestBody ApprovalTemplateDto approvalTemplateDto) {
return R.ok(approvalTemplateService.updateApprovalTemplateDto(approvalTemplateDto));
}
@PostMapping("/delete")
@Operation(summary = "鍒犻櫎")
+ @Log(title = "鍒犻櫎瀹℃壒妯℃澘", businessType = BusinessType.DELETE)
public R delete(@RequestBody List<Long> ids) {
return R.ok(approvalTemplateService.delete(ids));
}
@@ -60,6 +67,7 @@
@GetMapping("/detail/{id}")
@Operation(summary = "鏌ヨ瀹℃壒妯℃澘璇︽儏")
+ @Log(title = "鏌ヨ瀹℃壒妯℃澘璇︽儏", businessType = BusinessType.OTHER)
public R detail(@PathVariable("id") Long id) {
return R.ok(approvalTemplateService.getApprovalTemplateVoById(id));
}
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
index 3e710a8..251ff05 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -629,7 +629,7 @@
String title = StringUtils.hasText(instance.getTemplateName()) ? instance.getTemplateName() : "瀹℃壒鎻愰啋";
String message = "瀹℃壒鍗曞彿 " + instance.getInstanceNo() + " 闇�瑕佹偍瀹℃壒";
- String jumpPath = "/approvalInstance?id=" + instance.getId();
+ String jumpPath = "/officeProcessAutomation/ApproveManage/approve-list?id=" + instance.getId();
sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
}
@@ -644,7 +644,7 @@
}
String title = "浼佷笟鏂伴椈";
String message = "鎮ㄦ湁鏂扮殑浼佷笟鏂伴椈銆�" + enterpriseNews.getTitle() + "銆嬭鍙婃椂鏌ラ槄";
- String jumpPath = "/enterpriseNews?id=" + newsId;
+ String jumpPath = "/officeProcessAutomation/EnterpriseNews?id=" + newsId;
sysNoticeService.simpleNoticeByUser(title, message, userIds, jumpPath);
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/EnterpriseNewsController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/EnterpriseNewsController.java
index 88445fa..36f1e21 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/EnterpriseNewsController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/EnterpriseNewsController.java
@@ -4,6 +4,8 @@
import com.ruoyi.collaborativeApproval.dto.EnterpriseNewsDto;
import com.ruoyi.collaborativeApproval.service.EnterpriseNewsService;
import com.ruoyi.collaborativeApproval.vo.EnterpriseNewsVo;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -30,24 +32,28 @@
@Operation(summary = "鍒嗛〉鏌ヨ")
@GetMapping("/listPage")
+ @Log(title = "浼佷笟鏂伴椈鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public R listPage(Page<EnterpriseNewsVo> page , EnterpriseNewsDto enterpriseNewsDto) {
return R.ok(enterpriseNewsService.listPage(page, enterpriseNewsDto));
}
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
+ @Log(title = "淇濆瓨浼佷笟鏂伴椈", businessType = BusinessType.INSERT)
public R save(@RequestBody EnterpriseNewsDto enterpriseNewsDto) {
return R.ok(enterpriseNewsService.add(enterpriseNewsDto));
}
@PutMapping("/update")
@Operation(summary = "鏇存柊")
+ @Log(title = "鏇存柊浼佷笟鏂伴椈", businessType = BusinessType.UPDATE)
public R update(@RequestBody EnterpriseNewsDto enterpriseNewsDto) {
return R.ok(enterpriseNewsService.updateEnterpriseNewsDto(enterpriseNewsDto));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
+ @Log(title = "鍒犻櫎浼佷笟鏂伴椈", businessType = BusinessType.DELETE)
public R delete(@RequestBody List<Long> ids) {
return R.ok(enterpriseNewsService.delete(ids));
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java
index cb155fe..19b16ad 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/EnterpriseNewsServiceImpl.java
@@ -382,7 +382,7 @@
String title = StringUtils.isNotEmpty(instance.getTemplateName()) ? instance.getTemplateName() : "瀹℃壒鎻愰啋";
String message = "瀹℃壒鍗曞彿 " + instance.getInstanceNo() + " 闇�瑕佹偍瀹℃壒";
- String jumpPath = "/approvalInstance?id=" + instance.getId();
+ String jumpPath = "/officeProcessAutomation/ApproveManage/approve-list/?id=" + instance.getId();
sysNoticeService.simpleNoticeByUser(title, message, approverIds, jumpPath);
}
}
--
Gitblit v1.9.3