diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java index dfa974d..5f43ec0 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java +++ b/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); } // 开启新航线 diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/SarWsAsyncService.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/SarWsAsyncService.java index 8969ec5..45d328f 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/SarWsAsyncService.java +++ b/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); } diff --git a/library/logisen/GMTI/CHSRTProc.h b/library/logisen/GMTI/CHSRTProc.h new file mode 100644 index 0000000..fe0d255 --- /dev/null +++ b/library/logisen/GMTI/CHSRTProc.h @@ -0,0 +1,52 @@ +#ifndef __CHSRTPROC_H__ +#define __CHSRTPROC_H__ + +#pragma once + +#include "stdafx.h" +#include + +// ڴַ㺽Ľṹ + +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 +1dataRes GMTIʽV3.022ĺϢ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 \ No newline at end of file diff --git a/library/logisen/GMTI/MulTarTrk.dll b/library/logisen/GMTI/MulTarTrk.dll new file mode 100644 index 0000000..41d9606 Binary files /dev/null and b/library/logisen/GMTI/MulTarTrk.dll differ diff --git a/library/logisen/GMTI/MulTarTrk.lib b/library/logisen/GMTI/MulTarTrk.lib new file mode 100644 index 0000000..e461fa2 Binary files /dev/null and b/library/logisen/GMTI/MulTarTrk.lib differ diff --git a/library/logisen/GMTI/test/MulTarTrk.dll b/library/logisen/GMTI/test/MulTarTrk.dll new file mode 100644 index 0000000..41d9606 Binary files /dev/null and b/library/logisen/GMTI/test/MulTarTrk.dll differ diff --git a/library/logisen/GMTI/test/MulTarTrk.lib b/library/logisen/GMTI/test/MulTarTrk.lib new file mode 100644 index 0000000..e461fa2 Binary files /dev/null and b/library/logisen/GMTI/test/MulTarTrk.lib differ diff --git a/library/logisen/GMTI/test/TestBench.exe b/library/logisen/GMTI/test/TestBench.exe new file mode 100644 index 0000000..dc57039 Binary files /dev/null and b/library/logisen/GMTI/test/TestBench.exe differ diff --git a/library/logisen/GMTI/test/TrkConfig.ini b/library/logisen/GMTI/test/TrkConfig.ini new file mode 100644 index 0000000..7712e2e --- /dev/null +++ b/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 diff --git a/library/logisen/GMTI/test/mti1.dat b/library/logisen/GMTI/test/mti1.dat new file mode 100644 index 0000000..46f8cc9 Binary files /dev/null and b/library/logisen/GMTI/test/mti1.dat differ