视频获取编码、转码受视频类型影响（去除）

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionClassService.java

@@ -221,7 +221,7 @@ public class QuestionClassService {
 
     //视频转换mq
     private void convertVideo(TQuestionExplain research) {
-        if ("mp4".equals(research.getSuffix()) && !"h264".equals(research.getMp4code())) {
+        if (!"h264".equals(research.getMp4code())) {
             messageSender.convertVideo(research.getQcpid(), research.getFilepath(), "explain");
         }
     }
@@ -375,7 +375,7 @@ public class QuestionClassService {
         List<TQuestionExplain> list = questionExplainMapper.listByQuestionId(questionExplain.getQuestionid(),questionExplain.getQctype());
         if(list!=null && list.size()>0){
             for(TQuestionExplain qe : list){
-                if ("mp4".equals(qe.getSuffix()) && !"h264".equals(qe.getMp4code())) {
+                if (!"h264".equals(qe.getMp4code())) {
                     messageSender.convertVideo(qe.getQcpid(), qe.getFilepath(), "explain");
                 }
             }

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/GuideService.java

@@ -144,8 +144,13 @@ public class GuideService {
                     Integer resourceclass = r.getResourceclass();
                     if (resourceclass == 3 || resourceclass == 4 || resourceclass == 6) {
                         r.setConverted(1);
-                    } else if (resourceclass == 5 && ("flv".equals(r.getSuffix()) || "h264".equals(r.getMp4code()))) {
-                        r.setConverted(1);
+                    } else if (resourceclass == 5) {
+                        if("h264".equals(r.getMp4code())){
+                            r.setConverted(1);
+                        } else {
+                            r.setConverted(0);
+                        }
+
                     }
                     //保存资源信息
                     resourceMapper.insertSelective(r);

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/ResourceService.java

@@ -82,8 +82,14 @@ public class ResourceService {
         Integer resourceclass = model.getResourceclass();
         if (resourceclass == 3 || resourceclass == 4 || resourceclass == 6) {
             model.setConverted(1);
-        } else if (resourceclass == 5 && ("flv".equals(model.getSuffix()) || "h264".equals(model.getMp4code()))) {
-            model.setConverted(1);
+        } else if (resourceclass == 5) {
+            if("h264".equals(model.getMp4code())){
+                model.setConverted(1);
+            } else {
+                model.setConverted(0);
+            }
+        } else {
+
         }
         resourceMapper.insertSelective(model);//保存资源
 

sstudy/src/main/java/com/xhkjedu/sstudy/utils/ConvertUtil.java

@@ -85,7 +85,7 @@ public class ConvertUtil extends JedisUtil {
     public String videoTransfer(ResourceVo resource) {
         String resourceurl = resource.getResourceurl();
         String suffix = resource.getSuffix();
-        if ("mp4".equals(suffix) && !"h264".equals(resource.getMp4code())) {
+        if (!"h264".equals(resource.getMp4code())) {
             if (redisHandle(resource.getResourceurl(), resource.getResourceid())) return null;
             resourceurl = messageSender.convertResource(resource);
         }