修改分页查询

zqy

2024-07-16 9a4b09e6a32b4510e1e9c4fb13d6cb90b896abe4

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java

@@ -43,17 +43,17 @@
    public AjaxResult listAll(ZfPet zfPet){
        Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
        Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
        return zfPetService.selectPetList(zfPet, pageNum, pageSize);
        return zfPetService.selectDataList(zfPet, pageNum, pageSize);
    }

    /**
     * 获取导入模板
     */
    @GetMapping("/model")
    @PostMapping("/model")
    public void getExportModel(HttpServletResponse response){
        List<ZfPet> list = Collections.singletonList(new ZfPet());
        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
        util.exportExcel(response,list,"魅宠记录数据");
        util.exportExcel(response,list,"魅宠记录导入模板");
    }

    /**
@@ -71,20 +71,35 @@
    }

    /**
     * 导出魅宠记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "魅宠记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    public void export(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<ZfPet> list = zfPetService.selectByIds(ids);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
        util.exportExcel(response, list, "魅宠记录数据");
    }

    /**
     * 导入魅宠记录列表
     */
    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
    {
        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
        List<ZfPet> eventList = util.importExcel(file.getInputStream());
        log.info("魅宠列表为：{}",eventList);

        if (zfPetService.saveBatch(eventList)) {
            return AjaxResult.success("导入数据成功");
        }
        return AjaxResult.error("导入数据失败");
//        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
//        List<ZfPet> eventList = util.importExcel(file.getInputStream());
//        log.info("魅宠列表为：{}",eventList);
//
//        if (zfPetService.saveBatch(eventList)) {
//            return AjaxResult.success("导入数据成功");
//        }
//        return AjaxResult.error("导入数据失败");
        return zfPetService.importExcel(file);
    }

    /**
@@ -105,7 +120,7 @@
    @PostMapping
    public AjaxResult add(@RequestBody ZfPet zfPet)
    {
        return zfPetService.mySave(zfPet);
        return zfPetService.addData(zfPet);
    }

    /**
@@ -116,7 +131,7 @@
    @PutMapping
    public AjaxResult edit(@RequestBody ZfPet zfPet)
    {
        return toAjax(zfPetService.updateById(zfPet));
        return zfPetService.updateData(zfPet);
    }
//
    /**
@@ -127,7 +142,7 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(zfPetService.removeByIds(Arrays.asList(ids)));
        return zfPetService.deleteData(ids);
    }

}