update-框架查询定义

xiebin

2026-01-13 f50ab2af49a39eb2caaa615ff299d2f26343d510

update-框架查询定义

 drone-service/drone-fw/src/main/java/org/sxkj/fw/common/GenericConverter.java

File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/GenericConverter.java
@@ -1,4 +1,4 @@
package org.sxkj.fw.device.param;
package org.sxkj.fw.common;

import org.springblade.core.tool.utils.BeanUtil;


 drone-service/drone-fw/src/main/java/org/sxkj/fw/common/IdParam.java

File was renamed from drone-service/drone-fw/src/main/java/org/sxkj/fw/device/param/DetailParam.java
@@ -14,7 +14,7 @@
 *  this software without specific prior written permission.
 *  Author: Chill 庄骞 (smallchill@163.com)
 */
package org.sxkj.fw.device.param;
package org.sxkj.fw.common;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -29,7 +29,7 @@
 * @since 2026-01-08
 */
@Data
public class DetailParam implements Serializable {
public class IdParam implements Serializable {

    private static final long serialVersionUID = 1L;


 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceController.java

@@ -33,8 +33,8 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import org.sxkj.fw.device.param.GenericConverter;
import org.sxkj.fw.device.param.DetailParam;
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.common.IdParam;
import org.sxkj.fw.device.dto.FwDeviceDTO;
import org.sxkj.fw.device.entity.FwDeviceEntity;
import org.sxkj.fw.device.excel.FwDeviceExcel;
@@ -69,7 +69,7 @@
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入fwDevice")
    public R<FwDeviceVO> detail(@Valid DetailParam fwDevice) {
    public R<FwDeviceVO> detail(@Valid IdParam fwDevice) {
        FwDeviceEntity detail = fwDeviceService.getOne(Condition.getQueryWrapper(GenericConverter.convert(fwDevice, FwDeviceEntity.class)));

        if (detail == null) {

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceTrackController.java

@@ -33,8 +33,8 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import org.sxkj.fw.device.param.GenericConverter;
import org.sxkj.fw.device.param.DetailParam;
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.common.IdParam;
import org.sxkj.fw.device.dto.FwDeviceTrackDTO;
import org.sxkj.fw.device.entity.FwDeviceTrackEntity;
import org.sxkj.fw.device.excel.FwDeviceTrackExcel;
@@ -69,7 +69,7 @@
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "详情", notes = "传入fwDeviceTrack")
    public R<FwDeviceTrackVO> detail(DetailParam fwDeviceTrack) {
    public R<FwDeviceTrackVO> detail(IdParam fwDeviceTrack) {
        FwDeviceTrackEntity detail = fwDeviceTrackService.getOne(Condition.getQueryWrapper(GenericConverter.convert(fwDeviceTrack, FwDeviceTrackEntity.class)));

        if (detail == null) {