From 898bd4e44b8b0abe35cf98bf104aec44ec06dee2 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 22 四月 2025 20:57:59 +0800
Subject: [PATCH] bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java | 143 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 140 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
index f3708e4..aaea9bd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java
@@ -1,9 +1,29 @@
package com.ruoyi.web.controller.zhang;
-import org.springframework.web.bind.annotation.RequestMapping;
+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.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.ZfCollection;
+import com.ruoyi.domain.excel.ZfCleanExcelBean;
+import com.ruoyi.domain.excel.ZfCollectionExcelBean;
+import com.ruoyi.service.ZfCollectionService;
+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 org.springframework.web.bind.annotation.RestController;
+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;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
/**
* <p>
@@ -14,8 +34,125 @@
* @since 2023-03-12
*/
@RestController
+@Slf4j
@RequestMapping("/zfCollection")
-public class ZfCollectionController {
+public class ZfCollectionController extends BaseController {
+
+ @Autowired
+ private ZfCollectionService zfCollectionService;
+
+
+ @GetMapping("/all")
+ public AjaxResult listAll(ZfCollection zfCollection){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zfCollectionService.selectDataList(zfCollection, pageNum, pageSize);
+ }
+
+ @GetMapping("/type")
+ public AjaxResult listType(){
+ return zfCollectionService.listType();
+ }
+
+ /**
+ * 鏍规嵁id鏌ヨ
+ */
+ @GetMapping()
+ public AjaxResult listById(Long id){
+ return AjaxResult.success(zfCollectionService.getById(id));
+ }
+
+ /**
+ * 鑾峰彇瀵煎叆妯℃澘
+ */
+ @PostMapping("/model")
+ public void getExportModel(HttpServletResponse response){
+ List<ZfCollectionExcelBean> list = Collections.singletonList(new ZfCollectionExcelBean());
+ ExcelUtil<ZfCollectionExcelBean> util = new ExcelUtil<>(ZfCollectionExcelBean.class);
+ util.exportExcel(response,list,"鏀惰棌鑽ｈ獕瀵煎叆妯℃澘");
+ }
+
+ /**
+ * 瀵煎嚭鏀惰棌鍜岃崳瑾夎褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "鏀惰棌鍜岃崳瑾夎褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, ZfCollection zfCollection)
+ {
+ List<ZfCollection> list = zfCollectionService.selectByCondition(zfCollection);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.class);
+ util.exportExcel(response, list, "鏀惰棌鍜岃崳瑾夎褰曟暟鎹�");
+ }
+ /**
+ * 瀵煎嚭鏀惰棌鍜岃崳瑾夎褰曞垪琛�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:export')")
+ @Log(title = "鏀惰棌鍜岃崳瑾夎褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export1/{ids}")
+ public void export(HttpServletResponse response, @PathVariable Long[] ids)
+ {
+ List<ZfCollection> list = zfCollectionService.selectByIds(ids);
+ log.info("瀵煎嚭璁板綍涓�:{}",list);
+ ExcelUtil<ZfCollection> util = new ExcelUtil<>(ZfCollection.class);
+ util.exportExcel(response, list, "鏀惰棌鍜岃崳瑾夎褰曟暟鎹�");
+ }
+//
+
+ /**
+ * 瀵煎叆鏀惰棌鍜岃崳瑾夎褰曞垪琛�
+ */
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PostMapping("/importData")
+ public AjaxResult importData(@RequestParam("excelImport") MultipartFile file) throws Exception
+ {
+ return zfCollectionService.importExcel(file);
+ }
+
+ /**
+ * 鑾峰彇鏀惰棌鍜岃崳瑾夎褰曡缁嗕俊鎭�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(zfCollectionService.getById(id));
+ }
+//
+ /**
+ * 鏂板鏀惰棌鍜岃崳瑾夎褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:add')")
+ @Log(title = "鏀惰棌鍜岃崳瑾夎褰�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody ZfCollection zfCollection)
+ {
+ return zfCollectionService.addData(zfCollection);
+ }
+
+ /**
+ * 淇敼鏀惰棌鍜岃崳瑾夎褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:edit')")
+ @Log(title = "鏀惰棌鍜岃崳瑾夎褰�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody ZfCollection zfCollection)
+ {
+ return zfCollectionService.updateData(zfCollection);
+ }
+//
+ /**
+ * 鎵归噺鍒犻櫎鏀惰棌鍜岃崳瑾夎褰�
+ */
+// @PreAuthorize("@ss.hasPermi('system:property:remove')")
+ @Log(title = "鏀惰棌鍜岃崳瑾夎褰�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return zfCollectionService.deleteData(ids);
+ }
+
}
--
Gitblit v1.9.1