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/ZfPetController.java |   54 ++++++++++++++++++++++++++++--------------------------
 1 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java
index d923814..efa483d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java
@@ -43,7 +43,7 @@
     public AjaxResult listAll(ZfPet zfPet){
         Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
         Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
-        return zfPetService.selectPetList(zfPet, pageNum, pageSize);
+        return zfPetService.selectDataList(zfPet, pageNum, pageSize);
     }
 
     /**
@@ -56,25 +56,26 @@
         util.exportExcel(response,list,"榄呭疇璁板綍瀵煎叆妯℃澘");
     }
 
+//    /**
+//     * 瀵煎嚭榄呭疇璁板綍鍒楄〃
+//     */
+////    @PreAuthorize("@ss.hasPermi('system:property:export')")
+//    @Log(title = "榄呭疇璁板綍", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, ZfPet zfPet)
+//    {
+//        List<ZfPet> list = zfPetService.selectByCondition(zfPet);
+//        log.info("瀵煎嚭璁板綍涓�:{}",list);
+//        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
+//        util.exportExcel(response, list, "榄呭疇璁板綍鏁版嵁");
+//    }
+
     /**
      * 瀵煎嚭榄呭疇璁板綍鍒楄〃
      */
 //    @PreAuthorize("@ss.hasPermi('system:property:export')")
     @Log(title = "榄呭疇璁板綍", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, ZfPet zfPet)
-    {
-        List<ZfPet> list = zfPetService.selectByCondition(zfPet);
-        log.info("瀵煎嚭璁板綍涓�:{}",list);
-        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.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<ZfPet> list = zfPetService.selectByIds(ids);
@@ -90,14 +91,15 @@
     @PostMapping("/importData")
     public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
     {
-        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
-        List<ZfPet> eventList = util.importExcel(file.getInputStream());
-        log.info("榄呭疇鍒楄〃涓猴細{}",eventList);
-
-        if (zfPetService.saveBatch(eventList)) {
-            return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
-        }
-        return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
+//        ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
+//        List<ZfPet> eventList = util.importExcel(file.getInputStream());
+//        log.info("榄呭疇鍒楄〃涓猴細{}",eventList);
+//
+//        if (zfPetService.saveBatch(eventList)) {
+//            return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
+//        }
+//        return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
+        return zfPetService.importExcel(file);
     }
 
     /**
@@ -118,7 +120,7 @@
     @PostMapping
     public AjaxResult add(@RequestBody ZfPet zfPet)
     {
-        return zfPetService.mySave(zfPet);
+        return zfPetService.addData(zfPet);
     }
 
     /**
@@ -129,7 +131,7 @@
     @PutMapping
     public AjaxResult edit(@RequestBody ZfPet zfPet)
     {
-        return toAjax(zfPetService.updateById(zfPet));
+        return zfPetService.updateData(zfPet);
     }
 //
     /**
@@ -140,7 +142,7 @@
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(zfPetService.removeByIds(Arrays.asList(ids)));
+        return zfPetService.deleteData(ids);
     }
 
 }

--
Gitblit v1.9.1