From df3f154f020076d8b0075b92626f22e970f63702 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期二, 25 二月 2025 16:14:51 +0800 Subject: [PATCH] 设施和环境条件代码迁移 --- cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java b/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java index 244e9fd..5c48d2f 100644 --- a/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java +++ b/cnas-require/src/main/java/com/ruoyi/require/controller/ForeignRegisterController.java @@ -33,14 +33,13 @@ /** * 澶栨潵浜哄憳鐧昏鍒嗛〉鏌ヨ - * @param data + * @param page + * @param foreignRegister * @return */ @ApiOperation(value = "澶栨潵浜哄憳鐧昏鍒嗛〉鏌ヨ") - @PostMapping("/pageForeignRegister") - public Result<IPage<ForeignRegisterDto>> pageForeignRegister(@RequestBody Map<String, Object> data) throws Exception { - Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class); - ForeignRegisterDto foreignRegister = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ForeignRegisterDto.class); + @GetMapping("/pageForeignRegister") + public Result<IPage<ForeignRegisterDto>> pageForeignRegister(Page page,ForeignRegisterDto foreignRegister) throws Exception { return Result.success(foreignRegisterService.pageForeignRegister(page, foreignRegister)); } @@ -69,7 +68,7 @@ * @return */ @ApiOperation(value = "澶栨潵浜哄憳鐧昏鍒犻櫎") - @GetMapping("/delForeignRegister") + @DeleteMapping("/delForeignRegister") public Result delForeignRegister(Integer registerId){ return Result.success(foreignRegisterService.removeById(registerId)); } @@ -89,8 +88,8 @@ * @return */ @ApiOperation(value = "瀵煎嚭澶栨潵浜哄憳鐧昏") - @PostMapping("/exportForeignRegister") - public void exportForeignRegister(@RequestBody ForeignRegisterDto foreignRegister, HttpServletResponse response){ + @GetMapping("/exportForeignRegister") + public void exportForeignRegister(ForeignRegisterDto foreignRegister, HttpServletResponse response){ foreignRegisterService.exportForeignRegister(foreignRegister, response); } -- Gitblit v1.9.3