|  | @@ -2,16 +2,20 @@ package cn.com.ctop.manage.modules.material.service.impl;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.entity.CtopOauthToken;
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.entity.MaterialInfo;
 | 
	
		
			
				|  |  | +import cn.com.ctop.common.module.entity.MaterialParameter;
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.enums.MaterialEnum;
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
 | 
	
		
			
				|  |  | +import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.service.IFileInfoService;
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.utils.Check;
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.utils.LoadFileUtil;
 | 
	
		
			
				|  |  |  import cn.com.ctop.common.module.utils.PropertiesUtils;
 | 
	
		
			
				|  |  |  import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
 | 
	
		
			
				|  |  | +import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideoGet;
 | 
	
		
			
				|  |  |  import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
 | 
	
		
			
				|  |  | +import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoGetService;
 | 
	
		
			
				|  |  |  import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 | 
	
		
			
				|  |  |  import cn.com.ctop.manage.modules.material.service.IMaterialUploadService;
 | 
	
		
			
				|  |  |  import com.alibaba.fastjson.JSONArray;
 | 
	
	
		
			
				|  | @@ -128,6 +132,10 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | +    @Autowired
 | 
	
		
			
				|  |  | +    private MaterialParameterMapper parameterMapper;
 | 
	
		
			
				|  |  | +    @Autowired
 | 
	
		
			
				|  |  | +    private IKuaiShouVideoGetService kuaiShouVideoGetService;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      private void kuaiShouUpload(String mediaId, JSONArray materialArray, JSONArray accountArray) {
 | 
	
		
			
				|  |  |          for (int j = 0; j < materialArray.size(); j++) {
 | 
	
	
		
			
				|  | @@ -200,10 +208,34 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
 | 
	
		
			
				|  |  |                                                  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |                                              } else if ("VIDEO".equals(materialInfo.getType())) {
 | 
	
		
			
				|  |  | -                                                kuaishouInterfaceService.videoGet(accountId, ctopOauthToken.getAccessToken(), dataJson.getString("photo_id"), dataJson.getString("signature"));
 | 
	
		
			
				|  |  | +                                                // kuaishouInterfaceService.videoGet(accountId, ctopOauthToken.getAccessToken(), dataJson.getString("photo_id"), dataJson.getString("signature"));
 | 
	
		
			
				|  |  | +                                                String photoId = dataJson.getString("photo_id");
 | 
	
		
			
				|  |  | +                                                String signature = dataJson.getString("signature");
 | 
	
		
			
				|  |  | +                                                KuaiShouVideoGet videoGet = new KuaiShouVideoGet();
 | 
	
		
			
				|  |  | +                                                videoGet.setAccountId(accountId);
 | 
	
		
			
				|  |  | +                                                videoGet.setId(accountId + signature);
 | 
	
		
			
				|  |  | +                                                videoGet.setUrl(url);
 | 
	
		
			
				|  |  | +                                                QueryWrapper<MaterialParameter> parameterQueryWrapper = new QueryWrapper<>();
 | 
	
		
			
				|  |  | +                                                parameterQueryWrapper.eq("material_id", materialId);
 | 
	
		
			
				|  |  | +                                                parameterQueryWrapper.last("limit 1");
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                                                MaterialParameter materialParameter = parameterMapper.selectOne(parameterQueryWrapper);
 | 
	
		
			
				|  |  | +                                                if (!Check.isNull(materialParameter)) {
 | 
	
		
			
				|  |  | +                                                    String width = materialParameter.getWidth();
 | 
	
		
			
				|  |  | +                                                    String height = materialParameter.getHeight();
 | 
	
		
			
				|  |  | +                                                    videoGet.setWidth(Integer.valueOf(width));
 | 
	
		
			
				|  |  | +                                                    videoGet.setHeight(Integer.valueOf(height));
 | 
	
		
			
				|  |  | +                                                    Integer type = MaterialEnum.getTypeBySize(Integer.valueOf(width), Integer.valueOf(height));
 | 
	
		
			
				|  |  | +                                                    if (!Check.isNull(type)) {
 | 
	
		
			
				|  |  | +                                                        videoGet.setMaterialType(type);
 | 
	
		
			
				|  |  | +                                                    }
 | 
	
		
			
				|  |  | +                                                }
 | 
	
		
			
				|  |  | +                                                videoGet.setPhotoId(photoId);
 | 
	
		
			
				|  |  | +                                                //    videoGet.setCoverUrl(dataJson.getString("cover_url"));
 | 
	
		
			
				|  |  | +                                                videoGet.setSignature(signature);
 | 
	
		
			
				|  |  | +                                                kuaiShouVideoGetService.saveOrUpdate(videoGet);
 | 
	
		
			
				|  |  |                                              }
 | 
	
		
			
				|  |  |                                          }
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |                                          log.info("素材同步完成,accountId:{},code:{},返回信息:{}", accountId, materialInfo.getCode(), resultJson);
 | 
	
		
			
				|  |  |                                      } else {
 | 
	
		
			
				|  |  |                                          log.error("同步素材失败,返回信息:{},请求参数:{}", resultJson, requestJson);
 |