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); 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; } 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); }
@@ -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(); }
