From 150b8d2d049ceb69cb301d12c38aae190c21a05c Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 13 五月 2023 21:52:36 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
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 5cde8b7..bb1eb28 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
@@ -3,15 +3,13 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfProperty;
-import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.domain.excel.ZfEconomyExcelBean;
+import com.ruoyi.domain.excel.ZfPropertyExcelBean;
import com.ruoyi.service.IZfPropertyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +18,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -46,6 +45,16 @@
}
/**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
+ @GetMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ZfPropertyExcelBean> list = Collections.singletonList(new ZfPropertyExcelBean());
+ ExcelUtil<ZfPropertyExcelBean> util = new ExcelUtil<>(ZfPropertyExcelBean.class);
+ util.exportExcel(response,list,"瀹跺涵璧勪骇璁板綍鏁版嵁");
+ }
+
+ /**
* 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
*/
// @PreAuthorize("@ss.hasPermi('system:property:export')")
@@ -55,7 +64,7 @@
{
List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
log.info("瀵煎嚭璁板綍涓�:{}",list);
- ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
+ ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
util.exportExcel(response, list, "瀹跺涵璧勪骇璁板綍鏁版嵁");
}
//
@@ -88,7 +97,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfProperty zfProperty)
{
- return toAjax(zfPropertyService.addProperty(zfProperty));
+ return zfPropertyService.addData2(zfProperty);
}
/**
--
Gitblit v1.9.1