Jelajahi Sumber

调整快手

yumeng 6 tahun lalu
induk
melakukan
ffb2eb3a7a

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/controller/KuaiShouCreateController.java

@@ -55,7 +55,7 @@ public class KuaiShouCreateController {
             result.setSuccess(true);
         } else {
             result.setSuccess(false);
-            result.setMessage((String) map.get("desc"));
+            result.setMessage((String) map.get("message"));
         }
         return result;
 

+ 29 - 40
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreateServiceImpl.java

@@ -97,10 +97,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 Map<String, Object> campaignMap = kuaishouInterfaceService.campaignCreate(accessToken, accountId, campaignJson);
                 Integer code = (Integer) campaignMap.get("code");
                 if (code != 0) {
-                    returnMap.put("code", -1);
-                    returnMap.put("success", false);
-                    returnMap.put("desc", "创建广告计划失败");
-                    return returnMap;
+                    return campaignMap;
                 }
                 campaignId = (Long) campaignMap.get("campaign_id");
             } else {
@@ -135,10 +132,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     Map<String, Object> imageMap = kuaishouInterfaceService.imageUpload(accountId, accessToken, (String) appTemplate.getImageUrl(), 1);
                     Integer imageCode = (Integer) imageMap.get("code");
                     if (imageCode != 0) {
-                        returnMap.put("code", -1);
-                        returnMap.put("success", false);
-                        returnMap.put("desc", "上传图片失败");
-                        return returnMap;
+                        return imageMap;
                     }
                     apkJson.put("image_token", imageMap.get("imageToken"));
                 }
@@ -153,10 +147,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     apkMap = kuaishouInterfaceService.urlAppCreate(accountId, accessToken, apkJson);
                 }
                 if ((Integer) apkMap.get("code") != 0) {
-                    returnMap.put("code", -1);
-                    returnMap.put("success", false);
-                    returnMap.put("desc", "上传apk文件失败");
-                    return returnMap;
+                    return apkMap;
                 }
                 groupJson.put("app_id", apkMap.get("appId"));
             }
