报废无人机显示绑定区域

rain

2026-02-12 f8c9dba8366da27a2ed7c176533ac92261efe2b4

报废无人机显示绑定区域

Signed-off-by: rain <1679827795@qq.com>

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/IFwAreaDivideService.java

@@ -72,6 +72,14 @@
    boolean existsAreaByDeviceId(Long deviceId);

    /**
     * 根据设备ID查询绑定区域名称
     *
     * @param deviceId
     * @return 未绑定时返回空字符串
     */
    String selectAreaNameByDeviceId(Long deviceId);

    /**
     * 统计分页
     *
     * @param page

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwAreaDivideServiceImpl.java

@@ -237,6 +237,28 @@
    }

    @Override
    public String selectAreaNameByDeviceId(Long deviceId) {
        if (deviceId == null) {
            return "";
        }
        List<FwAreaDivideVO> areaList = baseMapper.selectFwAreaDivideListByDeviceIds(Collections.singletonList(deviceId));
        if (areaList == null || areaList.isEmpty()) {
            return "";
        }
        Set<String> areaNameSet = new LinkedHashSet<>();
        for (FwAreaDivideVO area : areaList) {
            if (area == null || StringUtil.isBlank(area.getAreaName())) {
                continue;
            }
            areaNameSet.add(area.getAreaName().trim());
        }
        if (areaNameSet.isEmpty()) {
            return "";
        }
        return String.join(",", areaNameSet);
    }

    @Override
    public IPage<FwAreaDivideStatisticsVO> selectFwAreaDivideStatisticsPage(IPage<FwAreaDivideStatisticsVO> page,
                                                                            FwAreaDivideStatisticsDTO fwAreaDivideStatistics) {
        if (!AuthUtil.isAdministrator()) {

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java

@@ -215,13 +215,13 @@
     */
    @GetMapping("/checkAreaBind")
    @ApiOperationSupport(order = 9)
    @ApiOperation(value = "设备区域绑定校验", notes = "传入deviceId")
    public R<Boolean> checkAreaBind(@ApiParam(value = "设备ID", required = true) @RequestParam Long deviceId) {
    @ApiOperation(value = "设备区域绑定校验", notes = "传入deviceId，返回设备绑定区域名称")
    public R<String> checkAreaBind(@ApiParam(value = "设备ID", required = true) @RequestParam Long deviceId) {
        FwDeviceEntity device = fwDeviceService.getById(deviceId);
        if (device == null || (device.getIsDeleted() != null && device.getIsDeleted() != 0)) {
            return R.fail("该设备不存在");
        }
        return R.data(fwDeviceService.existsAreaBindByDeviceId(deviceId));
        return R.data(fwDeviceService.selectAreaBindNameByDeviceId(deviceId));
    }

    /**

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/IFwDeviceService.java

@@ -141,6 +141,14 @@
    boolean existsAreaBindByDeviceId(Long deviceId);

    /**
     * 获取设备绑定区域名称
     *
     * @param deviceId
     * @return 未绑定时返回空字符串
     */
    String selectAreaBindNameByDeviceId(Long deviceId);

    /**
     * 新增或修改设备
     * @param fwDeviceEntity
     * @return

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceServiceImpl.java

@@ -194,6 +194,11 @@
        return fwAreaDivideService.existsAreaByDeviceId(deviceId);
    }

    @Override
    public String selectAreaBindNameByDeviceId(Long deviceId) {
        return fwAreaDivideService.selectAreaNameByDeviceId(deviceId);
    }

    /**
     * 保存或更新设备信息
     *