From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwDroneFlightRecordDetailController.java | 58 +++++++++++-----------------------------------------------
1 files changed, 11 insertions(+), 47 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 1479711..8e8386f 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,6 +47,7 @@
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
+import java.util.Objects;
import javax.servlet.http.HttpServletResponse;
/**
@@ -69,16 +74,7 @@
FwDroneFlightRecordDetailEntity detail = fwDroneFlightRecordDetailService.getOne(Condition.getQueryWrapper(fwDroneFlightRecordDetail));
return R.data(FwDroneFlightRecordDetailWrapper.build().entityVO(detail));
}
- /**
- * 无人机飞行记录详情表 分页
- */
- @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,30 +82,11 @@
@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);
}
- /**
- * 无人机飞行记录详情表 新增
- */
- @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));
- }
/**
* 无人机飞行记录详情表 新增或修改
@@ -117,8 +94,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));
}
/**
@@ -132,20 +110,6 @@
}
- /**
- * 导出数据
- */
- @GetMapping("/export-fwDroneFlightRecordDetail")
- @ApiOperationSupport(order = 9)
- @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);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(FwDroneFlightRecordDetail::getTenantId, bladeUser.getTenantId());
- //}
- queryWrapper.lambda().eq(FwDroneFlightRecordDetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
- List<FwDroneFlightRecordDetailExcel> list = fwDroneFlightRecordDetailService.exportFwDroneFlightRecordDetail(queryWrapper);
- ExcelUtil.export(response, "无人机飞行记录详情表数据" + DateUtil.time(), "无人机飞行记录详情表数据表", list, FwDroneFlightRecordDetailExcel.class);
- }
+
}
--
Gitblit v1.9.3