From e0699a13b156fe653940c1fcc99ed7efa1415ad2 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 12 Jan 2026 11:27:30 +0800
Subject: [PATCH] add-反无大屏-基础管理-设备相关
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java
index a6bed6a..9f95acd 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java
@@ -32,11 +32,13 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
+import org.sxkj.common.model.GenericConverter;
+import org.sxkj.common.param.DetailParam;
import org.sxkj.fw.device.dto.FwDeviceTrackDTO;
import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
import org.sxkj.fw.device.excel.FwDeviceTrackExcel;
+import org.sxkj.fw.device.param.FwDeviceTrackPageParam;
import org.sxkj.fw.device.service.IFwDeviceTrackService;
import org.sxkj.fw.device.vo.FwDeviceTrackVO;
import org.sxkj.fw.device.wrapper.FwDeviceTrackWrapper;
@@ -67,8 +69,8 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "详情", notes = "传入fwDeviceTrack")
- public R<FwDeviceTrackVO> detail(FwDeviceTrackDTO fwDeviceTrack) {
- FwDeviceTrackEntity detail = fwDeviceTrackService.getOne(Condition.getQueryWrapper(FwDeviceTrackWrapper.build().entityDTO(fwDeviceTrack)));
+ public R<FwDeviceTrackVO> detail(DetailParam fwDeviceTrack) {
+ FwDeviceTrackEntity detail = fwDeviceTrackService.getOne(Condition.getQueryWrapper(GenericConverter.convert(fwDeviceTrack, FwDeviceTrackEntity.class)));
if (detail == null) {
return R.fail("该记录不存在");
@@ -83,8 +85,8 @@
@GetMapping("/page")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入fwDeviceTrack")
- public R<IPage<FwDeviceTrackVO>> page(FwDeviceTrackDTO fwDeviceTrack, Query query) {
- IPage<FwDeviceTrackEntity> pages = fwDeviceTrackService.selectFwDeviceTrackPage(Condition.getPage(query), fwDeviceTrack);
+ public R<IPage<FwDeviceTrackVO>> page(FwDeviceTrackPageParam fwDeviceTrack, Query query) {
+ IPage<FwDeviceTrackEntity> pages = fwDeviceTrackService.selectFwDeviceTrackPage(Condition.getPage(query), GenericConverter.convert(fwDeviceTrack, FwDeviceTrackDTO.class));
return R.data(FwDeviceTrackWrapper.build().pageVO(pages));
}
--
Gitblit v1.9.3