Compare commits

...

2 Commits

Author SHA1 Message Date
d22a71739f Merge remote-tracking branch 'origin/dev' into dev 2025-07-14 16:16:19 +08:00
bf1d70c953 修改 mqtt 源数据存储 2025-07-14 16:16:14 +08:00
3 changed files with 25 additions and 18 deletions

View File

@ -61,15 +61,8 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
System.out.println("[SYSTEM] Status update: " + payload);
try {
// 业务处理逻辑
EmsMqttMessage mqttMessage = new EmsMqttMessage();
mqttMessage.setMqttTopic(topic);
mqttMessage.setMqttMessage(payload);
mqttMessage.setCreateTime(new java.util.Date());
mqttMessage.setUpdateTime(new java.util.Date());
mqttMessage.setCreateBy("system");
mqttMessage.setUpdateBy("system");
emsMqttMessageService.insertEmsMqttMessage(mqttMessage);
emsMqttMessageService.insertMqttOriginalMessage(topic,payload);
} catch (Exception e) {
log.error("Failed to process system status message: " + e.getMessage(), e);
}
@ -87,15 +80,7 @@ public class MqttMessageController implements MqttPublisher, MqttSubscriber {
fXXDataProcessService.handleFxData(payload);
}
EmsMqttMessage mqttMessage = new EmsMqttMessage();
mqttMessage.setMqttTopic(topic);
mqttMessage.setMqttMessage(payload);
mqttMessage.setCreateTime(new java.util.Date());
mqttMessage.setUpdateTime(new java.util.Date());
mqttMessage.setCreateBy("system");
mqttMessage.setUpdateBy("system");
emsMqttMessageService.insertEmsMqttMessage(mqttMessage);
emsMqttMessageService.insertMqttOriginalMessage(topic,payload);
} catch (Exception e) {
log.error("Failed to process system status message: " + e.getMessage(), e);
}

View File

@ -59,4 +59,13 @@ public interface IEmsMqttMessageService
* @return 结果
*/
public int deleteEmsMqttMessageById(Long id);
/**
* 新增【请填写功能名称】
*
* @param topic 【请填写功能名称】
* @param message 【请填写功能名称】
* @return 结果
*/
public int insertMqttOriginalMessage(String topic, String message);
}

View File

@ -93,4 +93,17 @@ public class EmsMqttMessageServiceImpl implements IEmsMqttMessageService
{
return emsMqttMessageMapper.deleteEmsMqttMessageById(id);
}
@Override
public int insertMqttOriginalMessage(String topic, String message) {
EmsMqttMessage mqttMessage = new EmsMqttMessage();
mqttMessage.setMqttTopic(topic);
mqttMessage.setMqttMessage(message);
mqttMessage.setCreateTime(new java.util.Date());
mqttMessage.setUpdateTime(new java.util.Date());
mqttMessage.setCreateBy("system");
mqttMessage.setUpdateBy("system");
mqttMessage.setUpdateTime(DateUtils.getNowDate());
return emsMqttMessageMapper.updateEmsMqttMessage(mqttMessage);
}
}