|
@@ -4,6 +4,7 @@ import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
import cn.com.ctop.common.module.service.ICtopOauthTokenService;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.Check;
|
|
import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
|
|
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.common.module.utils.PropertiesUtils;
|
|
import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouAppPackage;
|
|
import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouAppPackage;
|
|
import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouAppPackageRel;
|
|
import cn.com.ctop.kuaishou.modules.ai.entity.KuaishouAppPackageRel;
|
|
@@ -11,9 +12,12 @@ import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouAppGroupMapper;
|
|
import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouAppPackageMapper;
|
|
import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouAppPackageMapper;
|
|
import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouAppPackageRelMapper;
|
|
import cn.com.ctop.kuaishou.modules.ai.mapper.KuaishouAppPackageRelMapper;
|
|
import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouAppPackageService;
|
|
import cn.com.ctop.kuaishou.modules.ai.service.IKuaishouAppPackageService;
|
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImageGet;
|
|
|
|
+import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageGetService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
|
|
import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouMaterialUploadService;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageHelper;
|
|
import com.github.pagehelper.PageInfo;
|
|
import com.github.pagehelper.PageInfo;
|
|
@@ -62,9 +66,13 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
private ICtopOauthTokenService tokenService;
|
|
private ICtopOauthTokenService tokenService;
|
|
@Autowired
|
|
@Autowired
|
|
private IKuaiShouMaterialUploadService materialUploadService;
|
|
private IKuaiShouMaterialUploadService materialUploadService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IKuaiShouImageGetService imageGetService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private IKuaiShouMaterialUploadService uploadService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Result<Object> importExcel(MultipartFile file, Long projectId, Integer platform, String imageToken, String imageUrl) throws Exception {
|
|
|
|
|
|
+ public Result<Object> importExcel(MultipartFile file, Long projectId, Integer platform, String imageUrl) throws Exception {
|
|
JSONObject returnJson = new JSONObject();
|
|
JSONObject returnJson = new JSONObject();
|
|
Workbook workbook = null;
|
|
Workbook workbook = null;
|
|
String fileName = file.getOriginalFilename();
|
|
String fileName = file.getOriginalFilename();
|
|
@@ -121,7 +129,7 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
appPackage.setAppIconUrl(imageUrl);
|
|
appPackage.setAppIconUrl(imageUrl);
|
|
appPackage.setPackageName(packageName);
|
|
appPackage.setPackageName(packageName);
|
|
appPackage.setPlatform(platform);
|
|
appPackage.setPlatform(platform);
|
|
- appPackage.setImageToken(imageToken);
|
|
|
|
|
|
+ appPackage.setImageMd5(LoadFileUtil.getMD5(imageUrl));
|
|
appPackage.setTrackUrl(trackUrl);
|
|
appPackage.setTrackUrl(trackUrl);
|
|
appPackage.setAppPrivacyUrl(appPrivacyUrl);
|
|
appPackage.setAppPrivacyUrl(appPrivacyUrl);
|
|
appPackage.setDataStatus(1);//有效
|
|
appPackage.setDataStatus(1);//有效
|
|
@@ -199,16 +207,23 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
for (Object account : accountIds) {
|
|
for (Object account : accountIds) {
|
|
try {
|
|
try {
|
|
Long accountId = Long.valueOf(String.valueOf(account));
|
|
Long accountId = Long.valueOf(String.valueOf(account));
|
|
|
|
+ rel.setAccountId(accountId);
|
|
KuaishouAppPackageRel entity = relMapper.queryEntityByAccountId(accountId, appPackage.getAppVersion());
|
|
KuaishouAppPackageRel entity = relMapper.queryEntityByAccountId(accountId, appPackage.getAppVersion());
|
|
if (!Check.isNull(entity)) {
|
|
if (!Check.isNull(entity)) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
CtopOauthToken oauthToken = tokenService.getTokenByAccountId(accountId);
|
|
CtopOauthToken oauthToken = tokenService.getTokenByAccountId(accountId);
|
|
|
|
+ String imageToken = getImageToken(appPackage.getImageMd5(), accountId, oauthToken);
|
|
|
|
+ if (Check.isNull(imageToken) && (appPackage.getPlatform() == 1 || appPackage.getPlatform() == 3)) {
|
|
|
|
+ rel.setDataStatus(0);
|
|
|
|
+ rel.setMessage("获取图片文件失败");
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
JSONObject requestJson = new JSONObject();
|
|
JSONObject requestJson = new JSONObject();
|
|
requestJson.put("advertiser_id", accountId);
|
|
requestJson.put("advertiser_id", accountId);
|
|
requestJson.put("app_version", appPackage.getAppVersion());
|
|
requestJson.put("app_version", appPackage.getAppVersion());
|
|
requestJson.put("app_name", appPackage.getAppName());
|
|
requestJson.put("app_name", appPackage.getAppName());
|
|
- requestJson.put("image_token", appPackage.getImageToken());
|
|
|
|
|
|
+ requestJson.put("image_token", imageToken);
|
|
requestJson.put("package_name", appPackage.getPackageName());
|
|
requestJson.put("package_name", appPackage.getPackageName());
|
|
requestJson.put("platform", appPackage.getPlatform());
|
|
requestJson.put("platform", appPackage.getPlatform());
|
|
requestJson.put("url", appPackage.getUrl());
|
|
requestJson.put("url", appPackage.getUrl());
|
|
@@ -220,7 +235,7 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
headerMap.put("Access-Token", oauthToken.getAccessToken());
|
|
headerMap.put("Access-Token", oauthToken.getAccessToken());
|
|
String result = materialUploadService.exceptInfoForRestTemplate(url, requestJson, headerMap);
|
|
String result = materialUploadService.exceptInfoForRestTemplate(url, requestJson, headerMap);
|
|
JSONObject resultJson = JSONObject.parseObject(result);
|
|
JSONObject resultJson = JSONObject.parseObject(result);
|
|
- rel.setAccountId(accountId);
|
|
|
|
|
|
+
|
|
if (!Check.isNull(resultJson)) {
|
|
if (!Check.isNull(resultJson)) {
|
|
Integer code = resultJson.getInteger("code");
|
|
Integer code = resultJson.getInteger("code");
|
|
if (code == 0) {
|
|
if (code == 0) {
|
|
@@ -249,6 +264,28 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
}
|
|
}
|
|
return Result.ok("推送完成");
|
|
return Result.ok("推送完成");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 获取图片token
|
|
|
|
+ */
|
|
|
|
+ private String getImageToken(String md5, Long accountId, CtopOauthToken oauthToken) {
|
|
|
|
+ String imageToken = null;
|
|
|
|
+ if (!Check.isNull(md5)) {
|
|
|
|
+ QueryWrapper<KuaiShouImageGet> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.eq("account_id", accountId);
|
|
|
|
+ queryWrapper.eq("signature", md5);
|
|
|
|
+ queryWrapper.last("limit 1");
|
|
|
|
+ KuaiShouImageGet imageGet = imageGetService.getOne(queryWrapper);
|
|
|
|
+ if (!Check.isNull(imageGet)) {
|
|
|
|
+ imageToken = imageGet.getImageToken();
|
|
|
|
+ } else {
|
|
|
|
+ String url = imageGetService.getUrlByCode(md5);
|
|
|
|
+ imageToken = uploadService.kuauiShouImageUpload(url, md5, accountId, oauthToken.getAccessToken());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return imageToken;
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Result<Object> queryPushResults(String id, JSONArray accountIds, String status) {
|
|
public Result<Object> queryPushResults(String id, JSONArray accountIds, String status) {
|
|
List<JSONObject> lsit = relMapper.queryPushResults(id, accountIds, status);
|
|
List<JSONObject> lsit = relMapper.queryPushResults(id, accountIds, status);
|
|
@@ -256,8 +293,8 @@ public class KuaishouAppPackageServiceImpl extends ServiceImpl<KuaishouAppPackag
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public List<Long> queryByAppVersion(Long projectId,String appVersion) {
|
|
|
|
- return appPackageMapper.queryByAppVersion(projectId,appVersion);
|
|
|
|
|
|
+ public List<Long> queryByAppVersion(Long projectId, String appVersion) {
|
|
|
|
+ return appPackageMapper.queryByAppVersion(projectId, appVersion);
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|