From bc1a6bb5bb2803ed6a5669a976bf2b47f3dacfca Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 14 Jan 2026 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/controller/FwEffectEvalController.java | 33 +++------------------------------
1 files changed, 3 insertions(+), 30 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 681348b..7f5c879 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
@@ -16,6 +16,7 @@
*/
package org.sxkj.fw.detection.controller;
+import com.github.xiaoymin.knife4j.annotations.Ignore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -72,16 +73,7 @@
FwEffectEvalEntity detail = fwEffectEvalService.getOne(Condition.getQueryWrapper(fwEffectEval));
return R.data(FwEffectEvalWrapper.build().entityVO(detail));
}
- /**
- * 反制效果评估表 分页
- */
- // @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));
- // }
+
/**
* 反制效果评估表 自定义分页
@@ -93,26 +85,6 @@
IPage<FwEffectEvalVO> pages = fwEffectEvalService.selectFwEffectEvalPage(Condition.getPage(query), fwEffectEval);
return R.data(pages);
}
-
- /**
- * 反制效果评估表 新增
- */
- // @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));
- // }
/**
* 反制效果评估表 新增或修改
@@ -141,6 +113,7 @@
*/
@GetMapping("/export-fwEffectEval")
@ApiOperationSupport(order = 9)
+ @Ignore
@ApiOperation(value = "导出数据", notes = "传入fwEffectEval")
public void exportFwEffectEval(@ApiIgnore @RequestParam Map<String, Object> fwEffectEval, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<FwEffectEvalEntity> queryWrapper = Condition.getQueryWrapper(fwEffectEval, FwEffectEvalEntity.class);
--
Gitblit v1.9.3