hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-10 19:36:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy1108-llf' into dev1107-121

Browse Source 
# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
#	servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java
This commit is contained in:
zhaolongfei
2024-11-10 19:31:56 +08:00
parent d147a5f861 2c94b09199
commit 9c5941fd6b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
View File

@@ -253,6 +253,7 @@ public class StudyCourseApi extends ApiBaseController{
List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
rs.put("contentStudys",items);//学习的内容
}
return success(rs);
}

13
servers/boe-server-all/src/main/java/com/xboe/system/api/SysUploaderApi.java
View File

@@ -11,7 +11,6 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.util.ObjectUtil;
import com.xboe.core.SysConstant;
import com.xboe.standard.BaseConstant;
import com.xboe.system.assist.entity.XUploadResultDto;
@@ -118,11 +117,17 @@ public class SysUploaderApi extends ApiBaseController{
// ex.printStackTrace();
log.error("处理失败",ex);
}
Long ls = 0L;
XUploadResultDto dto=new XUploadResultDto();
String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath();
Encoder encoder = new Encoder();
MultimediaInfo m = encoder.getInfo(new File(fileFullPath));
Long ls = m.getDuration() / 1000;//秒
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());