add-反无大屏-基础管理-设备相关

xiebin

2026-01-12 e0699a13b156fe653940c1fcc99ed7efa1415ad2

add-反无大屏-基础管理-设备相关

 drone-common/src/main/java/org/sxkj/common/param/DetailParam.java

@@ -34,7 +34,7 @@

    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @ApiModelProperty(value = "主键", required = true)
    @NotEmpty
    private    Long id;


 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));
    }


 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/dto/FwDeviceTrackDTO.java

@@ -21,6 +21,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
import java.util.Date;

@@ -41,7 +42,8 @@
    /**
     * 设备ID
     */
    @ApiModelProperty(value = "设备ID")
    @ApiModelProperty(value = "设备ID", required = true)
    @NotEmpty
    private Long deviceId;
    /**
     * 出库时间