转码代码提交

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -244,19 +244,32 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         }
         //
         String old = JSONObject.toJSONString(obj);
-
-        if (StringUtils.isNotEmpty(obj.getUrl())) {
-            obj.setUrl(doTranscod(obj.getUrl()));
+        boolean flag = false;
+        String url = doTranscod(obj.getUrl());
+        if (StringUtils.isNotEmpty(url)) {
+            obj.setUrl(url);
+            flag = true;
+        }
+        String metronomeUrl = doTranscod(obj.getMetronomeUrl());
+        if (StringUtils.isNotEmpty(metronomeUrl)) {
+            obj.setMetronomeUrl(metronomeUrl);
+            flag = true;
         }
-        if (StringUtils.isNotEmpty(obj.getMetronomeUrl())) {
-            obj.setMetronomeUrl(doTranscod(obj.getMetronomeUrl()));
+        String mp3Url = doTranscod(obj.getMp3Url());
+        if (StringUtils.isNotEmpty(mp3Url)) {
+            obj.setMp3Url(mp3Url);
+            flag = true;
         }
-        if (StringUtils.isNotEmpty(obj.getMp3Url())) {
-            obj.setMp3Url(doTranscod(obj.getMp3Url()));
+        String metronomeMp3Url = doTranscod(obj.getMetronomeMp3Url());
+        if (StringUtils.isNotEmpty(metronomeMp3Url)) {
+            obj.setMetronomeMp3Url(metronomeMp3Url);
+            flag = true;
         }
-        if (StringUtils.isNotEmpty(obj.getMetronomeMp3Url())) {
-            obj.setMetronomeMp3Url(doTranscod(obj.getMetronomeMp3Url()));
+
+        if(!flag){
+            return;
         }
+
         String now = JSONObject.toJSONString(obj);
 
         //更新obj
@@ -286,8 +299,11 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
      * @param fileUrl
      * @return
      */
-    private String doTranscod(String fileUrl){
+    private String doTranscod(String fileUrl) {
         String transcodUrl = "";
+        if (StringUtils.isEmpty(fileUrl)) {
+            return transcodUrl;
+        }
         //文件扩展名
         String expand = FileUtil.getFileExpandByPath(fileUrl);
         //将远程文件写入本地临时文件路径
@@ -313,9 +329,9 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                 UploadReturnBean uploadReturnBean = uploadFileService.uploadFile(inputStream, expand);
                 transcodUrl = uploadReturnBean.getUrl();
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-        }finally {
+        } finally {
             //删除服务器中的文件
             /*if(tempFile.exists()){
                 tempFile.delete();

mec-util/src/main/java/com/ym/mec/util/file/FileUtil.java

@@ -13,7 +13,7 @@ public class FileUtil {
     public static String getFileExpandByPath(String filePath) {
         int i = filePath.lastIndexOf(".");
         if (i > 0) {
-            return filePath.substring(+1);
+            return filePath.substring(i+1);
         }
         return "";
     }

mec-web/src/main/java/com/ym/mec/web/controller/SysMusicScoreController.java

@@ -9,11 +9,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.ym.mec.biz.dal.dao.SysMusicScoreCategoriesDao;
 import com.ym.mec.biz.dal.dto.MusicScoreDto;