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/ZfEventController.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
index c74d0a5..722848a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
@@ -60,28 +60,28 @@
}
+// /**
+// * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
+// */
+//// @PreAuthorize("@ss.hasPermi('system:property:export')")
+// @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+// @PostMapping("/export")
+// public void export(HttpServletResponse response, ZfEvent zfEvent) {
+// List<ZfEvent> list = new ArrayList<>();
+//
+// list = zfEventService.selectByCondition(zfEvent);
+// log.info("瀵煎嚭璁板綍涓�:{}", list);
+// ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
+// util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+//
+// }
/**
* 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, ZfEvent zfEvent) {
- List<ZfEvent> list = new ArrayList<>();
-
- list = zfEventService.selectByCondition(zfEvent);
- log.info("瀵煎嚭璁板綍涓�:{}", list);
- ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
- util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
-
- }
- /**
- * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
- */
-// @PreAuthorize("@ss.hasPermi('system:property:export')")
- @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
- @PostMapping("/export1/{ids}")
- public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
+ @PostMapping("/export/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids) {
List<ZfEvent> list = zfEventService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
@@ -96,9 +96,7 @@
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception {
-
return zfEventService.importExcel(file);
-
}
/**
@@ -118,7 +116,7 @@
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ZfEvent zfEvent) {
- return zfEventService.addData2(zfEvent);
+ return zfEventService.addData(zfEvent);
}
/**
@@ -128,7 +126,7 @@
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ZfEvent zfEvent) {
- return toAjax(zfEventService.updateById(zfEvent));
+ return zfEventService.updateData(zfEvent);
}
//
@@ -139,7 +137,7 @@
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(zfEventService.removeByIds(Arrays.asList(ids)));
+ return zfEventService.deleteData(ids);
}
}
--
Gitblit v1.9.1