666

whywhyo

2023-07-16 2039385fa4b4ac688907134ee7c7025fb2aea1fb

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

@@ -57,26 +57,26 @@
        util.exportExcel(response,list,"通讯录导入模板");
    }

    /**
     * 导出通讯录记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "通讯录记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ZfContact zfContact)
    {
        List<ZfContact> list = zfContactService.selectByCondition(zfContact);
        log.info("导出记录为:{}",list);
        ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
        util.exportExcel(response, list, "通讯录记录数据");
    }
//    /**
//     * 导出通讯录记录列表
//     */
////    @PreAuthorize("@ss.hasPermi('system:property:export')")
//    @Log(title = "通讯录记录", businessType = BusinessType.EXPORT)
//    @PostMapping("/export")
//    public void export(HttpServletResponse response, ZfContact zfContact)
//    {
//        List<ZfContact> list = zfContactService.selectByCondition(zfContact);
//        log.info("导出记录为:{}",list);
//        ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
//        util.exportExcel(response, list, "通讯录记录数据");
//    }

    /**
     * 导出通讯录记录列表
     */
//    @PreAuthorize("@ss.hasPermi('system:property:export')")
    @Log(title = "通讯录记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export1/{ids}")
    @PostMapping("/export/{ids}")
    public void export(HttpServletResponse response, @PathVariable Long[] ids)
    {
        List<ZfContact> list = zfContactService.selectByIds(ids);
@@ -91,13 +91,14 @@
    @PostMapping("/importData")
    public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
    {
        ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
        List<ZfContact> eventList = util.importExcel(file.getInputStream());
        log.info("通讯录列表为：{}",eventList);
        if (zfContactService.saveBatch(eventList)) {
            return AjaxResult.success("导入数据成功");
        }
        return AjaxResult.error("导入数据失败");
//        ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
//        List<ZfContact> eventList = util.importExcel(file.getInputStream());
//        log.info("通讯录列表为：{}",eventList);
//        if (zfContactService.saveBatch(eventList)) {
//            return AjaxResult.success("导入数据成功");
//        }
//        return AjaxResult.error("导入数据失败");
        return zfContactService.importExcel(file);
    }

    /**
@@ -118,7 +119,7 @@
    @PostMapping
    public AjaxResult add(@RequestBody ZfContact zfContact)
    {
        return (zfContactService.addData2(zfContact));
        return (zfContactService.addData(zfContact));
    }

    /**
@@ -129,7 +130,7 @@
    @PutMapping
    public AjaxResult edit(@RequestBody ZfContact zfContact)
    {
        return toAjax(zfContactService.updateById(zfContact));
        return zfContactService.updateData(zfContact);
    }
//
    /**
@@ -140,7 +141,7 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(zfContactService.removeByIds(Arrays.asList(ids)));
        return zfContactService.deleteData(ids);
    }