Xiajijian
2026-01-26 163b908ddaacab8f54549e24dfb2d2b60b6c5385
1. 创建航线时,修改任务航线相关业务逻辑引用报错问题。
3 files modified
14 ■■■■■ changed files
ard-admin/src/main/java/com/ard/web/controller/inspection/BigFileUploadController.java 3 ●●●●● patch | view | raw | blame | history
ard-route/src/main/java/com/ard/route/domain/route/ArdRoutePoint.java 3 ●●●●● patch | view | raw | blame | history
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java 8 ●●●●● patch | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/inspection/BigFileUploadController.java
@@ -1,5 +1,6 @@
package com.ard.web.controller.inspection;
import com.ard.common.core.controller.BaseController;
import io.lettuce.core.dynamic.annotation.Value;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,7 +9,7 @@
@Api(tags = "大文件上传")
@RestController
@RequestMapping("/inspection/bigfile")
public class BigFileUploadController {
public class BigFileUploadController extends BaseController {
    /** 若依文件上传根目录(从配置文件读取) */
    //@Value("${ruoyi.profile}")
ard-route/src/main/java/com/ard/route/domain/route/ArdRoutePoint.java
@@ -1,6 +1,5 @@
package com.ard.route.domain.route;
import com.ard.common.core.domain.BaseEntity;
import lombok.Data;
/**
@@ -11,8 +10,6 @@
 */
@Data
public class ArdRoutePoint{
    private static final long serialVersionUID = 1L;
    /** 航线任务ID */
    private String missionId;
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -140,8 +140,10 @@
     */
    @Override
    public String insertArdRouteInfo(ArdRouteInfo ardRouteInfo) {
        if ("3".equals(ardRouteInfo.getType())) {
        checkRouteMissionStatus(ardRouteInfo,"1");
        checkRouteMissionStatus(ardRouteInfo,"2");
        }
        ardRouteInfo.setId(IdUtils.simpleUUID());
        ardRouteInfo.setCreateTime(DateUtils.getNowDate());
        ardRouteInfo.setUpdateTime(DateUtils.getNowDate()); // 修改时间,用于排序
@@ -165,6 +167,7 @@
     */
    private void checkRouteMissionStatus(ArdRouteInfo ardRouteInfo,String type){
        ArdRouteMission mission = ardRouteMissionMapper.selectArdRouteMissionById(ardRouteInfo.getMissionId());
        if (mission != null){
        switch(type){
            case "1":
                validateForCreate(mission);
@@ -177,6 +180,9 @@
                break;
            default:
                throw new RuntimeException("不支持的操作类型!!!");
            }
        }else {
            throw new RuntimeException("航线任务不存在!!!");
        }
    }
@@ -475,8 +481,10 @@
        // 判断是否循环航线
        if (null != route && "0".equals(route.getIsLoop())){
            deleteArdRouteInfoById(id);
            if ("3".equals(route.getType())) {
            checkRouteMissionStatus(route,"3");
        }
        }
        WayLineBeginDTO wayLineBeginDTO = new WayLineBeginDTO(boxSn);
        tyService.wayLineBegin(wayLineBeginDTO);
        return true;