Merge branch 'main' of http://182.92.203.107:3000/libingkun/skyeyesystem

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java

@@ -283,23 +283,19 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
                 return;
             }
             endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null);
-        } else if (isBoot == 1 && aStatus == ExecStatusEnum.PROCESSING) {
-            if (overButSending) {
+        } else if (isBoot == 1 && aStatus == ExecStatusEnum.PROCESSING && overButSending) {
                 // 前一航线的图片没传完，就开始了新航线
                 endAirline(jobId, jobVo, uavVo, airlineVo, wsVo, nextAirline == null);
                 if (nextAirline != null) {
                     startAirline(nextAirline, wsVo);
                 }
-            }
-
-            wsVo.setSarStatus(curr);
-            simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
-        } else {
-            return;
-        }
+        } // else {
+//            return;
+//        }
 
         // 4.将更新后的状态推送到前端
-        // simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
+        wsVo.setSarStatus(curr);
+        simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
     }
 
     // 开启新航线

backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/SarWsAsyncService.java

@@ -30,7 +30,7 @@ public class SarWsAsyncService {
      * @param datName
      * @param fileData
      */
-    @Async("commonThreadPool")
+    // @Async("commonThreadPool")
     public void saveImageDat(Object dirName, String datName, byte[] fileData) {
         String imageSrcPath = sysFileTypeService.getAbsolutePath(FileTypeEnum.SAR_IMAGE_LOW_SRC, dirName, datName);
         FileUtil.createDir(imageSrcPath);
@@ -48,7 +48,7 @@ public class SarWsAsyncService {
      * @param image 图像像素
      * @param release 是否释放参数 image 资源
      */
-    @Async("commonThreadPool")
+    // @Async("commonThreadPool")
     public void write(String imagePath, Mat image, boolean release) {
         OpenCVUtil.write(imagePath, image, true);
     }

library/logisen/GMTI/CHSRTProc.h

@@ -0,0 +1,52 @@
+#ifndef __CHSRTPROC_H__
+#define __CHSRTPROC_H__
+
+#pragma once
+
+#include "stdafx.h"
+#include <conio.h>
+
+// 输出内存地址点航迹的结构体
+
+struct MTI_pDot {
+
+	unsigned __int16 tar_no;
+	unsigned __int16 tar_rg;
+
+	__int16  tar_az;
+	__int16  tar_vr;
+
+	__int16  tar_high;
+	unsigned __int16 tar_ampl;
+
+	unsigned __int32 tar_logn;
+	unsigned __int32 tar_lati;
+
+};
+
+struct MTI_pTrk {
+
+	unsigned __int16 trk_no;
+	__int16 trk_high;
+
+	__int32 trk_logn;
+	__int32 trk_lati;
+
+	__int16 trk_vel;
+	__int16 trk_heading;
+
+	unsigned __int16 trk_ampl;
+	__int16 nc;
+
+};
+/*
+功能：处理动目标检测和凝聚后和定位的点迹，航迹起始和跟踪和管理
+输入：dataAr 按照GMTI格式V3.02 表1打包的每个cpi处理的点迹信息和辅助数据,长度8192BYTES；
+输出1：dataRes 按照GMTI格式V3.02表2输出的航迹信息，如果dataRes全部为0则没有航迹，长度8192字节；
+输出： outpath： 航迹关联后按照航迹格式的路径（	outpath\\GMTIDotInfo_lzx.dat outpath\\GMTITrkInfo_lzx.dat"，
+分别保存点迹和航迹信息，累加输出；
+*/
+__declspec(dllexport) void MTIDotProc(unsigned char *dataAr, unsigned char *dataRes, char *outpath);
+
+
+#endif

library/logisen/GMTI/test/TrkConfig.ini

@@ -0,0 +1,14 @@
+############ Track Relate Modual Param ##############
+
+nj_Rwin:  20
+nj_Awin:  5
+
+bomen_vmax:  20
+bomen_vmin:  3
+bomen_size: 50
+
+miss_frame_tmp: 4
+miss_frame_trust: 3
+NoiseMatrixRg: 100
+NoiseMatrixAz: 100
+NoiseSpetrumPowerDensity: 1