| 
				
				
					
				
				
				 | 
			
			 | 
			@@ -90,7 +90,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            record.setVideoType(personMould.getVideoType()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            JSONObject personMouldObject = new JSONObject(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            personMouldObject.put("id",personMould.getId()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            personMouldObject.put("videoType",personMould.getVideoType()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            personMouldObject.put("title",personMould.getTitle()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            personMouldObject.put("mouldSmId",personMould.getMouldSmId()); | 
		
		
	
	
		
			
				| 
				
				
				
					
				
				 | 
			
			 | 
			@@ -105,8 +104,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                JSONObject personObject = JSONObject.parseObject(record.getPersonJson()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                if(personObject != null && !personObject.isEmpty()){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                    isPerson = true; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                    Long id = personObject.getLong("id"); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                    Integer type = personObject.getInteger("type"); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                    String material = personObject.getString("material"); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                    int x = personObject.getIntValue("x"); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                    int y = personObject.getIntValue("y"); | 
		
		
	
	
		
			
				| 
				
				
				
					
				
				 | 
			
			 | 
			@@ -121,8 +118,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            //给数字人默认属性 | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            if(!isPerson){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                JSONObject personObject = new JSONObject(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                personObject.put("id",personMould.getId()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                personObject.put("type",EnumMouldPatchType.person_mould.getCode()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                personObject.put("material",personMould.getMaterial()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                //竖屏  数字人尺寸按竖屏尺寸处理 1080*1920 | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                if(EnumVideoType.VERTICAL_PLATE.getCode().equals(record.getVideoType())){ | 
		
		
	
	
		
			
				| 
				
					
				
				
					
				
				
				 | 
			
			 | 
			@@ -163,7 +158,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                JSONObject voiceMouldObject = new JSONObject(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                voiceMouldObject.put("title",voiceMould.getTitle()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                voiceMouldObject.put("languages",voiceMould.getLanguages()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                voiceMouldObject.put("mouldSmId",voiceMould.getMouldSmId()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                voiceMouldObject.put("personType",0); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                voiceMouldObject.put("personTypeStr","默认"); | 
		
		
	
	
		
			
				| 
				
				
				
					
				
				 | 
			
			 | 
			@@ -185,7 +179,6 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			                return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"未查询到背景信息"); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            } | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            JSONObject backgroundObject = new JSONObject(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            backgroundObject.put("id",background.getId()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            backgroundObject.put("title",background.getTitle()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            backgroundObject.put("material",background.getMaterial()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			            record.setBackgroundSm(backgroundObject.toJSONString()); | 
		
		
	
	
		
			
				| 
				
					
				
				
				
				 | 
			
			 | 
			
  |