From 09afe52c3ef2a09055fb621b25aa5416394a5382 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 14 十月 2022 16:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/GetListOnBindingController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 ec00e81..dfe475c 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
@@ -1,13 +1,11 @@
package com.sandu.ximon.admin.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.util.StringUtil;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
-import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
@@ -131,10 +129,12 @@
map.put("id", bean.getId());
map.put("name", bean.getName());
map.put("playerName", bean.getPlayerName());
+ map.put("playerId", bean.getPlayerId());
map.put("sn", bean.getSn());
map.put("poleId", bean.getPoleId());
map.put("poleName", bean.getPoleName());
map.put("onlineStatus", bean.getOnlineStatus());
+ map.put("resolution", bean.getWidth() + " * " + bean.getHeight());
mapList.add(map);
}
return ResponseUtil.success(mapList);
@@ -145,22 +145,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);
@@ -202,6 +207,7 @@
Map map;
for (PoleLightemitEntity bean : poleLightemitEntities) {
map = new LinkedHashMap();
+ map.put("lightemitId", bean.getLightemitId());
map.put("lightemitName", bean.getLightemitName());
map.put("lightemitControlCode", bean.getLightemitControlCode());
map.put("isOnLine", bean.isOnLine());
--
Gitblit v1.9.3