|
@@ -40,7 +40,7 @@ public class FilterServiceImpl implements FilterService {
|
|
|
@Override
|
|
|
public Result findById(String sceneCode, Integer id) {
|
|
|
List<JsonData> array = findBySceneCode(sceneCode);
|
|
|
- List<JsonData> result = array.stream().filter(p -> id==p.getId())
|
|
|
+ List<JsonData> result = array.stream().filter(p -> id.equals(p.getId()))
|
|
|
.collect(Collectors.toList());
|
|
|
if (result.size() == 0) {
|
|
|
throw new RuntimeException("此场景没有数据");
|
|
@@ -125,11 +125,11 @@ public class FilterServiceImpl implements FilterService {
|
|
|
// .limit(limit);
|
|
|
Stream<JsonData> dataStream = dbList.stream();
|
|
|
if (datasetId != null) {
|
|
|
- dataStream = dataStream.filter(p -> datasetId == p.getDataset_id().longValue());
|
|
|
+ dataStream = dataStream.filter(p -> datasetId.equals(p.getDataset_id()));
|
|
|
}
|
|
|
|
|
|
if (siteModelEntityId != null) {
|
|
|
- dataStream = dataStream.filter(p -> siteModelEntityId == p.getSite_model_entity_id().longValue());
|
|
|
+ dataStream = dataStream.filter(p -> siteModelEntityId.equals(p.getSite_model_entity_id()));
|
|
|
}
|
|
|
|
|
|
|