| | |
| | | @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)); |
| | | } |
| | | |
| | |
| | | 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); |