存放时数据处理问题

amos-boot-module/amos-boot-module-biz/amos-boot-module-ccs-biz/src/main/java/com/yeejoin/amos/boot/module/ccs/biz/config/CcsMqttReceiveConfig.java

@@ -19,6 +19,9 @@ import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Slf4j
 @Configuration
 @IntegrationComponentScan
@@ -82,7 +85,11 @@ public class CcsMqttReceiveConfig {
     //配置client,监听的topic
     @Bean
     public MessageProducer inbound() {
-        adapter = new MqttPahoMessageDrivenChannelAdapter(clientId, mqttPahoClientFactory(), alarmTopic, questionTopic);
+        List<String> list = new ArrayList<String>();
+        list.add(alarmTopic); // 告警/恢复事件监听
+        list.add(questionTopic); // 问题下发监听
+        String[] arr = list.toArray(new String[list.size()]);
+        adapter = new MqttPahoMessageDrivenChannelAdapter(clientId, mqttPahoClientFactory(), arr);
 //        adapter.setCompletionTimeout(completionTimeout);
         adapter.setConverter(new DefaultPahoMessageConverter());
         adapter.setQos(0);

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

@@ -64,7 +64,7 @@ public class MqttReceiveServiceImpl implements MqttReceiveService {
                     StrUtil.isNotEmpty(alarmEventLog.getObjectIndexType()) && "FIREALARM".equals(alarmEventLog.getObjectIndexType()) &&
             StrUtil.isNotEmpty(alarmEventLog.getOrgCode())) {
                 FireEquipmentSignalLog fireEquipmentSignalLog = new FireEquipmentSignalLog();
-                fireEquipmentSignalLog.setStationCode(alarmEventLog.getOrgCode());
+                fireEquipmentSignalLog.setStationCode(alarmEventLog.getCompanyCode());
                 fireEquipmentSignalLog.setFireEquipmentIndexValue(alarmEventLog.getObjectIndexValue());
                 fireEquipmentSignalLog.setFireEquipmentMrid(alarmEventLog.getObjectCode());
                 fireEquipmentSignalLog.setFireEquipmentName(alarmEventLog.getObjectName());