|
@@ -24,6 +24,8 @@ import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
+import static java.lang.Integer.valueOf;
|
|
|
+
|
|
|
@Slf4j
|
|
|
@Service
|
|
|
public class BatchServiceImpl implements IBatchService {
|
|
@@ -174,7 +176,7 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
if (!Check.isNull(scene_id)) {
|
|
|
unitJson.put("scene_id", scene_id);
|
|
|
}
|
|
|
- Integer sceneId = Integer.valueOf(scene_id.get(0).toString());
|
|
|
+ Integer sceneId = valueOf(scene_id.get(0).toString());
|
|
|
// 资源创作方式
|
|
|
if (!Check.isNull(requestJson.getInteger("unitType"))) {
|
|
|
unitJson.put("unit_type", requestJson.getInteger("unitType"));
|
|
@@ -476,6 +478,7 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
if (!Check.isNull(scene_id)) {
|
|
|
unitJson.put("scene_id", scene_id);
|
|
|
}
|
|
|
+ Integer sceneId = valueOf(scene_id.get(0).toString());
|
|
|
|
|
|
// 资源创作方式
|
|
|
if (!Check.isNull(requestJson.getInteger("unitType"))) {
|
|
@@ -580,29 +583,34 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
if (!Check.isNull(requestJson.getInteger("network"))) {
|
|
|
targetJson.put("network", requestJson.getInteger("network"));
|
|
|
}
|
|
|
+
|
|
|
//设备品牌
|
|
|
if (!Check.isNull(requestJson.getJSONArray("deviceBrand"))) {
|
|
|
targetJson.put("device_brand", requestJson.getJSONArray("deviceBrand"));
|
|
|
}
|
|
|
- //设备价格
|
|
|
- if (!Check.isNull(requestJson.getJSONArray("devicePrice"))) {
|
|
|
- targetJson.put("device_price", requestJson.getJSONArray("devicePrice"));
|
|
|
- }
|
|
|
- //商业兴趣类型
|
|
|
- if (!Check.isNull(requestJson.getInteger("businessInterestType"))) {
|
|
|
- targetJson.put("business_interest_type", requestJson.getInteger("businessInterestType"));
|
|
|
- }
|
|
|
- // 商业兴趣
|
|
|
- if (!Check.isNull(requestJson.getJSONArray("businessInterest"))) {
|
|
|
- targetJson.put("business_interest", requestJson.getJSONArray("businessInterest"));
|
|
|
- }
|
|
|
- //网红粉丝
|
|
|
- if (!Check.isNull(requestJson.getJSONArray("fansStar"))) {
|
|
|
- targetJson.put("fans_star", requestJson.getJSONArray("fansStar"));
|
|
|
- }
|
|
|
- //兴趣视频用户
|
|
|
- if (!Check.isNull(requestJson.getJSONArray("interestVideo"))) {
|
|
|
- targetJson.put("interest_video", requestJson.getJSONArray("interestVideo"));
|
|
|
+ if (sceneId != 5) {
|
|
|
+
|
|
|
+
|
|
|
+ //设备价格
|
|
|
+ if (!Check.isNull(requestJson.getJSONArray("devicePrice"))) {
|
|
|
+ targetJson.put("device_price", requestJson.getJSONArray("devicePrice"));
|
|
|
+ }
|
|
|
+ //商业兴趣类型
|
|
|
+ if (!Check.isNull(requestJson.getInteger("businessInterestType"))) {
|
|
|
+ targetJson.put("business_interest_type", requestJson.getInteger("businessInterestType"));
|
|
|
+ }
|
|
|
+ // 商业兴趣
|
|
|
+ if (!Check.isNull(requestJson.getJSONArray("businessInterest"))) {
|
|
|
+ targetJson.put("business_interest", requestJson.getJSONArray("businessInterest"));
|
|
|
+ }
|
|
|
+ //网红粉丝
|
|
|
+ if (!Check.isNull(requestJson.getJSONArray("fansStar"))) {
|
|
|
+ targetJson.put("fans_star", requestJson.getJSONArray("fansStar"));
|
|
|
+ }
|
|
|
+ //兴趣视频用户
|
|
|
+ if (!Check.isNull(requestJson.getJSONArray("interestVideo"))) {
|
|
|
+ targetJson.put("interest_video", requestJson.getJSONArray("interestVideo"));
|
|
|
+ }
|
|
|
}
|
|
|
// APP行为-按分类
|
|
|
if (!Check.isNull(requestJson.getJSONArray("appInterest"))) {
|
|
@@ -623,26 +631,27 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
|
|
|
JSONObject intelliExtendJson = new JSONObject();
|
|
|
|
|
|
- // 开启智能扩量
|
|
|
- if (!Check.isNull(requestJson.getInteger("isOpen"))) {
|
|
|
- intelliExtendJson.put("is_open", requestJson.getInteger("isOpen"));
|
|
|
- }
|
|
|
- //不可突破年龄
|
|
|
- if (!Check.isNull(requestJson.getInteger("noAgeBreak"))) {
|
|
|
- intelliExtendJson.put("no_age_break", requestJson.getInteger("noAgeBreak"));
|
|
|
- }
|
|
|
- //不可突破性别
|
|
|
- if (!Check.isNull(requestJson.getInteger("noGenderBreak"))) {
|
|
|
- intelliExtendJson.put("no_gender_break", requestJson.getInteger("noGenderBreak"));
|
|
|
- }
|
|
|
- // 不可突破地域
|
|
|
- if (!Check.isNull(requestJson.getInteger("noAreaBreak"))) {
|
|
|
- intelliExtendJson.put("no_area_break", requestJson.getInteger("noAreaBreak"));
|
|
|
- }
|
|
|
- if (!Check.isNull(intelliExtendJson)) {
|
|
|
- targetJson.put("intelli_extend", intelliExtendJson);
|
|
|
+ if (sceneId != 5) {
|
|
|
+ // 开启智能扩量
|
|
|
+ if (!Check.isNull(requestJson.getInteger("isOpen"))) {
|
|
|
+ intelliExtendJson.put("is_open", requestJson.getInteger("isOpen"));
|
|
|
+ }
|
|
|
+ //不可突破年龄
|
|
|
+ if (!Check.isNull(requestJson.getInteger("noAgeBreak"))) {
|
|
|
+ intelliExtendJson.put("no_age_break", requestJson.getInteger("noAgeBreak"));
|
|
|
+ }
|
|
|
+ //不可突破性别
|
|
|
+ if (!Check.isNull(requestJson.getInteger("noGenderBreak"))) {
|
|
|
+ intelliExtendJson.put("no_gender_break", requestJson.getInteger("noGenderBreak"));
|
|
|
+ }
|
|
|
+ // 不可突破地域
|
|
|
+ if (!Check.isNull(requestJson.getInteger("noAreaBreak"))) {
|
|
|
+ intelliExtendJson.put("no_area_break", requestJson.getInteger("noAreaBreak"));
|
|
|
+ }
|
|
|
+ if (!Check.isNull(intelliExtendJson)) {
|
|
|
+ targetJson.put("intelli_extend", intelliExtendJson);
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
unitJson.put("target", targetJson);
|
|
|
JSONObject groupJson = requestJson.getJSONObject("groupArr");
|
|
|
if (Check.isNull(groupJson)) {
|
|
@@ -752,7 +761,7 @@ public class BatchServiceImpl implements IBatchService {
|
|
|
unitJson.put("scene_id", scene_id);
|
|
|
}
|
|
|
|
|
|
- Integer sceneId = Integer.valueOf(scene_id.get(0).toString());
|
|
|
+ Integer sceneId = valueOf(scene_id.get(0).toString());
|
|
|
// 资源创作方式
|
|
|
if (!Check.isNull(group.getUnitType())) {
|
|
|
if (!Check.isNull(group.getUnitType())) {
|