Browse Source

批量应用添加 序号 通配符

zhaoxian 2 years ago
parent
commit
46d5ed5181

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouMaterialUploadController.java

@@ -210,7 +210,7 @@ public class KuaiShouMaterialUploadController {
                 }
                 String splashPath = "splash/image/" + DateUtils.date2Str() + "/";
                 String md5 = CosUtils.uploadFileByInputStream(inputStream, splashPath, fileName);
-                Thread.sleep(100);
+                Thread.sleep(200);
                 String imageUrl = CosConstant.URL_COS_ADDRESS + splashPath + fileName;
                 String imageToken = uploadService.kuauiShouImageUpload(imageUrl, md5, accountId, oauthToken.getAccessToken());
                 if (!Check.isNull(imageToken)) {

+ 25 - 6
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouBatchCampaignPreviewServiceImpl.java

@@ -25,11 +25,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.xxl.job.core.enums.NoEn;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -60,6 +62,8 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
     private KuaiShouCampaignMapper kuaiShouCampaignMapper;
     @Autowired
     private IKuaiShouVideoGetService videoGetService;
+    @Autowired
+    private RedisUtil redisUtil;
 
     @Override
     public JSONObject queryByBatchId(String batchId, String accountId) {
@@ -341,7 +345,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                 }
                 if (Check.isNull(campaignId)) {
                     campaignPreview.setId(null);
-                    campaignPreview.setCampaignName(getName(campaignPreview.getCampaignNameFormat(), targetIds.getLong(i), groupPreview.getSceneId(), appId, groupPreview.getUnitType(), i, getRandomFromArr(materialList.getJSONObject(0).getJSONArray("photoArr")), creativePreview.getCreativeCategory()));
+                    campaignPreview.setCampaignName(getName(campaignPreview.getCampaignNameFormat(), targetIds.getLong(i), groupPreview.getSceneId(), appId, groupPreview.getUnitType(), i, getRandomFromArr(materialList.getJSONObject(0).getJSONArray("photoArr")), creativePreview.getCreativeCategory(), campaignPreview.getAccountId(), "campaign"));
                     campaignPreviewMapper.insert(campaignPreview);
                 }
                 for (int j = 0; j < materialList.size(); j++) {
@@ -378,7 +382,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                     groupPreview.setAppId(appId);
                     groupPreview.setPlanId(campaignPreview.getId());
                     groupPreview.setTemplateId(targetIds.getLong(i));
-                    groupPreview.setUnitName(getName(groupPreview.getUnitNameFormat(), targetIds.getLong(i), groupPreview.getSceneId(), appId, groupPreview.getUnitType(), j, getRandomFromArr(photoArr), creativePreview.getCreativeCategory()));
+                    groupPreview.setUnitName(getName(groupPreview.getUnitNameFormat(), targetIds.getLong(i), groupPreview.getSceneId(), appId, groupPreview.getUnitType(), j, getRandomFromArr(photoArr), creativePreview.getCreativeCategory(), null, null));
                     groupPreview.setUrl(url);
                     groupPreview.setSchemaUri(schemaUri);
                     if (!Check.isNull(groupPreview.getBidMax()) && !Check.isNull(groupPreview.getBidMin())) {
@@ -498,7 +502,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                 JSONArray photoArr = material.getJSONArray("photoArr");
 
                 campaignPreview.setId(null);
-                campaignPreview.setCampaignName(getName(campaignPreview.getCampaignNameFormat(), targetIds.getLong(new Random().nextInt(targetIds.size())), groupPreview.getSceneId(), appId, groupPreview.getUnitType(), i, getRandomFromArr(photoArr), creativePreview.getCreativeCategory()));
+                campaignPreview.setCampaignName(getName(campaignPreview.getCampaignNameFormat(), targetIds.getLong(new Random().nextInt(targetIds.size())), groupPreview.getSceneId(), appId, groupPreview.getUnitType(), i, getRandomFromArr(photoArr), creativePreview.getCreativeCategory(), campaignPreview.getAccountId(), "campaign"));
                 campaignPreviewMapper.insert(campaignPreview);
 
                 if (matchingMethod == 2) {
@@ -535,7 +539,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                     groupPreview.setAppId(appId);
                     groupPreview.setPlanId(campaignPreview.getId());
                     groupPreview.setTemplateId(targetIds.getLong(j));
-                    groupPreview.setUnitName(getName(groupPreview.getUnitNameFormat(), targetIds.getLong(j), groupPreview.getSceneId(), appId, groupPreview.getUnitType(), j, getRandomFromArr(photoArr), creativePreview.getCreativeCategory()));
+                    groupPreview.setUnitName(getName(groupPreview.getUnitNameFormat(), targetIds.getLong(j), groupPreview.getSceneId(), appId, groupPreview.getUnitType(), j, getRandomFromArr(photoArr), creativePreview.getCreativeCategory(), null, null));
                     groupPreview.setUrl(url);
                     groupPreview.setSchemaUri(schemaUri);
                     if (!Check.isNull(groupPreview.getBidMax()) && !Check.isNull(groupPreview.getBidMin())) {
@@ -827,7 +831,7 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
      * @return
      */
     private String getName(String content, Long templateId, String sceneId, Integer appId, Integer unitType
-            , Integer number, String photoId, Integer creativeCategory) {
+            , Integer number, String photoId, Integer creativeCategory, Long accountId, String type) {
         String reg = "\\{\\{(.+?)\\}\\}";
         List<String> params = getParams(reg, content);
         if (Check.isNull(params)) {
@@ -877,7 +881,22 @@ public class KuaishouBatchCampaignPreviewServiceImpl extends ServiceImpl<Kuaisho
                     data.put(regName, unitType == 4 ? "自定义" : "程序化创意2.0");
                 }
             } else if ("序号".equals(regName)) {
-                data.put(regName, number + "");
+                if ("campaign".equals(type)) {
+                    String nowDate = DateUtils.formatDate(new Date(), "yyMMdd");
+                    String redisKey = accountId + "_batch_" + nowDate;
+                    Integer cnt = null;
+                    Integer redisCnt = (Integer) redisUtil.get(redisKey);
+                    if (Check.isNull(redisCnt)) {
+                        cnt = 1;
+                        redisUtil.set(redisKey, cnt, 100000L);
+                    } else {
+                        cnt = redisCnt + 1;
+                        redisUtil.set(redisKey, cnt, 100000L);
+                    }
+                    data.put(regName, cnt + "");
+                } else {
+                    data.put(regName, number + "");
+                }
             } else if ("素材命名".equals(regName)) {
                 KuaiShouVideoGet video = videoGetService.getVideoByPhotoId(photoId);
                 if (!Check.isNull(video)) {