|
@@ -1,8 +1,10 @@
|
|
package cn.com.ctop.kuaishou.modules.batch.service.impl;
|
|
package cn.com.ctop.kuaishou.modules.batch.service.impl;
|
|
|
|
|
|
import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
|
|
+import cn.com.ctop.common.module.entity.MaterialCutFrame;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.entity.UserAllocation;
|
|
import cn.com.ctop.common.module.enums.MaterialEnum;
|
|
import cn.com.ctop.common.module.enums.MaterialEnum;
|
|
|
|
+import cn.com.ctop.common.module.service.IMaterialCutFrameService;
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
import cn.com.ctop.common.module.utils.*;
|
|
import cn.com.ctop.common.module.utils.*;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.*;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.*;
|
|
@@ -2922,7 +2924,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
}
|
|
}
|
|
String result = HttpUtils.httpPostRequest(url, param, headers);
|
|
String result = HttpUtils.httpPostRequest(url, param, headers);
|
|
JSONObject resultJson = JSONObject.parseObject(result);
|
|
JSONObject resultJson = JSONObject.parseObject(result);
|
|
-// System.out.println(resultJson.toJSONString());
|
|
|
|
if (Check.isNull(resultJson)) {
|
|
if (Check.isNull(resultJson)) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -2973,12 +2974,12 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
suZhaoService.submit(new Runnable() {
|
|
suZhaoService.submit(new Runnable() {
|
|
@Override
|
|
@Override
|
|
public void run() {
|
|
public void run() {
|
|
- videoGetService.getKeyFrame(token, accountId, md5, String.valueOf(photo_id));
|
|
|
|
-
|
|
|
|
|
|
+ List<MaterialCutFrame> cutFrames = cutFrameService.getListByVideoSignature(md5);
|
|
|
|
+ if(null!=cutFrames&&!cutFrames.isEmpty()){
|
|
|
|
+ videoGetService.getKeyFrame(token, accountId, md5, String.valueOf(photo_id));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
});
|
|
});
|
|
-
|
|
|
|
-
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2986,6 +2987,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private IMaterialCutFrameService cutFrameService;
|
|
private static ExecutorService executorService = Executors.newFixedThreadPool(10);
|
|
private static ExecutorService executorService = Executors.newFixedThreadPool(10);
|
|
|
|
|
|
@Override
|
|
@Override
|