mqtt指令

device-api-service/src/main/java/com/xy/service/impl/MqttServiceImpl.java

@@ -61,11 +61,11 @@ public class MqttServiceImpl implements MqttService {
                 //发送消息
                 mqttProducer.sendToMqtt(value.toString(), topic, mqttDto.getLevel());
                 //指令记录
-                saveMqttCommand(mqttDto, value, pater.getAck() ? MqttCommandStatusEnum.COMMAND_SEND.getKey() : MqttCommandStatusEnum.COMMAND_SUCCESS.getKey(), null);
+                saveMqttCommand(mqttDto, value, pater.getAck() ? MqttCommandStatusEnum.COMMAND_SEND : MqttCommandStatusEnum.COMMAND_SUCCESS, null);
                 list.add(new MqttDto.Vo().setWorkSn(wkSn).setResult(true));
             } catch (Exception e) {
                 //指令记录
-                saveMqttCommand(mqttDto, value, MqttCommandStatusEnum.COMMAND_SEND_FAIL.getKey(), e.getMessage());
+                saveMqttCommand(mqttDto, value, MqttCommandStatusEnum.COMMAND_SEND_FAIL, e.getMessage());
                 list.add(new MqttDto.Vo().setWorkSn(wkSn).setResult(false));
             }
         });
@@ -99,16 +99,16 @@ public class MqttServiceImpl implements MqttService {
      * @param status  状态
      * @param error   错误信息
      */
-    private void saveMqttCommand(MqttDto mqttDto, JSONObject value, String status, String error) {
+    private void saveMqttCommand(MqttDto mqttDto, JSONObject value, MqttCommandStatusEnum status, String error) {
         PaterDto pater = mqttDto.getPater();
         MqttCommand mqttCommand = Beans.copy(Beans.copy(MqttCommand.class, mqttDto), pater)
                 .setId(pater.getSn())
                 .setType1(pater.getType1().getKey())
                 .setType2(pater.getType2().getKey())
-                .setStatus(Integer.parseInt(status))
+                .setStatus(Integer.parseInt(status.getKey()))
                 .setValue(value.toString())
                 .setSendTime(pater.getTime())
-                .setExecTime(status.equals(MqttCommandStatusEnum.COMMAND_SUCCESS.getKey()) ? DataTime.getSring() : null)
+                .setExecTime(status.getKey().equals(MqttCommandStatusEnum.COMMAND_SUCCESS.getKey()) ? DataTime.getSring() : null)
                 .setNum(1)
                 .setError(error);
         mqttCommandMapper.insert(mqttCommand);