From 8e3f58c38fd3d552125ada6afdf88e7fc2b380a0 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期一, 17 四月 2023 12:47:32 +0800
Subject: [PATCH] 888

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfCollectionController.java |  104 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 101 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..73aa728 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,26 @@
 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.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.List;
+
+import static com.ruoyi.common.core.page.TableSupport.PAGE_NUM;
+import static com.ruoyi.common.core.page.TableSupport.PAGE_SIZE;
 
 /**
  * <p>
@@ -14,8 +31,89 @@
  * @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);
+    }
+
+    /**
+     * 瀵煎嚭鏀惰棌鍜岃崳瑾夎褰曞垪琛�
+     */
+//    @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, "鏀惰棌鍜岃崳瑾夎褰曟暟鎹�");
+    }
+//
+
+    /**
+     * 瀵煎叆鏀惰棌鍜岃崳瑾夎褰曞垪琛�
+     */
+    @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.addData2(zfCollection);
+    }
+
+    /**
+     * 淇敼鏀惰棌鍜岃崳瑾夎褰�
+     */
+//    @PreAuthorize("@ss.hasPermi('system:property:edit')")
+    @Log(title = "鏀惰棌鍜岃崳瑾夎褰�", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ZfCollection zfCollection)
+    {
+        return toAjax(zfCollectionService.updateById(zfCollection));
+    }
+//
+    /**
+     * 鎵归噺鍒犻櫎鏀惰棌鍜岃崳瑾夎褰�
+     */
+//    @PreAuthorize("@ss.hasPermi('system:property:remove')")
+    @Log(title = "鏀惰棌鍜岃崳瑾夎褰�", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(zfCollectionService.removeByIds(Arrays.asList(ids)));
+    }
+
 
 }
 

--
Gitblit v1.9.1