From 8d5b8a8c1909be6cdca5228a01bdc017b85a4078 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:37:17 +0800
Subject: [PATCH] 处理Vo继承entity问题
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneFlightRecordDetailController.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneFlightRecordDetailController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneFlightRecordDetailController.java
index 669dcdf..6266fe8 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneFlightRecordDetailController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneFlightRecordDetailController.java
@@ -16,6 +16,7 @@
*/
package org.sxkj.fw.record.controller;
+import com.github.xiaoymin.knife4j.annotations.Ignore;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -27,11 +28,14 @@
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.record.dto.FwDroneFlightRecordDetailDTO;
import org.sxkj.fw.record.entity.FwDroneFlightRecordDetailEntity;
+import org.sxkj.fw.record.entity.FwDroneFlightRecordEntity;
import org.sxkj.fw.record.vo.FwDroneFlightRecordDetailVO;
import org.sxkj.fw.record.excel.FwDroneFlightRecordDetailExcel;
import org.sxkj.fw.record.wrapper.FwDroneFlightRecordDetailWrapper;
@@ -43,13 +47,14 @@
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
+import java.util.Objects;
import javax.servlet.http.HttpServletResponse;
/**
* 无人机飞行记录详情表 控制器
*
* @author lw
- * @since 2026-01-07
+ * @since 2026-01-08
*/
@RestController
@AllArgsConstructor
@@ -72,13 +77,13 @@
/**
* 无人机飞行记录详情表 分页
*/
- @GetMapping("/list")
- @ApiOperationSupport(order = 2)
- @ApiOperation(value = "分页", notes = "传入fwDroneFlightRecordDetail")
- public R<IPage<FwDroneFlightRecordDetailVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDroneFlightRecordDetail, Query query) {
- IPage<FwDroneFlightRecordDetailEntity> pages = fwDroneFlightRecordDetailService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDroneFlightRecordDetail, FwDroneFlightRecordDetailEntity.class));
- return R.data(FwDroneFlightRecordDetailWrapper.build().pageVO(pages));
- }
+ // @GetMapping("/list")
+ // @ApiOperationSupport(order = 2)
+ // @ApiOperation(value = "分页", notes = "传入fwDroneFlightRecordDetail")
+ // public R<IPage<FwDroneFlightRecordDetailVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDroneFlightRecordDetail, Query query) {
+ // IPage<FwDroneFlightRecordDetailEntity> pages = fwDroneFlightRecordDetailService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDroneFlightRecordDetail, FwDroneFlightRecordDetailEntity.class));
+ // return R.data(FwDroneFlightRecordDetailWrapper.build().pageVO(pages));
+ // }
/**
* 无人机飞行记录详情表 自定义分页
@@ -86,7 +91,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入fwDroneFlightRecordDetail")
- public R<IPage<FwDroneFlightRecordDetailVO>> page(FwDroneFlightRecordDetailVO fwDroneFlightRecordDetail, Query query) {
+ public R<IPage<FwDroneFlightRecordDetailVO>> page(FwDroneFlightRecordDetailDTO fwDroneFlightRecordDetail, Query query) {
IPage<FwDroneFlightRecordDetailVO> pages = fwDroneFlightRecordDetailService.selectFwDroneFlightRecordDetailPage(Condition.getPage(query), fwDroneFlightRecordDetail);
return R.data(pages);
}
@@ -94,22 +99,22 @@
/**
* 无人机飞行记录详情表 新增
*/
- @PostMapping("/save")
- @ApiOperationSupport(order = 4)
- @ApiOperation(value = "新增", notes = "传入fwDroneFlightRecordDetail")
- public R save(@Valid @RequestBody FwDroneFlightRecordDetailEntity fwDroneFlightRecordDetail) {
- return R.status(fwDroneFlightRecordDetailService.save(fwDroneFlightRecordDetail));
- }
+ // @PostMapping("/save")
+ // @ApiOperationSupport(order = 4)
+ // @ApiOperation(value = "新增", notes = "传入fwDroneFlightRecordDetail")
+ // public R save(@Valid @RequestBody FwDroneFlightRecordDetailEntity fwDroneFlightRecordDetail) {
+ // return R.status(fwDroneFlightRecordDetailService.save(fwDroneFlightRecordDetail));
+ // }
/**
* 无人机飞行记录详情表 修改
*/
- @PostMapping("/update")
- @ApiOperationSupport(order = 5)
- @ApiOperation(value = "修改", notes = "传入fwDroneFlightRecordDetail")
- public R update(@Valid @RequestBody FwDroneFlightRecordDetailEntity fwDroneFlightRecordDetail) {
- return R.status(fwDroneFlightRecordDetailService.updateById(fwDroneFlightRecordDetail));
- }
+ // @PostMapping("/update")
+ // @ApiOperationSupport(order = 5)
+ // @ApiOperation(value = "修改", notes = "传入fwDroneFlightRecordDetail")
+ // public R update(@Valid @RequestBody FwDroneFlightRecordDetailEntity fwDroneFlightRecordDetail) {
+ // return R.status(fwDroneFlightRecordDetailService.updateById(fwDroneFlightRecordDetail));
+ // }
/**
* 无人机飞行记录详情表 新增或修改
@@ -117,8 +122,9 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入fwDroneFlightRecordDetail")
- public R submit(@Valid @RequestBody FwDroneFlightRecordDetailEntity fwDroneFlightRecordDetail) {
- return R.status(fwDroneFlightRecordDetailService.saveOrUpdate(fwDroneFlightRecordDetail));
+ public R submit(@Valid @RequestBody FwDroneFlightRecordDetailDTO fwDroneFlightRecordDetail) {
+ FwDroneFlightRecordDetailEntity entity = Objects.requireNonNull(BeanUtil.copy(fwDroneFlightRecordDetail, FwDroneFlightRecordDetailEntity.class));
+ return R.status(fwDroneFlightRecordDetailService.saveOrUpdate(entity));
}
/**
@@ -137,6 +143,7 @@
*/
@GetMapping("/export-fwDroneFlightRecordDetail")
@ApiOperationSupport(order = 9)
+ @Ignore
@ApiOperation(value = "导出数据", notes = "传入fwDroneFlightRecordDetail")
public void exportFwDroneFlightRecordDetail(@ApiIgnore @RequestParam Map<String, Object> fwDroneFlightRecordDetail, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<FwDroneFlightRecordDetailEntity> queryWrapper = Condition.getQueryWrapper(fwDroneFlightRecordDetail, FwDroneFlightRecordDetailEntity.class);
--
Gitblit v1.9.3