把天网数据压测的秒改为毫秒

business-service/src/main/java/com/ozs/entity/vo/BaseVideoTrains.java

@@ -1,4 +1,4 @@
-package com.ozs.entity.vo;
+package com.ozs.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

business-service/src/main/java/com/ozs/mapper/BaseVideoTrainsMapper.java

@@ -1,7 +1,7 @@
 package com.ozs.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ozs.entity.vo.BaseVideoTrains;
+import com.ozs.entity.BaseVideoTrains;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

business-service/src/main/java/com/ozs/service/BaseVideoTrainsService.java

@@ -1,7 +1,7 @@
 package com.ozs.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ozs.entity.vo.BaseVideoTrains;
+import com.ozs.entity.BaseVideoTrains;
 
 /**
  * 视频与列车位置关联匹配日志表 服务类

business-service/src/main/java/com/ozs/service/impl/BaseVideoTrainsServiceImpl.java

@@ -1,7 +1,7 @@
 package com.ozs.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ozs.entity.vo.BaseVideoTrains;
+import com.ozs.entity.BaseVideoTrains;
 import com.ozs.mapper.BaseVideoTrainsMapper;
 import com.ozs.service.BaseVideoTrainsService;
 import org.springframework.stereotype.Service;

business-service/src/main/java/com/ozs/utils/CameraUtil.java

@@ -1135,7 +1135,7 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
      */
     public String apiPreviewURLs(CamerasVo camerasVo) {
         long begin = System.currentTimeMillis();
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
         StringBuilder stringBuilder = new StringBuilder();
         /**
          *  jsonBody.put("cameraIndexCode", "01ea43e6676f4e47bd6c5cd9e02aa006");

vehicle-sdk/src/main/java/com/ozs/controller/upload/GeoHazardMonitorTokenController.java

@@ -30,18 +30,16 @@ import com.ozs.entity.MsgAlarmFrequency;
 import com.ozs.entity.MsgHeartbeatAlarmMessage;
 import com.ozs.entity.SkynetHeartbeatLog;
 import com.ozs.entity.SvcAddress;
-import com.ozs.entity.TerminalHeartbeatLog;
 import com.ozs.entity.TerminalIgnoreAlarm;
 import com.ozs.entity.VehiclePosition;
 import com.ozs.entity.vo.AlarmFilesVo;
 import com.ozs.entity.vo.AlarmHeartbeatLog;
 import com.ozs.entity.vo.AlarmInfoVo;
 import com.ozs.entity.vo.AlarmListVo;
-import com.ozs.entity.vo.BaseVideoTrains;
+import com.ozs.entity.BaseVideoTrains;
 import com.ozs.entity.vo.CameraPlayVo;
 import com.ozs.entity.vo.CameraVo;
 import com.ozs.entity.vo.CameraVos;
-import com.ozs.entity.vo.CamerasVo;
 import com.ozs.entity.vo.Files;
 import com.ozs.entity.vo.HeartbeatVo;
 import com.ozs.entity.vo.ParameterVo;
@@ -69,14 +67,11 @@ import com.ozs.service.MsgAlarmExtService;
 import com.ozs.service.MsgAlarmFrequencyService;
 import com.ozs.service.MsgAlarmService;
 import com.ozs.service.SvcAddressService;
-import com.ozs.service.TerminalHeartbeatLogService;
 import com.ozs.service.TerminalIgnoreAlarmService;
 import com.ozs.service.VehiclePositionService;
-import com.ozs.system.service.ISysDictDataService;
 import com.ozs.system.service.ISysDictTypeService;
 import com.ozs.utils.CameraUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -91,22 +86,17 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**

vehicle-sdk/src/main/java/com/ozs/controller/upload/PressureController.java

@@ -33,7 +33,6 @@ public class PressureController {
         for (int i = 0; i < 12; i++) {
             for (BaseCameraManagement baseCameraManagement : list) {
                 TimeUnit.SECONDS.sleep(2);
-                log.info("2秒+-------------------------");
                 CamerasVo camerasVo = new CamerasVo();
                 camerasVo.setCameraIndexCode(baseCameraManagement.getCameraCode());
                 String msg = cameraUtil.apiPreviewURLs(camerasVo);