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

bug: (no ticket tracked) start a created job, the backend won't check whether sar is on or off

Browse Source
This commit is contained in:
Andy Yang 2026-03-04 17:29:13 +08:00
parent 1ee4a59f7d
commit 1031ac1578
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,9 +10,11 @@ import com.zhangy.skyeye.jm.event.JmJobStatusEvent;
import com.zhangy.skyeye.jm.event.JmPayloadStatusEvent; import com.zhangy.skyeye.jm.event.JmPayloadStatusEvent;
import com.zhangy.skyeye.jm.service.JmJobStatusService; import com.zhangy.skyeye.jm.service.JmJobStatusService;
import com.zhangy.skyeye.jm.service.JmStatusLogService; import com.zhangy.skyeye.jm.service.JmStatusLogService;
import com.zhangy.skyeye.publics.consts.CacheKey;
import com.zhangy.skyeye.publics.consts.ExecStatusEnum; import com.zhangy.skyeye.publics.consts.ExecStatusEnum;
import com.zhangy.skyeye.publics.consts.WebSocketKey; import com.zhangy.skyeye.publics.consts.WebSocketKey;
import com.zhangy.skyeye.publics.utils.CoordUtil; import com.zhangy.skyeye.publics.utils.CoordUtil;
import com.zhangy.skyeye.redis.utils.RedisUtil;
import com.zhangy.skyeye.sar.listen.SarImageUdpProcessor; import com.zhangy.skyeye.sar.listen.SarImageUdpProcessor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -43,6 +45,9 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
@Autowired @Autowired
private SarImageUdpProcessor imageProcessService; private SarImageUdpProcessor imageProcessService;
@Autowired
private RedisUtil redisUtil;
// @Autowired // @Autowired
// private ISmpSubscriptService subscriptService; // private ISmpSubscriptService subscriptService;
@ -177,6 +182,11 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
throw ServiceException.warnLog(MessageUtils.message("sar.control.turnon.euavinexec")); throw ServiceException.warnLog(MessageUtils.message("sar.control.turnon.euavinexec"));
} }
for (JmJobPayload payload : newUav.getPayloadList()) { for (JmJobPayload payload : newUav.getPayloadList()) {
// 校验雷达连接状态
if (!redisUtil.hasKey(CacheKey.getSarConnect(payload.getIp()))) {
throw ServiceException.warnLog(MessageUtils.message("device.sar.offline", payload.getPayloadName()));
}
if (runningPayloadIds.contains(payload.getPayloadId())) { if (runningPayloadIds.contains(payload.getPayloadId())) {
throw ServiceException.warnLog(MessageUtils.message("sar.control.turnon.esarinexec")); throw ServiceException.warnLog(MessageUtils.message("sar.control.turnon.esarinexec"));
} }

2
backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages.properties
View File

@ -2,6 +2,8 @@
# device management # device management
device.uav.remove.success=Remove success device.uav.remove.success=Remove success
device.uav.remove.fail=Remove failed device.uav.remove.fail=Remove failed
device.uav.offline=UAV [{0}] disconnected
device.sar.offline=SAR [{0}] disconnected
# SAR图片管理 # SAR图片管理
sar.image.remove.success=Remove success sar.image.remove.success=Remove success

2
backend/Skyeye-sys-dev/skyeye-service-manager/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -2,6 +2,8 @@
# 设备管理 # 设备管理
device.uav.remove.success=操作成功 device.uav.remove.success=操作成功
device.uav.remove.fail=操作失败 device.uav.remove.fail=操作失败
device.uav.offline=无人机[{0}]未连接
device.sar.offline=雷达[{0}]未连接
# SAR图片管理 # SAR图片管理
sar.image.remove.success=操作完成 sar.image.remove.success=操作完成