From ffb8b05b06cbe324d9f8c1c4d8918661fd2cc675 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 11:33:49 +0800
Subject: [PATCH] 设备列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
index 0cfacca..dda2b8f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java
@@ -21,6 +21,8 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import java.util.List;
+
/**
* @Author liuhaonan
* @Date 2022/1/13 17:02
@@ -59,13 +61,9 @@
if (!permissionConfig.check(MenuEnum.LED_FILE_S_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- LambdaQueryWrapper<LedSFile> wrapper = ledProgramFileService.listFile();
- if (keyword != null && !keyword.isEmpty()) {
- wrapper.like(LedSFile::getOriginName, keyword);
- }
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return ResponseUtil.success(ledProgramFileService.list(wrapper));
+ List<LedSFile> listfile = ledProgramFileService.listfile(baseConditionVO, keyword);
+ return ResponseUtil.success(listfile);
}
@PostMapping("/uploading/{dateType}")
@@ -85,7 +83,7 @@
/**
* 鏂囦欢涓婁紶 鏃ュ織璁板綍寮�濮�
*/
- String content = "鏂囦欢鍐呭:"+ JSON.toJSONString(fileUploadDto);
+ String content = "鏂囦欢鍐呭:" + JSON.toJSONString(fileUploadDto);
StoreOperationRecordsUtils.storeOperationData(null, null, "鏂囦欢涓婁紶", content);
/**
* 鏂囦欢涓婁紶 鏃ュ織璁板綍缁撴潫
--
Gitblit v1.9.3