From ae4e620514b1c1baf94cef706d16c5385fdff837 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 09 Feb 2026 15:04:42 +0800
Subject: [PATCH] 查询飞手优化
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java | 62 +++++--------------------------
1 files changed, 10 insertions(+), 52 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java
index 8d820bf..c912e1b 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/flyer/controller/GdFlyerController.java
@@ -31,7 +31,11 @@
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.sxkj.gd.common.GenericConverter;
import org.sxkj.gd.flyer.entity.GdFlyerEntity;
+import org.sxkj.gd.flyer.param.GdFlyerAddParam;
+import org.sxkj.gd.flyer.param.GdFlyerPageParam;
+import org.sxkj.gd.flyer.param.GdFlyerParam;
import org.sxkj.gd.flyer.vo.GdFlyerVO;
import org.sxkj.gd.flyer.excel.GdFlyerExcel;
import org.sxkj.gd.flyer.wrapper.GdFlyerWrapper;
@@ -65,20 +69,11 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入gdFlyer")
- public R<GdFlyerVO> detail(GdFlyerEntity gdFlyer) {
- GdFlyerEntity detail = gdFlyerService.getOne(Condition.getQueryWrapper(gdFlyer));
+ public R<GdFlyerVO> detail(GdFlyerParam gdFlyer) {
+ GdFlyerEntity detail = gdFlyerService.getOne(Condition.getQueryWrapper(GenericConverter.convert(gdFlyer, GdFlyerEntity.class)));
return R.data(GdFlyerWrapper.build().entityVO(detail));
}
- /**
- * 飞手表 分页
- */
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入gdFlyer")
- public R<IPage<GdFlyerVO>> list(@ApiIgnore @RequestParam Map<String, Object> gdFlyer, Query query) {
- IPage<GdFlyerEntity> pages = gdFlyerService.page(Condition.getPage(query), Condition.getQueryWrapper(gdFlyer, GdFlyerEntity.class));
- return R.data(GdFlyerWrapper.build().pageVO(pages));
- }
+
/**
* 飞手表 自定义分页
@@ -86,29 +81,9 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入gdFlyer")
- public R<IPage<GdFlyerVO>> page(GdFlyerVO gdFlyer, Query query) {
+ public R<IPage<GdFlyerVO>> page(GdFlyerPageParam gdFlyer, Query query) {
IPage<GdFlyerVO> pages = gdFlyerService.selectGdFlyerPage(Condition.getPage(query), gdFlyer);
return R.data(pages);
- }
-
- /**
- * 飞手表 新增
- */
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入gdFlyer")
- public R save(@Valid @RequestBody GdFlyerEntity gdFlyer) {
- return R.status(gdFlyerService.save(gdFlyer));
- }
-
- /**
- * 飞手表 修改
- */
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入gdFlyer")
- public R update(@Valid @RequestBody GdFlyerEntity gdFlyer) {
- return R.status(gdFlyerService.updateById(gdFlyer));
}
/**
@@ -117,8 +92,8 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入gdFlyer")
- public R submit(@Valid @RequestBody GdFlyerEntity gdFlyer) {
- return R.status(gdFlyerService.saveOrUpdate(gdFlyer));
+ public R submit(@Valid @RequestBody GdFlyerAddParam gdFlyer) {
+ return R.status(gdFlyerService.saveOrUpdateFlyer(GenericConverter.convert(gdFlyer, GdFlyerEntity.class)));
}
/**
@@ -129,23 +104,6 @@
@ApiOperation(value = "逻辑删除", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(gdFlyerService.deleteLogic(Func.toLongList(ids)));
- }
-
-
- /**
- * 导出数据
- */
- @GetMapping("/export-gdFlyer")
- @ApiOperationSupport(order = 9)
- @ApiOperation(value = "导出数据", notes = "传入gdFlyer")
- public void exportGdFlyer(@ApiIgnore @RequestParam Map<String, Object> gdFlyer, BladeUser bladeUser, HttpServletResponse response) {
- QueryWrapper<GdFlyerEntity> queryWrapper = Condition.getQueryWrapper(gdFlyer, GdFlyerEntity.class);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(GdFlyer::getTenantId, bladeUser.getTenantId());
- //}
- queryWrapper.lambda().eq(GdFlyerEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<GdFlyerExcel> list = gdFlyerService.exportGdFlyer(queryWrapper);
- ExcelUtil.export(response, "飞手表数据" + DateUtil.time(), "飞手表数据表", list, GdFlyerExcel.class);
}
}
--
Gitblit v1.9.3