Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-11-24 62425ee97401796752694001a2222dd38aa34c71

Merge remote-tracking branch 'origin/dev' into dev

 ard-route/src/main/java/com/ard/route/mapper/ArdRouteInfoMapper.java

@@ -62,7 +62,7 @@
    public int deleteArdRouteInfoByIds(String[] ids);

    /**
     * 根据文件名称查询航线信息
     * 根据名称查询航线信息
     *
     * @param fileName 文件名称
     * @return 结果

 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java

@@ -206,7 +206,7 @@
    }

    /**
     * 根据文件名称查询航线信息
     * 根据名称查询航线信息
     *
     * @param name 文件名称
     * @return 结果
@@ -254,7 +254,6 @@
            throw new RuntimeException(e);
        }
        // 1.2通过minio获取航线信息

        // 2.将航线信息转换成对应实体类
        WayLineUploadDTO wayLineUploadDTO = buildWayLineUploadDTO(route);
        wayLineUploadDTO.setBoxSn(boxSn);
@@ -326,9 +325,6 @@
        String exitOnRcLostAction = ardRouteInfo.getUavRouteReq().getExitOnRcLostAction();  //0

        PlanLineData planLineData = new PlanLineData();



        if (finishAction != null){
            planLineData.setLoseAction(0);
        }

 ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml

@@ -124,7 +124,7 @@

    <select id="selectArdRouteInfoByName" parameterType="String" resultMap="ArdRouteInfoResult">
        <include refid="selectArdRouteInfoVo"/>
        where file_name = #{fileName}
        where name = #{name}
    </select>

    <delete id="deleteRouteInforByGroupIds" parameterType="String">

 ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java

@@ -763,6 +763,7 @@
        }
        //wayLineUploadDTO.setWayLineData(this.CreatePlanLineData());//设置航线数据
        System.out.println("wayLineUploadDTO:-----------------" + wayLineUploadDTO);
        log.info("打印数据 ++++ wayLineUploadDTO:-----------------" + wayLineUploadDTO);
        WayLineUploadCmd wayLineUploadCmd = new WayLineUploadCmd(wayLineUploadDTO);
        System.out.println("wayLineUploadCmd:-----------------" + wayLineUploadCmd);
        this.sendMessage(ardDroneInfo.getServerId(), wayLineUploadCmd);