From 9aff69d38fa75981560ce21807be4b30122ef8f4 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期四, 13 四月 2023 23:32:06 +0800
Subject: [PATCH] 授权接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 32 ++++----------------------------
1 files changed, 4 insertions(+), 28 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..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
@@ -7,6 +7,7 @@
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;
@@ -37,27 +38,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);
-// }
/**
* 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
@@ -81,18 +67,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 +88,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfProperty zfProperty)
{
- return toAjax(zfPropertyService.save(zfProperty));
+ return toAjax(zfPropertyService.addProperty(zfProperty));
}
/**
--
Gitblit v1.9.1