From 1573d3f7c7271a80b4e6dc3874455aec784fdd47 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期六, 15 四月 2023 12:01:50 +0800
Subject: [PATCH] 111
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 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 de7d918..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
@@ -1,20 +1,22 @@
package com.ruoyi.web.controller.zhang;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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.page.TableDataInfo;
+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.PageParams;
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;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
@@ -28,6 +30,7 @@
* @Author Jin_quan Ou
* @Date 2023-03-09 10:18
*/
+@Slf4j
@RestController
@RequestMapping("/family/property")
public class ZfPropertyController extends BaseController
@@ -39,20 +42,8 @@
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);
-// }
/**
* 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
@@ -63,10 +54,22 @@
public void export(HttpServletResponse response,ZfProperty zfProperty)
{
List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
ExcelUtil<ZfProperty> util = new ExcelUtil<ZfProperty>(ZfProperty.class);
util.exportExcel(response, list, "瀹跺涵璧勪骇璁板綍鏁版嵁");
}
//
+
+ /**
+ * 瀵煎叆瀹跺涵璧勪骇璁板綍鍒楄〃
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport")MultipartFile file) throws Exception
+ {
+ return zfPropertyService.importExcel(file);
+ }
+
/**
* 鑾峰彇瀹跺涵璧勪骇璁板綍璇︾粏淇℃伅
*/
@@ -85,7 +88,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfProperty zfProperty)
{
- return toAjax(zfPropertyService.save(zfProperty));
+ return toAjax(zfPropertyService.addProperty(zfProperty));
}
/**
--
Gitblit v1.9.1