@@ -257,6 +248,10 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
 
     @Override
     public Map<String, Object> createCreative(JSONObject requestJson) {
+        System.err.println("广告类型: " +requestJson.getInteger("positionType"));
+        System.err.println("素材类型:" + requestJson.getInteger("creativeMaterialType"));
+        System.err.println("后贴片图片横竖 :" + requestJson.getString("singlePicTiepianType"));
+
         Map<String, Object> returnMap = new HashMap<>();
         try {
             if (Check.isNull(requestJson)) {
@@ -312,7 +307,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             Integer sceneId = requestJson.getInteger("sceneId");
             if (sceneId == 2) {  // 普通 广告
                 JSONObject localVideoJson = new JSONObject();
-                localVideoJson.put("videoType", requestJson.getString("videoType"));
+                localVideoJson.put("videoType", requestJson.getString("creativeMaterialType"));
                 localVideoJson.put("login_id", requestJson.getString("loginId"));
                 localVideoJson.put("videoUrl", requestJson.getString("videoUrl"));
                 localVideoJson.put("description", requestJson.getString("description"));
@@ -326,15 +321,15 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     return returnMap;
                 }
 
+                long startTime = System.currentTimeMillis();
+                logger.info("开始上传视频");
                 Map<String, Object> videoMap = kuaishouInterfaceService.videoUpload(accountId, accessToken, videoUrl); // 上传视频到快手后台
                 if ((Integer) videoMap.get("code") != 0) {
                     logger.error("上传视频失败,accountId:{}", accountId);
-                    returnMap.put("code", -1);
-                    returnMap.put("success", false);
-                    returnMap.put("message", "上传视频失败");
-                    return returnMap;
+                    return videoMap;
                 }
                 createJson.put("photo_id", videoMap.get("photoId"));
+                logger.info("上传信息流广告视频完成,共耗时:{} ms", System.currentTimeMillis() - startTime);
 
 
                 if (!Check.isNull(requestJson.getString("clickTrackUrl"))) {
@@ -358,17 +353,14 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     }
                     JSONObject imageJson = new JSONObject();
                     imageJson.put("loginId", requestJson.getString("loginId"));
-                    imageJson.put("videoUploadType", requestJson.getString("videoUploadType"));
+                    imageJson.put("videoUploadType", requestJson.getString("creativeMaterialType"));
                     imageJson.put("url", imageUrl);
-                    imageJson.put(" positionType", requestJson.getString(" positionType"));
+                    imageJson.put("positionType", requestJson.getString("positionType"));
                     String imagePath = imageService.localInsert(imageJson);
 
                     Map<String, Object> imageMap = kuaishouInterfaceService.imageUpload(accountId, accessToken, imagePath, 0);
                     if ((Integer) imageMap.get("code") != 0) {
-                        returnMap.put("code", -1);
-                        returnMap.put("success", false);
-                        returnMap.put("message", "上传图片失败");
-                        return returnMap;
+                        return imageMap;
                     }
                     createJson.put("image_token", imageMap.get("imageToken"));
                     createJson.put("creative_name", creativeName + "_" + i);
@@ -405,7 +397,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                         haveLocalVideoJson.put("videoUrl", haveSinglePicVideoUrl);
                         haveLocalVideoJson.put("description", requestJson.getString("description"));
                         haveLocalVideoJson.put("login_id", requestJson.getString("loginId"));
-                        haveLocalVideoJson.put("videoType", requestJson.getString("videoType"));
+                        haveLocalVideoJson.put("videoType", requestJson.getString("creativeMaterialType"));
                         String havaVideoUrl = videoService.localInsert(haveLocalVideoJson); // 校验文件是否在本地有留存记录
                         if (Check.isNull(havaVideoUrl)) {
                             logger.error("创建创意视频为空,accountId:{}", accountId);
@@ -415,19 +407,20 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                             return returnMap;
                         }
 
+                        long startTime = System.currentTimeMillis();
+                        logger.info("开始上传视频");
                         Map<String, Object> videoMap = kuaishouInterfaceService.videoUpload(accountId, accessToken, havaVideoUrl); // 上传视频到快手后台
                         if ((Integer) videoMap.get("code") != 0) {
-                            logger.error("上传视频失败,accountId:{}", accountId);
-                            returnMap.put("success", false);
-                            returnMap.put("message", "上传视频失败");
-                            returnMap.put("code", -1);
-                            return returnMap;
+                            logger.error("后贴片素材上传视频失败,accountId:{}", accountId);
+                            return videoMap;
                         }
+                        logger.info("上传贴片视频完成,共耗时:{} ms", System.currentTimeMillis() - startTime);
                         createJson.put("photo_id", videoMap.get("photoId"));
                         createJson.put("creative_name", creativeName + "_" + i);
                         Map<String, Object> creativeMap = kuaishouInterfaceService.creativeCreate(accessToken, accountId, createJson);
                         if ((Integer) creativeMap.get("code") != 0) {
-                            throw new Exception("批量创建创意失败");
+                            logger.error("后贴片视频素材批量创建创意失败,accountId:{},creativeName:{}", accountId, creativeName + "_" + i);
+                            return creativeMap;
                         }
                     }
 
@@ -448,27 +441,24 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                         }
                         JSONObject imageJson = new JSONObject();
                         imageJson.put("url", imageUrl);
-                        imageJson.put(" positionType", requestJson.getString(" positionType"));
+                        imageJson.put("positionType", requestJson.getInteger("positionType"));
                         imageJson.put("loginId", requestJson.getString("loginId"));
-                        imageJson.put("videoUploadType", requestJson.getString("videoUploadType"));
+                        imageJson.put("videoUploadType", requestJson.getString("singlePicTiepianType"));
 
                         String imagePath = imageService.localInsert(imageJson);
 
                         Map<String, Object> imageMap = kuaishouInterfaceService.imageUpload(accountId, accessToken, imagePath, 0);
                         if ((Integer) imageMap.get("code") != 0) {
-                            returnMap.put("success", false);
-                            returnMap.put("message", "上传图片失败");
-                            returnMap.put("code", -1);
-                            return returnMap;
+                            logger.error("上传后贴片单张图片素材失败,accountId:{}", accountId);
+                            return imageMap;
                         }
                         createJson.put("creative_name", creativeName + "_" + i);
                         JSONArray image_tokens = new JSONArray();
                         image_tokens.add(imageMap.get("imageToken"));
-
-
                         createJson.put("image_tokens", image_tokens);
                         Map<String, Object> creativeMap = kuaishouInterfaceService.creativeCreate(accessToken, accountId, createJson);
                         if ((Integer) creativeMap.get("code") != 0) {
+                            logger.error("后贴片素材单张图片批量创建创意失败,accountId:{}", accountId);
                             return creativeMap;
                         }
                     }
