From 2bcbf32c439a5d7fbb20234b86e410347d5b806f Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期六, 15 四月 2023 16:04:48 +0800
Subject: [PATCH] 456
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 15 ++-------------
1 files changed, 2 insertions(+), 13 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 6cd7dad..5cde8b7 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
@@ -40,12 +40,10 @@
@GetMapping("/all")
public AjaxResult listAll(ZfProperty zfProperty){
-
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return zfPropertyService.selectPropertyList(zfProperty, pageNum, pageSize);
}
-
/**
* 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
@@ -69,16 +67,7 @@
@PostMapping("/importData")
public AjaxResult importData(@RequestParam("excelImport")MultipartFile file) throws Exception
{
- ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
- List<ZfProperty> propertyList = util.importExcel(file.getInputStream());
- log.info("璧勪骇鍒楄〃涓猴細{}",propertyList);
-
- if (zfPropertyService.saveBatch(propertyList)) {
- return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
- }
-
- return AjaxResult.error("瀵煎叆鏁版嵁澶辫触");
-
+ return zfPropertyService.importExcel(file);
}
/**
@@ -99,7 +88,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfProperty zfProperty)
{
- return toAjax(zfPropertyService.save(zfProperty));
+ return toAjax(zfPropertyService.addProperty(zfProperty));
}
/**
--
Gitblit v1.9.1