From ae536b434f6eae2a64b4ce30cd8def726ff05a0a Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 22:47:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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..32e270f 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);
}
/**
@@ -69,6 +69,7 @@
ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
util.exportExcel(response, list, "榄呭疇璁板綍鏁版嵁");
}
+
/**
* 瀵煎嚭榄呭疇璁板綍鍒楄〃
*/
@@ -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