From 8e27235844b5640441d810e18e5adc863479735b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期五, 19 五月 2023 21:41:22 +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/ZfCleanController.java | 17 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 12 ++
zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java | 17 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 12 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java | 12 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java | 18 ++
zhang-content/src/main/java/com/ruoyi/service/ZfEventService.java | 1
zhang-content/src/main/java/com/ruoyi/service/ZfPetService.java | 2
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 13 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java | 17 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 16 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEquipmentController.java | 18 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java | 13 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java | 17 ++
zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 17 ++
zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java | 8 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java | 17 ++
zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java | 3
zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java | 1
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java | 11 +
zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java | 6 +
zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java | 1
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 15 ++
zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java | 2
zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java | 13 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java | 12 ++
zhang-content/src/main/java/com/ruoyi/service/ZfCleanService.java | 1
zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java | 18 ++-
zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java | 18 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java | 22 +++
33 files changed, 305 insertions(+), 54 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java
index 3a98096..13e7d7a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCleanController.java
@@ -50,11 +50,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfCleanExcelBean> list = Collections.singletonList(new ZfCleanExcelBean());
ExcelUtil<ZfCleanExcelBean> util = new ExcelUtil<>(ZfCleanExcelBean.class);
- util.exportExcel(response,list,"淇濇磥鏀剁撼璁板綍鏁版嵁");
+ util.exportExcel(response,list,"淇濇磥鏀剁撼瀵煎叆妯℃澘");
}
@@ -71,6 +71,19 @@
ExcelUtil<ZfClean> util = new ExcelUtil<>(ZfClean.class);
util.exportExcel(response, list, "淇濇磥鏀剁撼璁板綍鏁版嵁");
}
+ /**
+ * 瀵煎嚭淇濇磥鏀剁撼璁板綍鍒楄〃
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "淇濇磥鏀剁撼璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<ZfClean> list = zfCleanService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfClean> util = new ExcelUtil<>(ZfClean.class);
+ util.exportExcel(response, list, "淇濇磥鏀剁撼璁板綍鏁版嵁");
+ }
/**
* 瀵煎叆淇濇磥鏀剁撼璁板綍鍒楄〃
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 b26002a..f938ef0 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
@@ -52,11 +52,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfCollectionExcelBean> list = Collections.singletonList(new ZfCollectionExcelBean());
ExcelUtil<ZfCollectionExcelBean> util = new ExcelUtil<>(ZfCollectionExcelBean.class);
- util.exportExcel(response,list,"鏀惰棌鑽ｈ獕璁板綍鏁版嵁");
+ util.exportExcel(response,list,"鏀惰棌鑽ｈ獕瀵煎叆妯℃澘");
}
/**
@@ -72,6 +72,19 @@
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}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<ZfCollection> list = zfCollectionService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.class);
+ util.exportExcel(response, list, "鏀惰棌鍜岃崳瑾夎褰曟暟鎹�");
+ }
//
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
index b8acd25..58d7002 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfContactController.java
@@ -50,11 +50,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfContactExcelBean> list = Collections.singletonList(new ZfContactExcelBean());
ExcelUtil<ZfContactExcelBean> util = new ExcelUtil<>(ZfContactExcelBean.class);
- util.exportExcel(response,list,"閫氳褰曟暟鎹�");
+ util.exportExcel(response,list,"閫氳褰曞鍏ユā鏉�");
}
/**
@@ -72,6 +72,19 @@
}
/**
+ * 瀵煎嚭閫氳褰曡褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "閫氳褰曡褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<ZfContact> list = zfContactService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfContact> util = new ExcelUtil<>(ZfContact.class);
+ util.exportExcel(response, list, "閫氳褰曡褰曟暟鎹�");
+ }
+ /**
* 瀵煎叆閫氳褰曡褰曞垪琛�
*/
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java
index a9bc22e..9a197dd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorController.java
@@ -49,11 +49,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfDoctor> list = Collections.singletonList(new ZfDoctor());
ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
- util.exportExcel(response,list,"灏忓尰鐢熻褰曟暟鎹�");
+ util.exportExcel(response,list,"瀹跺涵灏忓尰鐢熷鍏ユā鏉�");
}
@@ -70,7 +70,19 @@
ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
util.exportExcel(response, list, "瀹跺涵灏忓尰鐢熻褰曟暟鎹�");
}
-
+ /**
+ * 瀵煎嚭瀹跺涵灏忓尰鐢熻褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "瀹跺涵灏忓尰鐢熻褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<ZfDoctor> list = zfDoctorService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfDoctor> util = new ExcelUtil<>(ZfDoctor.class);
+ util.exportExcel(response, list, "瀹跺涵灏忓尰鐢熻褰曟暟鎹�");
+ }
/**
* 瀵煎叆瀹跺涵灏忓尰鐢熻褰曞垪琛�
*/
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java
index d81738e..2521423 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEconomyController.java
@@ -50,11 +50,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfEconomyExcelBean> list = Collections.singletonList(new ZfEconomyExcelBean());
ExcelUtil<ZfEconomyExcelBean> util = new ExcelUtil<>(ZfEconomyExcelBean.class);
- util.exportExcel(response,list,"瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁");
+ util.exportExcel(response,list,"瀹跺涵鏀舵敮鍙拌处瀵煎叆妯℃澘");
}
/**
@@ -70,6 +70,19 @@
ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class);
util.exportExcel(response, list, "瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁");
}
+ /**
+ * 瀵煎嚭瀹跺涵鏀舵敮鍙拌处璁板綍鍒楄〃
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "瀹跺涵鏀舵敮鍙拌处璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<ZfEconomy> list = zfEconomyService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfEconomy> util = new ExcelUtil<>(ZfEconomy.class);
+ util.exportExcel(response, list, "瀹跺涵鏀舵敮鍙拌处璁板綍鏁版嵁");
+ }
//
/**
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 4d2309c..b871ac0 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
@@ -9,6 +9,7 @@
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfEquipment;
+import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.excel.ZfEconomyExcelBean;
import com.ruoyi.domain.excel.ZfEquipmentExcelBean;
import com.ruoyi.service.ZfEquipmentService;
@@ -51,11 +52,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfEquipmentExcelBean> list = Collections.singletonList(new ZfEquipmentExcelBean());
ExcelUtil<ZfEquipmentExcelBean> util = new ExcelUtil<>(ZfEquipmentExcelBean.class);
- util.exportExcel(response,list,"瀹跺涵璁惧璁板綍鏁版嵁");
+ util.exportExcel(response,list,"瀹跺涵璁惧瀵煎叆妯℃澘");
}
@@ -72,6 +73,19 @@
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) {
+ List<ZfEquipment> list = zfEquipmentService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}", list);
+ ExcelUtil<ZfEquipment> util = new ExcelUtil<ZfEquipment>(ZfEquipment.class);
+ util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+
+ }
+
//
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
index a45c468..c74d0a5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfEventController.java
@@ -18,6 +18,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -51,11 +52,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfEventExcelBean> list = Collections.singletonList(new ZfEventExcelBean());
ExcelUtil<ZfEventExcelBean> util = new ExcelUtil<>(ZfEventExcelBean.class);
- util.exportExcel(response,list,"瀹跺ぇ浜嬭璁板綍鏁版嵁");
+ util.exportExcel(response,list,"瀹跺ぇ浜嬭瀵煎叆妯℃澘");
}
@@ -66,7 +67,22 @@
@Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ZfEvent zfEvent) {
- List<ZfEvent> list = zfEventService.selectByCondition(zfEvent);
+ List<ZfEvent> list = new ArrayList<>();
+
+ list = zfEventService.selectByCondition(zfEvent);
+ log.info("瀵煎嚭璁板綍涓�:{}", list);
+ ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
+ util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+
+ }
+ /**
+ * 瀵煎嚭瀹跺涵澶т簨浠惰褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
+ List<ZfEvent> list = zfEventService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<ZfEvent> util = new ExcelUtil<>(ZfEvent.class);
util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
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..d923814 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
@@ -49,11 +49,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @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,"榄呭疇璁板綍瀵煎叆妯℃澘");
}
/**
@@ -69,6 +69,19 @@
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}")
+ 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, "榄呭疇璁板綍鏁版嵁");
+ }
/**
* 瀵煎叆榄呭疇璁板綍鍒楄〃
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
index a9c0085..b018a3e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java
@@ -61,11 +61,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfPetNote> list = Collections.singletonList(new ZfPetNote());
ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
- util.exportExcel(response,list,"榄呭疇澶囧繕褰曡褰曟暟鎹�");
+ util.exportExcel(response,list,"榄呭疇澶囧繕褰曞鍏ユā鏉�");
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
index bb1eb28..46810a1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.domain.excel.ZfEconomyExcelBean;
import com.ruoyi.domain.excel.ZfPropertyExcelBean;
@@ -47,11 +48,11 @@
/**
* 鑾峰彇瀵煎叆妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getExportModel(HttpServletResponse response){
List<ZfPropertyExcelBean> list = Collections.singletonList(new ZfPropertyExcelBean());
ExcelUtil<ZfPropertyExcelBean> util = new ExcelUtil<>(ZfPropertyExcelBean.class);
- util.exportExcel(response,list,"瀹跺涵璧勪骇璁板綍鏁版嵁");
+ util.exportExcel(response,list,"瀹跺涵璧勪骇瀵煎叆妯℃澘");
}
/**
@@ -67,6 +68,18 @@
ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
util.exportExcel(response, list, "瀹跺涵璧勪骇璁板綍鏁版嵁");
}
+ /**
+ * 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
+ */
+ @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
+ List<ZfProperty> list = zfPropertyService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}", list);
+ ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
+ util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+
+ }
//
/**
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java
index e9c57ef..497190b 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCleanExcelBean.java
@@ -5,6 +5,7 @@
import lombok.ToString;
import java.io.Serializable;
+import java.util.Date;
/**
* @Author Jinquan_Ou
@@ -52,6 +53,11 @@
*/
@Excel(name = "鏀剧疆鍦扮偣")
private String location;
+ /**
+ * 鍙戠敓鏃堕棿
+ */
+ @Excel(name = "鍙戠敓鏃堕棿")
+ private Date happenTime;
/**
* 澶囨敞
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
index 94c8883..c06f6c4 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfCollectionExcelBean.java
@@ -19,13 +19,19 @@
/**
* 绫诲埆
*/
- @Excel(name = "绫诲埆")
- private String type;
+// @Excel(name = "绫诲埆")
+// private String type;
+ /**
+ * 鑾峰緱鏃堕棿
+ */
+ @Excel(name = "鑾峰緱鏃堕棿", dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date happenTime;
/**
* 鍚嶅瓧
*/
- @Excel(name = "鍚嶅瓧")
+ @Excel(name = "鍚嶇О")
private String name;
/**
@@ -58,11 +64,5 @@
@Excel(name = "澶囨敞")
private String remark;
- /**
- * 鑾峰緱鏃堕棿
- */
- @Excel(name = "鍙戠敓鏃堕棿", dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
- private Date happenTime;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java
index e549d97..fdef2d3 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEconomyExcelBean.java
@@ -21,6 +21,12 @@
@Excel(name = "鏀舵敮绫诲瀷",readConverterExp = "0=鍩洪噾,1=鍙拌处")
private Integer type;
/**
+ * 鍙戠敓鏃堕棿
+ */
+ @Excel(name = "鍙戠敓鏃堕棿", dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date happenTime;
+ /**
* 鏀跺叆/鏀嚭
*/
@Excel(name = "鏀跺叆/鏀嚭")
@@ -56,10 +62,5 @@
@Excel(name = "澶囨敞")
private String remark;
- /**
- * 鍙戠敓鏃堕棿
- */
- @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
- private Date happenTime;
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java
index 1aaaada..7ea56e0 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEquipmentExcelBean.java
@@ -22,6 +22,17 @@
*/
@Excel(name = "璁惧鍚嶇О")
private String name;
+ /**
+ * 璁板綍鏃堕棿
+ */
+ @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date happenTime;
+ /**
+ * 鏄惁娉ㄩ攢
+ */
+ @Excel(name = "鏄惁娉ㄩ攢")
+ private Integer status;
/**
* 璐拱浜�
@@ -47,12 +58,7 @@
@Excel(name = "澶囨敞")
private String remark;
- /**
- * 璁板綍鏃堕棿
- */
- @Excel(name = "鏃堕棿", dateFormat = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
- private Date happenTime;
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java
index 01e7276..e5d850a 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/excel/ZfEventExcelBean.java
@@ -5,6 +5,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.util.Date;
/**
* @Author Jinquan_Ou
@@ -39,4 +40,11 @@
*/
@Excel(name="澶囨敞淇℃伅")
private String remark;
+
+
+ /**
+ * 鍙戠敓鏃堕棿
+ */
+ @Excel(name="鍙戠敓鏃堕棿")
+ private Date happenTime;;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
index 448bad5..a61ca00 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfProperty;
import org.springframework.web.multipart.MultipartFile;
@@ -19,7 +20,7 @@
List<ZfProperty> selectByCondition(ZfProperty zfProperty);
AjaxResult selectPropertyList(ZfProperty zfProperty,Integer pageNum,Integer pageSize);
-
+ List<ZfProperty> selectByIds( Long[] ids);
AjaxResult addData(ZfProperty zfProperty);
AjaxResult addData2(ZfProperty zfProperty);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfCleanService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfCleanService.java
index 1a02dac..89e4f16 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfCleanService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfCleanService.java
@@ -23,6 +23,7 @@
List<ZfClean> selectByCondition(ZfClean zfClean);
+ List<ZfClean> selectByIds(Long[] ids);
AjaxResult addData(ZfClean zfClean);
AjaxResult addData2(ZfClean zfClean);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java
index 4b84d99..118b331 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfCollectionService.java
@@ -22,6 +22,7 @@
List<ZfCollection> selectByCondition(ZfCollection zfCollection);
+ List<ZfCollection> selectByIds(Long[] ids);
AjaxResult importExcel(MultipartFile file);
AjaxResult addData2(ZfCollection zfCollection);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java
index fa6efe4..4130db4 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfContactService.java
@@ -22,7 +22,7 @@
AjaxResult selectDataList(ZfContact zfContact, Integer pageNum, Integer pageSize);
List<ZfContact> selectByCondition(ZfContact zfContact);
-
+ List<ZfContact> selectByIds(Long [] ids);
AjaxResult addData(ZfContact zfContact);
AjaxResult addData2(ZfContact zfContact);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java
index a2112ac..c748b58 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfDoctorService.java
@@ -20,6 +20,7 @@
AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize);
List<ZfDoctor> selectByCondition(ZfDoctor zfDoctor);
+ List<ZfDoctor> selectByIds(Long[] ids);
AjaxResult mySave(ZfDoctor zfDoctor);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java
index 73ea5cb..83c97cf 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfEconomyService.java
@@ -21,7 +21,7 @@
AjaxResult selectDataList(ZfEconomy zfEconomy, Integer pageNum, Integer pageSize);
List<ZfEconomy> selectByCondition(ZfEconomy zfEconomy);
-
+ List<ZfEconomy> selectByIds(Long [] ids);
AjaxResult importExcel(MultipartFile file);
AjaxResult addData2(ZfEconomy zfEconomy);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java
index 8df6b0e..428f483 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfEquipmentService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZfEquipment;
+import com.ruoyi.domain.ZfEvent;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -21,7 +22,7 @@
AjaxResult selectDataList(ZfEquipment zfEquipment, Integer pageNum, Integer pageSize);
List<ZfEquipment> selectByCondition(ZfEquipment zfEquipment);
-
+ List<ZfEquipment> selectByIds(Long[] ids);
AjaxResult addData(ZfEquipment zfEquipment);
AjaxResult addData2(ZfEquipment zfEquipment);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfEventService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfEventService.java
index ed4cf44..1a38063 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfEventService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfEventService.java
@@ -21,6 +21,7 @@
AjaxResult selectDataList(ZfEvent zfEvent, Integer pageNum, Integer pageSize);
List<ZfEvent> selectByCondition(ZfEvent zfEvent);
+ List<ZfEvent> selectByIds(Long[] ids);
AjaxResult addData(ZfEvent zfEvent);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfPetService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfPetService.java
index de1d08a..e02b9dd 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfPetService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfPetService.java
@@ -20,6 +20,6 @@
AjaxResult selectPetList(ZfPet zfPet, Integer pageNum, Integer pageSize);
List<ZfPet> selectByCondition(ZfPet zfPet);
-
+ List<ZfPet> selectByIds(Long[] ids);
AjaxResult mySave(ZfPet zfPet);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 6fd2c53..a684a63 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZInfoUser;
+import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPropertyMapper;
@@ -25,9 +26,7 @@
import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
import static com.ruoyi.constant.MenuAuthority.PROPERTY_LIST;
@@ -230,6 +229,16 @@
}
@Override
+ public List<ZfProperty> selectByIds(Long[] ids) {
+ List<ZfProperty> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
+ @Override
public AjaxResult addData(ZfProperty zfProperty) {
String familyIds = listFamilyIds();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
index e2e279b..928222c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -10,11 +10,9 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.domain.ZInfoUser;
-import com.ruoyi.domain.ZfClean;
+import com.ruoyi.domain.*;
import com.ruoyi.domain.ZfClean;
-import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfCleanMapper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfCleanService;
@@ -26,6 +24,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -208,6 +208,16 @@
return markOwnData(familyIds, beanRecords);
}
+ @Override
+ public List<ZfClean> selectByIds(Long[] ids) {
+ List<ZfClean> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
private static List<ZfClean> markOwnData(String familyIds, List<ZfClean> beanRecords) {
return beanRecords.stream().peek(record -> {
String recordFamilyId = record.getFamilyId();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index 080b9f5..4ca7ad4 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -23,6 +23,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -205,6 +207,16 @@
return markOwnData(familyIds, beanRecords);
}
+ @Override
+ public List<ZfCollection> selectByIds(Long[] ids) {
+ List<ZfCollection> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
private List<ZfCollection> markOwnData(String familyIds, List<ZfCollection> beanRecords) {
return beanRecords.stream().peek(record -> {
String recordFamilyId = record.getFamilyId();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
index 6677c56..d6a662c 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -24,6 +24,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -196,6 +198,16 @@
return markOwnData(familyIds, beanRecords);
}
+ @Override
+ public List<ZfContact> selectByIds(Long[] ids) {
+ List<ZfContact> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
private static List<ZfContact> markOwnData(String familyIds, List<ZfContact> beanRecords) {
return beanRecords.stream().peek(record -> {
String recordFamilyId = record.getFamilyId();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index 30e7509..41bf507 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -8,12 +8,15 @@
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.domain.ZfDoctor;
+import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfPet;
import com.ruoyi.mapper.ZfDoctorMapper;
import com.ruoyi.service.ZfDoctorService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -51,6 +54,16 @@
}
@Override
+ public List<ZfDoctor> selectByIds(Long[] ids) {
+ List<ZfDoctor> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
+ @Override
public AjaxResult mySave(ZfDoctor zfDoctor) {
//鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
LambdaQueryWrapper<ZfDoctor> lqw = uniqueCondition(zfDoctor);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 552d378..3badb7a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -23,6 +23,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -205,6 +207,16 @@
return markOwnData(familyIds, beanRecords);
}
+ @Override
+ public List<ZfEconomy> selectByIds(Long[] ids) {
+ List<ZfEconomy> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
private List<ZfEconomy> markOwnData(String familyIds, List<ZfEconomy> beanRecords) {
return beanRecords.stream().peek(record -> {
String recordFamilyId = record.getFamilyId();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
index d805402..8b1a5bf 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -22,6 +22,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -203,6 +205,15 @@
return markOwnData(familyIds, beanRecords);
}
+ @Override
+ public List<ZfEquipment> selectByIds(Long[] ids) {
+ List<ZfEquipment> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list; }
+
private static List<ZfEquipment> markOwnData(String familyIds, List<ZfEquipment> beanRecords) {
return beanRecords.stream().peek(record -> {
String recordFamilyId = record.getFamilyId();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index 97d08ef..0a139c9 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -24,6 +24,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -201,6 +203,16 @@
return markOwnData(familyIds, beanRecords);
}
+ @Override
+ public List<ZfEvent> selectByIds(Long[] ids) {
+ List<ZfEvent> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
private static List<ZfEvent> markOwnData(String familyIds, List<ZfEvent> beanRecords) {
return beanRecords.stream().peek(record -> {
String recordFamilyId = record.getFamilyId();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
index b6501de..5d1639f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfMaster;
+import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfPet;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPetMapper;
@@ -24,6 +25,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -67,6 +70,16 @@
}
@Override
+ public List<ZfPet> selectByIds(Long[] ids) {
+ List<ZfPet> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
+ @Override
@Transactional
public AjaxResult mySave(ZfPet zfPet) {
SysUser user = SecurityUtils.getLoginUser().getUser();
--
Gitblit v1.9.1