From 7c5e1ef7db84731610d5616b2ee7e6e63abd886d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 01 八月 2025 13:21:02 +0800
Subject: [PATCH] mqtt回调方法调整

---
 cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java |   36 +++++++++++++++++-------------------
 1 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
index 9153cfa..16f6cac 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
@@ -2,13 +2,15 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
 import com.ruoyi.manage.dto.InternalPlanDto;
 import com.ruoyi.manage.pojo.InternalPlan;
 import com.ruoyi.manage.service.InternalPlanService;
-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;
@@ -22,7 +24,7 @@
  * 鍐呭骞村害璁″垝 鍓嶇鎺у埗鍣�
  * </p>
  *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author 
  * @since 2024-11-13 03:27:47
  */
 @Api(tags = "鍐呭骞村害璁″垝")
@@ -36,15 +38,13 @@
 
     /**
      * 鍐呭骞村害璁″垝鍒嗛〉鏌ヨ
-     * @param data
+     * @param
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭骞村害璁″垝鍒嗛〉鏌ヨ")
-    @PostMapping("/pageInternalPlan")
-    public Result<IPage<InternalPlanDto>> pageInternalPlan(@RequestBody Map<String, Object> data) throws Exception {
-        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-        InternalPlan internalPlan = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalPlan.class);
+    @GetMapping("/pageInternalPlan")
+    public Result<IPage<InternalPlanDto>> pageInternalPlan(Page page,InternalPlan internalPlan) throws Exception {
         return Result.success(internalPlanService.pageInternalPlan(page, internalPlan));
     }
 
@@ -52,7 +52,7 @@
      * 鍐呭骞村害璁″垝鏂板
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭骞村害璁″垝鏂板")
     @PostMapping("/addInternalPlan")
     public Result addInternalPlan(@RequestBody InternalPlanDto internalPlan){
@@ -63,7 +63,7 @@
      * 鍐呭骞村害璁″垝淇敼
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭骞村害璁″垝淇敼")
     @PostMapping("/updateInternalPlan")
     public Result updateInternalPlan(@RequestBody InternalPlanDto internalPlan){
@@ -74,9 +74,9 @@
      * 鍐呭骞村害璁″垝鍒犻櫎
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭骞村害璁″垝鍒犻櫎")
-    @GetMapping("/delInternalPlan")
+    @DeleteMapping("/delInternalPlan")
     public Result delInternalPlan(Integer planId){
         return Result.success(internalPlanService.delInternalPlan(planId));
     }
@@ -85,7 +85,7 @@
      * 鍐呭骞村害璁″垝鏌ョ湅璇︽儏
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍐呭骞村害璁″垝鏌ョ湅璇︽儏")
     @GetMapping("/getInternalPlanOne")
     public Result<InternalPlanDto> getInternalPlanOne(Integer planId){
@@ -97,7 +97,6 @@
      * 鍐呭骞村害璁″垝瀹℃牳
      * @return
      */
-    @ValueClassify("鍐呭骞村害璁″垝")
     @ApiOperation(value = "鍐呭骞村害璁″垝瀹℃牳")
     @PostMapping("/examineInternalPlan")
     public Result examineInternalPlan(@RequestBody InternalPlanDto internalPlanDto){
@@ -108,7 +107,6 @@
      * 鍐呭骞村害璁″垝鎵瑰噯
      * @return
      */
-    @ValueClassify("鍐呭骞村害璁″垝")
     @ApiOperation(value = "鍐呭瀹炴柦璁″垝鎵瑰噯")
     @PostMapping("/ratifyInternalPlan")
     public Result ratifyInternalPlan(@RequestBody InternalPlanDto internalPlanDto){
@@ -119,7 +117,7 @@
      * 瀵煎嚭鍐呭骞村害璁″垝
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "瀵煎嚭鍐呭骞村害璁″垝")
     @GetMapping("/exportInternalPlan")
     public void exportInternalPlan(Integer planId, HttpServletResponse response){

--
Gitblit v1.9.3