浏览代码

修改快手规则定向数据字段清洗逻辑

syh 4 年之前
父节点
当前提交
5acdaec698

+ 9 - 0
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -366,4 +366,13 @@ public class SampleTest {
         }
     }
 
+    @Autowired
+    private IRuleKuaiShouPlanService ruleKuaiShouPlanService;
+    @Test
+    public void execute() {
+        CtopOauthToken token= tokenService.getTokenByAccountId(9589905L);
+        ruleKuaiShouPlanService.cleanRuleDataTarget(token.getAccountId(), 1);
+    }
+
+
 }

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/entity/RuleDataTargetKuaishou.java

@@ -10,7 +10,7 @@ import lombok.Data;
 @Data
 @TableName("ctop_rule_data_target_kuaishou")
 public class RuleDataTargetKuaishou {
-    
+
 	/**id*/
 	private Long id;
 	/**accountId*/

+ 1 - 2
module-job-kuaishou/src/main/resources/application-jiaoyang.yml

@@ -221,11 +221,10 @@ xxl:
   job:
     accessToken:
     executor:
-      appname: module-job-kuaishou-v2
+      appname: module-job-kuaishou
       port: 9998
       ip:
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
     admin:
       addresses: http://129.28.150.229:8090/xxl-job-admin
-#      addresses: http://139.186.29.76:8090/xxl-job-admin

+ 25 - 9
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/RuleKuaiShouPlanServiceImpl.java

@@ -132,6 +132,7 @@ public class RuleKuaiShouPlanServiceImpl implements IRuleKuaiShouPlanService {
         if (Check.isNull(details)) {
             return;
         }
+
         this.insertTarget(accountId, details);
         cleanRuleDataTarget(accountId, page + 1);
     }
@@ -190,20 +191,35 @@ public class RuleKuaiShouPlanServiceImpl implements IRuleKuaiShouPlanService {
         details.forEach(detail -> {
             JSONObject unitDetail = (JSONObject) detail;
             RuleDataTargetKuaishou target = new RuleDataTargetKuaishou();
-            if ((unitDetail.getInteger("status") == 20 || unitDetail.getInteger("status") == 19) &&
-                    unitDetail.getInteger("put_status") == 1) {
+            Integer status = unitDetail.getInteger("status");
+            Integer putStatus = unitDetail.getInteger("put_status");
+            if ((status == 20 || status == 19) && putStatus == 1) {
                 target.setId(unitDetail.getLong("unit_id"));
                 target.setAccountId(accountId);
                 target.setPlanId(unitDetail.getLong("campaign_id"));
                 target.setUnitId(unitDetail.getLong("unit_id"));
                 target.setSceneId(unitDetail.getJSONArray("scene_id")==null?"":unitDetail.getJSONArray("scene_id").toString());
-                target.setRegion(unitDetail.getJSONArray("region")==null?"":unitDetail.getJSONArray("region").toString());
-                target.setGender(unitDetail.getInteger("gender")==null?0:unitDetail.getInteger("gender"));
-                target.setPlatformOs(unitDetail.getInteger("platform_os")==null?0:unitDetail.getInteger("platform_os"));
-                target.setDeviceBrand(unitDetail.getJSONArray("device_brand")==null?"":unitDetail.getJSONArray("device_brand").toString());
-                target.setDevicePrice(unitDetail.getJSONArray("device_price")==null?"":unitDetail.getJSONArray("device_price").toString());
-                target.setFilterConvertedLevel(unitDetail.getInteger("filter_converted_level")==null?0:unitDetail.getInteger("filter_converted_level"));
-                target.setIsOpen(unitDetail.getInteger("is_open")==null?0:unitDetail.getInteger("is_open"));
+
+                JSONArray region = unitDetail.getJSONObject("target").getJSONArray("region");
+                target.setRegion(region==null?"":region.toJSONString());
+
+                Integer gender = unitDetail.getJSONObject("target").getInteger("gender");
+                target.setGender(gender==null?0:gender);
+
+                Integer platformOs = unitDetail.getJSONObject("target").getInteger("platform_os");
+                target.setPlatformOs(platformOs==null?0:platformOs);
+
+                JSONArray deviceBrand = unitDetail.getJSONObject("target").getJSONArray("device_brand");
+                target.setDeviceBrand(deviceBrand==null?"":deviceBrand.toJSONString());
+
+                JSONArray devicePrice = unitDetail.getJSONObject("target").getJSONArray("device_price");
+                target.setDevicePrice(devicePrice==null?"":devicePrice.toJSONString());
+
+                Integer filterConvertedLevel = unitDetail.getJSONObject("target").getInteger("filter_converted_level");
+                target.setFilterConvertedLevel(filterConvertedLevel);
+
+                Integer isOpen = unitDetail.getJSONObject("target").getJSONObject("intelli_extend").getInteger("is_open");
+                target.setIsOpen(isOpen==null?0:isOpen);
                 target.setScheduleTime(unitDetail.getString("schedule_time")==null?"":unitDetail.getString("schedule_time"));
                 batch.add(target);
             }