From a465f67fdd32f818f35938eded708b166b1cc1f7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 20 二月 2025 10:25:37 +0800
Subject: [PATCH] 搬迁cnas的8体系管理要求模块完成

---
 cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
index f8ecb39..57805f0 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
@@ -2,12 +2,14 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
 import com.ruoyi.manage.dto.InternalMeetingDto;
 import com.ruoyi.manage.pojo.InternalMeeting;
 import com.ruoyi.manage.service.InternalMeetingService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -34,15 +36,13 @@
 
     /**
      * 鍐呭浼氳鍒嗛〉鏌ヨ
-     * @param data
+     * @param
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭浼氳鍒嗛〉鏌ヨ")
     @PostMapping("/pageInternalMeeting")
-    public Result<IPage<InternalMeetingDto>> pageInternalMeeting(@RequestBody Map<String, Object> data) throws Exception {
-        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-        InternalMeeting internalMeeting = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalMeeting.class);
+    public Result<IPage<InternalMeetingDto>> pageInternalMeeting(Page page,InternalMeeting internalMeeting) throws Exception {
         return Result.success(internalMeetingService.pageInternalMeeting(page, internalMeeting));
     }
 
@@ -50,7 +50,7 @@
      * 鍐呭浼氳鏂板
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭浼氳鏂板")
     @PostMapping("/addInternalMeeting")
     public Result addInternalMeeting(@RequestBody InternalMeetingDto internalMeeting){
@@ -61,7 +61,7 @@
      * 鍐呭浼氳淇敼
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭浼氳淇敼")
     @PostMapping("/updateInternalMeeting")
     public Result updateInternalMeeting(@RequestBody InternalMeetingDto internalMeeting){
@@ -72,7 +72,7 @@
      * 鍐呭浼氳鍒犻櫎
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭浼氳鍒犻櫎")
     @GetMapping("/delInternalMeeting")
     public Result delInternalMeeting(Integer meetingId){
@@ -83,7 +83,7 @@
      * 鍐呭浼氳鏌ョ湅璇︽儏
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭浼氳鏌ョ湅璇︽儏")
     @GetMapping("/getInternalMeetingOne")
     public Result<InternalMeetingDto> getInternalMeetingOne(Integer meetingId){
@@ -94,7 +94,7 @@
      * 瀵煎嚭鍐呭浼氳
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "瀵煎嚭鍐呭浼氳")
     @GetMapping("/exportInternalMeeting")
     public void exportInternalMeeting(Integer meetingId, HttpServletResponse response){

--
Gitblit v1.9.3