新增消防设备数据上传

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

@@ -824,13 +824,40 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
     }
 
+
+
+
     @Override
     @javax.transaction.Transactional
     public String processFireEqumtData(AlarmParam deviceData) throws Exception {
+
+        // 格式化发送数据
+        sendRiskSourceData(deviceData);
+
         blockingQueue.add(deviceData);
         return "SUCCESS";
     }
 
+    /**
+     * webSocket向前台推送消防设备数据
+     * @param param
+     */
+    @Async
+    public void sendRiskSourceData(AlarmParam param) {
+        try {
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("value", param.getState());
+            map.put("id", param.getPointCode());
+            Map<String, Map<String, Object>> riskSourceMap = new HashMap();
+            riskSourceMap.put("equipments", map);
+
+            remoteWebSocketServer.sendMessage("equipmentMode", JSON.toJSONString(riskSourceMap));
+        } catch (Exception e) {
+            log.error("推送前端数据失败-->"+JSON.toJSONString(param));
+        }
+    }
+
 
     private void saveFireEquipmentData(FireEquipmentPoint fireEquipmentPoint, FireEquipment fireEquipment, AlarmParam deviceData, String fireEquipmentPointType) {
         if ("alarm_type_fire".equals(fireEquipmentPointType) || "alarm_type_trouble".equals(fireEquipmentPointType)) {
@@ -903,7 +930,12 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     @Override
     public void saveData(List<AlarmParam> deviceDatas, String type) {
         List<EquipCommunicationData> list = deviceDatas.stream().map(param -> {
+
             log.debug("pointCode==" + param.getPointCode() + " InformationAddress==" + param.getInformationAddress());
+
+            // 格式化发送数据
+            sendRiskSourceData(param);
+
             if (ObjectUtils.isEmpty(param.getPointCode())) {
                 EquipCommunicationData data = new EquipCommunicationData();
                 data.setIsInvalid(param.getIsInvalid());