李进 2 роки тому
батько
коміт
dd01d62f78

+ 4 - 3
device-api-service/src/main/java/com/xy/service/MqttServiceImpl.java

@@ -92,13 +92,13 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
             Long wkSn = pater.getWkSn();
             try {
                 //指令记录
-                saveMqttCommand(mqttDto, value, pater.getAck() ? MqttCommandStatusEnum.COMMAND_SEND : MqttCommandStatusEnum.COMMAND_EXE_SUCCESS, null);
+                saveMqttCommand(mqttDto, topic, value, pater.getAck() ? MqttCommandStatusEnum.COMMAND_SEND : MqttCommandStatusEnum.COMMAND_EXE_SUCCESS, null);
                 //发送消息
                 mqttProducer.sendToMqtt(value.toString(), topic, mqttDto.getLevel());
                 list.add(new Tuple.Tuple3<>(wkSn, pater.getSn(), true));
             } catch (Exception e) {
                 //指令记录
-                saveMqttCommand(mqttDto, value, MqttCommandStatusEnum.COMMAND_SEND_FAIL, e.getMessage());
+                saveMqttCommand(mqttDto, topic, value, MqttCommandStatusEnum.COMMAND_SEND_FAIL, e.getMessage());
                 list.add(new Tuple.Tuple3<>(wkSn, pater.getSn(), false));
             }
         });
@@ -255,11 +255,12 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
      * @param status  状态
      * @param error   错误信息
      */
-    private void saveMqttCommand(MqttDto mqttDto, JSONObject value, MqttCommandStatusEnum status, String error) {
+    private void saveMqttCommand(MqttDto mqttDto, String topic, JSONObject value, MqttCommandStatusEnum status, String error) {
         PaterDto pater = mqttDto.getPater();
         MqttCommand mqttCommand = Beans.copy(Beans.copy(MqttCommand.class, mqttDto), pater)
                 .setSn(pater.getSn())
                 .setWkSn(pater.getWkSn())
+                .setTopic(topic)
                 .setStatus(Integer.parseInt(status.getKey()))
                 .setValue(value.toString())
                 .setSendTime(pater.getTime())