From abd77acc13c646cd23d0521a386fe0a1210ffdf7 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 20 四月 2022 15:46:41 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramFileController.java | 21 +++++++++++++++++++--
1 files changed, 19 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 33bebca..eb243c1 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,10 +1,16 @@
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.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.LEDProgramFileService;
+import com.sandu.ximon.dao.domain.LEDProgramFile;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +27,7 @@
public class LEDProgramFileController {
private final LEDProgramFileService ledProgramFileService;
+ private PermissionConfig permissionConfig;
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramFileParam param) {
@@ -33,8 +40,18 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listfile() {
- return ResponseUtil.success(ledProgramFileService.list(ledProgramFileService.listFile()));
+ public ResponseVO<Object> listfile(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.LED_FILE_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
+ LambdaQueryWrapper<LEDProgramFile> wrapper = ledProgramFileService.listFile();
+ if (keyword != null&&!keyword.isEmpty()) {
+ wrapper.like(LEDProgramFile::getName, keyword);
+ }
+
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ return ResponseUtil.successPage(ledProgramFileService.list(wrapper));
}
}
--
Gitblit v1.9.3