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 |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 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 9884102..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
@@ -67,25 +67,25 @@
         util.exportExcel(response,list,"鏀惰棌鑽h獕瀵煎叆妯℃澘");
     }
 
+//    /**
+//     * 瀵煎嚭鏀惰棌鍜岃崳瑾夎褰曞垪琛�
+//     */
+////    @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)
-    {
-        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("/export1/{ids}")
+    @PostMapping("/export/{ids}")
     public void export(HttpServletResponse response, @PathVariable Long[] ids)
     {
         List<ZfCollection> list = zfCollectionService.selectByIds(ids);
@@ -123,7 +123,7 @@
     @PostMapping
     public AjaxResult add(@RequestBody ZfCollection zfCollection)
     {
-        return zfCollectionService.addData2(zfCollection);
+        return zfCollectionService.addData(zfCollection);
     }
 
     /**
@@ -134,7 +134,7 @@
     @PutMapping
     public AjaxResult edit(@RequestBody ZfCollection zfCollection)
     {
-        return toAjax(zfCollectionService.updateById(zfCollection));
+        return zfCollectionService.updateData(zfCollection);
     }
 //
     /**
@@ -145,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