下发指令增加日志

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

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xy.annotation.LogOperate;
 import com.xy.collections.list.JArrayList;
 import com.xy.collections.list.JList;
 import com.xy.collections.map.JHashMap;
@@ -12,6 +13,7 @@ import com.xy.collections.map.JMap;
 import com.xy.dto.*;
 import com.xy.entity.DeviceInfo;
 import com.xy.entity.MqttCommand;
+import com.xy.enums.LogEnum;
 import com.xy.mapper.MqttCommandMapper;
 import com.xy.service.factory.cmd.CmdService;
 import com.xy.service.factory.device.DeviceFactory;
@@ -98,6 +100,7 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
     }
 
     @Override
+    @LogOperate
     @ApiOperation("指令发送")
     public R<List<Tuple.Tuple3<Long, Long, Boolean>>> senCommand(List<CommandMqtt> commandMqtts) {
         JList<CommandMqtt> commandMqttsList = new JArrayList<>(commandMqtts);
@@ -122,7 +125,7 @@ public class MqttServiceImpl extends ServiceImpl<MqttCommandMapper, MqttCommand>
                 list.addAll(data);
             }
         });
-        return R.ok(list);
+        return R.ok(list).setLogMsg(JSONUtil.parseObj(jMap).toString());
     }
 
     @ApiOperation("指令Ack")

device-api-service/src/main/java/com/xy/service/factory/cmd/impl/SetsCmdServiceImpl.java

@@ -3,12 +3,10 @@ package com.xy.service.factory.cmd.impl;
 import cn.hutool.json.JSONObject;
 import com.xy.annotate.Factory;
 import com.xy.device.EnumMqttCmdTempletSets;
-import com.xy.dto.DeviceEventMsgDto;
 import com.xy.dto.DeviceTempSetDto;
 import com.xy.dto.MqttCmdDto;
 import com.xy.dto.PaterDto;
 import com.xy.entity.DeviceTempSet;
-import com.xy.service.DeviceEventMsgService;
 import com.xy.service.DeviceTempSetServiceImpl;
 import com.xy.service.factory.cmd.CmdService;
 import com.xy.utils.R;
@@ -25,20 +23,12 @@ public class SetsCmdServiceImpl implements CmdService {
 
     private DeviceTempSetServiceImpl deviceTempSetService;
 
-    private DeviceEventMsgService deviceEventMsgService;
-
     @Override
     public R senCommand(List<MqttCmdDto> mqttDtos) {
         for (MqttCmdDto mqttDto : mqttDtos) {
             PaterDto pater = mqttDto.getPater();
             JSONObject data = pater.getData();
             String type = data.getStr("type");
-            //设备事件
-            DeviceEventMsgDto.Save deviceEventMsgInfo = new DeviceEventMsgDto.Save()
-                    .setDeviceId(mqttDto.getDeviceId());
-            deviceEventMsgInfo.setCode("M011");
-            deviceEventMsgInfo.setMsg(String.format("发送设置指令，类型：%s，指令值：%s", type, mqttDto.getPater().getData().toString()));
-            deviceEventMsgService.save(deviceEventMsgInfo);
             //温度设置指令
             if (type.equals(EnumMqttCmdTempletSets.TEMPERATURE.getCode())) {
                 DeviceTempSetDto.Save save = new DeviceTempSetDto.Save()

device-api-service/src/main/java/com/xy/service/factory/cmd/impl/TaskCmdServiceImpl.java

@@ -5,11 +5,9 @@ import com.xy.annotate.Factory;
 import com.xy.device.EnumAppUpdateStatus;
 import com.xy.device.EnumMqttCmdTempletTask;
 import com.xy.dto.ActivityInfoDto;
-import com.xy.dto.DeviceEventMsgDto;
 import com.xy.dto.DeviceVersionUpDto;
 import com.xy.dto.MqttCmdDto;
 import com.xy.service.ActivityInfoService;
-import com.xy.service.DeviceEventMsgService;
 import com.xy.service.DeviceVersionUpServiceImpl;
 import com.xy.service.factory.cmd.CmdService;
 import com.xy.utils.R;
@@ -30,19 +28,11 @@ public class TaskCmdServiceImpl implements CmdService {
 
     private DeviceVersionUpServiceImpl deviceVersionUpService;
 
-    private DeviceEventMsgService deviceEventMsgService;
-
     @Override
     public R senCommand(List<MqttCmdDto> mqttDtos) {
         for (MqttCmdDto mqttDto : mqttDtos) {
             JSONObject data = mqttDto.getPater().getData();
             String type = data.getStr("type");
-            //设备事件
-            DeviceEventMsgDto.Save deviceEventMsgInfo = new DeviceEventMsgDto.Save()
-                    .setDeviceId(mqttDto.getDeviceId());
-            deviceEventMsgInfo.setCode("M011");
-            deviceEventMsgInfo.setMsg(String.format("发送任务指令，类型：%s，指令值：%s", type, mqttDto.getPater().getData().toString()));
-            deviceEventMsgService.save(deviceEventMsgInfo);
             //终止活动
             if (type.equals(EnumMqttCmdTempletTask.ABORT.getCode())) {
                 activityInfoService.abort(new ActivityInfoDto.Abort().setDeviceId(mqttDto.getDeviceId()));