Merge branch 'develop_station' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_station

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -102,6 +102,8 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
         CommonPageInfoParam param = new CommonPageInfoParam();
         if (AlarmTypeEnum.GZGJ.getCode().equals(alarmType)) {
             param.setIsFireAlarm("false");
+        } else if (AlarmTypeEnum.HZGJ.getCode().equals(alarmType)) {
+            param.setAlarmType(alarmType);
         }
         List<HashMap<String, Object>> list = this.baseMapper.getAlarmList(param);
         List<EquipmentAlarmDownloadVO> equipmentDownloads = handleExportData(ids, list);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/MqttReceiveServiceImpl.java

@@ -321,8 +321,17 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
             }
             Map<String, Object> map = JSON.parseObject(JSON.toJSONString(equipmentStateVo));
             map.put(canvasTopic, topicObject);
-            // 发送数据至画布
-            mqttSendGateway.sendToMqtt(canvasTopic, JSON.toJSONString(map));
+
+            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+                @Override
+                public void afterCompletion(int status) {
+                    if (TransactionSynchronization.STATUS_COMMITTED == status) {
+                        // 发送数据至画布
+                        mqttSendGateway.sendToMqtt(canvasTopic, JSON.toJSONString(map));
+                    }
+                }
+            });
+
         }
     }