优化线程池

device-api-service/src/main/java/com/xy/entity/DeviceLog.java

@@ -39,9 +39,9 @@ public class DeviceLog extends BaseEntity<DeviceLog> implements Serializable {
     private LocalDateTime updateTime;
 
     @ApiModelProperty(value = "日志截取开始时间")
-    private String logBeginTime;
+    private LocalDateTime logBeginTime;
 
     @ApiModelProperty(value = "日志截取结束时间")
-    private String logEndTime;
+    private LocalDateTime logEndTime;
 
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.dto.DeviceLogDto;
 import com.xy.entity.DeviceLog;
 import com.xy.mapper.DeviceLogMapper;
+import com.xy.utils.Beans;
 import com.xy.utils.MybatisPlusQuery;
 import com.xy.utils.PageBean;
 import com.xy.utils.R;
@@ -45,16 +46,15 @@ public class DeviceLogServiceImpl extends ServiceImpl<DeviceLogMapper, DeviceLog
         return R.ok(toPageBean(DeviceLogDto.Vo.class, iPage));
     }
 
-    @PostMapping("update")
-    @ApiOperation("修改")
-    public R update(@RequestBody @Validated DeviceLogDto.Update update) {
-        LambdaQueryWrapper<DeviceLog> logLambdaQueryWrapper = new LambdaQueryWrapper<DeviceLog>().eq(DeviceLog::getDeviceId, update.getDeviceId())
-                .orderByDesc(DeviceLog::getCreateTime)
-                .last("limit 1");
-        DeviceLog deviceLog = getOne(logLambdaQueryWrapper)
-                .setLogName(update.getLogName())
-                .setUpdateTime(LocalDateTime.now());
-        updateById(deviceLog);
+    @PostMapping("save")
+    @ApiOperation("添加")
+    public R save(@RequestBody @Validated DeviceLogDto.Save save) {
+        LocalDateTime now = LocalDateTime.now();
+        DeviceLog saveInfo = Beans.copy(DeviceLog.class, save)
+                .createId()
+                .setCreateTime(now)
+                .setUpdateTime(now);
+        save(saveInfo);
         return R.ok();
     }
 }

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

@@ -3,16 +3,13 @@ package com.xy.service.factory;
 import cn.hutool.json.JSONObject;
 import com.xy.dto.ActivityInfoDto;
 import com.xy.dto.MqttDto;
-import com.xy.entity.DeviceLog;
 import com.xy.service.ActivityInfoService;
-import com.xy.service.DeviceLogServiceImpl;
 import com.xy.utils.LambdaUtils;
 import com.xy.utils.R;
 import com.xy.utils.enums.TaskEnum;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -24,8 +21,6 @@ public class TaskCmdServiceImpl implements CmdService {
 
     private final ActivityInfoService activityInfoService;
 
-    private final DeviceLogServiceImpl deviceLogService;
-
     @Override
     public R senCommand(List<MqttDto> mqttDtos) {
         for (MqttDto mqttDto : mqttDtos) {
@@ -35,15 +30,6 @@ public class TaskCmdServiceImpl implements CmdService {
             if (type.equals(TaskEnum.ABORT.getType())) {
                 activityInfoService.abort(new ActivityInfoDto.Abort().setDeviceId(mqttDto.getDeviceId()));
             }
-            //日志上传
-            if (type.equals(TaskEnum.LOG.getType())) {
-                DeviceLog deviceLog = new DeviceLog().createId()
-                        .setDeviceId(mqttDto.getDeviceId())
-                        .setLogBeginTime(data.getStr("startTime"))
-                        .setLogEndTime(data.getStr("endTime"))
-                        .setCreateTime(LocalDateTime.now());
-                deviceLogService.save(deviceLog);
-            }
         }
         return R.ok();
     }

device-api-service/src/main/java/com/xy/utils/enums/TaskEnum.java

@@ -12,8 +12,6 @@ public enum TaskEnum {
 
     ABORT("abort", "活动终止指令"),
 
-    LOG("log", "日志上传指令"),
-
     ;
 
     /**

device-api/src/main/java/com/xy/dto/DeviceLogDto.java

@@ -31,15 +31,23 @@ public class DeviceLogDto {
 
     @Data
     @Accessors(chain = true)
-    public static class Update {
+    public static class Save {
 
         @NotNull(message = "deviceId不能为空")
-        @ApiModelProperty(value = "设备id")
+        @ApiModelProperty(value = "设备id", required = true)
         private Long deviceId;
 
         @NotBlank(message = "logName不能为空")
-        @ApiModelProperty(value = "日志名称")
+        @ApiModelProperty(value = "日志名称", required = true)
         private String logName;
+
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @ApiModelProperty(value = "日志截取开始时间", required = true)
+        private LocalDateTime logBeginTime;
+
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+        @ApiModelProperty(value = "日志截取结束时间", required = true)
+        private LocalDateTime logEndTime;
     }
 
     @Data
@@ -63,11 +71,13 @@ public class DeviceLogDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty(value = "日志截取开始时间")
-        private String logBeginTime;
+        private LocalDateTime logBeginTime;
 
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         @ApiModelProperty(value = "日志截取结束时间")
-        private String logEndTime;
+        private LocalDateTime logEndTime;
     }
 
 }