ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInforController.java
File was renamed from ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInformationController.java
@@ -5,17 +5,16 @@
import com.ard.common.utils.poi.ExcelUtil;
import com.ard.oss.model.MinioUploadResult;
import com.ard.route.domain.route.ArdRouteInformation;
import com.ard.route.domain.route.ArdRouteInfor;
import com.ard.route.service.IArdRouteInforService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.ard.common.annotation.Log;
import com.ard.common.core.controller.BaseController;
import com.ard.common.core.domain.AjaxResult;
import com.ard.common.enums.BusinessType;
import com.ard.route.service.IArdRouteInformationService;
import com.ard.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
@@ -30,19 +29,19 @@
@Api(tags = "航线信息接口")
@RestController
@RequestMapping("/route/information")
public class ArdRouteInformationController extends BaseController {
public class ArdRouteInforController extends BaseController {
    @Autowired
    private IArdRouteInformationService ardRouteInformationService;
    private IArdRouteInforService ardRouteInforService;
    /**
     * 查询航线(kmz)列表
     */
    @ApiOperation("查询航线(kmz)列表")
    @GetMapping("/list")
    public TableDataInfo list(ArdRouteInformation ardRouteInformation) {
    public TableDataInfo list(ArdRouteInfor ardRouteInfor) {
        startPage();
        List<ArdRouteInformation> list = ardRouteInformationService.selectArdRouteInformationList(ardRouteInformation);
        List<ArdRouteInfor> list = ardRouteInforService.selectArdRouteInforList(ardRouteInfor);
        return getDataTable(list);
    }
@@ -52,9 +51,9 @@
    @ApiOperation("导出航线(kmz)列表")
    @Log(title = "航线(kmz)", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ArdRouteInformation ardRouteInformation) {
        List<ArdRouteInformation> list = ardRouteInformationService.selectArdRouteInformationList(ardRouteInformation);
        ExcelUtil<ArdRouteInformation> util = new ExcelUtil<ArdRouteInformation>(ArdRouteInformation.class);
    public void export(HttpServletResponse response, ArdRouteInfor ardRouteInfor) {
        List<ArdRouteInfor> list = ardRouteInforService.selectArdRouteInforList(ardRouteInfor);
        ExcelUtil<ArdRouteInfor> util = new ExcelUtil<ArdRouteInfor>(ArdRouteInfor.class);
        util.exportExcel(response, list, "航线(kmz)数据");
    }
@@ -64,7 +63,7 @@
    @ApiOperation("获取航线(kmz)详细信息")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") String id) {
        return success(ardRouteInformationService.selectArdRouteInformationById(id));
        return success(ardRouteInforService.selectArdRouteInforById(id));
    }
    /**
@@ -73,9 +72,9 @@
    @ApiOperation("新增航线(kmz)")
    @Log(title = "航线(kmz)", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody ArdRouteInformation ardRouteInformation) {
        ardRouteInformation.setCreateBy(getUsername());
        return success(ardRouteInformationService.insertArdRouteInformation(ardRouteInformation));
    public AjaxResult add(@RequestBody ArdRouteInfor ardRouteInfor) {
        ardRouteInfor.setCreateBy(getUsername());
        return success(ardRouteInforService.insertArdRouteInfor(ardRouteInfor));
    }
    /**
@@ -84,9 +83,9 @@
    @ApiOperation("修改航线(kmz)")
    @Log(title = "航线(kmz)", businessType = BusinessType.UPDATE)
    @PutMapping
    public AjaxResult edit(@RequestBody ArdRouteInformation ardRouteInformation) {
        ardRouteInformation.setUpdateBy(getUsername());
        return toAjax(ardRouteInformationService.updateArdRouteInformation(ardRouteInformation));
    public AjaxResult edit(@RequestBody ArdRouteInfor ardRouteInfor) {
        ardRouteInfor.setUpdateBy(getUsername());
        return toAjax(ardRouteInforService.updateArdRouteInfor(ardRouteInfor));
    }
    /**
@@ -96,7 +95,7 @@
    @Log(title = "航线(kmz)", businessType = BusinessType.DELETE)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids) {
        return toAjax(ardRouteInformationService.deleteArdRouteInformationByIds(ids));
        return toAjax(ardRouteInforService.deleteArdRouteInforByIds(ids));
    }
    /**
@@ -105,7 +104,7 @@
    @ApiOperation("导入航线(kmz)文件")
    @PostMapping("/upload")
    public AjaxResult upload(@RequestPart("file") MultipartFile file) {
        MinioUploadResult minioUploadResult = ardRouteInformationService.uploadArdRouteInformation(file);
        MinioUploadResult minioUploadResult = ardRouteInforService.uploadArdRouteInfor(file);
        return success(minioUploadResult);
    }
@@ -114,10 +113,10 @@
     */
    @ApiOperation("修改航线分组ID")
    @Log(title = "航线(kmz)", businessType = BusinessType.UPDATE)
    @PutMapping("/updateFolderId/{id}/{folderId}")
    public AjaxResult updateFolderId(@PathVariable("id") String id,
                                     @PathVariable("folderId") String folderId) {
        return toAjax(ardRouteInformationService.updateRouteInformationFolderId(id,folderId));
    @PutMapping("/updateGroupingId/{id}/{groupingId}")
    public AjaxResult updateGroupingId(@PathVariable("id") String id,
                                     @PathVariable("groupingId") String groupingId) {
        return toAjax(ardRouteInforService.updateRouteInformationGroupingId(id,groupingId));
    }
    /**
@@ -127,7 +126,16 @@
    @GetMapping("/noFly/{longitude}/{latitude}")
    public Boolean noFly(@PathVariable("longitude") Double longitude,
                               @PathVariable("latitude") Double latitude) {
        return ardRouteInformationService.selectRouteInformationNoFly(longitude,latitude);
        return ardRouteInforService.selectRouteInformationNoFly(longitude,latitude);
    }
    /**
     * 上传航线到边缘服务器
     */
//    @ApiOperation("上传航线到边缘服务器")
//    @PostMapping
//    public AjaxResult uploadRouteInformation(@RequestBody ArdRouteInfor ArdRouteInfor) {
//        return success(ArdRouteInforService.selectArdRouteInforByName(ArdRouteInfor.getName()));
//    }
}