4577

whywhyo

2023-07-19 d1abd1ef9c4b33d4c0fe9c15a43996b2f9f67048

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

@@ -50,6 +50,14 @@
    }

    /**
     * 根据id查询
     */
    @GetMapping()
    public AjaxResult listById(Long id){
        return AjaxResult.success(zfCollectionService.getById(id));
    }

    /**
     * 获取导入模板
     */
    @PostMapping("/model")
@@ -59,15 +67,28 @@
        util.exportExcel(response,list,"收藏荣誉导入模板");
    }

//    /**
//     * 导出收藏和荣誉记录列表
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:export')")
//    @Log(title = "收藏和荣誉记录", businessType = BusinessType.EXPORT)
//    @PostMapping("/export")
//    public void export(HttpServletResponse response, ZfCollection zfCollection)
//    {
//        List<ZfCollection> list = zfCollectionService.selectByCondition(zfCollection);
//        log.info("导出记录为:{}",list);
//        ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.class);
//        util.exportExcel(response, list, "收藏和荣誉记录数据");
//    }
    /**
     * 导出收藏和荣誉记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "收藏和荣誉记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ZfCollection zfCollection)
    @PostMapping("/export/{ids}")
    public void export(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<ZfCollection> list = zfCollectionService.selectByCondition(zfCollection);
        List<ZfCollection> list = zfCollectionService.selectByIds(ids);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.class);
        util.exportExcel(response, list, "收藏和荣誉记录数据");
@@ -102,7 +123,7 @@
    @PostMapping
    public AjaxResult add(@RequestBody ZfCollection zfCollection)
    {
        return zfCollectionService.addData2(zfCollection);
        return zfCollectionService.addData(zfCollection);
    }

    /**
@@ -113,7 +134,7 @@
    @PutMapping
    public AjaxResult edit(@RequestBody ZfCollection zfCollection)
    {
        return toAjax(zfCollectionService.updateById(zfCollection));
        return zfCollectionService.updateData(zfCollection);
    }
//
    /**
@@ -124,7 +145,7 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(zfCollectionService.removeByIds(Arrays.asList(ids)));
        return zfCollectionService.deleteData(ids);
    }