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/ClientSatisfactionController.java | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java index c548731..f7872cb 100644 --- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java +++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ClientSatisfactionController.java @@ -3,13 +3,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.manage.annotation.ValueAuth; +import com.ruoyi.common.core.domain.Result; +import com.ruoyi.common.utils.JackSonUtil; import com.ruoyi.manage.mapper.ClientSatisfactionAnalyseFileMapper; import com.ruoyi.manage.pojo.ClientSatisfaction; import com.ruoyi.manage.pojo.ClientSatisfactionAnalyseFile; import com.ruoyi.manage.service.ClientSatisfactionService; -import com.ruoyi.manage.utils.JackSonUtil; -import com.ruoyi.manage.vo.Result; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; @@ -37,15 +36,12 @@ /** * 瀹㈡埛婊℃剰搴﹁皟鏌ュ垪琛� - * @param data + * @param * @return */ - @ValueAuth @ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ュ垪琛�") @PostMapping("/pageClientSatisfaction") - public Result<IPage<ClientSatisfaction>> pageClientSatisfaction(@RequestBody Map<String, Object> data) throws Exception { - Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); - ClientSatisfaction clientSatisfaction = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ClientSatisfaction.class); + public Result<IPage<ClientSatisfaction>> pageClientSatisfaction(Page page,ClientSatisfaction clientSatisfaction) throws Exception { return Result.success(clientSatisfactionService.pageClientSatisfaction(page, clientSatisfaction)); } @@ -53,7 +49,6 @@ * 瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧� * @return */ - @ValueAuth @ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�") @PostMapping("/addClientSatisfaction") public Result addClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction){ @@ -64,7 +59,6 @@ * 瀹㈡埛婊℃剰搴﹁皟鏌ヤ慨鏀� * @return */ - @ValueAuth @ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�") @PostMapping("/updateClientSatisfaction") public Result updateClientSatisfaction(@RequestBody ClientSatisfaction clientSatisfaction){ @@ -75,7 +69,7 @@ * 瀹㈡埛婊℃剰搴﹁皟鏌ヤ慨鏀� * @return */ - @ValueAuth + @ApiOperation(value = "瀹㈡埛婊℃剰搴﹁皟鏌ユ柊澧�") @GetMapping("/delClientSatisfaction") public Result updateClientSatisfaction(Integer clientSatisfactionId){ @@ -88,7 +82,7 @@ * @param response * @return */ - @ValueAuth + @ApiOperation(value = "瀹㈡埛婊℃剰瀵煎嚭") @GetMapping("/exportWordClientSatisfaction") public Result exportWordClientSatisfaction(Integer clientSatisfactionId, HttpServletResponse response){ @@ -101,7 +95,7 @@ * @param clientSatisfaction 瑕佷慨鏀瑰鎴锋弧鎰忓害鐨勭姸鎬佸璞� * @param userId 淇敼浜篿d */ - @ValueAuth + @ApiOperation(value = "纭瀹㈡埛婊℃剰搴�") @GetMapping("/confirmClientSatisfaction") public void confirmClientSatisfaction(ClientSatisfaction clientSatisfaction, Integer userId){ @@ -113,7 +107,7 @@ * @param file * @return */ - @ValueAuth + @ApiOperation(value = "鏂板鎴峰垎鏋愰檮浠�") @PostMapping("/uploadAnalyseFile") public Result<?> uploadAnalyseFile(MultipartFile file) { @@ -125,7 +119,7 @@ * 鏌ヨ鎴峰垎鏋愰檮浠� * @return */ - @ValueAuth + @ApiOperation(value = "鏌ヨ鎴峰垎鏋愰檮浠�") @PostMapping("/pageAnalyseFile") public Result<IPage<ClientSatisfactionAnalyseFile>> pageAnalyseFile(@RequestBody Map<String, Object> data) throws Exception { @@ -138,7 +132,7 @@ * 鍒犻櫎鎴峰垎鏋愰檮浠� * @return */ - @ValueAuth + @ApiOperation(value = "鍒犻櫎鎴峰垎鏋愰檮浠�") @GetMapping("/delAnalyseFile") public Result delAnalyseFile(Integer analyseFileId){ -- Gitblit v1.9.3