Merge branch 'dev_bitmap' of 172.16.10.76:moa/amos-boot-biz into dev_bitmap

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

@@ -146,7 +146,7 @@ public class EquipmentSpecificAlarm extends BaseEntity {
 
     @ApiModelProperty(value = "设备编码")
     @TableField(exist = false)
-    private String code;
+    private String equipmentSpecificCode;
 
     @ApiModelProperty(value = "消防系统名称",notes = "告警详情时使用")
     @TableField(exist = false)

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

@@ -51,6 +51,30 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @TableField("equipment_index_key")
     private String equipmentIndexKey;
     
+    /**
+     * 颜色
+     */
+    @TableField(value = "emergency_level_color")
+    private String emergencyLevelColor;
+
+    /**
+     * 是否告警:0-否；1-是
+     */
+    @TableField(value = "is_alarm")
+    private Integer isAlarm;
+
+    /**
+     * 紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）
+     */
+    @TableField(value = "emergency_level")
+    private String emergencyLevel;
+
+    /**
+     * 紧急程度描述
+     */
+    @TableField(value = "emergency_level_describe")
+    private String emergencyLevelDescribe;
+    
     @TableField(exist = false)
     private String nameKey;
 
@@ -109,28 +133,14 @@ public class EquipmentSpecificIndex extends BaseEntity {
     @ApiModelProperty(value = "设备所属系统ids")
     @TableField(exist = false)
     private String systemId;
+    
+    @ApiModelProperty(value = "详细位置")
+    @TableField(exist = false)
+    private String location;
+    
+    @ApiModelProperty(value = "所属建筑id")
+    @TableField(exist = false)
+    private String buildId;
 
-    /**
-     * 颜色
-     */
-    @TableField(value = "emergency_level_color")
-    private String emergencyLevelColor;
-
-    /**
-     * 是否告警:0-否；1-是
-     */
-    @TableField(value = "is_alarm")
-    private Integer isAlarm;
-
-    /**
-     * 紧急程度枚举（1：紧急，2：严重，3：轻微，4：正常，5：无效，6：备用，7：其他）
-     */
-    @TableField(value = "emergency_level")
-    private String emergencyLevel;
-
-    /**
-     * 紧急程度描述
-     */
-    @TableField(value = "emergency_level_describe")
-    private String emergencyLevelDescribe;
+    
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificAlarmLogMapper.java

 package com.yeejoin.equipmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
 import com.yeejoin.equipmanage.common.datasync.vo.AppAlarmExtVo;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarm;
 import com.yeejoin.equipmanage.common.entity.EquipmentSpecificAlarmLog;
@@ -28,4 +29,7 @@ public interface EquipmentSpecificAlarmLogMapper extends BaseMapper<EquipmentSpe
     List<AppAlarmExtVo> findByIdListNoBuildId(@Param("list") List<Long> idBNullList);
 
     List<EquipmentSpecificAlarmLog> getIsConfirmByAlarmId(@Param("equipmentSpecificAlarmId") Long equipmentSpecificAlarmId, @Param("isConfirm") String isConfirm);
+    
+    List<FireEquipmentFireAlarm> getFireEquipAlarmLogDetailsById(@Param("list") List<Long> ids);
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentSpecificMapper.java

@@ -109,7 +109,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
 
     IPage<SourceNameByEquipSpeIdVO> getSourceNameList(IPage page, Long warehouseStructureId, Long sourceId, String equipmentName, String equipmentCode);
 
-    FireEquipment getEquipSpecificDetail(EquipmentSpecific equipmentSpecific);
+    FireEquipment getEquipSpecificDetail(Long id);
 
     List<EquipmentCategory> getEquipSpeTypeByQrcode(@Param("qrCode") String qrCode);
 
@@ -199,4 +199,7 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecific> {
     List<Map<String, String>> getBoxTropicsIndexDetails();
 
     String getEquipmentBySpecificId(@Param("specificId") Long specificId);
+    
+    
+    List<Map<String,String>> getStationInfo();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -1425,7 +1425,7 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
 
     @Override
     public FireEquipment getEquipSpecificDetail(EquipmentSpecific equipmentSpecific) {
-        return equipmentSpecificMapper.getEquipSpecificDetail(equipmentSpecific);
+        return equipmentSpecificMapper.getEquipSpecificDetail(equipmentSpecific.getId());
     }
 
     @Override

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

@@ -110,4 +110,42 @@
             </if>
         </where>
     </select>
+    
+    <select id="getFireEquipAlarmLogDetailsById"
+            resultType="com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm">
+        SELECT
+        sal.id,
+        es.id AS fireEquipmentId,
+        si.id AS equipmentMeasurementId,
+        ei.name_key AS fieldName,
+        ei.`name` AS fieldLabel,
+        IFNULL(si.`value`,'') AS `value`,
+        sa.frequency,
+        sa.`status`,
+        sa.type,
+        IFNULL(es.code,'') AS fireEquipmentMRid,
+        '' AS equipmentMeasurementMRid,
+        ed.`name` AS fireEquipmentName,
+        sa.recovery_date,
+        sal.create_date,
+        sal.update_date,
+        sal.alarm_reason AS description,
+        IFNULL(sal.equipment_specific_name,'') AS `name`,
+        IFNULL(sal.equipment_specific_code,'') AS mrid
+        FROM
+        wl_equipment_specific_alarm_log sal
+        LEFT JOIN wl_equipment_specific_alarm sa ON sal.equipment_specific_alarm_id = sa.id
+        LEFT JOIN wl_equipment_specific es ON sa.equipment_specific_id = es.id
+        LEFT JOIN wl_equipment_specific_index si ON es.id = si.equipment_specific_id
+        LEFT JOIN wl_equipment_detail ed ON ed.id = es.equipment_detail_id
+        LEFT JOIN wl_equipment_index ei ON si.equipment_index_id = ei.id
+        <where>
+            <if test="list != null and list.size > 0">
+                sal.id IN
+                <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -61,12 +61,15 @@
 			wesi.is_alarm as isAlarm,
 			wesi.emergency_level_color as emergencyLevelColor,
 			wesi.emergency_level as emergencyLevel,
-			wesi.emergency_level_describe as emergencyLevelDescribe
+			wesi.emergency_level_describe as emergencyLevelDescribe,
+			TRIM(CONCAT_WS(' ',wes.position,sd.description)) AS location,
+			sd.warehouse_structure_id AS buildId
         FROM
         wl_equipment_specific_index AS wesi
         LEFT JOIN wl_equipment_specific AS wes ON wes.id = wesi.equipment_specific_id
         LEFT JOIN wl_equipment_detail ed ON ed.id = wes.equipment_detail_id
         LEFT JOIN wl_equipment_index AS wei ON wei.id = wesi.equipment_index_id
+        LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = wes.id
         WHERE
         wes.iot_code = #{iotCode}  and wei.is_iot = true
     </select>

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

@@ -1473,4 +1473,13 @@
         where
             wes.id = #{specificId}
     </select>
+
+    <select id="getStationInfo" resultType="Map">
+        SELECT
+			`name` AS stationName,
+			station_code AS stationCode
+		FROM
+			f_station_info
+		LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file