From 2f165d7451198c69080d667853e97701ea466318 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 30 七月 2023 15:39:36 +0800
Subject: [PATCH] 51896
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java | 14 ++++++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java | 10 +++++
zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java | 2 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java | 11 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetNoteController.java | 11 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java | 14 ++++++-
zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java | 2 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java | 10 +++++
zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java | 3 +
zhang-content/src/main/java/com/ruoyi/service/ZIdeaService.java | 4 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java | 14 ++++++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java | 13 ++++++
12 files changed, 101 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
index e9e5c5e..d90baaa 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
@@ -68,13 +68,23 @@
util.exportExcel(response, emptyList, "鐧惧勾蹇冩効璁板綍鏁版嵁");
}
+ @Log(title = "鐧惧勾蹇冩効璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response)
+ {
+ List<ZIdea> list = zIdeaService.selectByCondition();
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZIdea> util = new ExcelUtil<>(ZIdea.class);
+ util.exportExcel(response, list, "鐧惧勾蹇冩効璁板綍鏁版嵁");
+ }
+
/**
* 瀵煎嚭鐧惧勾蹇冩効璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "鐧惧勾蹇冩効璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export/{ids}")
- public void export(HttpServletResponse response,@PathVariable Long[] ids)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response,@PathVariable Long[] ids)
{
List<ZIdea> list = zIdeaService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}",list);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
index 59edb03..8b60c42 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -73,8 +73,18 @@
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export/{ids}")
- public void export(HttpServletResponse response,@PathVariable Long[] ids)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response)
+ {
+ List<ZProperty> list = zPropertyService.selectByCondition();
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZProperty> util = new ExcelUtil<>(ZProperty.class);
+ util.exportExcel(response, list, "涓汉璐骇璁板綍鏁版嵁");
+ }
+
+ @Log(title = "涓汉璐骇璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response,@PathVariable Long[] ids)
{
List<ZProperty> list = zPropertyService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}",list);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
index 5f85dcb..d79a65d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -67,13 +67,23 @@
util.exportExcel(response, emptyList, "钘忓績瀵嗚璁板綍鏁版嵁");
}
+ @Log(title = "钘忓績瀵嗚璁板綍", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response)
+ {
+ List<ZSecret> list = zSecretService.selectByCondition();
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZSecret> util = new ExcelUtil<>(ZSecret.class);
+ util.exportExcel(response, list, "钘忓績瀵嗚璁板綍鏁版嵁");
+ }
+
/**
* 瀵煎嚭钘忓績瀵嗚璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@Log(title = "钘忓績瀵嗚璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export/{ids}")
- public void export(HttpServletResponse response,@PathVariable Long[] ids)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response,@PathVariable Long[] ids)
{
List<ZSecret> list = zSecretService.selectByIds(ids);
log.info("瀵煎嚭璁板綍涓�:{}",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 9ee1cb5..6b79a8d 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
@@ -85,6 +85,17 @@
util.exportExcel(response, list, "榄呭疇澶囧繕褰曡褰曟暟鎹�");
}
+ @Log(title = "榄呭疇澶囧繕褰曡褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export1(HttpServletResponse response, ZfPetNote zfPetNote, @PathVariable Long[] ids)
+ {
+ List<ZfPetNote> list = zfPetNoteService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfPetNote> util = new ExcelUtil<>(ZfPetNote.class);
+ util.exportExcel(response, list, "榄呭疇澶囧繕褰曡褰曟暟鎹�");
+ }
+
+
/**
* 瀵煎叆榄呭疇澶囧繕褰曡褰曞垪琛�
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZIdeaService.java b/zhang-content/src/main/java/com/ruoyi/service/ZIdeaService.java
index 6b15e44..f5d5f1b 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZIdeaService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZIdeaService.java
@@ -25,6 +25,8 @@
AjaxResult importExcel(MultipartFile file);
AjaxResult mySave(ZIdea zIdea);
-
+
+
+ List<ZIdea> selectByCondition();
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java b/zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java
index 9dbf640..98b29a3 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZPropertyService.java
@@ -27,4 +27,6 @@
AjaxResult mySave(ZProperty zProperty);
+ List<ZProperty> selectByCondition();
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java b/zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java
index b523695..73d3119 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZSecretService.java
@@ -26,4 +26,7 @@
AjaxResult mySave(ZSecret zSecret);
+ List<ZSecret> selectByCondition();
+
+
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
index ca41b7c..9edaa01 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
@@ -24,4 +24,6 @@
AjaxResult getAllPetNoteByPetId(Integer pageNum,Integer pageSize,String pid,ZfPetNote zfPetNote);
AjaxResult mySave(ZfPetNote zfPetNote);
+
+ List<ZfPetNote> selectByIds(Long[] ids);
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
index ce7ff0b..51a54dd 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZIdeaServiceImpl.java
@@ -115,6 +115,16 @@
}
@Override
+ public List<ZIdea> selectByCondition() {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZIdea zIdea = new ZIdea();
+ LambdaQueryWrapper<ZIdea> lqw = buildCondition(zIdea, userId);
+ return list(lqw);
+
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
index 3aabe7e..a126d31 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZProperty;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZPropertyMapper;
import com.ruoyi.service.ZPropertyService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -116,6 +117,15 @@
}
@Override
+ public List<ZProperty> selectByCondition() {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZProperty zProperty = new ZProperty();
+ LambdaQueryWrapper<ZProperty> lqw = buildCondition(zProperty, userId);
+ return list(lqw);
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
index 87e1d66..4173dda 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
@@ -116,6 +116,17 @@
}
@Override
+ public List<ZSecret> selectByCondition() {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZSecret zSecret = new ZSecret();
+
+ LambdaQueryWrapper<ZSecret> lqw = buildCondition(zSecret, userId);
+ return list(lqw);
+
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
index 74f6489..c4abfff 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
@@ -10,11 +10,14 @@
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfPet;
import com.ruoyi.domain.ZfPetNote;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPetNoteMapper;
import com.ruoyi.service.ZfPetNoteService;
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;
@@ -81,6 +84,16 @@
}
}
+ @Override
+ public List<ZfPetNote> selectByIds(Long[] ids) {
+ List<ZfPetNote> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
private LambdaQueryWrapper<ZfPetNote> uniqueCondition(ZfPetNote zfPetNote) {
LambdaQueryWrapper<ZfPetNote> lqw = new LambdaQueryWrapper<>();
lqw.eq(StringUtils.isNotEmpty(zfPetNote.getTitle()),ZfPetNote::getTitle,zfPetNote.getTitle());
--
Gitblit v1.9.1