吉安感知网项目-后端
xiebin
2026-01-28 36946e9c6c5a891bf695d84d450582977b6eb3af
update-区域划分表结构调整
2 files modified
8 ■■■■ changed files
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java 6 ●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java 2 ●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwAreaDivideController.java
@@ -161,9 +161,9 @@
    @ApiOperation(value = "新增或修改", notes = "传入fwAreaDivide")
    public R submit(@Valid @RequestBody FwAreaDivideDTO fwAreaDivide) {
        FwAreaDivideEntity fwAreaDivideEntity = Objects.requireNonNull(BeanUtil.copy(fwAreaDivide, FwAreaDivideEntity.class));
        if (isGeomInvalid(fwAreaDivideEntity.getGeom())) {
            return R.fail("几何数据格式不正确");
        }
//        if (isGeomInvalid(fwAreaDivideEntity.getGeom())) {
//            return R.fail("几何数据格式不正确");
//        }
        return R.status(fwAreaDivideService.saveOrUpdate(fwAreaDivideEntity));
    }
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwDefenseSceneServiceImpl.java
@@ -87,7 +87,7 @@
                if (area == null || area.getId() == null) {
                    continue;
                }
                areaSizeMap.put(area.getId(), area.getAreaSize());
//                areaSizeMap.put(area.getId(), area.getAreaSize());
                List<Long> areaDeviceIds = parseIdList(area.getDeviceIds());
                areaDeviceMap.put(area.getId(), areaDeviceIds);
                deviceIdSet.addAll(areaDeviceIds);