From e5d57ddda13dc26cfe481668b17f97143a23efdd Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 30 五月 2022 18:12:37 +0800
Subject: [PATCH] 排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
index 2d518d5..66450dd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java
@@ -143,22 +143,27 @@
*/
@GetMapping("/getLedFilesList")
public ResponseVO<Object> getLedFilesList() {
- LambdaQueryWrapper<LedSFile> wrapper = Wrappers.lambdaQuery(LedSFile.class);
+ LambdaQueryWrapper<LEDProgramFile> wrapper = Wrappers.lambdaQuery(LEDProgramFile.class);
if (SecurityUtils.getClientId() != null) {
- wrapper.eq(LedSFile::getCilentId, SecurityUtils.getUserId()).or(w -> {
- w.eq(LedSFile::getUserId, SecurityUtils.getUserId());
+ wrapper.eq(LEDProgramFile::getClientId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(LEDProgramFile::getUserId, SecurityUtils.getUserId());
});
}
- List<LedSFile> list = SpringContextHolder.getBean(LedSFileService.class).list(wrapper);
+ List<LEDProgramFile> list = SpringContextHolder.getBean(LEDProgramFileService.class).list(wrapper);
List<Map> mapList = new ArrayList<>();
Map map;
- for (LedSFile bean : list) {
+ for (LEDProgramFile bean : list) {
map = new LinkedHashMap();
- map.put("fileId", bean.getFileId());
+ map.put("fileId", bean.getId());
map.put("fileType", bean.getFileType());
map.put("fileUrl", bean.getFileUrl());
- map.put("fileSize", bean.getFileSize());
+ map.put("fileSize", bean.getSize());
+ if ("mp4".equals(bean.getFileType())) {
+ map.put("screenShot", bean.getScreenShot());
+ } else {
+ map.put("screenShot", bean.getFileUrl());
+ }
mapList.add(map);
}
return ResponseUtil.success(mapList);
--
Gitblit v1.9.3