|
@@ -15,6 +15,7 @@ import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouAppPackageService;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
|
|
import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouAppList;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppListService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouAppListService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
|
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
|
|
import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannel;
|
|
import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannel;
|
|
import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannelAppInfo;
|
|
import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannelAppInfo;
|
|
import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannelCreateStrategy;
|
|
import cn.com.ctop.kuaishou.modules.channel.entity.KuaishouChannelCreateStrategy;
|
|
@@ -94,6 +95,9 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
private IKuaiShouAppListService kuaiShouAppListService;
|
|
private IKuaiShouAppListService kuaiShouAppListService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
|
+ private IKuaishouInterfaceService kuaishouInterfaceService;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
private IAiKuaiShouAppInfoService appInfoService;
|
|
private IAiKuaiShouAppInfoService appInfoService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -324,6 +328,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
|
|
log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
|
|
}
|
|
}
|
|
//使用范围是账户时,查询旧app来做匹配
|
|
//使用范围是账户时,查询旧app来做匹配
|
|
|
|
+ kuaishouInterfaceService.getAppList(accountId, token.getAccessToken());
|
|
List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(accountId);
|
|
List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(accountId);
|
|
strategy.setImageToken(tokenJson.getString("imageToken"));
|
|
strategy.setImageToken(tokenJson.getString("imageToken"));
|
|
strategy.setAccountId(accountId);
|
|
strategy.setAccountId(accountId);
|
|
@@ -360,6 +365,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
|
|
log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
|
|
}
|
|
}
|
|
//使用范围是账户时,查询旧app来做匹配
|
|
//使用范围是账户时,查询旧app来做匹配
|
|
|
|
+ kuaishouInterfaceService.getAppList(strategy.getAccountId(), token.getAccessToken());
|
|
List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(strategy.getAccountId());
|
|
List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(strategy.getAccountId());
|
|
strategy.setImageToken(tokenJson.getString("imageToken"));
|
|
strategy.setImageToken(tokenJson.getString("imageToken"));
|
|
if (url.contains(CHANNEL_STR)) {
|
|
if (url.contains(CHANNEL_STR)) {
|
|
@@ -425,9 +431,9 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
KuaishouChannelAppInfo channelAppInfo = new KuaishouChannelAppInfo();
|
|
KuaishouChannelAppInfo channelAppInfo = new KuaishouChannelAppInfo();
|
|
BeanUtils.copyProperties(app, channelAppInfo);
|
|
BeanUtils.copyProperties(app, channelAppInfo);
|
|
channelAppInfo.setState(1);
|
|
channelAppInfo.setState(1);
|
|
- channelAppInfo.setUrl((String)app.getUrl());
|
|
|
|
|
|
+ channelAppInfo.setUrl((String) app.getUrl());
|
|
channelAppInfo.setUseSdk(0);
|
|
channelAppInfo.setUseSdk(0);
|
|
- channelAppInfo.setAppIconUrl((String)app.getAppIconUrl());
|
|
|
|
|
|
+ channelAppInfo.setAppIconUrl((String) app.getAppIconUrl());
|
|
channelAppInfo.setId(null);
|
|
channelAppInfo.setId(null);
|
|
channelAppInfo.setType("copy");
|
|
channelAppInfo.setType("copy");
|
|
channelAppInfo.setRemark("copy原有App");
|
|
channelAppInfo.setRemark("copy原有App");
|
|
@@ -906,6 +912,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
|
|
log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
|
|
}
|
|
}
|
|
//使用范围是账户时,查询旧app来做匹配
|
|
//使用范围是账户时,查询旧app来做匹配
|
|
|
|
+ kuaishouInterfaceService.getAppList(strategy.getAccountId(), token.getAccessToken());
|
|
List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(accountId);
|
|
List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(accountId);
|
|
strategy.setImageToken(tokenJson.getString("imageToken"));
|
|
strategy.setImageToken(tokenJson.getString("imageToken"));
|
|
strategy.setAccountId(accountId);
|
|
strategy.setAccountId(accountId);
|
|
@@ -927,6 +934,7 @@ public class KuaishouChannelServiceImpl extends ServiceImpl<KuaishouChannelMappe
|
|
log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
|
|
log.error("通过账户ID(" + token.getAccountId() + ")获取图片Token失败,返回信息:" + tokenJson.getString("message"));
|
|
}
|
|
}
|
|
//使用范围是账户时,查询旧app来做匹配
|
|
//使用范围是账户时,查询旧app来做匹配
|
|
|
|
+ kuaishouInterfaceService.getAppList(strategy.getAccountId(), token.getAccessToken());
|
|
List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(strategy.getAccountId());
|
|
List<KuaiShouAppList> oldAppList = kuaiShouAppListService.getAppListByAccountId(strategy.getAccountId());
|
|
strategy.setImageToken(tokenJson.getString("imageToken"));
|
|
strategy.setImageToken(tokenJson.getString("imageToken"));
|
|
try {
|
|
try {
|