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/InternalPlanController.java | 30 ++++++++++++++---------------- 1 files changed, 14 insertions(+), 16 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..4e10221 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; @@ -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); + 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,7 +74,7 @@ * 鍐呭骞村害璁″垝鍒犻櫎 * @return */ - @ValueAuth + @ApiOperation(value = "鍐呭骞村害璁″垝鍒犻櫎") @GetMapping("/delInternalPlan") public Result delInternalPlan(Integer 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