|
@@ -3,6 +3,7 @@ package cn.com.ctop.kuaishou.modules.batch.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.UserAllocation;
|
|
|
+import cn.com.ctop.common.module.enums.MaterialEnum;
|
|
|
import cn.com.ctop.common.module.mapper.MaterialInfoMapper;
|
|
|
import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
|
import cn.com.ctop.common.module.service.IUserAllocationService;
|
|
@@ -103,6 +104,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
private IKuaishouReportHourlyAccountService hourlyAccountService;
|
|
|
@Autowired
|
|
|
private KuaiShouAdvertiserBaseInfoMapper advertiserBaseInfoMapper;
|
|
|
+ @Autowired
|
|
|
+ private IKuaiShouImageGetService iKuaiShouImageGetService;
|
|
|
|
|
|
@Override
|
|
|
public void getAdvertiserReportHourly(CtopOauthToken token, Date startDate, Date endDate) {
|
|
@@ -240,11 +243,19 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
List<KuaiShouVideoGet> videoGets = new ArrayList<>();
|
|
|
for (int i = 0; i < details.size(); i++) {
|
|
|
var detailJson = details.getJSONObject(i);
|
|
|
+ if (Check.isNull(detailJson.getString("signature"))) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
var kuaiShouVideoGet = JSONObject.toJavaObject(detailJson, KuaiShouVideoGet.class);
|
|
|
kuaiShouVideoGet.setAccountId(token.getAccountId());
|
|
|
- kuaiShouVideoGet.setId("" + token.getAccountId() + kuaiShouVideoGet.getPhotoId());
|
|
|
+ kuaiShouVideoGet.setId(token.getAccountId() + kuaiShouVideoGet.getSignature());
|
|
|
kuaiShouVideoGet.setCreateTime(new Date());
|
|
|
kuaiShouVideoGet.setUpdateTime(new Date());
|
|
|
+ Integer type = MaterialEnum.getTypeBySize(kuaiShouVideoGet.getWidth(), kuaiShouVideoGet.getHeight());
|
|
|
+ if (!Check.isNull(type)) {
|
|
|
+ kuaiShouVideoGet.setMaterialType(type);
|
|
|
+ }
|
|
|
+
|
|
|
videoGets.add(kuaiShouVideoGet);
|
|
|
}
|
|
|
kuaiShouVideoGetService.replaceBatch(videoGets);
|
|
@@ -2180,12 +2191,16 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
if (!Check.isNull(dataJson)) {
|
|
|
KuaiShouVideoGet videoGet = new KuaiShouVideoGet();
|
|
|
videoGet.setAccountId(advertiserId);
|
|
|
- videoGet.setId(advertiserId + photoId);
|
|
|
+ videoGet.setId(advertiserId + signature);
|
|
|
videoGet.setWidth(dataJson.getInteger("width"));
|
|
|
videoGet.setHeight(dataJson.getInteger("height"));
|
|
|
videoGet.setUrl(dataJson.getString("url"));
|
|
|
videoGet.setPhotoId(dataJson.getString("photo_id"));
|
|
|
videoGet.setCoverUrl(dataJson.getString("cover_url"));
|
|
|
+ Integer type = MaterialEnum.getTypeBySize(dataJson.getInteger("width"), dataJson.getInteger("height"));
|
|
|
+ if (!Check.isNull(type)) {
|
|
|
+ videoGet.setMaterialType(type);
|
|
|
+ }
|
|
|
videoGet.setSignature(signature);
|
|
|
kuaiShouVideoGetService.saveOrUpdate(videoGet);
|
|
|
|
|
@@ -2211,6 +2226,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
* @param accessToken
|
|
|
* @param imageToken
|
|
|
*/
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public void imageGet(Long advertiserId, String accessToken, String imageToken) {
|
|
|
try {
|
|
@@ -2230,21 +2247,20 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
if (!Check.isNull(dataJson)) {
|
|
|
String signature = dataJson.getString("signature");
|
|
|
KuaiShouImageGet imageGet = new KuaiShouImageGet();
|
|
|
+ imageGet.setId(advertiserId + signature);
|
|
|
imageGet.setAccountId(advertiserId);
|
|
|
imageGet.setUrl(dataJson.getString("url"));
|
|
|
- imageGet.setWidth(dataJson.getLong("width"));
|
|
|
- imageGet.setHeight(dataJson.getLong("height"));
|
|
|
+ imageGet.setWidth(dataJson.getInteger("width"));
|
|
|
+ imageGet.setHeight(dataJson.getInteger("height"));
|
|
|
imageGet.setSize(dataJson.getLong("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(dataJson.getString("image_token"));
|
|
|
- Map<String, Object> deleteMap = new HashMap<>();
|
|
|
- deleteMap.put("account_id", advertiserId);
|
|
|
- deleteMap.put("signature", signature);
|
|
|
- imageGetMapper.deleteByMap(deleteMap);
|
|
|
-
|
|
|
- imageGetMapper.insert(imageGet);
|
|
|
+ iKuaiShouImageGetService.saveOrUpdate(imageGet);
|
|
|
}
|
|
|
} else {
|
|
|
log.error("获取广告图片失败,advertiser_id:{},返回信息:{}", advertiserId, resultJson);
|
|
@@ -2815,12 +2831,24 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
List<KuaiShouImageGet> imageGets = new ArrayList<>();
|
|
|
for (int i = 0; i < details.size(); i++) {
|
|
|
var detailJson = details.getJSONObject(i);
|
|
|
+
|
|
|
+ if (Check.isNull(detailJson.getString("signature"))) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
var kuaiShouImageGet = JSONObject.toJavaObject(detailJson, KuaiShouImageGet.class);
|
|
|
|
|
|
if (StringUtils.isBlank(String.valueOf(kuaiShouImageGet.getImageToken()))) {
|
|
|
continue;
|
|
|
}
|
|
|
+ kuaiShouImageGet.setId(token.getAccountId() + kuaiShouImageGet.getSignature());
|
|
|
kuaiShouImageGet.setAccountId(token.getAccountId());
|
|
|
+
|
|
|
+ Integer type = MaterialEnum.getTypeBySize(kuaiShouImageGet.getWidth(), kuaiShouImageGet.getHeight());
|
|
|
+ if (!Check.isNull(type)) {
|
|
|
+ kuaiShouImageGet.setMaterialType(type);
|
|
|
+ }
|
|
|
+
|
|
|
kuaiShouImageGet.setCreateTime(new Date());
|
|
|
kuaiShouImageGet.setUpdateTime(new Date());
|
|
|
imageGets.add(kuaiShouImageGet);
|
|
@@ -2858,8 +2886,8 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
|
|
|
List<KuaiShouImageGet> list = new ArrayList<>();
|
|
|
KuaiShouImageGet kuaiShouImageGet1 = new KuaiShouImageGet();
|
|
|
kuaiShouImageGet1.setUrl("http://static.yximgs.com/udata/pkg/markb21f94845c4350.jpg");
|
|
|
- kuaiShouImageGet1.setWidth(720L);
|
|
|
- kuaiShouImageGet1.setHeight(1280L);
|
|
|
+ kuaiShouImageGet1.setWidth(720);
|
|
|
+ kuaiShouImageGet1.setHeight(1280);
|
|
|
kuaiShouImageGet1.setSize(441029L);
|
|
|
kuaiShouImageGet1.setFormat("jpg");
|
|
|
kuaiShouImageGet1.setImageToken("market0a8a3104ee6b4f148ab21f94845c4350.jpg");
|