From ba0fbe5e47b484d3c2cc89b8d28f78c7ecf9b44c Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Tue, 13 Jan 2026 11:16:18 +0800
Subject: [PATCH] 场景，区域的列表新增父子级id查询
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseZoneController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 9196505..7e79f1d 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
@@ -37,7 +37,6 @@
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;
@@ -73,8 +72,11 @@
if (id == null) {
return R.fail("主键不能为空");
}
- FwDefenseZoneEntity detail = fwDefenseZoneService.getById(id);
- return R.data(FwDefenseZoneWrapper.build().entityVO(detail));
+ FwDefenseZoneVO detail = fwDefenseZoneService.selectFwDefenseZoneDetail(id);
+ if (detail == null) {
+ return R.fail("数据不存在");
+ }
+ return R.data(detail);
}
// /**
// * 防区管理表 分页
@@ -93,7 +95,7 @@
@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);
}
--
Gitblit v1.9.3