Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -1064,11 +1064,9 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
|
|||||||
json.setValueType(split[1]);
|
json.setValueType(split[1]);
|
||||||
json.setTime(String.join(",", value.stream()
|
json.setTime(String.join(",", value.stream()
|
||||||
.map(abnormal -> abnormal.getTime())
|
.map(abnormal -> abnormal.getTime())
|
||||||
.distinct()
|
|
||||||
.collect(Collectors.toList())));
|
.collect(Collectors.toList())));
|
||||||
json.setValue(String.join(",", value.stream()
|
json.setValue(String.join(",", value.stream()
|
||||||
.map(abnormal -> abnormal.getValue() + "")
|
.map(abnormal -> abnormal.getValue() + "")
|
||||||
.distinct()
|
|
||||||
.collect(Collectors.toList())));
|
.collect(Collectors.toList())));
|
||||||
info.add(json);
|
info.add(json);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user