改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/dto/FireBuildingDto.java

@@ -68,4 +68,40 @@ public class FireBuildingDto extends BaseDto {
     
     @ApiModelProperty(value = "子节点")
     private List<FireBuildingDto> children;
+
+    @ApiModelProperty(value = "")
+    private String area;
+
+    @ApiModelProperty(value = "")
+    private String buildDate;
+
+    @ApiModelProperty(value = "")
+    private String structureType;
+
+    @ApiModelProperty(value = "")
+    private String fireRisk;
+
+    @ApiModelProperty(value = "")
+    private String fireResistanceLevel;
+
+    @ApiModelProperty(value = "")
+    private String height;
+
+    @ApiModelProperty(value = "")
+    private String floorArea;
+
+    @ApiModelProperty(value = "")
+    private String dutyUser;
+
+    @ApiModelProperty(value = "")
+    private String dutyUserPhone;
+
+    @ApiModelProperty(value = "")
+    private String fireRoadPhoto;
+
+    @ApiModelProperty(value = "")
+    private String build3photo;
+
+    @ApiModelProperty(value = "")
+    private String buildPhoto;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/java/com/yeejoin/amos/boot/module/ccs/api/mapper/FireBuildingMapper.java

@@ -17,6 +17,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2021-11-09
  */
 public interface FireBuildingMapper extends BaseMapper<FireBuilding> {
-	
+
 	List<FireBuildingDto> getFireBuildingByMridIntreeMrids(@Param("mrid") String mrid);
+
+
+	/**
+	 * @param parentMrid
+	 * @Description 根据parentMrid查询其下资源（楼层、房间）
+	 * @Return List<Map < String, Object>>
+	 * @Date 2020/12/19 15:06
+	 */
+	List<Map<String, Object>> queryFloorRoom(@Param("parentMrid") String parentMrid);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-ccs-api/src/main/resources/mapper/FireBuildingMapper.xml

@@ -10,4 +10,45 @@
 		type = 'building'
 	AND find_in_set(#{mrid}, tree_mrids)
  </select>
+
+
+
+	<select id="queryFloorRoom" resultType="java.util.Map">
+		SELECT
+			afb.*
+		FROM ast_fire_building afb
+		WHERE afb.parent_mrid = #{parentMrid,jdbcType=VARCHAR}
+	</select>
+
+
+<!-- <select id="queryFloorRoom" resultType="java.util.Map">-->
+<!--	 SELECT-->
+<!--		 	afb.id,-->
+<!--			afb.station_code as stationCode,-->
+<!--		 	afb.station_name as stationName,-->
+<!--         	afb.mrid as code,-->
+<!--         	afb.name as `name`,-->
+<!--         	afb.classify as buildType,-->
+<!--         	afb.floor_number,-->
+<!--         	afb.equipment_number as equipmentNumber,-->
+<!--         	afb.parent_mrid as parentMrid,-->
+<!--         	afb.tree_mrids as treeMrids,-->
+<!--         	afb.type,-->
+<!--		 	afb.position as address,-->
+<!--			afb.photo_url as photoUrl,-->
+<!--			afb.area as area,-->
+<!--			afb.build_date as buildDate,-->
+<!--			afb.structure_type as structureType,-->
+<!--			afb.fire_risk as fireRisk,-->
+<!--			afb.fire_resistance_level as fireResistanceLevel,-->
+<!--			afb.height as height,-->
+<!--			afb.floor_area as floorArea,-->
+<!--			afb.duty_user as dutyUser,-->
+<!--			afb.duty_user_phone as dutyUserPhone,-->
+<!--		 	afb.fire_road_photo as fireRoadPhoto,-->
+<!--			afb.build_3photo as build3photo,-->
+<!--			afb.build_photo as buildPhoto-->
+<!--	 FROM ast_fire_building afb-->
+<!--	 WHERE afb.mrid = #{parentMrid,jdbcType=VARCHAR}-->
+<!--	</select>-->
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/service/impl/FireBuildingServiceImpl.java

 package com.yeejoin.amos.boot.module.ccs.biz.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ccs.api.dto.BaseDto;
@@ -14,11 +17,7 @@ import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -90,6 +89,52 @@ public class FireBuildingServiceImpl extends BaseService<FireBuildingDto, FireBu
         		result.putAll(attribute);
     		}
     	}
-		return result;
+        List<Map<String, Object>> list = this.baseMapper.queryFloorRoom(mrid);
+        int floorNum = list.parallelStream().filter(o -> o.get("type").equals("floor")).collect(Collectors.toList()).size();
+        result.put("floorNumber", floorNum);
+        int roomNum = list.parallelStream().filter(o -> o.get("type").equals("room")).collect(Collectors.toList()).size();
+        result.put("roomNumber", roomNum);
+        if (result.containsKey("position")) {
+            result.put("address", result.get("position"));
+        }
+        if (result.containsKey("mrid")) {
+            result.put("code", result.get("mrid"));
+        }
+        if (result.containsKey("classify")) {
+            result.put("buildType", result.get("classify"));
+        }
+        if (result.containsKey("photoUrl")) {
+            String[] strArr = result.get("photoUrl").toString().split(",");
+            List<String> list1 = Arrays.asList(strArr);
+            result.put("img", list1);
+            if (CollUtil.isEmpty(list1)) {
+                result.remove("img", "");
+            }
+        }
+        if (result.containsKey("fireRoadPhoto")) {
+            String[] strArr = result.get("fireRoadPhoto").toString().split(",");
+            List<String> list1 = Arrays.asList(strArr);
+            result.put("fireExitsImg", list1);
+            if (CollUtil.isEmpty(list1)) {
+                result.remove("fireExitsImg", "");
+            }
+        }
+        if (result.containsKey("build3photo")) {
+            String[] strArr = result.get("build3photo").toString().split(",");
+            List<String> list1 = Arrays.asList(strArr);
+            result.put("elevationImg", list1);
+            if (CollUtil.isEmpty(list1)) {
+                result.remove("elevationImg", "");
+            }
+        }
+        if (result.containsKey("buildPhoto")) {
+            String[] strArr = result.get("buildPhoto").toString().split(",");
+            List<String> list1 = Arrays.asList(strArr);
+            result.put("planarGraphImg", list1);
+            if (CollUtil.isEmpty(list1)) {
+                result.remove("planarGraphImg");
+            }
+        }
+        return result;
     }
 }
\ No newline at end of file