wuweihao před 4 roky
rodič
revize
53dfbc31b5

+ 1 - 0
laser/src/main/java/com/fdkankan/indoor/core/controller/FilterController.java

@@ -32,6 +32,7 @@ public class FilterController {
 
     /**
      * http://127.0.0.1:9294/indoor/test3/api/images/1
+     * http://127.0.0.1:9294/indoor/test1/api/images/1306
      * @param sceneCode
      * @param id
      * @return

+ 3 - 3
laser/src/main/java/com/fdkankan/indoor/core/service/impl/FilterServiceImpl.java

@@ -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()));
         }