Merge branch 'develop_ccs' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceDto.java

@@ -54,7 +54,7 @@ public class WaterResourceDto extends BaseDto {
 	@ApiModelProperty(value = "所在建筑id")
 	private Long belongBuildingId;
 
-	@ExplicitConstraint(indexNum = 3, sourceClass = CommonExplicitConstraint.class, method = "getBuildingList")
+	@ExplicitConstraint(indexNum = 3, sourceClass = CommonExplicitConstraint.class, method = "getWaterBuildingList")
 	@ExcelProperty(value = "所在建筑", index = 3)
 	@ApiModelProperty(value = "所在建筑")
 	private String belongBuilding;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -112,6 +112,9 @@ public class DataSourcesImpl implements DataSources {
                 case "getBuildingList":
                     str = getBuildingList();
                     break;
+                case "getWaterBuildingList":
+                    str = getWaterBuildingList();
+                    break;
                 case "getFireSystemList":
                     str = getFireSystemList();
                     break;
@@ -404,6 +407,20 @@ public class DataSourcesImpl implements DataSources {
         return str;
     }
 
+
+    private String[] getWaterBuildingList() {
+
+        ResponseModel<Object> response = equipFeignClient.getBuildingTree();
+        List<Map<String, Object>> buildingMapList = (List<Map<String, Object>>) response.getResult();
+        List<Map<String, Object>> children = (List<Map<String, Object>>) buildingMapList.get(0).get("children");
+        List<String> collect = children.stream().map(itme -> {
+            return itme.get("name") + "@" + itme.get("id");
+        }).collect(Collectors.toList());
+        String[] str = collect.toArray(new String[collect.size()]);
+        return str;
+    }
+
+
     private String[] getDataDictionary(String type) {
         QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("type", type);