From 8e93f63d7eab5c4f5d193763cbb2e81ea5476923 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 16 七月 2023 21:03:59 +0800
Subject: [PATCH] 559
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
index 0e4539c..112aec8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
+++ b/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);
}
--
Gitblit v1.9.1