From 33ab5566da759239cdde4e80464ee293e4154fc3 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 09 Jan 2026 10:44:01 +0800
Subject: [PATCH] 数据驾驶舱

---
 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwEffectEvalController.java |   48 ++++++++++++++++++++++++++----------------------
 1 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwEffectEvalController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwEffectEvalController.java
index 17f507d..681348b 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwEffectEvalController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwEffectEvalController.java
@@ -27,10 +27,12 @@
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 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.fw.detection.dto.FwEffectEvalDTO;
 import org.sxkj.fw.detection.entity.FwEffectEvalEntity;
 import org.sxkj.fw.detection.vo.FwEffectEvalVO;
 import org.sxkj.fw.detection.excel.FwEffectEvalExcel;
@@ -43,13 +45,14 @@
 import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 import java.util.List;
+import java.util.Objects;
 import javax.servlet.http.HttpServletResponse;
 
 /**
  * 反制效果评估表 控制器
  *
  * @author BladeX
- * @since 2026-01-07
+ * @since 2026-01-08
  */
 @RestController
 @AllArgsConstructor
@@ -72,13 +75,13 @@
 	/**
 	 * 反制效果评估表 分页
 	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "分页", notes = "传入fwEffectEval")
-	public R<IPage<FwEffectEvalVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwEffectEval, Query query) {
-		IPage<FwEffectEvalEntity> pages = fwEffectEvalService.page(Condition.getPage(query), Condition.getQueryWrapper(fwEffectEval, FwEffectEvalEntity.class));
-		return R.data(FwEffectEvalWrapper.build().pageVO(pages));
-	}
+	// @GetMapping("/list")
+	// @ApiOperationSupport(order = 2)
+	// @ApiOperation(value = "分页", notes = "传入fwEffectEval")
+	// public R<IPage<FwEffectEvalVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwEffectEval, Query query) {
+	// 	IPage<FwEffectEvalEntity> pages = fwEffectEvalService.page(Condition.getPage(query), Condition.getQueryWrapper(fwEffectEval, FwEffectEvalEntity.class));
+	// 	return R.data(FwEffectEvalWrapper.build().pageVO(pages));
+	// }
 
 	/**
 	 * 反制效果评估表 自定义分页
@@ -94,22 +97,22 @@
 	/**
 	 * 反制效果评估表 新增
 	 */
-	@PostMapping("/save")
-	@ApiOperationSupport(order = 4)
-	@ApiOperation(value = "新增", notes = "传入fwEffectEval")
-	public R save(@Valid @RequestBody FwEffectEvalEntity fwEffectEval) {
-		return R.status(fwEffectEvalService.save(fwEffectEval));
-	}
+	// @PostMapping("/save")
+	// @ApiOperationSupport(order = 4)
+	// @ApiOperation(value = "新增", notes = "传入fwEffectEval")
+	// public R save(@Valid @RequestBody FwEffectEvalEntity fwEffectEval) {
+	// 	return R.status(fwEffectEvalService.save(fwEffectEval));
+	// }
 
 	/**
 	 * 反制效果评估表 修改
 	 */
-	@PostMapping("/update")
-	@ApiOperationSupport(order = 5)
-	@ApiOperation(value = "修改", notes = "传入fwEffectEval")
-	public R update(@Valid @RequestBody FwEffectEvalEntity fwEffectEval) {
-		return R.status(fwEffectEvalService.updateById(fwEffectEval));
-	}
+	// @PostMapping("/update")
+	// @ApiOperationSupport(order = 5)
+	// @ApiOperation(value = "修改", notes = "传入fwEffectEval")
+	// public R update(@Valid @RequestBody FwEffectEvalEntity fwEffectEval) {
+	// 	return R.status(fwEffectEvalService.updateById(fwEffectEval));
+	// }
 
 	/**
 	 * 反制效果评估表 新增或修改
@@ -117,8 +120,9 @@
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入fwEffectEval")
-	public R submit(@Valid @RequestBody FwEffectEvalEntity fwEffectEval) {
-		return R.status(fwEffectEvalService.saveOrUpdate(fwEffectEval));
+	public R submit(@Valid @RequestBody FwEffectEvalDTO fwEffectEval) {
+		FwEffectEvalEntity fwEffectEvalEntity = Objects.requireNonNull(BeanUtil.copy(fwEffectEval, FwEffectEvalEntity.class));
+		return R.status(fwEffectEvalService.saveOrUpdate(fwEffectEvalEntity));
 	}
 
 	/**

--
Gitblit v1.9.3