|
@@ -110,7 +110,7 @@ public class MatchLogic {
|
|
//包含 任一存在则报警
|
|
//包含 任一存在则报警
|
|
if ("contain".equals(condition)) {
|
|
if ("contain".equals(condition)) {
|
|
//人群包、流量包判断的是对象
|
|
//人群包、流量包判断的是对象
|
|
- if (NoEn.NO1.valueStr().equals(logicalType) || "retargetingTagsInclude".equals(indicatorCode) || "population".equals(indicatorCode)) {
|
|
|
|
|
|
+ if (NoEn.NO1.valueStr().equals(logicalType) || "retargetingTagsInclude".equals(indicatorCode) || "population".equals(indicatorCode) || "district".equals(indicatorCode) || "region".equals(indicatorCode)) {
|
|
for (String thr : thresholds) {
|
|
for (String thr : thresholds) {
|
|
if (values.contains(thr)) {
|
|
if (values.contains(thr)) {
|
|
return true;
|
|
return true;
|
|
@@ -136,7 +136,7 @@ public class MatchLogic {
|
|
} else {
|
|
} else {
|
|
//不包含,阈值中,存在任一目标则不报警,都不存在时则报警,出现阈值之外的亦报警
|
|
//不包含,阈值中,存在任一目标则不报警,都不存在时则报警,出现阈值之外的亦报警
|
|
boolean flag = true;
|
|
boolean flag = true;
|
|
- if ("retargetingTagsInclude".equals(indicatorCode) || "population".equals(indicatorCode)) {
|
|
|
|
|
|
+ if ("retargetingTagsInclude".equals(indicatorCode) || "population".equals(indicatorCode) || "region".equals(indicatorCode) || "district".equals(indicatorCode)) {
|
|
//人群包判断是否存在该对象
|
|
//人群包判断是否存在该对象
|
|
for (String thr : thresholds) {
|
|
for (String thr : thresholds) {
|
|
if (values.contains(thr)) {
|
|
if (values.contains(thr)) {
|