diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java index 84f47abb..1241d912 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java @@ -1,9 +1,6 @@ package com.xboe.system.api; -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; +import java.io.*; import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; @@ -14,6 +11,11 @@ import java.util.Set; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.xboe.core.SysConstant; +import com.xboe.standard.BaseConstant; +import com.xboe.system.assist.entity.XUploadResultDto; +import it.sauronsoftware.jave.Encoder; +import it.sauronsoftware.jave.MultimediaInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -115,8 +117,23 @@ public class SysUploaderApi extends ApiBaseController{ // ex.printStackTrace(); log.error("处理失败",ex); } - - return wrap(xur); + Long ls = 0L; + XUploadResultDto dto=new XUploadResultDto(); + String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath(); + try { + Encoder encoder = new Encoder(); + MultimediaInfo m = encoder.getInfo(new File(fileFullPath)); + ls = m.getDuration() / 1000;//秒 + }catch (Exception e){ + e.printStackTrace(); + log.error("读取视频时长错误"); + } + dto.setDuration(ls); + dto.setDisplayName(xur.getDisplayName()); + dto.setFilePath(xur.getFilePath()); + dto.setFileType(xur.getFileType()); + dto.setHttpPath(xur.getHttpPath()); + return wrap(dto); } catch (Exception e) { log.error("upload file error ",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java b/servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java new file mode 100644 index 00000000..9efec465 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java @@ -0,0 +1,9 @@ +package com.xboe.system.assist.entity; + +import com.xboe.core.upload.XUploadResult; +import lombok.Data; + +@Data +public class XUploadResultDto extends XUploadResult { + private Long duration; +}