item：消防预案执行，新增摄像头、消防炮消息返回

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/EquipmentSpecificMapper.java

@@ -76,5 +76,5 @@ public interface EquipmentSpecificMapper extends BaseMapper<EquipmentSpecificVo>
      * @param equipmentId
      * @return
      */
-    Map queryFireMonitor(@Param("equipmentId") String equipmentId, @Param("fireMonitor") String fireMonitor);
+    Map queryFireMonitor(@Param("equipmentId") String equipmentId, @Param("code") String fireMonitor);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java

@@ -405,17 +405,6 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         contingencyRo.setEquipmentCode(equipment.getCode());
         contingencyRo.setEquipmentOrgCode(equipment.getOrgCode());
 
-//        Map cameraInfo = impAndFireEquipMapper.queryForCamera(String.valueOf(equipment.getId()));//查询重点设备关联视频点位，暂不处理
-//
-//        if (cameraInfo != null) {
-//            contingencyRo.setCameraCodes(String.valueOf(cameraInfo.get("codes")));
-//            contingencyRo.setCameraIds(String.valueOf(cameraInfo.get("ids")));
-//        }
-
-//        contingencyRo.setMobile("13259783333");
-//        contingencyRo.setAdminName("admin");
-//        contingencyRo.setFireEquipmentPosition(fireEquipment.getPosition3d());
-
         //查询重点设备关联视频点位
         Map cameraInfo = impAndFireEquipMapper.queryCamera(String.valueOf(equipment.getId()));
         if (cameraInfo != null && !cameraInfo.isEmpty()) {

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml

@@ -191,14 +191,14 @@
             GROUP_CONCAT( es.`code` ) codes
         FROM
             `f_equipment_fire_equipment` fe
-        LEFT JOIN wl_equipment_specific es ON fe.fire_equipment_id = es.equipment_detail_id
+        LEFT JOIN wl_equipment_specific es ON fe.fire_equipment_id = es.id
         LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
         <where>
             <if test="equipmentId !=null and equipmentId != ''">
                 AND fe.equipment_id = #{equipmentId}
             </if>
-            <if test="fireMonitor !=null and fireMonitor != ''">
-                AND ed.`code` LIKE CONCAT(fireMonitor,'%')
+            <if test="code !=null and code != ''">
+                AND ed.`code` LIKE CONCAT(#{code},'%')
             </if>
         </where>
     </select>