From 71f1ecb26bc9f8f92be176bb03052212beff221a Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 28 Jan 2026 15:09:44 +0800
Subject: [PATCH] 1. 航线任务测试时所需优化项，增加业务逻辑判断。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index f5f878d..6fb58d9 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -140,10 +140,8 @@
*/
@Override
public String insertArdRouteInfo(ArdRouteInfo ardRouteInfo) {
- if ("3".equals(ardRouteInfo.getType())) {
- checkRouteMissionStatus(ardRouteInfo,"1");
- checkRouteMissionStatus(ardRouteInfo,"2");
- }
+ checkRouteMissionStatus(ardRouteInfo,"1");
+ checkRouteMissionStatus(ardRouteInfo,"2");
ardRouteInfo.setId(IdUtils.simpleUUID());
ardRouteInfo.setCreateTime(DateUtils.getNowDate());
ardRouteInfo.setUpdateTime(DateUtils.getNowDate()); // 修改时间，用于排序
@@ -173,16 +171,14 @@
validateForCreate(mission);
break;
case "2":
- bindRoute(mission, ardRouteInfo);
+ bindRoute(mission,ardRouteInfo);
break;
case "3":
- executeMission(mission);
+ executeMission(mission,ardRouteInfo);
break;
default:
throw new RuntimeException("不支持的操作类型!!!");
}
- }else {
- throw new RuntimeException("航线任务不存在！！！");
}
}
@@ -193,15 +189,16 @@
}
private void bindRoute(ArdRouteMission mission, ArdRouteInfo routeInfo) {
- if (!"0".equals(mission.getRouteId())) {
+ if (mission.getRouteId() != null) {
throw new RuntimeException("航线任务下已绑定航线，不可创建新航线信息！！！");
}
mission.setRouteId(routeInfo.getId());
ardRouteMissionMapper.updateArdRouteMission(mission);
}
- private void executeMission(ArdRouteMission mission) {
+ private void executeMission(ArdRouteMission mission,ArdRouteInfo ardRouteInfo) {
if ("0".equals(mission.getExecuteStatus())) {
+ mission.setRouteId(ardRouteInfo.getId());
mission.setExecuteStatus("1");
mission.setExecuteBy(getUsername());
mission.setExecuteTime(DateUtils.getNowDate());
@@ -478,12 +475,12 @@
@Override
public Boolean routeBegins(String id,String boxSn) {
ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(id);
- // 判断是否循环航线
- if (null != route && "0".equals(route.getIsLoop())){
- deleteArdRouteInfoById(id);
- if ("3".equals(route.getType())) {
- checkRouteMissionStatus(route,"3");
+ if (null != route){
+ // 判断是否循环航线
+ if ("0".equals(route.getIsLoop())){
+ deleteArdRouteInfoById(id);
}
+ checkRouteMissionStatus(route,"3");
}
WayLineBeginDTO wayLineBeginDTO = new WayLineBeginDTO(boxSn);
tyService.wayLineBegin(wayLineBeginDTO);
--
Gitblit v1.9.3