From d1abd1ef9c4b33d4c0fe9c15a43996b2f9f67048 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期三, 19 七月 2023 20:38:35 +0800
Subject: [PATCH] 4577
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 68 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 22 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..4dceeef 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,23 +1,25 @@
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.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.PageParams;
+import com.ruoyi.domain.ZfEquipment;
import com.ruoyi.domain.ZfProperty;
+import com.ruoyi.domain.excel.ZfEconomyExcelBean;
+import com.ruoyi.domain.excel.ZfPropertyExcelBean;
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;
+import java.util.Collections;
import java.util.List;
import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
@@ -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,34 +42,55 @@
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.selectDataList(zfProperty, pageNum, pageSize);
+ }
+
+ /**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ZfPropertyExcelBean> list = Collections.singletonList(new ZfPropertyExcelBean());
+ ExcelUtil<ZfPropertyExcelBean> util = new ExcelUtil<>(ZfPropertyExcelBean.class);
+ util.exportExcel(response,list,"瀹跺涵璧勪骇瀵煎叆妯℃澘");
}
// /**
-// * 鏌ヨ瀹跺涵璧勪骇璁板綍鍒楄〃
+// * 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
// */
-//// @PreAuthorize("@ss.hasPermi('system:property:list')")
-// @GetMapping("/list")
-// public TableDataInfo list(ZfProperty zfProperty)
+//// @PreAuthorize("@ss.hasPermi('system:property:export')")
+// @Log(title = "瀹跺涵璧勪骇璁板綍", businessType = BusinessType.EXPORT)
+// @PostMapping("/export")
+// public void export(HttpServletResponse response,ZfProperty zfProperty)
// {
-// startPage();
-// List<ZfProperty> list = zfPropertyService.selectZfPropertyList(zfProperty);
-// return getDataTable(list);
+// List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
+// log.info("瀵煎嚭璁板綍涓�:{}",list);
+// ExcelUtil<ZfProperty> util = new ExcelUtil<>(ZfProperty.class);
+// util.exportExcel(response, list, "瀹跺涵璧勪骇璁板綍鏁版嵁");
// }
-
/**
* 瀵煎嚭瀹跺涵璧勪骇璁板綍鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('system:property:export')")
- @Log(title = "瀹跺涵璧勪骇璁板綍", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response,ZfProperty zfProperty)
- {
- List<ZfProperty> list = zfPropertyService.selectByCondition(zfProperty);
+ @Log(title = "瀹跺涵澶т簨浠惰褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export/{ids}")
+ public void export1(HttpServletResponse response, @PathVariable Long[] ids) {
+ List<ZfProperty> list = zfPropertyService.selectByIds(ids);
+ 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 +109,7 @@
@PostMapping
public AjaxResult add(@RequestBody ZfProperty zfProperty)
{
- return toAjax(zfPropertyService.save(zfProperty));
+ return zfPropertyService.addData(zfProperty);
}
/**
@@ -96,7 +120,7 @@
@PutMapping
public AjaxResult edit(@RequestBody ZfProperty zfProperty)
{
- return toAjax(zfPropertyService.updateById(zfProperty));
+ return zfPropertyService.updateData(zfProperty);
}
//
/**
@@ -107,6 +131,6 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(zfPropertyService.removeByIds(Arrays.asList(ids)));
+ return zfPropertyService.deleteData(ids);
}
}
--
Gitblit v1.9.1