libingkun/skyeyesystem
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove join image func, push each image to frontend directly

Browse Source
This commit is contained in:
Bingkun Li 2026-03-09 10:47:07 +08:00
parent 6764c7bfe1
commit 460af8d011
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/sar/service/impl/SarImageServiceImpl.java
View File

@ -67,7 +67,8 @@ public class SarImageServiceImpl implements ISarImageService {
* @param frameNo 当前帧号 * @param frameNo 当前帧号
* @return 返回非空的图像信息，其字段 imageNo 一定有值 * @return 返回非空的图像信息，其字段 imageNo 一定有值
*/ */
private JmImage getBaseImage(Long airlineId, int singleWidth, int frameNo) {IMG_MAX_WITH=1; private JmImage getBaseImage(Long airlineId, int singleWidth, int frameNo) {
// IMG_MAX_WITH=1;
List<JmImage> imageList = imageService.selectLowByAirline(airlineId); List<JmImage> imageList = imageService.selectLowByAirline(airlineId);
String cacheKey = "jmImgJoin-" + airlineId; String cacheKey = "jmImgJoin-" + airlineId;
JmImage base = null; JmImage base = null;
@ -80,17 +81,18 @@ public class SarImageServiceImpl implements ISarImageService {
} }
// 情况2：如果最后一张还能拼图，则直接返回继续拼 // 情况2：如果最后一张还能拼图，则直接返回继续拼
JmImage last = imageList.get(imageList.size() - 1); JmImage last = imageList.get(imageList.size() - 1);
Integer startFrameNo = (Integer) redisUtil.hget(cacheKey, CACHE_FIELD_START_FRAME_NO); // Integer startFrameNo = (Integer) redisUtil.hget(cacheKey, CACHE_FIELD_START_FRAME_NO);
int currWidth = startFrameNo == null ? 0 : singleWidth * (frameNo - startFrameNo + 1); // 图宽（当前图+基准图） // int currWidth = startFrameNo == null ? 0 : singleWidth * (frameNo - startFrameNo + 1); // 图宽（当前图+基准图）
int surplusNum = (IMG_MAX_WITH - currWidth) / singleWidth; // 还可以拼图片数 // int surplusNum = (IMG_MAX_WITH - currWidth) / singleWidth; // 还可以拼图片数
Integer baseNo = (Integer) redisUtil.hget("jmImgJoin-" + airlineId, CACHE_FIELD_CURR_FRAME_NO); // log.info("surplusNum: = " + surplusNum);
if (startFrameNo == null || currWidth < IMG_MAX_WITH || // Integer baseNo = (Integer) redisUtil.hget("jmImgJoin-" + airlineId, CACHE_FIELD_CURR_FRAME_NO);
baseNo == null || (frameNo - baseNo + 1 <= surplusNum)) { // 当前图+填充 不能超过允许拼接数 // if (startFrameNo == null || currWidth < IMG_MAX_WITH ||
log.info("当前宽度：" + currWidth + " < " + IMG_MAX_WITH + " 可以继续拼接"); // baseNo == null || (frameNo - baseNo + 1 <= surplusNum)) { // 当前图+填充 不能超过允许拼接数
return last; // log.info("当前宽度：" + currWidth + " < " + IMG_MAX_WITH + " 可以继续拼接");
} // return last;
// }
// 情况3：已经拼接到最大数量，或者当前图+填充数量超过允许拼接数量，创建新图像文件 // 情况3：已经拼接到最大数量，或者当前图+填充数量超过允许拼接数量，创建新图像文件
log.info("当前宽度：" + currWidth + " > " + IMG_MAX_WITH + " 重新拼接，当前帧号" + frameNo + "作为首帧"); // log.info("当前宽度：" + currWidth + " > " + IMG_MAX_WITH + " 重新拼接，当前帧号" + frameNo + "作为首帧");
base = new JmImage(); base = new JmImage();
redisUtil.hset(cacheKey, CACHE_FIELD_START_FRAME_NO, frameNo, CACHE_EXPIRE_SECOND); redisUtil.hset(cacheKey, CACHE_FIELD_START_FRAME_NO, frameNo, CACHE_EXPIRE_SECOND);
base.setImageNo(last.getImageNo() + 1); base.setImageNo(last.getImageNo() + 1);