| 
				
				
					
				
				
				 | 
			
			 | 
			@@ -8,11 +8,13 @@ import com.iformall.common.ResultData; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.domain.po.base.BaseEntity; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.domain.po.sm.PhotoSpeakVideo; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.domain.po.sm.UserMouldVideo; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.domain.po.sm.VoiceInfo; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.enums.EnumVideoStatus; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.exception.MallinkException; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.service.sm.MouldPatchService; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.service.sm.PhotoSpeakVideoService; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.service.sm.UserMouldVideoService; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.service.sm.VoiceInfoService; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.video.VideoFactory; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.iformall.video.entity.VideUploadResult; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import io.swagger.annotations.Api; | 
		
		
	
	
		
			
				| 
				
					
				
				
					
				
				
				 | 
			
			 | 
			@@ -50,6 +52,9 @@ public class PhotoSpeakVideoController extends BaseController { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    @Autowired | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    private MouldPatchService mouldPatchService; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    @Autowired | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    private VoiceInfoService voiceInfoService; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    @Autowired | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    private VideoFactory videoFactory; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
	
		
			
				| 
				
					
				
				
					
				
				
				 | 
			
			 | 
			@@ -82,6 +87,10 @@ public class PhotoSpeakVideoController extends BaseController { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        if(photoSpeakVideo == null || !photoSpeakVideo.getUserId().equals(getMemberId())){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"未找到用户数据"); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        if(photoSpeakVideo.getVoiceMouldId() != null){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            VoiceInfo voiceInfo = voiceInfoService.getById(photoSpeakVideo.getVoiceMouldId()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            photoSpeakVideo.setVoiceInfo(voiceInfo); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			        return new ResultData(photoSpeakVideo); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			    } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
	
		
			
				| 
				
					
				
				
				
				 | 
			
			 | 
			
  |