From 36bf931a5195a53f1b43213032320effcef87d39 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 07 三月 2022 10:23:56 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
index 81c6b15..aaeb3d5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/IpVolumeFileController.java
@@ -1,10 +1,15 @@
 package com.sandu.ximon.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.ximon.admin.param.IpVolumeFileParam;
 import com.sandu.ximon.admin.param.ReceiveParam;
 import com.sandu.ximon.admin.service.IpVolumeFileService;
+import com.sandu.ximon.dao.domain.IpVolumeFile;
+import com.sandu.ximon.dao.domain.LedSFile;
 import lombok.AllArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -16,7 +21,7 @@
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("v1/IpVolumeFile")
+@RequestMapping("/v1/IpVolumeFile")
 public class IpVolumeFileController {
 
     private final IpVolumeFileService ipVolumeFileService;
@@ -26,13 +31,18 @@
         return ResponseUtil.success(ipVolumeFileService.addFile(fileParam));
     }
 
-    @PostMapping("/delete/{id}")
+    @PostMapping("/delete/{fileId}")
     public ResponseVO<Object> deleteFile(@PathVariable Long fileId){
         return ResponseUtil.success(ipVolumeFileService.deleteFile(fileId));
     }
 
-    @PostMapping("/list}")
-    public ResponseVO<Object> list(@RequestBody ReceiveParam receiveParam){
-        return ResponseUtil.success(ipVolumeFileService.list(ipVolumeFileService.listFile(receiveParam)));
+    @GetMapping("/list")
+    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword){
+        LambdaQueryWrapper<IpVolumeFile> wrapper = ipVolumeFileService.listFile(baseConditionVO, keyword);
+        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+      /*  if (null != keyword) {
+            wrapper.like(IpVolumeFile::getFileName, keyword);
+        }*/
+        return ResponseUtil.success(ipVolumeFileService.list(wrapper));
     }
 }

--
Gitblit v1.9.3