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

zhaowenyu

2025-11-28 d76f8e3b59969d4bf0f1bf4c92730719bd5389d3

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

@@ -1,16 +1,13 @@
package com.ard.web.controller.route;

import com.ard.common.core.domain.AjaxResult;
import com.ard.route.domain.UavRouteReq;
import com.ard.route.domain.djuav.UavRouteReq;
import com.ard.route.service.UavRouteService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

import java.io.IOException;

import static com.ard.common.core.domain.AjaxResult.success;

@@ -26,7 +23,7 @@
     * 编辑kmz文件
     */
    @ApiOperation("编辑kmz文件")
    @PreAuthorize("@ss.hasPermi('route:kmz:updateKmz')")
    //@PreAuthorize("@ss.hasPermi('route:kmz:updateKmz')")
    @PostMapping("/updateKmz/{fileName}")
    public AjaxResult updateKmz(@RequestBody UavRouteReq uavRouteReq,
                                @PathVariable("fileName") String fileName){
@@ -37,7 +34,7 @@
     * 生成kmz文件
     */
    @ApiOperation("生成kmz文件")
    @PreAuthorize("@ss.hasPermi('route:kmz:buildKmz')")
    //@PreAuthorize("@ss.hasPermi('route:kmz:buildKmz')")
    @PostMapping("/buildKmz/{fileName}")
    public AjaxResult buildKmz(@RequestBody UavRouteReq uavRouteReq,
                               @PathVariable("fileName") String fileName){
@@ -48,9 +45,9 @@
     * 解析kmz文件
     */
    @ApiOperation("解析kmz文件")
    @PreAuthorize("@ss.hasPermi('route:kmz:parseKmz')")
    //@PreAuthorize("@ss.hasPermi('route:kmz:parseKmz')")
    @PostMapping("/parseKmz")
    public AjaxResult parseKmz(@RequestParam("fileUrl") String fileUrl) throws IOException {
    public AjaxResult parseKmz(@RequestParam("fileUrl") String fileUrl){
        return success(routeService.parseKmz(fileUrl));
    }