1.增加分组列表接口。

Xiajijian

2025-11-14 aeb302cc46f60a2f5825a0149a972d82837f0071

1.增加分组列表接口。

 ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java

@@ -11,6 +11,7 @@
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
import com.ard.route.domain.route.ArdRouteGroup;
import com.ard.route.domain.vo.ArdRouteGroupVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -111,4 +112,14 @@
        }
    }

    /**
     * 分组列表
     */
    @ApiOperation("分组列表")
    @GetMapping("/groupList")
    public TableDataInfo groupList(ArdRouteGroup ardRouteGroup) {
        List<ArdRouteGroupVo> list = ardRouteGroupService.selectGroupList(ardRouteGroup);
        return getDataTable(list);
    }

}

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

New file
@@ -0,0 +1,26 @@
package com.ard.route.domain.vo;

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 {

    private static final long serialVersionUID = 1L;

    /** ID */
    private String id;

    /** 分组名称 */
    @Excel(name = "分组名称")
    private String groupName;

    /** 序列号 */
    @Excel(name = "序列号")
    private Integer serialNumber;

}

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

@@ -4,6 +4,7 @@
import java.util.Map;

import com.ard.route.domain.route.ArdRouteGroup;
import com.ard.route.domain.vo.ArdRouteGroupVo;

/**
 * 分组Service接口
@@ -60,4 +61,13 @@
     * @return 结果
     */
    public int deleteArdRouteGroupById(String id);

    /**
     * 分组列表
     *
     * @param ardRouteGroup 分组
     * @return 分组集合
     */
    public List<ArdRouteGroupVo> selectGroupList(ArdRouteGroup ardRouteGroup);

}

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

@@ -3,13 +3,16 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import com.ard.common.annotation.DataScope;
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.route.domain.route.ArdRouteGroup;
import com.ard.route.domain.vo.ArdRouteGroupVo;
import com.ard.route.mapper.ArdRouteGroupMapper;
import com.ard.route.mapper.ArdRouteInfoMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.service.IArdRouteGroupService;
@@ -134,4 +137,21 @@
        return ardRouteGroupMapper.deleteArdRouteGroupById(id);
    }

    /**
     * 分组列表
     *
     * @param ardRouteGroup 分组
     * @return 分组集合
     */
    @Override
    public List<ArdRouteGroupVo> selectGroupList(ArdRouteGroup ardRouteGroup) {
        return ardRouteGroupMapper.selectArdRouteGroupList(ardRouteGroup).stream()
                .map(entity -> {
                    ArdRouteGroupVo vo = new ArdRouteGroupVo();
                    BeanUtils.copyProperties(entity, vo);
                    return vo;
                })
                .collect(Collectors.toList());
    }

}

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

@@ -97,8 +97,7 @@
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
        Integer droneType = subStringDroneType(ardRouteInfo.getAircraft());
        ardRouteInfo.getUavRouteReq().setDroneType(droneType);
        ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
        ardRouteInfo.setRouteData(routeData);
        KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
        ardRouteInfo.setPath(kmzResult.getPath());