dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
149 changed files with 12803 additions and 889 deletions
Showing only changes of commit bf1d70c953 - Show all commits

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);
}
}