Browse Source

上传素材绑定账号

yumeng 5 năm trước cách đây
mục cha
commit
f7bbf5a2e7

+ 6 - 8
jeecg-boot-module-system/src/main/java/org/jeecg/modules/kuaishou/service/impl/KuaiShouCreateAppTemplateServiceImpl.java

@@ -63,9 +63,9 @@ public class KuaiShouCreateAppTemplateServiceImpl extends ServiceImpl<KuaiShouCr
                 }
                 appTemplateMapper.insert(appTemplate);
 
-              /*  Thread thread = new Thread() {
+                Thread thread = new Thread() {
                     @Override
-                    public void run() {*/
+                    public void run() {
                         JSONObject apkJson = new JSONObject();
                         String platform = appTemplate.getPlatform();
                         apkJson.put("app_name", appTemplate.getAppName());
@@ -74,23 +74,21 @@ public class KuaiShouCreateAppTemplateServiceImpl extends ServiceImpl<KuaiShouCr
                         if (!Check.isNull(appTemplate.getPackageName())) {
                             apkJson.put("package_name", appTemplate.getPackageName());
                         }
-                        if (!Check.isNull(appTemplate.getImageUrl()) && ("1".equals(platform) || "3".equals(platform))) {
+                        if (!Check.isNull(appTemplate.getImageUrl()) && ("1".equals(platform) || "2".equals(platform))) {
                             Map<String, Object> imageMap = interfaceService.imageUpload(accountId, accessToken, (String) appTemplate.getImageUrl(), 1);
                             apkJson.put("image_token", imageMap.get("imageToken"));
                         }
                         if ("1".equals(platform) && appTemplate.getUploadType() == 1) {
                             apkJson.put("file", appTemplate.getFile());
-
                             interfaceService.appCreate(accountId, accessToken, apkJson);
-
                         } else {
                             apkJson.put("url", appTemplate.getUrl());
                             interfaceService.urlAppCreate(accountId, accessToken, apkJson);
                         }
-                   // }
+                    }
 
-               /* };
-                thread.start();*/
+                };
+                thread.start();
                 resultMap.put("success", true);
                 resultMap.put("message", "创建应用成功");
                 resultMap.put("code", 0);

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

@@ -128,7 +128,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 if (!Check.isNull(appTemplate.getPackageName())) {
                     apkJson.put("package_name", appTemplate.getPackageName());
                 }
