Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

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

@@ -723,7 +723,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
             //保存实时数据
             saveFireEquipmentData(fireEquipmentPoint, fireEquipment, deviceData, fireEquipmentPointType);
             equipment = impAndFireEquipMapper.queryImpEqumtByFireEquipmt(fireEquipmentPoint.getFireEquipmentId());
-            if (equipment != null) {
+            if (equipment != null && "alarm_type_fire".equals(fireEquipmentPointType)) {
             	//动态预案执行
             	dynamicPlan(deviceData, equipment, fireEquipment, fireEquipmentPointType);
             }
@@ -829,10 +829,8 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     		if(alarm != null){
 				if ("alarm_type_trouble".equals(fireEquipmentPointType)) {
                     //通知刷新3d页面相关故障数据
-					if(alarm.getFrequency()==1 || alarm.getStatus() == false){
 					 notifyAlarm(fireEquipmentPoint, deviceData);
                      iDataRefreshService.refreshViewData(DataRefreshTypeEum.trouble.getCode());
-					}
                 }else{
                 	 //通知刷新3d页面告警数据
                     iDataRefreshService.refreshViewData(DataRefreshTypeEum.alarm.getCode());

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/client/invoke/RsDataQueue.java

@@ -115,7 +115,7 @@ public class RsDataQueue {
                         String userName = fmeaMessage.getUserName();
                         String relationName = fmeaMessage.getRelationName();
                         String checkStatus =null;
-                        if(fmeaMessage.getCheckStatus()!=null){
+                        if(fmeaMessage.getCheckStatus()!=null && fmeaMessage.getCheckStatus()!=""){
                             checkStatus =(fmeaMessage.getCheckStatus().equals("1"))?"合格":"不合格";
                         }
                         if (from.equals(TriggerRpnChangeTypeEum.patrol.getCode())) {