Merge remote-tracking branch 'origin/master'

EricsHu

2022-12-08 6ca7ca9feb1cc4a35cab3a3af8dddfae2580bddc

 src/main/java/com/qxueyou/scc/teach/res/service/impl/resitem/ResItemVideoService.java

@@ -4,6 +4,8 @@
import java.io.File;
import java.util.Date;

import com.obs.services.ObsClient;
import com.obs.services.model.ObsObject;
import com.qxueyou.scc.sys.utils.VideoUtil;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
@@ -39,8 +41,6 @@
    @Autowired
    ICacheService cacheService;

    @Value("${scc.resRootPath}")
    String resRootPath;

    @Override
    public String add(String fileId, String name) {
@@ -52,7 +52,7 @@
            TraceUtils.setCreateTrace(resVideo);
        try {
            resVideo.setFileId(fileId);
            resVideo.setPlayTime((int) VideoUtil.getMp4Duration(resRootPath +"/"+ file.getPath()));
            resVideo.setPlayTime((int) VideoUtil.getMp4Duration(file.getPath()));
            resVideo.setName(name);
            resVideo.setMediaVideoId(mediaVideoId);
            resVideo.setStatus(ResItemVideo.STATUS_LINEUP);
@@ -83,7 +83,7 @@

        try {
            video.setDeleteFlag(false);
            video.setPlayTime((int) VideoUtil.getMp4Duration(resRootPath +"/"+ file.getPath()));
            video.setPlayTime((int) VideoUtil.getMp4Duration(file.getPath()));
            video.setName(file.getFileName());
            video.setOrigUrl(file.getPath());
            video.setStatus(MediaVideo.STATUS_LINEUP);