From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +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/ZSecretController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
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..9ceeac3 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
@@ -48,6 +48,11 @@
return zSecretService.selectDataList(zSecret,pageNum,pageSize);
}
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zSecretService.listType();
+ }
+
/**
* 鏍规嵁id鏌ヨ
*/
@@ -59,7 +64,7 @@
/**
* 妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getModel(HttpServletResponse response){
ZSecret zSecret = new ZSecret();
List<ZSecret> emptyList = Collections.singletonList(zSecret);
@@ -67,13 +72,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);
--
Gitblit v1.9.1