1.修改BUG。

Xiajijian

2025-11-14 368f3fa38702695666810250310cd5110579f876

1.修改BUG。

 ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java

@@ -2,10 +2,7 @@

import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import com.ard.route.domain.route.ArdRouteInfo;
import lombok.Data;

import java.util.List;

@Data
public class ArdRouteGroupVo  extends BaseEntity {

 ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVo.java

File was renamed from ard-route/src/main/java/com/ard/route/domain/vo/KmzInfoVO.java
@@ -10,7 +10,7 @@
 * Date: 2024/12/22 10:46
 **/
@Data
public class KmzInfoVO implements Serializable {
public class KmzInfoVo implements Serializable {

    /**
     * 航线kml信息

 ard-route/src/main/java/com/ard/route/service/UavRouteService.java

@@ -1,10 +1,8 @@
package com.ard.route.service;

import com.ard.route.domain.UavRouteReq;
import com.ard.route.domain.vo.KmzInfoVO;
import com.ard.route.domain.vo.KmzInfoVo;
import com.ard.route.domain.vo.KmzResultVo;

import java.io.IOException;


public interface UavRouteService {
@@ -22,7 +20,7 @@
    /**
     * 解析kmz文件
     */
    public KmzInfoVO parseKmz(String file);
    public KmzInfoVo parseKmz(String file);

    /**
     * 编辑kmz文件

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

@@ -115,18 +115,21 @@
    @Override
    public int updateArdRouteInfo(ArdRouteInfo ardRouteInfo) {
        ardRouteInfo.setUpdateTime(DateUtils.getNowDate());
        KmzResultVo kmzResult = new KmzResultVo();
        // 获取源文件名字
        ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(ardRouteInfo.getId());
        if (route.getName().equals(ardRouteInfo.getName())) {
            kmzResult = routeService.updateKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
        }else {
            kmzResult = routeService.updateKmzNew(ardRouteInfo.getUavRouteReq(), route.getName(), ardRouteInfo.getName());
        // 判断生成kmz文件实体类是否为空，为空就修改航信信息，不修改行点信息。
        if (ardRouteInfo.getUavRouteReq() != null) {
            KmzResultVo kmzResult;
            // 获取源文件名字
            ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(ardRouteInfo.getId());
            if (route.getName().equals(ardRouteInfo.getName())) {
                kmzResult = routeService.updateKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
            }else {
                kmzResult = routeService.updateKmzNew(ardRouteInfo.getUavRouteReq(), route.getName(), ardRouteInfo.getName());
            }
            if ("更新航线kmz文件失败".equals(kmzResult.getData())) {
                return 0;
            }
            ardRouteInfo.setPath(kmzResult.getPath());
        }
        if ("更新航线kmz文件失败".equals(kmzResult.getData())) {
            return 0;
        }
        ardRouteInfo.setPath(kmzResult.getPath());
        return ardRouteInfoMapper.updateArdRouteInfo(ardRouteInfo);
    }


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

@@ -10,7 +10,7 @@
import com.ard.route.domain.WaypointTurnReq;
import com.ard.route.domain.kml.*;
import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.domain.vo.KmzInfoVO;
import com.ard.route.domain.vo.KmzInfoVo;
import com.ard.route.domain.vo.KmzResultVo;
import com.ard.route.enums.kml.ExitOnRCLostEnums;
import com.ard.route.service.IArdRouteInfoService;
@@ -233,8 +233,8 @@
     * 解析kmz文件
     */
    @Override
    public KmzInfoVO parseKmz(String fileUrl){
        KmzInfoVO kmzInfoVO = new KmzInfoVO();
    public KmzInfoVo parseKmz(String fileUrl){
        KmzInfoVo kmzInfoVO = new KmzInfoVo();
        try (InputStream inputStream = ossService.getObject(kmzPath,fileUrl);
             ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
            ArchiveEntry entry;

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

@@ -40,7 +40,7 @@
    <select id="selectArdRouteInfoList" parameterType="ArdRouteInfo" resultMap="ArdRouteInfoResult">
        <include refid="selectArdRouteInfoVo"/>
        <where>  
            <if test="name != null  and kmzName != ''"> and name like concat('%', #{name}, '%')</if>
            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
            <if test="aircraft != null  and aircraft != ''"> and aircraft = #{aircraft}</if>
            <if test="payload != null  and payload != ''"> and payload = #{payload}</if>
            <if test="type != null  and type != ''"> and type = #{type}</if>