添加预案触发接口

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

@@ -93,6 +93,7 @@ import com.yeejoin.amos.fas.business.param.AlarmParam;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.param.FmeaBindParam;
 import com.yeejoin.amos.fas.business.service.intfc.IDataRefreshService;
+import com.yeejoin.amos.fas.business.service.intfc.IEquipmentHandlerService;
 import com.yeejoin.amos.fas.business.service.intfc.IEquipmentService;
 import com.yeejoin.amos.fas.business.service.intfc.IRiskSourceService;
 import com.yeejoin.amos.fas.business.service.intfc.IView3dService;
@@ -103,7 +104,9 @@ import com.yeejoin.amos.fas.business.util.DateUtils;
 import com.yeejoin.amos.fas.business.util.JexlUtil;
 import com.yeejoin.amos.fas.business.util.RpnUtils;
 import com.yeejoin.amos.fas.business.vo.EquipCommunicationData;
+import com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo;
 import com.yeejoin.amos.fas.business.vo.Toke;
+import com.yeejoin.amos.fas.business.vo.TopicEntityVo;
 import com.yeejoin.amos.fas.client.invoke.RsDataQueue;
 import com.yeejoin.amos.fas.common.enums.CheckStatusEnum;
 import com.yeejoin.amos.fas.common.enums.DataRefreshTypeEum;
@@ -243,6 +246,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Autowired
     protected HttpServletRequest request;
     
+    @Autowired
+    private IEquipmentHandlerService iEquipmentHandlerService;
+    
     @Value("${station.name}")
     private String stationName;
 
@@ -1022,10 +1028,20 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @javax.transaction.Transactional
     public String processFireEqumtData(AlarmParam deviceData) throws Exception {
     	
-        // 格式化发送数据
-        sendRiskSourceData(deviceData);
+    	EquipmentSpecificIndexVo equipmentSpecificIndexVo = new EquipmentSpecificIndexVo();
+    	equipmentSpecificIndexVo.setEquipmentSpecificId(Long.valueOf(deviceData.getPointCode()));
+    	equipmentSpecificIndexVo.setType("FIREALARM");
     	
-        blockingQueue.add(deviceData);
+    	TopicEntityVo topicEntity = new TopicEntityVo();
+    	topicEntity.setMessage(JSON.toJSONString(equipmentSpecificIndexVo));
+    	
+    	String data = JSON.toJSONString(topicEntity);
+    	System.out.println(data);
+    	iEquipmentHandlerService.handlerMqttMessage("",data );
+        // 格式化发送数据
+//        sendRiskSourceData(deviceData);
+//
+//        blockingQueue.add(deviceData);
         return "SUCCESS";
     }
 

YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-sql-task.xml

@@ -5,7 +5,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog 
         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd">
-    <changeSet author="suhg" id="1561454393000-1" runOnChange="true">
+    <changeSet author="suhg" id="1561454393001-1"  runAlways="true">
         <comment>update f_fmea_equipment_point 更新触发器创建</comment>
         <sql endDelimiter="#">
            DROP TRIGGER IF EXISTS `trigger_fmea_equipment_point_update`;
@@ -30,7 +30,7 @@
 			END#
         </sql>
     </changeSet>
-    <changeSet author="suhg" id="1561454393000-2" runOnChange="true">
+    <changeSet author="suhg" id="1561454393001-2"  runAlways="true">
         <comment>f_risk_source_point_inputitem  更新触发器创建</comment>
         <sql endDelimiter="#">
             DROP TRIGGER IF EXISTS `trigger_fmea_point_inputitem_update`;
@@ -57,7 +57,7 @@
         </sql>
     </changeSet>
 
-    <changeSet author="tianbo" id="1561717770000-1" runOnChange="true">
+    <changeSet author="tianbo" id="1561717770001-1"  runAlways="true">
         <comment>f_fire_equipment_point_update 触发器创建(修改判断条件为->value等于'true')</comment>
         <sql endDelimiter="#">
             DROP TRIGGER IF EXISTS `trigger_fire_equipment_point_update`;
@@ -74,7 +74,7 @@
         </sql>
     </changeSet>
     
-    <changeSet author="shanqiyun" id="1588901126338-1" runOnChange="true">
+    <changeSet author="shanqiyun" id="1588901126339-1"  runAlways="true">
         <comment>f_risk_source 查询所有子节点id</comment>
         <sql endDelimiter="#">
             DROP FUNCTION IF EXISTS queryRiskSourceChildrenIds;
@@ -96,7 +96,7 @@
         </sql>
     </changeSet>
 
-	<changeSet author="maoying" id="1589954524000-1" runOnChange="true">
+	<changeSet author="maoying" id="1589954524001-1"  runAlways="true">
         <comment>updatePointConfig 触发器创建</comment>
         <sql endDelimiter="#">
 	        DROP TRIGGER IF EXISTS `updatePointConfig`;
@@ -110,7 +110,7 @@
 			END#
         </sql>
     </changeSet>
-    <changeSet author="shanqiyun" id="1597831211780-1" runOnChange="true">
+    <changeSet author="shanqiyun" id="1597831211781-1"  runAlways="true">
         <comment>create view toip_biz_message</comment>
         <sql>
             DROP VIEW IF EXISTS toip_biz_message;