From 2039385fa4b4ac688907134ee7c7025fb2aea1fb Mon Sep 17 00:00:00 2001 From: whywhyo <1511349576@qq.com> Date: 星期日, 16 七月 2023 12:59:17 +0800 Subject: [PATCH] 666 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java | 49 +++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java index 58d7002..d461ea6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java +++ b/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); } -- Gitblit v1.9.1