change 区域搜索

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/entity/GeoRegionEntity.java

@@ -60,6 +60,6 @@ public  class GeoRegionEntity extends  GenericTreeSortSupportEntity<String> {
 
     @Override
     public int hashCode() {
-        return Objects.hash(getName(), getChildrenNum(), getRegion(), getChildren());
+        return Objects.hash(getId());
     }
 }

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/web/GeoController.java

@@ -44,10 +44,9 @@ public class GeoController  implements ReactiveTreeServiceQueryController<GeoReg
     @QueryAction
     @QueryOperation(summary = "使用GET动态查询并返回树形结构以及geo集合信息")
     public Mono<?> findAllTreeTp2(@Parameter(hidden = true) QueryParamEntity paramEntity) {
-
         return this.findAllChildren(paramEntity)
-            .collectList()
-            .map(result->  Tuple.of(TreeSupportEntity.list2tree(result,GeoRegionEntity::setChildren), GeoJson.of(result.stream().map(GeoRegionEntity::getRegion)
+            .collectSortedList()
+            .map(result->  Tuple.of(TreeSupportEntity.list2tree(new HashSet<>(result),GeoRegionEntity::setChildren), GeoJson.of(result.stream().map(GeoRegionEntity::getRegion)
                 .filter(Objects::nonNull).collect(Collectors.toList()), "FeatureCollection")));
     }