修改预案查询

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

 package com.yeejoin.amos.fas.business.dao.mapper;
 
+import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
 import com.yeejoin.amos.fas.dao.entity.Equipment;
 import com.yeejoin.amos.fas.dao.entity.EquipmentFireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireEquipment;
@@ -35,5 +36,7 @@ public interface ImpAndFireEquipMapper extends BaseMapper {
 
     public Boolean existsAlarmPointByEqpPointIdAndEquipId(@Param("pointId") long pointId, @Param("equipmentId") long equipmentId);
 //	Boolean containGroupedPoint(long id);
+    
+    EquipmentSpecificIndexVo findFireEqupmentByCode(String code);
 
 }

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

@@ -1024,9 +1024,10 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @javax.transaction.Transactional
     public String processFireEqumtData(AlarmParam deviceData) throws Exception {
     	
-    	EquipmentSpecificIndexVo equipmentSpecificIndexVo = new EquipmentSpecificIndexVo();
-    	equipmentSpecificIndexVo.setEquipmentSpecificId(Long.valueOf(deviceData.getPointCode()));
-    	equipmentSpecificIndexVo.setType("FIREALARM");
+    	EquipmentSpecificIndexVo equipmentSpecificIndexVo = impAndFireEquipMapper.findFireEqupmentByCode(deviceData.getPointCode());
+//    			new EquipmentSpecificIndexVo();
+//    	equipmentSpecificIndexVo.setEquipmentSpecificId(Long.valueOf(deviceData.getPointCode()));
+//    	equipmentSpecificIndexVo.setType("FIREALARM");
     	
     	TopicEntityVo topicEntity = new TopicEntityVo();
     	topicEntity.setMessage(JSON.toJSONString(equipmentSpecificIndexVo));

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

@@ -157,5 +157,16 @@
 			and fe.equipment_id = #{equipmentId}
 			and ep.id = #{pointId}
 	</select>
+	
+	<select id="findFireEqupmentByCode" resultType="com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo">
+			SELECT
+				id as equipmentSpecificId,
+				'FIREALARM' as type
+			FROM
+				wl_equipment_specific
+			WHERE
+				`code` = #{code}
+			LIMIT 1
+	</select>
 
 </mapper>
\ No newline at end of file