From ab06f7043e4192556c4d9881b0430bcb6cc75f50 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期三, 03 五月 2023 23:28:02 +0800
Subject: [PATCH] 完成家根网
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 36 ++++--------------------------------
1 files changed, 4 insertions(+), 32 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 ee85e92..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;
@@ -37,27 +34,12 @@
@Autowired
private IZfPropertyService zfPropertyService;
- @Autowired
- private TokenService tokenService;
-
@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.selectUserList(zfProperty, pageNum, pageSize);
+ return zfPropertyService.selectPropertyList(zfProperty, pageNum, pageSize);
}
-
-// /**
-// * 鏌ヨ瀹跺涵璧勪骇璁板綍鍒楄〃
-// */
-//// @PreAuthorize("@ss.hasPermi('system:property:list')")
-// @GetMapping("/list")
-// public TableDataInfo list(ZfProperty zfProperty)
-// {
-// startPage();
-// List<ZfProperty> list = zfPropertyService.selectZfPropertyList(zfProperty);
-// return getDataTable(list);
-// }
/**
* 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
@@ -69,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, "瀹跺涵璧勪骇璁板綍鏁版嵁");
}
//
@@ -81,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);
}
-
/**
* 鑾峰彇瀹跺涵璧勪骇璁板綍璇︾粏淇℃伅
@@ -112,7 +84,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfProperty zfProperty)
{
- return toAjax(zfPropertyService.save(zfProperty));
+ return zfPropertyService.addData2(zfProperty);
}
/**
--
Gitblit v1.9.1