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/ZfCollectionController.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 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 73aa728..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
@@ -9,6 +9,8 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfCollection;
+import com.ruoyi.domain.excel.ZfCleanExcelBean;
+import com.ruoyi.domain.excel.ZfCollectionExcelBean;
import com.ruoyi.service.ZfCollectionService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -47,14 +50,45 @@
}
/**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zfCollectionService.getById(id));
+ }
+
+ /**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ZfCollectionExcelBean> list = Collections.singletonList(new ZfCollectionExcelBean());
+ ExcelUtil<ZfCollectionExcelBean> util = new ExcelUtil<>(ZfCollectionExcelBean.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)
+// {
+// 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, "鏀惰棌鍜岃崳瑾夎褰曟暟鎹�");
@@ -89,7 +123,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfCollection zfCollection)
{
- return zfCollectionService.addData2(zfCollection);
+ return zfCollectionService.addData(zfCollection);
}
/**
@@ -100,7 +134,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfCollection zfCollection)
{
- return toAjax(zfCollectionService.updateById(zfCollection));
+ return zfCollectionService.updateData(zfCollection);
}
//
/**
@@ -111,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