解决冲突

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/KeySiteMapper.xml

@@ -49,6 +49,9 @@
 			  <foreach collection="buildingIds" item="buildingId" open="(" close=")" separator=",">
                 #{buildingId}
             </foreach>
+          </if>
+		<if test="buildingId != null and buildingId != -1 and buildingId != '-1'">
+			AND c.`building_id`= #{buildingId}
 		</if>
 		<if test="fireEnduranceRate != null and fireEnduranceRate != ''">
 			AND c.`fire_endurance_rate`= #{fireEnduranceRate}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquipmentSpecificIndex.java

@@ -101,4 +101,12 @@ public class EquipmentSpecificIndex extends BaseEntity {
 
     @TableField(exist = false)
     private String valueEnum;
+
+    @ApiModelProperty(value = "设备CODE")
+    @TableField(exist = false)
+    private String equipmentSpecificCode;
+
+    @ApiModelProperty(value = "设备所属系统ids")
+    @TableField(exist = false)
+    private String systemId;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/vo/SpeIndexVo.java

@@ -9,11 +9,14 @@ import lombok.Data;
 @Data
 @ApiModel(description = "性能指标类")
 public class SpeIndexVo {
-    private String key;
-    private String name;
-    private String value;
+	
+    private String key = "";
+    
+    private String name = "";
+    
+    private String value = "";
 
-    private String typeCode;
+    private String typeCode = "";
 
     private Long equipmentSpecificId;
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -547,7 +547,18 @@ public class FireFightingSystemController extends AbstractBaseController {
 
 
     /**
-     * 设备报警信息
+     * 获取点位图，区域树数据
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "获取点位图，区域树数据", notes = "消防系统点位图使用")
+    @GetMapping(value = "/point/tree")
+    public List<PointTreeVo> getPointTree(@RequestParam(required = false) String systemId) {
+        return fireFightingSystemService.getPointTree(systemId, getOrgCode());
+    }
+
+
+    /**
+     * 设备指标数据查询
      *
      * @param id
      * @return

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificIndexMapper.xml

@@ -55,7 +55,9 @@
 			wesi.update_date AS updateDate,
 			ed.code AS equipmentCode,
 			ed.equipment_id AS equipmentId,
-			ed.id AS equipmentDetailId
+			ed.id AS equipmentDetailId,
+			wes.code as equipmentSpecificCode,
+			wes.system_id as systemId
         FROM
         wl_equipment_specific_index AS wesi
         LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -334,21 +334,53 @@
             p_point p
     </select>
     <select id="getSpeIndex" resultType="com.yeejoin.equipmanage.common.vo.SpeIndexVo">
-		select * from (
-         select
-             eqin.name_key as `key`,
-             eqin.name as name,
-             eqin.type_code,
-             spein.update_date as updateDate,
-             if (eqin.unit is null, spein.value,concat(spein.value,eqin.unit)) as value
-             from
-             wl_equipment_specific_index as spein
-             left join wl_equipment_index as eqin on spein.equipment_index_id = eqin.id
-             where
-             spein.equipment_specific_id = #{id}
-            order by eqin.sort_num) as dat
-            where `key` is not null and `key` != ''
-            ORDER BY dat.updateDate DESC
+    	SELECT
+			*
+		FROM
+			(
+				SELECT
+					eqin.name_key AS `key`,
+					eqin.`name` AS `name`,
+					eqin.type_code,
+					spein.update_date AS updateDate,
+					spein.equipment_specific_id as equipmentSpecificId,
+				IF (
+					eqin.unit IS NULL,
+				IF (
+					(
+						ISNULL(spein.value_label)
+						OR spein.value_label = ''
+					),
+					spein.`value`,
+					spein.value_label
+				),
+				concat(
+		
+					IF (
+						(
+							ISNULL(spein.value_label)
+							OR spein.value_label = ''
+						),
+						spein.`value`,
+						spein.value_label
+					),
+					' ',
+					eqin.unit
+				)
+				) AS `value`
+				FROM
+					wl_equipment_specific_index AS spein
+				LEFT JOIN wl_equipment_index AS eqin ON spein.equipment_index_id = eqin.id
+				WHERE
+					spein.equipment_specific_id = #{id}
+				ORDER BY
+					eqin.sort_num
+			) AS dat
+		WHERE
+			`key` IS NOT NULL
+		AND `key` != ''
+		ORDER BY
+			dat.updateDate DESC
     </select>
     <select id="getSpeIndexIn" resultType="com.yeejoin.equipmanage.common.vo.SpeIndexVo">
 		select * from (