Parcourir la source

超分接口修改

private_deployment
lrh il y a 1 an
Parent
révision
5ec1d66e01
11 fichiers modifiés avec 17 ajouts et 14 suppressions
  1. +1
    -1
      suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java
  2. +1
    -1
      suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java
  3. +1
    -1
      suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java
  4. +1
    -1
      suimangCApi/src/main/java/com/iformall/controller/VideoController.java
  5. +2
    -2
      suimangSchedule/src/main/java/com/iformall/schedule/PhotoSpeakSchedule.java
  6. +1
    -1
      suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java
  7. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java
  8. +2
    -2
      suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java
  9. +1
    -1
      suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java
  10. +1
    -1
      suimangVideo/src/main/java/com/iformall/video/VideoExcutor.java
  11. +5
    -2
      suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java

+ 1
- 1
suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java Voir le fichier

@@ -154,7 +154,7 @@ public class VideoController extends BaseController {
@ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)})
public ResultData videoDetial(String videoId) {
try {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId);
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true);
return new ResultData(videoDetail);
} catch (Exception e) {
logger.error(e.getMessage());


+ 1
- 1
suimangCApi/src/main/java/com/iformall/controller/PhotoSpeakVideoController.java Voir le fichier

@@ -272,7 +272,7 @@ public class PhotoSpeakVideoController extends BaseController {
@ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)})
public ResultData videoDetial(String videoId) {
try {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId);
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true);
return new ResultData(videoDetail);
} catch (Exception e) {
logger.error(e.getMessage());


+ 1
- 1
suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java Voir le fichier

@@ -204,7 +204,7 @@ public class UserMouldVideoController extends BaseController {
@ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)})
public ResultData videoDetial(String videoId) {
try {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId);
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true);
return new ResultData(videoDetail);
} catch (Exception e) {
logger.error(e.getMessage());


+ 1
- 1
suimangCApi/src/main/java/com/iformall/controller/VideoController.java Voir le fichier

@@ -111,7 +111,7 @@ public class VideoController extends BaseController {
@ApiImplicitParam(name = "videoId", value = "视频编号", dataType = "String", paramType = "query", required = true)})
public ResultData videoDetial(String videoId) {
try {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId);
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(videoId,true);
return new ResultData(videoDetail);
} catch (Exception e) {
logger.error(e.getMessage());


+ 2
- 2
suimangSchedule/src/main/java/com/iformall/schedule/PhotoSpeakSchedule.java Voir le fichier

@@ -94,7 +94,7 @@ public class PhotoSpeakSchedule {
if (videos != null && videos.size() > 0) {
for (PhotoSpeakVideo video : videos) {
try {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId());
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false);
logger.info("userVideoDetailSchedule" + videoDetail);
if (videoDetail.isSuccess()
&& StringUtils.isNotBlank(videoDetail.getDuration())
@@ -143,7 +143,7 @@ public class PhotoSpeakSchedule {
if (videos != null && videos.size() > 0) {
for (PhotoSpeakVideo video : videos) {
try {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId());
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false);
if (videoDetail.isSuccess()
&& StringUtils.isNotBlank(videoDetail.getDuration())
&& !"0.0".equals(videoDetail.getDuration())) {


+ 1
- 1
suimangSchedule/src/main/java/com/iformall/schedule/VideoSchedule.java Voir le fichier

@@ -87,7 +87,7 @@ public class VideoSchedule {
if (videos != null && videos.size() > 0) {
for (UserMouldVideo video : videos) {
try {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId());
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(video.getVideoId(),false);
if (videoDetail.isSuccess()
&& StringUtils.isNotBlank(videoDetail.getDuration())
&& !"0.0".equals(videoDetail.getDuration())) {


+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/MusicInfoServiceImpl.java Voir le fichier

@@ -46,7 +46,7 @@ public class MusicInfoServiceImpl implements MusicInfoService {

@Override
public ResultData saveOrUpdate(MusicInfo record) {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVoiceId());
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVoiceId(),true);
if (videoDetail.isSuccess()
&& StringUtils.isNotBlank(videoDetail.getDuration())
&& !"0.0".equals(videoDetail.getDuration())


+ 2
- 2
suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java Voir le fichier

@@ -281,7 +281,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId());
Thread.sleep(1000);
if (StringUtils.isNotEmpty(progress) && progress.equals("complete")) {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId());
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true);
if (videoDetail.isSuccess()
&& StringUtils.isNotBlank(videoDetail.getDuration())
&& !"0.0".equals(videoDetail.getDuration())) {
@@ -409,7 +409,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService {
String progress = videoFactory.getExcutor(videoType).getVedioUploadProgress(result.getVideoId());
Thread.sleep(1000);
if (progress.equals("complete")) {
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId());
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(result.getVideoId(),true);
if (videoDetail.isSuccess()
&& StringUtils.isNotBlank(videoDetail.getDuration())
&& !"0.0".equals(videoDetail.getDuration())) {


+ 1
- 1
suimangService/src/main/java/com/iformall/service/sm/impl/VoiceMaterialServiceImpl.java Voir le fichier

@@ -137,7 +137,7 @@ public class VoiceMaterialServiceImpl implements VoiceMaterialService {
return;
}

VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVideoId());
VideUploadResult videoDetail = videoFactory.getExcutor(videoType).getVideoDetailWithCache(record.getVideoId(),true);
if (videoDetail.isSuccess()) {
record.setMaterial(videoDetail.getVideoUrl());
if(record.getId() != null){


+ 1
- 1
suimangVideo/src/main/java/com/iformall/video/VideoExcutor.java Voir le fichier

@@ -23,7 +23,7 @@ public interface VideoExcutor {

public String getVedioContentLength(String videoId);

VideUploadResult getVideoDetailWithCache(String videoId);
VideUploadResult getVideoDetailWithCache(String videoId,Boolean flag);

VideUploadResult getVideoDetailFromApi(String videoId);



+ 5
- 2
suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java Voir le fichier

@@ -141,8 +141,11 @@ public class AliyunVideoExcutor implements VideoExcutor {
}

@Override
public VideUploadResult getVideoDetailWithCache(String videoId) {
VideUploadResult videoDetail = UploadCacheHelper.getVideoDetail(redisTemplate, videoId);
public VideUploadResult getVideoDetailWithCache(String videoId,Boolean flag) {
VideUploadResult videoDetail = null;
if (flag){
videoDetail = UploadCacheHelper.getVideoDetail(redisTemplate, videoId);
}
if(videoDetail != null){
return videoDetail;
}else{


Chargement…
Annuler
Enregistrer