-                if (!Check.isNull(appTemplate.getImageUrl()) && ("1".equals(platform) || "3".equals(platform))) {
+                if (!Check.isNull(appTemplate.getImageUrl()) && ("1".equals(platform) || "2".equals(platform))) {
                     Map<String, Object> imageMap = kuaishouInterfaceService.imageUpload(accountId, accessToken, (String) appTemplate.getImageUrl(), 1);
                     Integer imageCode = (Integer) imageMap.get("code");
                     if (imageCode != 0) {
@@ -136,7 +136,6 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     }
                     apkJson.put("image_token", imageMap.get("imageToken"));
                 }
-
                 Map<String, Object> apkMap;
                 if ("1".equals(platform) && appTemplate.getUploadType() == 1) {
                     apkJson.put("file", appTemplate.getFile());
@@ -192,16 +191,13 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
             if (!Check.isNull(groupCreateTemplate.getUnitType())) {
                 groupJson.put("unit_type", groupCreateTemplate.getUnitType());
             }
-
             if (!Check.isNull(groupCreateTemplate.getDeepConversionType())) {
                 groupJson.put("deep_conversion_type", groupCreateTemplate.getDeepConversionType());
             }
-
             if (!Check.isNull(groupCreateTemplate.getDeepConversionBid()) && groupCreateTemplate.getDeepConversionBid() > 0) {
                 groupJson.put("deep_conversion_bid", groupCreateTemplate.getDeepConversionBid());
             }
 
-
             JSONObject targetJson = new JSONObject();
             groupJson.put("target", targetJson);
 
@@ -248,7 +244,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
 
     @Override
     public Map<String, Object> createCreative(JSONObject requestJson) {
-        System.err.println("广告类型: " +requestJson.getInteger("positionType"));
+        System.err.println("广告类型: " + requestJson.getInteger("positionType"));
         System.err.println("素材类型:" + requestJson.getInteger("creativeMaterialType"));
         System.err.println("后贴片图片横竖 :" + requestJson.getString("singlePicTiepianType"));
 
@@ -312,6 +308,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                 localVideoJson.put("videoUrl", requestJson.getString("videoUrl"));
                 localVideoJson.put("description", requestJson.getString("description"));
                 localVideoJson.put("positionType", requestJson.getString("positionType"));
+                localVideoJson.put("accountId", requestJson.getString("accountId"));
                 String videoUrl = videoService.localInsert(localVideoJson); // 校验文件是否在本地有留存记录
                 if (Check.isNull(videoUrl)) {
                     logger.error("创建创意视频为空,accountId:{}", accountId);
@@ -355,6 +352,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                     imageJson.put("loginId", requestJson.getString("loginId"));
                     imageJson.put("videoUploadType", requestJson.getString("creativeMaterialType"));
                     imageJson.put("url", imageUrl);
+                    imageJson.put("accountId", accountId);
                     imageJson.put("positionType", requestJson.getString("positionType"));
                     String imagePath = imageService.localInsert(imageJson);
 
@@ -395,6 +393,7 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                         JSONObject haveLocalVideoJson = new JSONObject();
                         haveLocalVideoJson.put("positionType", requestJson.getString("positionType"));
                         haveLocalVideoJson.put("videoUrl", haveSinglePicVideoUrl);
+                        haveLocalVideoJson.put("accountId", accountId);
                         haveLocalVideoJson.put("description", requestJson.getString("description"));
                         haveLocalVideoJson.put("login_id", requestJson.getString("loginId"));
                         haveLocalVideoJson.put("videoType", requestJson.getString("creativeMaterialType"));
@@ -441,12 +440,11 @@ public class KuaiShouCreateServiceImpl implements IKuaiShouCreateService {
                         }
                         JSONObject imageJson = new JSONObject();
                         imageJson.put("url", imageUrl);
+                        imageJson.put("accountId", accountId);
                         imageJson.put("positionType", requestJson.getInteger("positionType"));
                         imageJson.put("loginId", requestJson.getString("loginId"));
                         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) {
                             logger.error("上传后贴片单张图片素材失败,accountId:{}", accountId);

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

@@ -69,6 +69,7 @@ public class KuaiShouImageServiceImpl extends ServiceImpl<KuaiShouImageMapper, K
                 }
                 image.setLocalUrl(imageUrlStr);
                 imageMapper.insert(image);
+
                 Thread thread = new Thread() {
                     @Override
                     public void run() {
@@ -87,9 +88,11 @@ public class KuaiShouImageServiceImpl extends ServiceImpl<KuaiShouImageMapper, K
         String positionType = imageJson.getString("positionType");
         String videoUploadType = imageJson.getString("videoUploadType");
         String loginId = imageJson.getString("loginId");
+        Long accountId = imageJson.getLong("accountId");
 
         QueryWrapper<KuaiShouImage> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("local_url", url);
+        queryWrapper.eq("account_id", accountId);
         queryWrapper.eq("position_type", positionType);
         queryWrapper.eq("material_type", videoUploadType);
         queryWrapper.eq("login_id", loginId);
@@ -115,6 +118,7 @@ public class KuaiShouImageServiceImpl extends ServiceImpl<KuaiShouImageMapper, K
             } else {
                 image.setLocalUrl(url);
             }
+            image.setAccountId(accountId);
 
             imageMapper.insert(image);
             return image.getLocalUrl().toString();

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

@@ -42,12 +42,9 @@ public class KuaiShouVideoServiceImpl extends ServiceImpl<KuaiShouVideoMapper, K
             throw new Exception("未获取到token信息");
         }
         String accessToken = cTopOauthToken.getAccessToken();
-
-
         JSONArray localArr = requestJson.getJSONArray("localUrl");
         if (!Check.isNull(localArr)) {
             for (int i = 0; i < localArr.size(); i++) {
-
                 KuaiShouVideo video = new KuaiShouVideo();
                 video.setVideoDesc(requestJson.getString("videoDesc"));
                 String url = localArr.get(i).toString();
@@ -87,9 +84,11 @@ public class KuaiShouVideoServiceImpl extends ServiceImpl<KuaiShouVideoMapper, K
     public String localInsert(JSONObject requestJson) throws Exception {
         String loginId = requestJson.getString("login_id");
         String videoUrl = requestJson.getString("videoUrl");
+        Long accountId = requestJson.getLong("accountId");
         QueryWrapper<KuaiShouVideo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("login_id", loginId);
         queryWrapper.eq("local_url", videoUrl);
+        queryWrapper.eq("account_id", accountId);
         queryWrapper.orderByDesc("create_time");
         queryWrapper.last("limit 1");
         KuaiShouVideo localVideo = kuaiShouVideoMapper.selectOne(queryWrapper);
@@ -113,6 +112,7 @@ public class KuaiShouVideoServiceImpl extends ServiceImpl<KuaiShouVideoMapper, K
 
                 video.setLoginId(loginId);
                 video.setMaterialType(requestJson.getString("videoType"));
+                video.setAccountId(accountId);
                 video.setPositionType(requestJson.getString("positionType"));
                 video.setVideoName(AesEncryptUtil.getURLDecoderString(fileNameStr));
                 kuaiShouVideoMapper.insert(video);

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

@@ -1265,6 +1265,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             queryWrapper.last("limit 1");
             KuaiShouAppCreate kuaiShouAppCreate = appCreateMapper.selectOne(queryWrapper);
             if (!Check.isNull(kuaiShouAppCreate)) {
+                logger.info("file应用已经存在");
                 returnMap.put("code", 0);
                 returnMap.put("message", "文件已上传");
                 returnMap.put("success", true);
@@ -1304,10 +1305,10 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
                         if (i > 0) {
                             logger.info("快手创建应用成功");
                         }
-                        returnMap.put("code", 0);
-                        returnMap.put("message", "success");
                         returnMap.put("appId", dataJson.getLong("app_id"));
                         returnMap.put("success", true);
+                        returnMap.put("code", 0);
+                        returnMap.put("message", "success");
                     }
 
                 } else {
@@ -1354,6 +1355,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             queryWrapper.last("limit 1");
             KuaiShouAppCreate kuaiShouAppCreate = appCreateMapper.selectOne(queryWrapper);
             if (!Check.isNull(kuaiShouAppCreate)) {
+                logger.info("url应用已经存在");
                 returnMap.put("code", 0);
                 returnMap.put("message", "文件已上传");
                 returnMap.put("success", true);