1.修改文件业务，屏蔽前台接口开关。 2.文件夹业务修改为，分组管理业务。 3.航线(kmz)对象增加分组ID。 4.分组信息删除同时删除分组下航信信...

Xiajijian

2025-11-06 1791d8d45a0f6de527a1e243b9ba806edc0753aa

 ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java

@@ -95,9 +95,11 @@
     * @return
     */
    @ApiOperation("设备列表")
    @PreAuthorize("@ss.hasPermi('device:dock:list')")
    @GetMapping("/list")
    public ResponseResult<List<DeviceDTO>> getDevices() {
        List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb();
//        List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb();
        List<DeviceDTO> devicesList = deviceService.getDockList();
        return ResponseResult.success(devicesList);
    }

@@ -140,6 +142,7 @@
     */
    @ApiOperation("绑定设备列表")
    @GetMapping("/list/bound")
    @PreAuthorize("@ss.hasPermi('device:dock:list')")
    public ResponseResult<PaginationData<DeviceDTO>> getBoundDevicesWithDomain(Integer domain,
                                                                               @RequestParam(defaultValue = "1") Long page,
                                                                               @RequestParam(value = "page_size",
@@ -210,23 +213,25 @@
        if (propertyEnumOpt.isEmpty()) {
            return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
        }
        deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param.get(property));
        deviceService.devicePropertySet(dockSn, propertyEnumOpt.get(), param);
        return ResponseResult.success();
    }

    /**
     * 查询机场设备列表
     */
    @PreAuthorize("@ss.hasPermi('device:camera:list')")
    @GetMapping("/test/list")
    @ApiOperation("查询机场设备列表")
    public TableDataInfo list(DeviceDTO device) {
        startPage();
        DeviceEntity deviceEntity = deviceDTO2Entity(device);
        QueryWrapper<DeviceEntity> queryWrapper=new QueryWrapper<>(deviceEntity);
        List<DeviceEntity> list = deviceService.selectList(queryWrapper);
        return getDataTable(list);
    }
    //.get(property)

//    /**
//     * 查询机场设备列表
//     */
//    @PreAuthorize("@ss.hasPermi('device:camera:list')")
//    @GetMapping("/test/list")
//    @ApiOperation("查询机场设备列表")
//    public TableDataInfo list(DeviceDTO device) {
//        startPage();
//        DeviceEntity deviceEntity = deviceDTO2Entity(device);
//        QueryWrapper<DeviceEntity> queryWrapper=new QueryWrapper<>(deviceEntity);
//        List<DeviceEntity> list = deviceService.selectList(queryWrapper);
//        return getDataTable(list);
//    }

    private DeviceEntity deviceDTO2Entity(DeviceDTO dto) {
        DeviceEntity.DeviceEntityBuilder builder = DeviceEntity.builder();