|
@@ -20,6 +20,7 @@ import java.text.ParseException;
|
|
import java.text.SimpleDateFormat;
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
* Description
|
|
* Description
|
|
@@ -226,10 +227,10 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
|
|
if(StringUtils.isNotBlank(r.getPageLabel()) && StringUtils.isNotEmpty(r.getPageLabel()) && !label.contains(r.getPageLabel())) {
|
|
if(StringUtils.isNotBlank(r.getPageLabel()) && StringUtils.isNotEmpty(r.getPageLabel()) && !label.contains(r.getPageLabel())) {
|
|
RetuenEntity retuenEntity = new RetuenEntity();
|
|
RetuenEntity retuenEntity = new RetuenEntity();
|
|
if (r.getPageLabel().contains(",")) {
|
|
if (r.getPageLabel().contains(",")) {
|
|
- log.info("contains");
|
|
|
|
String[] split = r.getPageLabel().split(",");
|
|
String[] split = r.getPageLabel().split(",");
|
|
for (String str : split) {
|
|
for (String str : split) {
|
|
- if (StringUtils.isNotBlank(str) && !label.contains(str)) {
|
|
|
|
|
|
+ List<String> collect = label.stream().map(RetuenEntity::getValue).collect(Collectors.toList());
|
|
|
|
+ if (StringUtils.isNotBlank(str) && !collect.contains(str)) {
|
|
retuenEntity = new RetuenEntity();
|
|
retuenEntity = new RetuenEntity();
|
|
returnId.updateAndGet(v -> v + 1);
|
|
returnId.updateAndGet(v -> v + 1);
|
|
retuenEntity.setId(returnId.get().toString());
|
|
retuenEntity.setId(returnId.get().toString());
|
|
@@ -238,8 +239,8 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- log.info("not contains");
|
|
|
|
- if (!label.contains(r.getPageLabel())) {
|
|
|
|
|
|
+ List<String> collect = label.stream().map(RetuenEntity::getValue).collect(Collectors.toList());
|
|
|
|
+ if (!collect.contains(r.getPageLabel())) {
|
|
returnId.updateAndGet(v -> v + 1);
|
|
returnId.updateAndGet(v -> v + 1);
|
|
retuenEntity.setId(returnId.get().toString());
|
|
retuenEntity.setId(returnId.get().toString());
|
|
retuenEntity.setValue(r.getPageLabel());
|
|
retuenEntity.setValue(r.getPageLabel());
|