From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseZoneController.java | 135 +++++++++++++++++++++++++++++---------------
1 files changed, 88 insertions(+), 47 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseZoneController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseZoneController.java
index 393c917..cc0d338 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseZoneController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseZoneController.java
@@ -16,40 +16,44 @@
*/
package org.sxkj.fw.area.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.common.utils.GeomUtils;
+import org.sxkj.fw.area.dto.FwDefenseZoneDTO;
import org.sxkj.fw.area.entity.FwDefenseZoneEntity;
-import org.sxkj.fw.area.vo.FwDefenseZoneVO;
import org.sxkj.fw.area.excel.FwDefenseZoneExcel;
-import org.sxkj.fw.area.wrapper.FwDefenseZoneWrapper;
import org.sxkj.fw.area.service.IFwDefenseZoneService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.tool.constant.BladeConstant;
+import org.sxkj.fw.area.vo.FwAreaDivideVO;
+import org.sxkj.fw.area.vo.FwDefenseZoneVO;
import springfox.documentation.annotations.ApiIgnore;
-import java.util.Map;
-import java.util.List;
+
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
/**
* 防区管理表 控制器
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@RestController
@AllArgsConstructor
@@ -64,21 +68,44 @@
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
- @ApiOperation(value = "详情", notes = "传入fwDefenseZone")
- public R<FwDefenseZoneVO> detail(FwDefenseZoneEntity fwDefenseZone) {
- FwDefenseZoneEntity detail = fwDefenseZoneService.getOne(Condition.getQueryWrapper(fwDefenseZone));
- return R.data(FwDefenseZoneWrapper.build().entityVO(detail));
+ @ApiOperation(value = "详情", notes = "传入id")
+ public R<FwDefenseZoneVO> detail(@ApiParam(value = "主键id", required = true) @RequestParam Long id) {
+ if (id == null) {
+ return R.fail("主键不能为空");
+ }
+ FwDefenseZoneVO detail = fwDefenseZoneService.selectFwDefenseZoneDetail(id);
+ if (detail == null) {
+ return R.fail("数据不存在");
+ }
+ return R.data(detail);
}
+
/**
- * 防区管理表 分页
+ * 根据防区id获取区域列表
*/
- @GetMapping("/list")
+ @GetMapping("/areaList")
@ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入fwDefenseZone")
- public R<IPage<FwDefenseZoneVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDefenseZone, Query query) {
- IPage<FwDefenseZoneEntity> pages = fwDefenseZoneService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDefenseZone, FwDefenseZoneEntity.class));
- return R.data(FwDefenseZoneWrapper.build().pageVO(pages));
+ @ApiOperation(value = "区域列表", notes = "传入防区id")
+ public R<List<FwAreaDivideVO>> areaList(@ApiParam(value = "防区id", required = true) @RequestParam Long zoneId) {
+ if (zoneId == null) {
+ return R.fail("防区id不能为空");
+ }
+ List<FwAreaDivideVO> list = fwDefenseZoneService.selectFwAreaDivideListByZoneId(zoneId);
+ if (list == null) {
+ return R.fail("防区不存在");
+ }
+ return R.data(list);
}
+// /**
+// * 防区管理表 分页
+// */
+// @GetMapping("/list")
+// @ApiOperationSupport(order = 2)
+// @ApiOperation(value = "分页", notes = "传入fwDefenseZone")
+// public R<IPage<FwDefenseZoneVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDefenseZone, Query query) {
+// IPage<FwDefenseZoneEntity> pages = fwDefenseZoneService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDefenseZone, FwDefenseZoneEntity.class));
+// return R.data(FwDefenseZoneWrapper.build().pageVO(pages));
+// }
/**
* 防区管理表 自定义分页
@@ -86,30 +113,38 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入fwDefenseZone")
- public R<IPage<FwDefenseZoneVO>> page(FwDefenseZoneVO fwDefenseZone, Query query) {
+ public R<IPage<FwDefenseZoneVO>> page(FwDefenseZoneDTO fwDefenseZone, Query query) {
IPage<FwDefenseZoneVO> pages = fwDefenseZoneService.selectFwDefenseZonePage(Condition.getPage(query), fwDefenseZone);
return R.data(pages);
}
- /**
- * 防区管理表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入fwDefenseZone")
- public R save(@Valid @RequestBody FwDefenseZoneEntity fwDefenseZone) {
- return R.status(fwDefenseZoneService.save(fwDefenseZone));
- }
-
- /**
- * 防区管理表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入fwDefenseZone")
- public R update(@Valid @RequestBody FwDefenseZoneEntity fwDefenseZone) {
- return R.status(fwDefenseZoneService.updateById(fwDefenseZone));
- }
+// /**
+// * 防区管理表 新增
+// */
+// @PostMapping("/save")
+// @ApiOperationSupport(order = 4)
+// @ApiOperation(value = "新增", notes = "传入fwDefenseZone")
+// public R save(@Valid @RequestBody FwDefenseZoneDTO fwDefenseZone) {
+// FwDefenseZoneEntity entity = Objects.requireNonNull(BeanUtil.copy(fwDefenseZone, FwDefenseZoneEntity.class));
+// if (isGeomInvalid(entity.getGeom())) {
+// return R.fail("几何数据格式不正确");
+// }
+// return R.status(fwDefenseZoneService.save(entity));
+// }
+//
+// /**
+// * 防区管理表 修改
+// */
+// @PostMapping("/update")
+// @ApiOperationSupport(order = 5)
+// @ApiOperation(value = "修改", notes = "传入fwDefenseZone")
+// public R update(@Valid @RequestBody FwDefenseZoneDTO fwDefenseZone) {
+// FwDefenseZoneEntity entity = Objects.requireNonNull(BeanUtil.copy(fwDefenseZone, FwDefenseZoneEntity.class));
+// if (isGeomInvalid(entity.getGeom())) {
+// return R.fail("几何数据格式不正确");
+// }
+// return R.status(fwDefenseZoneService.updateById(entity));
+// }
/**
* 防区管理表 新增或修改
@@ -117,8 +152,12 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入fwDefenseZone")
- public R submit(@Valid @RequestBody FwDefenseZoneEntity fwDefenseZone) {
- return R.status(fwDefenseZoneService.saveOrUpdate(fwDefenseZone));
+ public R submit(@Valid @RequestBody FwDefenseZoneDTO fwDefenseZone) {
+ FwDefenseZoneEntity entity = Objects.requireNonNull(BeanUtil.copy(fwDefenseZone, FwDefenseZoneEntity.class));
+ if (GeomUtils.isGeomInvalid(entity.getGeom())) {
+ return R.fail("几何数据格式不正确");
+ }
+ return R.status(fwDefenseZoneService.saveOrUpdate(entity));
}
/**
@@ -135,6 +174,7 @@
/**
* 导出数据
*/
+ @ApiIgnore
@GetMapping("/export-fwDefenseZone")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "导出数据", notes = "传入fwDefenseZone")
@@ -148,4 +188,5 @@
ExcelUtil.export(response, "防区管理表数据" + DateUtil.time(), "防区管理表数据表", list, FwDefenseZoneExcel.class);
}
+
}
--
Gitblit v1.9.3