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/collaborativeApproval/controller/MeetingController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
index 453986e..716dbe7 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/MeetingController.java
@@ -13,9 +13,11 @@
import com.ruoyi.collaborativeApproval.vo.SearchMeetingRoomVo;
import com.ruoyi.collaborativeApproval.vo.SearchMeetingUseVo;
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.web.domain.R;
-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.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -32,7 +34,7 @@
@RestController
@RequestMapping("/meeting")
@RequiredArgsConstructor
-@Api(tags = "浼氳")
+@Tag(name = "浼氳")
public class MeetingController {
private final MeetingService meetingService;
@@ -42,6 +44,7 @@
return R.ok(meetingService.getMeetingRoomList(vo));
}
+ @Log(title = "鏂板浼氳瀹�", businessType = BusinessType.INSERT)
@PostMapping("/saveRoom")
public R saveRoom(@RequestBody MeetingRoom meetingRoom) {
meetingService.saveMeetRoom(meetingRoom);
@@ -53,6 +56,7 @@
return R.ok(meetingService.findMeetRoomById(id));
}
+ @Log(title = "鍒犻櫎浼氳瀹�", businessType = BusinessType.DELETE)
@DeleteMapping("/delRoom/{id}")
public R deleteRoom(@PathVariable Long id) {
meetingService.deleteMeetingRoom(id);
@@ -69,18 +73,21 @@
return R.ok(meetingService.getMeetingDraftList(vo));
}
+ @Log(title = "淇濆瓨浼氳鑽夌", businessType = BusinessType.INSERT)
@PostMapping("/saveDraft")
public R saveMeetingDraft(@RequestBody MeetDraft meetDraft) {
meetingService.saveMeetDraft(meetDraft);
return R.ok();
}
+ @Log(title = "鍒犻櫎浼氳鑽夌", businessType = BusinessType.DELETE)
@DeleteMapping("/delDraft/{id}")
public R deleteMeetingDraft(@PathVariable Long id) {
meetingService.deleteMeetingDraft(id);
return R.ok();
}
+ @Log(title = "鏂板浼氳鐢宠", businessType = BusinessType.INSERT)
@PostMapping("/saveMeetingApplication")
public R saveMeetApplication(@RequestBody MeetApplication meetApplication) {
return meetingService.saveMeetApplication(meetApplication);
@@ -110,6 +117,7 @@
return R.ok(meetingService.getMeetingMinutesById(id));
}
+ @Log(title = "淇濆瓨浼氳绾", businessType = BusinessType.INSERT)
@PostMapping("/saveMeetingMinutes")
public R saveMeetingMinutes(@RequestBody MeetingMinutes meetingMinutes) {
meetingService.saveMeetingMinutes(meetingMinutes);
@@ -126,7 +134,8 @@
return R.ok(meetingService.getMeetSummaryItems());
}
- @ApiOperation(value = "浼氳瀹よ缃鍑�")
+ @Operation(summary = "浼氳瀹よ缃鍑�")
+ @Log(title = "瀵煎嚭浼氳瀹よ缃�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<MeetingRoom> accountExpenses = meetingService.list();
@@ -136,7 +145,8 @@
private final MeetDraftMapper meetDraftMapper;
- @ApiOperation(value = "浼氳鑽夌瀵煎嚭")
+ @Operation(summary = "浼氳鑽夌瀵煎嚭")
+ @Log(title = "瀵煎嚭浼氳鑽夌", businessType = BusinessType.EXPORT)
@PostMapping("/exportOne")
public void exportOne(HttpServletResponse response) {
List<MeetDraft> accountExpenses = meetDraftMapper.selectList(new LambdaQueryWrapper<MeetDraft>());
--
Gitblit v1.9.3