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/ZfEquipmentController.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 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 b871ac0..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
@@ -60,29 +60,29 @@
}
+// /**
+// * 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃
+// */
+//// @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);
- ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
- util.exportExcel(response, list, "瀹跺涵璁惧璁板綍鏁版嵁");
- }
- /**
- * 瀵煎嚭瀹跺涵璁惧璁板綍鍒楄〃
- */
- @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<ZfEquipment> list = zfEquipmentService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
- util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+ util.exportExcel(response, list, "瀹跺涵璁惧鏁版嵁");
}
@@ -116,7 +116,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfEquipment zfEquipment)
{
- return zfEquipmentService.addData2(zfEquipment);
+ return zfEquipmentService.addData(zfEquipment);
}
/**
@@ -127,7 +127,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfEquipment zfEquipment)
{
- return toAjax(zfEquipmentService.updateById(zfEquipment));
+ return zfEquipmentService.updateData(zfEquipment);
}
//
/**
@@ -138,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