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/InternalCheckController.java | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java index 9554a5e..c1ee078 100644 --- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java +++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCheckController.java @@ -4,13 +4,14 @@ 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.InternalCheckDto; import com.ruoyi.manage.pojo.InternalCheck; import com.ruoyi.manage.service.InternalCheckService; -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 +37,13 @@ /** * 鍐呭妫�鏌ュ垎椤垫煡璇� - * @param data + * @param * @return */ - @ValueAuth + @ApiOperation(value = "鍐呭妫�鏌ュ垎椤垫煡璇�") @PostMapping("/pageInternalCheck") - public Result<IPage<InternalCheckDto>> pageInternalCheck(@RequestBody Map<String, Object> data) throws Exception { - Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); - InternalCheck internalCheck = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalCheck.class); + public Result<IPage<InternalCheckDto>> pageInternalCheck(Page page,InternalCheck internalCheck) throws Exception { return Result.success(internalCheckService.pageInternalCheck(page, internalCheck)); } @@ -52,7 +51,7 @@ * 鍐呭妫�鏌ユ柊澧� * @return */ - @ValueAuth + @ApiOperation(value = "鍐呭妫�鏌ユ柊澧�") @PostMapping("/addInternalCheck") public Result addInternalCheck(@RequestBody InternalCheckDto internalCheck){ @@ -63,7 +62,7 @@ * 鍐呭妫�鏌ヤ慨鏀� * @return */ - @ValueAuth + @ApiOperation(value = "鍐呭妫�鏌ヤ慨鏀�") @PostMapping("/updateInternalCheck") public Result updateInternalCheck(@RequestBody InternalCheckDto internalCheck){ @@ -74,7 +73,7 @@ * 鍐呭妫�鏌ュ垹闄� * @return */ - @ValueAuth + @ApiOperation(value = "鍐呭妫�鏌ュ垹闄�") @GetMapping("/delInternalCheck") public Result delInternalCheck(Integer checkId){ @@ -85,7 +84,7 @@ * 鍐呭妫�鏌ユ煡鐪嬭鎯� * @return */ - @ValueAuth + @ApiOperation(value = "鍐呭妫�鏌ユ煡鐪嬭鎯�") @GetMapping("/getInternalCheckOne") public Result<InternalCheckDto> getInternalCheckOne(Integer checkId){ @@ -97,7 +96,6 @@ * 鍐呭妫�鏌ユ壒鍑� * @return */ - @ValueClassify("鍐呭妫�鏌�") @ApiOperation(value = "鍐呭妫�鏌ユ壒鍑�") @PostMapping("/ratifyInternalCheck") public Result ratifyInternalCheck(@RequestBody InternalCheckDto internalCheck){ @@ -108,7 +106,7 @@ * 瀵煎嚭鍐呭妫�鏌� * @return */ - @ValueAuth + @ApiOperation(value = "瀵煎嚭鍐呭妫�鏌�") @GetMapping("/exportInternalCheck") public void exportInternalCheck(Integer checkId, HttpServletResponse response){ -- Gitblit v1.9.3