From c751933819729c429a16353dced879bdb8615395 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 21 三月 2022 15:06:33 +0800
Subject: [PATCH] LED熙讯---任务详情图片路径
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 15 +++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/entity/ProgramPro.java | 3 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java | 4 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LedSFileController.java | 6 +++---
4 files changed, 25 insertions(+), 3 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 4453982..014cf2b 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
@@ -61,9 +61,9 @@
fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
}
FileOperationRecord fileOperationRecord = new FileOperationRecord();
- if("mp4".equals(fileUploadDto.getFileType())){
- fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
- }
+// if("mp4".equals(fileUploadDto.getFileType())){
+// fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
+// }
BeanUtils.copyProperties(fileUploadDto, fileOperationRecord);
fileOperationRecord.setDataType(dateType);
fileOperationRecordService.save(fileOperationRecord);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/ProgramPro.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/ProgramPro.java
index a0003c3..0c54cf9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/ProgramPro.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/ProgramPro.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.entity;
+import com.sandu.ximon.dao.domain.LedSFile;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
@@ -19,4 +20,6 @@
private boolean isOthers=true;
private int version; //2涓虹畝鏄撹妭鐩紝9涓哄畾鐐硅妭鐩紝鍏朵粬涓洪珮绾ц妭鐩紝璇疯祴鍊煎叾浠栥��
+ private List<LedSFile> fileList;
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
index 37e172e..f8da784 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramFileService.java
@@ -17,6 +17,7 @@
public class LEDProgramFileService extends BaseServiceImpl<LEDProgramFileMapper, LEDProgramFile> {
private final LEDProgramFileMapper ledProgramFileMapper;
+ private final ClientService clientService;
public boolean addProgramFile(LEDProgramFileParam param) {
LEDProgramFile file = new LEDProgramFile();
@@ -25,6 +26,9 @@
if (SecurityUtils.getClientId() != null) {
file.setUserName(SecurityUtils.getUsername());
}
+// if("mp4".equals(fileUploadDto.getFileType())){
+// fileUploadDto.setScreenShot(fileUploadDto.getFileUrl()+"?x-oss-process=video/snapshot,t_10000,m_fast");
+// }
return save(file);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index 12336bf..856ea90 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -13,6 +13,7 @@
import com.sandu.ximon.admin.utils.JsonUtil;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.admin.utils.LogUtils;
+import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.mapper.PoleXixunPlayerEntityMapper;
@@ -34,6 +35,7 @@
private final RealtimeServerBean realtimeServerBean;
private final PoleLightemitService poleLightemitService;
private final ClientService clientService;
+ private final LedSFileService xiXunFileService;
public boolean insert(ProgramPro programPro) {
@@ -68,6 +70,8 @@
public Object getByPid(Long pid) {
PoleXixunPlayerEntity byId = getById(pid);
+ List<Long> fileIds=new ArrayList<>();
+ List<LedSFile> file=new ArrayList<>();
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
@@ -77,6 +81,17 @@
programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
programPro.setProgramId(pid);
programPro.setScreenShot(byId.getScreenShot());
+ programPro.getLayers().forEach(
+ layerPro -> {
+ layerPro.getSources().forEach(
+ sourcePro -> {
+ long fileId = Long.parseLong(sourcePro.getId());
+ file.add(xiXunFileService.getById(fileId));
+ }
+ );
+ }
+ );
+ programPro.setFileList(file);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.3