From 3ad8fb4e7cc1391e8090f3da6ffa9c48690a12a3 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期日, 16 六月 2024 13:45:39 +0800 Subject: [PATCH] 修改了权限的代码 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java index ee1f042..6b79a8d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java @@ -53,8 +53,10 @@ * 鏍规嵁瀹犵墿id鑾峰彇鐩稿叧澶囧繕褰� */ @GetMapping - public AjaxResult getByPetId(@PathParam("pid")String pid){ - return zfPetNoteService.getAllPetNoteByPetId(pid); + public AjaxResult getByPetId(@PathParam("pid")String pid,ZfPetNote zfPetNote){ + Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1); + Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10); + return zfPetNoteService.getAllPetNoteByPetId(pageNum,pageSize,pid,zfPetNote); } @@ -83,12 +85,23 @@ util.exportExcel(response, list, "榄呭疇澶囧繕褰曡褰曟暟鎹�"); } + @Log(title = "榄呭疇澶囧繕褰曡褰�", businessType = BusinessType.EXPORT) + @PostMapping("/export1/{ids}") + public void export1(HttpServletResponse response, ZfPetNote zfPetNote, @PathVariable Long[] ids) + { + List<ZfPetNote> list = zfPetNoteService.selectByIds(ids); + log.info("瀵煎嚭璁板綍涓�:{}",list); + ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class); + util.exportExcel(response, list, "榄呭疇澶囧繕褰曡褰曟暟鎹�"); + } + + /** * 瀵煎叆榄呭疇澶囧繕褰曡褰曞垪琛� */ @Log(title = "鐢ㄦ埛绠$悊", businessType = BusinessType.IMPORT) @PostMapping("/importData/{pid}") - public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable Long pid) throws Exception + public AjaxResult importData(@RequestParam("excelImport") MultipartFile file,@PathVariable String pid) throws Exception { ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class); List<ZfPetNote> eventList = util.importExcel(file.getInputStream()); -- Gitblit v1.9.1