From d1abd1ef9c4b33d4c0fe9c15a43996b2f9f67048 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期三, 19 七月 2023 20:38:35 +0800
Subject: [PATCH] 4577
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java
index 978344c..9664f3f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java
@@ -9,6 +9,9 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfEquipment;
+import com.ruoyi.domain.ZfEvent;
+import com.ruoyi.domain.excel.ZfEconomyExcelBean;
+import com.ruoyi.domain.excel.ZfEquipmentExcelBean;
import com.ruoyi.service.ZfEquipmentService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +20,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;
@@ -40,26 +44,48 @@
@GetMapping("/all")
public AjaxResult listAll(ZfEquipment zfEquipment){
-
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zfEquipmentService.selectDataList(zfEquipment, pageNum, pageSize);
}
+ /**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ZfEquipmentExcelBean> list = Collections.singletonList(new ZfEquipmentExcelBean());
+ ExcelUtil<ZfEquipmentExcelBean> util = new ExcelUtil<>(ZfEquipmentExcelBean.class);
+ util.exportExcel(response,list,"瀹跺涵璁惧瀵煎叆妯℃澘");
+ }
+
+// /**
+// * 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃
+// */
+//// @PreAuthorize("@ss.hasPermi('system:equipment:export')")
+// @Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.EXPORT)
+// @PostMapping("/export")
+// public void export(HttpServletResponse response, ZfEquipment zfEquipment)
+// {
+// List<ZfEquipment> list = zfEquipmentService.selectByCondition(zfEquipment);
+// log.info("瀵煎嚭璁板綍涓�:{}",list);
+// ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
+// util.exportExcel(response, list, "瀹跺涵璁惧璁板綍鏁版嵁");
+// }
/**
* 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('system:equipment:export')")
@Log(title = "瀹跺涵璁惧璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, ZfEquipment zfEquipment)
- {
- List<ZfEquipment> list = zfEquipmentService.selectByCondition(zfEquipment);
- log.info("瀵煎嚭璁板綍涓�:{}",list);
+ @PostMapping("/export/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids) {
+ List<ZfEquipment> list = zfEquipmentService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
- util.exportExcel(response, list, "瀹跺涵璁惧璁板綍鏁版嵁");
+ util.exportExcel(response, list, "瀹跺涵璁惧鏁版嵁");
+
}
+
//
/**
@@ -90,7 +116,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfEquipment zfEquipment)
{
- return zfEquipmentService.addData2(zfEquipment);
+ return zfEquipmentService.addData(zfEquipment);
}
/**
@@ -101,7 +127,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfEquipment zfEquipment)
{
- return toAjax(zfEquipmentService.updateById(zfEquipment));
+ return zfEquipmentService.updateData(zfEquipment);
}
//
/**
@@ -112,7 +138,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfEquipmentService.removeByIds(Arrays.asList(ids)));
+ return zfEquipmentService.deleteData(ids);
}
}
--
Gitblit v1.9.1