From cedaeeed6d401aefebf93ea6ea21cc9e06d5f5db Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:36:48 +0800
Subject: [PATCH] 新增搜索 模块+同伴+时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 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 7c848d5..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,17 +43,17 @@
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);
}
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfPet> list = Collections.singletonList(new ZfPet());
ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
- util.exportExcel(response,list,"榄呭疇璁板綍鏁版嵁");
+ util.exportExcel(response,list,"榄呭疇璁板綍瀵煎叆妯℃澘");
}
/**
@@ -71,20 +71,35 @@
}
/**
+ * 瀵煎嚭榄呭疇璁板綍鍒楄〃
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "榄呭疇璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<ZfPet> list = zfPetService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfPet> util = new ExcelUtil<>(ZfPet.class);
+ util.exportExcel(response, list, "榄呭疇璁板綍鏁版嵁");
+ }
+
+ /**
* 瀵煎叆榄呭疇璁板綍鍒楄〃
*/
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
@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);
}
/**
@@ -105,7 +120,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfPet zfPet)
{
- return zfPetService.mySave(zfPet);
+ return zfPetService.addData(zfPet);
}
/**
@@ -116,7 +131,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfPet zfPet)
{
- return toAjax(zfPetService.updateById(zfPet));
+ return zfPetService.updateData(zfPet);
}
//
/**
@@ -127,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