@@ -478,8 +468,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             returnMap.put("code", 0);
             returnMap.put("success", true);
             returnMap.put("message", "创建创意成功");
-        } catch (
-                Exception e) {
+        } catch (Exception e) {
             returnMap.put("code", -1);
             returnMap.put("success", false);
             returnMap.put("message", "批量创建广告创意失败");

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouImageServiceImpl.java

@@ -82,6 +82,7 @@ public class KuaiShouImageServiceImpl extends ServiceImpl<KuaiShouImageMapper, K
             image.setLoginId(loginId);
             image.setImageName(AesEncryptUtil.getURLDecoderString(fileNameStr));
             image.setMaterialType(videoUploadType);
+            image.setPositionType(positionType);
             if (!url.contains("https:")) {
                 String imageUrl = KuaishouInterfaceConstant.HTTPS_PREFIX + url;
                 image.setLocalUrl(imageUrl);

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouVideoServiceImpl.java

@@ -54,7 +54,7 @@ public class KuaiShouVideoServiceImpl extends ServiceImpl<KuaiShouVideoMapper, K
 
     @Override
     public String localInsert(JSONObject requestJson) throws Exception {
-        String loginId = requestJson.getString("loginId");
+        String loginId = requestJson.getString("login_id");
         String videoUrl = requestJson.getString("videoUrl");
         QueryWrapper<KuaiShouVideo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("login_id", loginId);

+ 47 - 28
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaishouInterfaceServiceImpl.java

@@ -328,27 +328,30 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                     returnMap.put("code", 0);
                     returnMap.put("message", "success");
                     returnMap.put("campaign_id", campaign_id);
+                    returnMap.put("success", true);
 
                 } else {
                     logger.error("创建广告信息失败,advertiser_id:{},返回信息:{}", advertiser_id, resultJson);
                     returnMap.put("code", -1);
-                    returnMap.put("message", "error");
-                    returnMap.put("desc", resultJson.getString("message"));
+                    returnMap.put("message", resultJson.getString("message"));
+                    returnMap.put("desc", "创建广告计划失败");
+                    returnMap.put("success", false);
                 }
 
 
             } else {
                 logger.error("快手创建广告计划返回内容为空,advertiser_id:{}", advertiser_id);
                 returnMap.put("code", -1);
-                returnMap.put("message", "error");
+                returnMap.put("message", "创建广告计划错误");
                 returnMap.put("desc", "result is null");
+                returnMap.put("success", false);
             }
 
 
         } catch (Exception e) {
             logger.error("创建广告计划失败,advertiser_id:{}", advertiser_id);
             returnMap.put("code", -1);
-            returnMap.put("message", "error");
+            returnMap.put("message", "创建广告计划失败");
             returnMap.put("desc", "Interface exception");
             e.printStackTrace();
         }
@@ -393,29 +396,33 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         returnMap.put("code", 0);
                         returnMap.put("message", "success");
                         returnMap.put("unitId", unitId);
