From cc967be03d754403ab4159a7229d50f46e731a2d Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期一, 24 四月 2023 22:56:49 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 20 +++-----------------
1 files changed, 3 insertions(+), 17 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 41cf919..cd2cfa9 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,14 +3,11 @@
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.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZfProperty;
-import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.service.IZfPropertyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +41,6 @@
return zfPropertyService.selectPropertyList(zfProperty, pageNum, pageSize);
}
-
/**
* 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
*/
@@ -55,7 +51,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, "瀹跺涵璧勪骇璁板綍鏁版嵁");
}
//
@@ -67,18 +63,8 @@
@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);
}
-
/**
* 鑾峰彇瀹跺涵璧勪骇璁板綍璇︾粏淇℃伅
@@ -98,7 +84,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfProperty zfProperty)
{
- return toAjax(zfPropertyService.save(zfProperty));
+ return zfPropertyService.addData2(zfProperty);
}
/**
--
Gitblit v1.9.1