|
@@ -8,7 +8,6 @@ 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.service.IMaterialImageInfoService;
|
|
|
import cn.com.ctop.common.module.service.IMaterialParameterService;
|
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
|
import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
@@ -18,6 +17,7 @@ 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.IMaterialUploadImageService;
|
|
|
import cn.com.ctop.manage.modules.material.service.IMaterialUploadService;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
@@ -72,7 +72,7 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
|
|
|
@Autowired
|
|
|
private IKuaiShouVideoGetService kuaiShouVideoGetService;
|
|
|
@Autowired
|
|
|
- private IMaterialImageInfoService iMaterialImageInfoService;
|
|
|
+ private IMaterialUploadImageService materialUploadImageService;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -197,15 +197,7 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
|
|
|
public void run() {
|
|
|
try {
|
|
|
log.info("快手文件多线程上传:{},accountId:{}", Thread.currentThread().getName(), accountId);
|
|
|
- String url = "";
|
|
|
- if ("VIDEO".equals(materialInfo.getType())) {
|
|
|
- url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.VIDEO_UPLOAD;
|
|
|
-
|
|
|
- } else if ("IMAGE".equals(materialInfo.getType())) {
|
|
|
- url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.IMAGE_UPLOAD;
|
|
|
- requestJson.put("type", "2");
|
|
|
- requestJson.put("upload_type", "1");
|
|
|
- }
|
|
|
+ String url = PropertiesUtils.getConfig("kuaishou_api_url") + KuaishouInterfaceConstant.VIDEO_UPLOAD;
|
|
|
|
|
|
String result = exceptInfoForRestTemplate(url, requestJson, headerMap);
|
|
|
JSONObject resultJson = JSONObject.parseObject(result);
|
|
@@ -213,58 +205,36 @@ public class MaterialUploadServiceImpl implements IMaterialUploadService {
|
|
|
if (resultJson.getInteger("code") == 0) {
|
|
|
JSONObject dataJson = resultJson.getJSONObject("data");
|
|
|
if (!Check.isNull(dataJson)) {
|
|
|
- /* if ("IMAGE".equals(materialInfo.getType())) {
|
|
|
- // kuaishouInterfaceService.imageGet(accountId, ctopOauthToken.getAccessToken(), dataJson.getString("image_token"));
|
|
|
- if (!Check.isNull(dataJson)) {
|
|
|
- String signature = dataJson.getString("signature");
|
|
|
- String image_token = dataJson.getString("image_token");
|
|
|
- KuaiShouImageGet imageGet = new KuaiShouImageGet();
|
|
|
- imageGet.setId(accountId + image_token);
|
|
|
- imageGet.setAccountId(accountId);
|
|
|
- imageGet.setUrl(dataJson.getString("url"));
|
|
|
- imageGet.setWidth(dataJson.getInteger("width"));
|
|
|
- imageGet.setHeight(dataJson.getInteger("height"));
|
|
|
- imageGet.setSize(dataJson.getInteger("size"));
|
|
|
- imageGet.setFormat(dataJson.getString("format"));
|
|
|
- Integer type = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
|
|
|
- if (!Check.isNull(type)) {
|
|
|
- imageGet.setMaterialType(type);
|
|
|
- }
|
|
|
- imageGet.setSignature(signature);
|
|
|
- imageGet.setImageToken(image_token);
|
|
|
- iKuaiShouImageGetService.saveOrUpdate(imageGet);
|
|
|
- }
|
|
|
|
|
|
- } else*/
|
|
|
- if ("VIDEO".equals(materialInfo.getType())) {
|
|
|
- // 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 + photoId);
|
|
|
- videoGet.setUrl(materialInfo.getUrl());
|
|
|
- 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);
|
|
|
- }
|
|
|
+
|
|
|
+ // 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 + photoId);
|
|
|
+ videoGet.setUrl(materialInfo.getUrl());
|
|
|
+ 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);
|
|
|
- iMaterialImageInfoService.uploadImage(videoGet.getId(), accountId, ctopOauthToken.getAccessToken());
|
|
|
}
|
|
|
+ videoGet.setPhotoId(photoId);
|
|
|
+ // videoGet.setCoverUrl(dataJson.getString("cover_url"));
|
|
|
+ videoGet.setSignature(signature);
|
|
|
+ kuaiShouVideoGetService.saveOrUpdate(videoGet);
|
|
|
+ materialUploadImageService.uploadImage(videoGet.getId(), accountId, ctopOauthToken.getAccessToken());
|
|
|
+
|
|
|
}
|
|
|
log.info("快手素材同步完成,accountId:{},code:{},返回信息:{}", accountId, materialInfo.getCode(), resultJson);
|
|
|
} else {
|