+                        returnMap.put("success", true);
                     }
 
                 } else {
                     logger.error("创建广告信息失败,advertiser_id:{},返回信息:{}", advertiser_id, resultJson);
                     returnMap.put("code", -1);
-                    returnMap.put("message", "error");
-                    returnMap.put("desc", resultJson.getString("message"));
+                    returnMap.put("message", resultJson.getString("message"));
+                    returnMap.put("desc", "创建广告组失败");
+                    returnMap.put("success", false);
                 }
 
 
             } else {
                 logger.error("快手创建广告计划返回内容为空,advertiser_id:{}", advertiser_id);
                 returnMap.put("code", -1);
-                returnMap.put("message", "error");
+                returnMap.put("message", "创建广告组异常");
                 returnMap.put("desc", "result is null");
+                returnMap.put("success", false);
             }
 
 
         } catch (Exception e) {
             logger.error("创建广告计划失败,advertiser_id:{}", advertiser_id);
             returnMap.put("code", -1);
-            returnMap.put("message", "error");
+            returnMap.put("message", "创建广告组错误");
             returnMap.put("desc", "Interface exception");
+            returnMap.put("success", false);
             e.printStackTrace();
         }
 
@@ -818,7 +825,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
             String result = HttpUtils.kuaiShouhttpPostRequest(url, requestJson.toJSONString(), header);
             JSONObject resultJson = JSONObject.parseObject(result);
-            logger.info("快手创建创意返回信息:{}",resultJson);
+            logger.info("快手创建创意返回信息:{}", resultJson);
             if (!Check.isNull(resultJson)) {
                 Integer code = resultJson.getInteger("code");
                 if (code == 0) {
@@ -840,18 +847,21 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         }
                         returnMap.put("code", 0);
                         returnMap.put("message", "success");
+                        returnMap.put("success", true);
                     }
                 } else {
                     logger.error("创建广告创意失败,advertiser_id:{},返回信息:{}", advertiserId, resultJson);
                     returnMap.put("code", -1);
-                    returnMap.put("message", "error");
-                    returnMap.put("desc", resultJson.getString("message"));
+                    returnMap.put("message", resultJson.getString("message"));
+                    returnMap.put("desc", "上传图片失败");
+                    returnMap.put("success", false);
                 }
             } else {
                 logger.error("快手创建广告创意返回内容为空,advertiser_id:{}", advertiserId);
                 returnMap.put("code", -1);
-                returnMap.put("message", "error");
+                returnMap.put("message", "上传图片异常");
                 returnMap.put("desc", "result is null");
+                returnMap.put("success", false);
             }
 
         } catch (Exception e) {
@@ -859,6 +869,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             returnMap.put("code", -1);
             returnMap.put("message", "error");
             returnMap.put("desc", "Interface exception");
+            returnMap.put("success", false);
             e.printStackTrace();
         }
         return returnMap;
@@ -903,7 +914,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             headerMap.put("Content-Type", "multipart/form-data");
             String result = exceptInfoForRestTemplate(url, requestJson, headerMap, localUrl);
             JSONObject resultJson = JSONObject.parseObject(result);
-            System.err.println(requestJson);
             if (!Check.isNull(result)) {
                 Integer code = resultJson.getInteger("code");
                 if (code == 0) {
@@ -929,7 +939,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                 } else {
                     logger.error("快手上传视频返回信息异常 ,advertiserId:{},异常信息:{}", advertiserId, resultJson);
                     returnMap.put("code", -1);
-                    returnMap.put("message", "视频上传失败");
+                    returnMap.put("message", resultJson.getString("message"));
                     returnMap.put("success", false);
                     return returnMap;
                 }
@@ -945,10 +955,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
         } catch (Exception e) {
             logger.error("上传视频失败,advertiser_id:{}", advertiserId);
-
             e.printStackTrace();
             returnMap.put("code", -1);
-            returnMap.put("message", "error");
+            returnMap.put("message", "上传视频异常");
             returnMap.put("desc", "Interface exception");
             returnMap.put("success", false);
             return returnMap;
@@ -1142,7 +1151,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
 
     @Override
     public Map<String, Object> imageUpload(Long advertiserId, String accessToken, String filePath, Integer type) {
-        System.err.println(filePath);
         Map<String, Object> returnMap = new HashMap<>();
         try {
             QueryWrapper<KuaiShouImageUploand> queryWrapper = new QueryWrapper<>();
@@ -1192,21 +1200,24 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         returnMap.put("code", 0);
                         returnMap.put("desc", "上传图片完成");
                         returnMap.put("imageToken", dataJson.getString("image_token"));
+                        returnMap.put("success", true);
                         return returnMap;
                     }
 
                 } else {
                     logger.error("快手上传图片返回信息异常 ,advertiserId:{},异常信息:{}", advertiserId, resultJson);
                     returnMap.put("code", -1);
-                    returnMap.put("message", "error");
-                    returnMap.put("desc", resultJson.getString("message"));
+                    returnMap.put("desc", "error");
+                    returnMap.put("message", resultJson.getString("message"));
+                    returnMap.put("success", false);
                 }
 
             } else {
                 logger.error("快手上传图片返回信息为空,advertiserId:{}", advertiserId);
                 returnMap.put("code", -1);
-                returnMap.put("message", "error");
-                returnMap.put("desc", "上传失败");
+                returnMap.put("desc", "error");
+                returnMap.put("message", "上传图片失败失败");
+                returnMap.put("success", false);
             }
             boolean trueOrFalse = LoadFileUtil.delFile(localUrl);
             if (trueOrFalse) {
@@ -1215,8 +1226,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         } catch (Exception e) {
             logger.error("上传图片失败,advertiser_id:{}", advertiserId);
             returnMap.put("code", -1);
-            returnMap.put("message", "error");
+            returnMap.put("message", "上传图片异常");
             returnMap.put("desc", "Interface exception");
+            returnMap.put("success", false);
             e.printStackTrace();
         }
         return returnMap;
