From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
index ed0820a..1b369ab 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java
@@ -1,9 +1,14 @@
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.LEDProgramFileParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LEDProgramFileService;
+import com.sandu.ximon.dao.domain.LEDProgramFile;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -26,8 +31,19 @@
return ResponseUtil.success(ledProgramFileService.addProgramFile(param));
}
- @PostMapping("/delete{fileId}")
- public ResponseVO<Object> addLEDProgram(@PathVariable Long fileId) {
+ @PostMapping("/delete/{fileId}")
+ public ResponseVO<Object> deleteLEDProgram(@PathVariable Long fileId) {
return ResponseUtil.success(ledProgramFileService.deleteFile(fileId));
}
+
+ @GetMapping("/list")
+ public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
+ if(null!=keyword){
+ wrapper.like(LEDProgramFile::getName,keyword);
+ }
+ return ResponseUtil.successPage(ledProgramFileService.list(wrapper));
+ }
+
}
--
Gitblit v1.9.3