[refactor]#北斗-天奥

es-track-common/src/main/java/cn/com/taiji/utils/LocationUtils.java

@@ -67,7 +67,53 @@ public class LocationUtils {
     public static List<Location> generateLogLatTianao(String startTime, String endTime, Double startLog, Double startLat, Double endLog, Double endLat) {
         List<Location> list = new ArrayList<>();
         try {
-            final int seconds = 1000;
+            final int seconds = 2500;
+            //经纬度差
+            Double difflog = Math.abs(startLog - endLog);
+            Double difflat = Math.abs(startLat - endLat);
+            //相差秒数
+            long diffSeconds = diffSeconds(startTime, endTime);
+            //平均经纬度差
+            Double avgLog = difflog / diffSeconds;
+            Double avgLat = difflat / diffSeconds;
+            //开始时间时间戳
+            long startTimeStamp = dateToStamp(startTime);
+            long endTimeStamp = dateToStamp(endTime);
+            Double resLog = startLog;
+            Double resLat = startLat;
+            long startTimeStampNew = startTimeStamp + seconds;
+            //判断时间大小关系
+            if (startTimeStampNew < endTimeStamp) {
+                for (long i = startTimeStamp + seconds; i < endTimeStamp; i += seconds) {
+                    resLog = avgLog + resLog;
+                    resLat = avgLat + resLat;
+                    double bdLog = doubleDown(resLog);
+                    double bdLat = doubleDown(resLat);
+                    Location location = new Location(bdLog,bdLat);
+                    list.add(location);
+                }
+            } else {
+                for (long i = endTimeStamp + seconds; i < startTimeStampNew; i += seconds) {
+                    resLog = avgLog + resLog;
+                    resLat = avgLat + resLat;
+                    double bdLog = doubleDown(resLog);
+                    double bdLat = doubleDown(resLat);
+                    Location location = new Location(bdLog,bdLat);
+                    list.add(location);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+
+
+    public static List<Location> generateLogLatBeidou(String startTime, String endTime, Double startLog, Double startLat, Double endLog, Double endLat) {
+        List<Location> list = new ArrayList<>();
+        try {
+            final int seconds = 1000 * 60;
             //经纬度差
             Double difflog = Math.abs(startLog - endLog);
             Double difflat = Math.abs(startLat - endLat);

simulation-track/src/main/java/cn/com/taiji/controller/SimulationTrackController.java

@@ -41,14 +41,14 @@ public class SimulationTrackController {
 
 
     @GetMapping("/tianao")
-    public void tianaoTrack(@RequestParam("status") Integer status){
-        simulationTrackService.tianaoTrack(status);
+    public void tianaoTrack(@RequestParam("status") Integer status,@RequestParam("type") Integer type){
+        simulationTrackService.tianaoTrack(status,type);
     }
 
 
     @GetMapping("/beidou/new")
-    public void beidouNewTrack(@RequestParam("status") Integer status){
-        simulationTrackService.beidouNewTrack(status);
+    public void beidouNewTrack(@RequestParam("status") Integer status,@RequestParam("type")Integer type){
+        simulationTrackService.beidouNewTrack(status,type);
     }
 
 }

simulation-track/src/main/java/cn/com/taiji/service/SimulationTrackService.java

@@ -15,7 +15,7 @@ public interface SimulationTrackService {
 
     void beidouaisTrack(Integer status);
 
-    void tianaoTrack(Integer status);
+    void tianaoTrack(Integer status,Integer type);
 
-    void beidouNewTrack(Integer status);
+    void beidouNewTrack(Integer status,Integer type);
 }

simulation-track/src/main/java/cn/com/taiji/service/impl/SimulationTrackImpl.java

@@ -45,6 +45,8 @@ public class SimulationTrackImpl implements SimulationTrackService {
 
     private Integer beidouNewStatus;
 
+    private Integer beidouType;
+
     HashSet<Thread> hlxOneLevelTherads = new HashSet<>();
 
     private Integer hlxOneLevelStatus;
@@ -59,6 +61,8 @@ public class SimulationTrackImpl implements SimulationTrackService {
 
     private Integer tianaoStatus;
 
+    private Integer tianaoType;
+
 
     @Override
     public void beidouTrack(Integer status) {
@@ -300,8 +304,9 @@ public class SimulationTrackImpl implements SimulationTrackService {
     }
 
     @Override
-    public void tianaoTrack(Integer status) {
+    public void tianaoTrack(Integer status,Integer type) {
         tianaoStatus = status;
+        tianaoType = type;
         if (0 == tianaoStatus) {
             Thread thread = new Thread(() -> {
                 while (true) {
@@ -336,7 +341,9 @@ public class SimulationTrackImpl implements SimulationTrackService {
 
                             String data = JSONUtil.toJsonStr(tianaoRadar);
                             try {
-                                Thread.sleep(2500);
+                                if(0 == tianaoType){
+                                    Thread.sleep(1000);
+                                }
                                 kafkaTemplate.send(TopicConstants.TIANAO_TOPIC, data);
                                 log.info(DateUtil.now() + "模拟天奥船舶:天奥模拟船舶1,FusionBatchNum为202302191完成");
                             } catch (InterruptedException e) {
@@ -380,7 +387,9 @@ public class SimulationTrackImpl implements SimulationTrackService {
 
                             String data = JSONUtil.toJsonStr(tianaoRadar);
                             try {
-                                Thread.sleep(2500);
+                                if(0 == tianaoType){
+                                    Thread.sleep(1000);
+                                }
                                 kafkaTemplate.send(TopicConstants.TIANAO_TOPIC, data);
                                 log.info(DateUtil.now() + "模拟天奥船舶:天奥模拟船舶2,FusionBatchNum为202302192完成");
                             } catch (InterruptedException e) {
@@ -405,18 +414,19 @@ public class SimulationTrackImpl implements SimulationTrackService {
 
 
     @Override
-    public void beidouNewTrack(Integer status) {
+    public void beidouNewTrack(Integer status,Integer type) {
         //开始位置 109.11032753891612,19.687745190689267
         //结束位置 109.16730608884323,19.68914959156775
         //模拟同船的第一个设备
         beidouNewStatus = status;
+        beidouType = type;
         if (0 == beidouNewStatus) {
             Thread thread = new Thread(() -> {
                 while (true) {
                     if (beidouNewStatus == 1) {
                         Thread.currentThread().interrupt();
                     } else {
-                        List<Location> list = LocationUtils.generateLogLat("2023-02-19 14:00:00", "2023-02-19 14:30:00", 109.11032753891612, 19.687745190689267, 109.16730608884323,19.68914959156775);
+                        List<Location> list = LocationUtils.generateLogLatBeidou("2023-02-19 14:00:00", "2023-02-19 14:30:00", 109.11032753891612, 19.687745190689267, 109.16730608884323,19.68914959156775);
                         for (Location location : list) {
                             BeidouShipTrackDTO beidouShipTrackDTO = new BeidouShipTrackDTO();
                             beidouShipTrackDTO.setId("202302193");
@@ -431,7 +441,9 @@ public class SimulationTrackImpl implements SimulationTrackService {
                             beidouShipTrackDTO.setLatitude(location.getLat());
                             String data = JSONUtil.toJsonStr(beidouShipTrackDTO);
                             try {
-                                Thread.sleep(1000 * 60);
+                                if(0 == beidouType){
+                                    Thread.sleep(1000);
+                                }
                                 kafkaTemplate.send(TopicConstants.BEIDOU_TOPIC, data);
                                 log.info(DateUtil.now() + "模拟北斗船舶:202302193测试船舶,终端号为202302193完成");
                             } catch (InterruptedException e) {