@@ -1287,20 +1299,23 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         returnMap.put("code", 0);
                         returnMap.put("message", "success");
                         returnMap.put("appId", dataJson.getLong("app_id"));
+                        returnMap.put("success", true);
                     }
 
                 } else {
                     logger.error("快手创建应用返回信息异常 ,advertiserId:{},异常信息:{}", advertiserId, resultJson);
                     returnMap.put("code", -1);
-                    returnMap.put("message", "error");
+                    returnMap.put("message", resultJson.getString("message"));
                     returnMap.put("desc", "Interface exception");
+                    returnMap.put("success", false);
                 }
 
             } else {
                 logger.error("快手创建应用返回信息为空,advertiserId:{}", advertiserId);
                 returnMap.put("code", -1);
-                returnMap.put("message", "error");
+                returnMap.put("message", "上传apk文件失败");
                 returnMap.put("desc", "Interface exception");
+                returnMap.put("success", false);
             }
             boolean trueOrFalse = LoadFileUtil.delFile(localUrl);
             if (trueOrFalse) {
@@ -1309,8 +1324,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
         } catch (Exception e) {
             logger.error("创建应用失败,advertiser_id:{}", advertiserId);
             returnMap.put("code", -1);
-            returnMap.put("message", "error");
+            returnMap.put("message", "上传apk文件错误");
             returnMap.put("desc", "Interface exception");
+            returnMap.put("success", false);
             e.printStackTrace();
         }
         return returnMap;
@@ -1364,27 +1380,30 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         returnMap.put("code", 0);
                         returnMap.put("message", "success");
                         returnMap.put("appId", dataJson.getLong("app_id"));
+                        returnMap.put("success", true);
                     }
 
                 } else {
                     logger.error("快手创建应用返回信息异常 ,advertiserId:{},异常信息:{}", accountId, resultJson);
                     returnMap.put("code", -1);
-                    returnMap.put("message", "error");
+                    returnMap.put("message", resultJson.getString("message"));
                     returnMap.put("desc", "Interface exception");
+                    returnMap.put("success", false);
                 }
 
             } else {
                 logger.error("快手创建应用返回信息为空,advertiserId:{}", accountId);
                 returnMap.put("code", -1);
-                returnMap.put("message", "error");
+                returnMap.put("message", "apk文件url上传异常");
                 returnMap.put("desc", "Interface exception");
+                returnMap.put("success", false);
             }
 
 
         } catch (Exception e) {
             logger.error("创建应用失败,advertiser_id:{}", accountId);
             returnMap.put("code", -1);
-            returnMap.put("message", "error");
+            returnMap.put("message", "应用url异常");
             returnMap.put("desc", "Interface exception");
             e.printStackTrace();
         }