Ver Fonte

Merge remote-tracking branch 'origin/master'

yumeng há 4 anos atrás
pai
commit
1da79e03b3

+ 12 - 11
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -502,23 +502,24 @@ public class SampleTest {
 //            return;
 //        }
 
-        AiKuaishouAccountTargetTemplate accountTargetTemplate0 = aiKuaishouAccountTargetTemplateService.getById(1);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate0,50);
-
-        AiKuaishouAccountTargetTemplate accountTargetTemplate1 = aiKuaishouAccountTargetTemplateService.getById(30002);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate1,50);
-
-        AiKuaishouAccountTargetTemplate accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(30001);
-        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2,50);
+//        AiKuaishouAccountTargetTemplate accountTargetTemplate0 = aiKuaishouAccountTargetTemplateService.getById(1);
+//        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate0,50);
+//
+//        AiKuaishouAccountTargetTemplate accountTargetTemplate1 = aiKuaishouAccountTargetTemplateService.getById(30002);
+//        aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate1,50);
+
+        AiKuaishouAccountTargetTemplate accountTargetTemplate2 = aiKuaishouAccountTargetTemplateService.getById(90005);
+        aiKuaishouNewCreateCampaign.kuaishouAiAdsNewMaterialCreativity(accountTargetTemplate2);
     }
 
     @Test
     public void etlKuaishouProjectData(){
-        String dateString = "2020-03-17";
+        String dateString = "2020-08-07";
         Date startDate = DateUtils.parseDate(dateString,"yyyy-MM-dd");
-        for(int i=0;i<=365;i++){
+        for(int i=0;i<=180;i++){
             Date getDate = DateUtils.addDay(startDate,i);
-            kuaishouVideoEtlInfoService.etlKuaishouVideoInfoGroupByProjectId(getDate);
+            kuaishouVideoEtlInfoService.etlKuaishouVideoInfo(getDate);
+            bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
         }
     }
 }

+ 7 - 10
module-alarm/src/main/java/cn/com/ctop/alarm/modules/constant/MatchLogic.java

@@ -68,16 +68,13 @@ public class MatchLogic {
                         return value.equals(thresholds.get(0));
                     } else if ("not_equal".equals(condition)) {
                         return !value.equals(thresholds.get(0));
-                    }
-                    for (String thro : thresholds) {
-                        if ("contain".equals(condition)) {
-                            if (value.contains(thro)) {
-                                return true;
-                            }
-                        } else if ("no_contain".equals(condition)) {
-                            if (!value.contains(thro)) {
-                                return true;
-                            }
+                    } else if ("contain".equals(condition)) {
+                        if (thresholds.toString().contains(value)) {
+                            return true;
+                        }
+                    } else if ("no_contain".equals(condition)) {
+                        if (!thresholds.toString().contains(value)) {
+                            return true;
                         }
                     }
                 } else {

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouVideoEtlInfoServiceImpl.java

@@ -110,7 +110,7 @@ public class KuaishouVideoEtlInfoServiceImpl extends ServiceImpl<KuaishouVideoEt
                                 etlInfo.setEffectDate(date);
                                 etlInfo.setEffectDayNum(days);
                             }
-                            if(totalCost.compareTo(new BigDecimal("100000"))>0){
+                            if(totalCost.compareTo(new BigDecimal("50000"))>0){
                                 //此刻成为爆款
                                 etlInfo.setFaddishDate(date);
                                 etlInfo.setFaddishDayNum(days);
@@ -145,7 +145,7 @@ public class KuaishouVideoEtlInfoServiceImpl extends ServiceImpl<KuaishouVideoEt
                                 }
                             }
                             if(null == etlInfo.getFaddishDayNum()){
-                                if(totalCost.compareTo(new BigDecimal("100000"))>0){
+                                if(totalCost.compareTo(new BigDecimal("50000"))>0){
                                     //此刻成为爆款
                                     etlInfo.setFaddishDate(date);
                                     etlInfo.setFaddishDayNum(days);

+ 2 - 2
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/service/impl/BytedanceVideoEtlInfoServiceImpl.java

@@ -110,7 +110,7 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
                                 etlInfo.setEffectDate(date);
                                 etlInfo.setEffectDayNum(days);
                             }
-                            if(totalCost.compareTo(new BigDecimal("100000"))>0){
+                            if(totalCost.compareTo(new BigDecimal("50000"))>0){
                                 //此刻成为爆款
                                 etlInfo.setFaddishDate(date);
                                 etlInfo.setFaddishDayNum(days);
@@ -145,7 +145,7 @@ public class BytedanceVideoEtlInfoServiceImpl extends ServiceImpl<BytedanceVideo
                                 }
                             }
                             if(null == etlInfo.getFaddishDayNum()){
-                                if(totalCost.compareTo(new BigDecimal("100000"))>0){
+                                if(totalCost.compareTo(new BigDecimal("50000"))>0){
                                     //此刻成为爆款
                                     etlInfo.setFaddishDate(date);
                                     etlInfo.setFaddishDayNum(days);