From 291512d150c44fbb2b993903237d27ae6c4277e7 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Fri, 30 Jan 2026 15:10:46 +0800
Subject: [PATCH] 区域场景优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java
index 9b25f4f..f71b7bb 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwDefenseSceneManageController.java
@@ -33,9 +33,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.fw.area.dto.FwDefenseSceneManageDTO;
import org.sxkj.fw.area.entity.FwDefenseSceneManageEntity;
+import org.sxkj.fw.area.param.FwDefenseSceneManagePageParam;
import org.sxkj.fw.area.vo.FwDefenseSceneManageVO;
import org.sxkj.fw.area.excel.FwDefenseSceneManageExcel;
-import org.sxkj.fw.area.wrapper.FwDefenseSceneManageWrapper;
import org.sxkj.fw.area.service.IFwDefenseSceneManageService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
@@ -43,9 +43,11 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.common.IdParam;
+import org.springframework.format.annotation.DateTimeFormat;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
+import java.util.Date;
import javax.servlet.http.HttpServletResponse;
/**
@@ -69,10 +71,11 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入fwDefenseSceneManage")
public R<FwDefenseSceneManageVO> detail(IdParam idParam) {
- FwDefenseSceneManageEntity detail = fwDefenseSceneManageService.getOne(
- Condition.getQueryWrapper(
- GenericConverter.convert(idParam, FwDefenseSceneManageEntity.class)));
- return R.data(FwDefenseSceneManageWrapper.build().entityVO(detail));
+ if (idParam == null || idParam.getId() == null) {
+ return R.fail("主键不能为空");
+ }
+ FwDefenseSceneManageVO detail = fwDefenseSceneManageService.selectFwDefenseSceneManageDetail(idParam.getId());
+ return R.data(detail);
}
/**
@@ -80,13 +83,26 @@
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "分页", notes = "传入fwDefenseSceneManage")
- public R<IPage<FwDefenseSceneManageVO>> page(FwDefenseSceneManageDTO fwDefenseSceneManage, Query query) {
- IPage<FwDefenseSceneManageVO> pages = fwDefenseSceneManageService.selectFwDefenseSceneManagePage(Condition.getPage(query), fwDefenseSceneManage);
+ @ApiOperation(value = "分页", notes = "传入fwDefenseSceneManagePageParam")
+ public R<IPage<FwDefenseSceneManageVO>> page(FwDefenseSceneManagePageParam fwDefenseSceneManagePageParam, Query query) {
+ IPage<FwDefenseSceneManageVO> pages = fwDefenseSceneManageService.selectFwDefenseSceneManagePage(Condition.getPage(query), fwDefenseSceneManagePageParam);
return R.data(pages);
}
/**
+ * 场景管理表 列表
+ */
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "列表", notes = "传入time")
+ public R<List<FwDefenseSceneManageVO>> list(
+ @ApiParam(value = "时间筛选（yyyy-MM-dd HH:mm:ss）") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date time) {
+ Date filterTime = time == null ? new Date() : time;
+ List<FwDefenseSceneManageVO> list = fwDefenseSceneManageService.selectFwDefenseSceneManageList(filterTime);
+ return R.data(list);
+ }
+
+ /**
* 场景管理表 新增或修改
*/
@PostMapping("/submit")
--
Gitblit v1.9.3