From 1510366fa12fafd5197ebcd8d7fbc45d2383218d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Jan 2026 15:49:27 +0800
Subject: [PATCH] 设备管理优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataEvaluationController.java | 63 ++++++++++++++++---------------
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataEvaluationController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataEvaluationController.java
index 451d851..b72884b 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataEvaluationController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/orderdata/controller/GdDataEvaluationController.java
@@ -32,6 +32,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.gd.orderdata.entity.GdDataEvaluationEntity;
+import org.sxkj.gd.orderdata.param.GdDataEvaluationPageParam;
import org.sxkj.gd.orderdata.vo.GdDataEvaluationVO;
import org.sxkj.gd.orderdata.excel.GdDataEvaluationExcel;
import org.sxkj.gd.orderdata.wrapper.GdDataEvaluationWrapper;
@@ -86,30 +87,30 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdDataEvaluation")
- public R<IPage<GdDataEvaluationVO>> page(GdDataEvaluationVO gdDataEvaluation, Query query) {
+ public R<IPage<GdDataEvaluationVO>> page(GdDataEvaluationPageParam gdDataEvaluation, Query query) {
IPage<GdDataEvaluationVO> pages = gdDataEvaluationService.selectGdDataEvaluationPage(Condition.getPage(query), gdDataEvaluation);
return R.data(pages);
}
- /**
- * 数据评价管理表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入gdDataEvaluation")
- public R save(@Valid @RequestBody GdDataEvaluationEntity gdDataEvaluation) {
- return R.status(gdDataEvaluationService.save(gdDataEvaluation));
- }
+// /**
+// * 数据评价管理表 新增
+// */
+// @PostMapping("/save")
+// @ApiOperationSupport(order = 4)
+// @ApiOperation(value = "新增", notes = "传入gdDataEvaluation")
+// public R save(@Valid @RequestBody GdDataEvaluationEntity gdDataEvaluation) {
+// return R.status(gdDataEvaluationService.save(gdDataEvaluation));
+// }
- /**
- * 数据评价管理表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdDataEvaluation")
- public R update(@Valid @RequestBody GdDataEvaluationEntity gdDataEvaluation) {
- return R.status(gdDataEvaluationService.updateById(gdDataEvaluation));
- }
+// /**
+// * 数据评价管理表 修改
+// */
+// @PostMapping("/update")
+// @ApiOperationSupport(order = 5)
+// @ApiOperation(value = "修改", notes = "传入gdDataEvaluation")
+// public R update(@Valid @RequestBody GdDataEvaluationEntity gdDataEvaluation) {
+// return R.status(gdDataEvaluationService.updateById(gdDataEvaluation));
+// }
/**
* 数据评价管理表 新增或修改
@@ -132,20 +133,20 @@
}
- /**
- * 导出数据
- */
- @GetMapping("/export-gdDataEvaluation")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入gdDataEvaluation")
- public void exportGdDataEvaluation(@ApiIgnore @RequestParam Map<String, Object> gdDataEvaluation, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<GdDataEvaluationEntity> queryWrapper = Condition.getQueryWrapper(gdDataEvaluation, GdDataEvaluationEntity.class);
+// /**
+// * 导出数据
+// */
+// @GetMapping("/export-gdDataEvaluation")
+// @ApiOperationSupport(order = 9)
+// @ApiOperation(value = "导出数据", notes = "传入gdDataEvaluation")
+// public void exportGdDataEvaluation(@ApiIgnore @RequestParam Map<String, Object> gdDataEvaluation, BladeUser bladeUser, HttpServletResponse response) {
+// QueryWrapper<GdDataEvaluationEntity> queryWrapper = Condition.getQueryWrapper(gdDataEvaluation, GdDataEvaluationEntity.class);
//if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(GdDataEvaluation::getTenantId, bladeUser.getTenantId());
//}
- queryWrapper.lambda().eq(GdDataEvaluationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<GdDataEvaluationExcel> list = gdDataEvaluationService.exportGdDataEvaluation(queryWrapper);
- ExcelUtil.export(response, "数据评价管理表数据" + DateUtil.time(), "数据评价管理表数据表", list, GdDataEvaluationExcel.class);
- }
+// queryWrapper.lambda().eq(GdDataEvaluationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+// List<GdDataEvaluationExcel> list = gdDataEvaluationService.exportGdDataEvaluation(queryWrapper);
+// ExcelUtil.export(response, "数据评价管理表数据" + DateUtil.time(), "数据评价管理表数据表", list, GdDataEvaluationExcel.class);
+// }
}
--
Gitblit v1.9.3