修改定义
This commit is contained in:
parent
72b111b13f
commit
48f53231c9
|
|
@ -4,10 +4,13 @@ import com.ruoyi.common.core.constant.SecurityConstants;
|
||||||
import com.ruoyi.common.core.constant.ServiceNameConstants;
|
import com.ruoyi.common.core.constant.ServiceNameConstants;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import com.ruoyi.common.core.domain.R;
|
||||||
import com.ruoyi.device.api.domain.AircraftDetailVO;
|
import com.ruoyi.device.api.domain.AircraftDetailVO;
|
||||||
|
import com.ruoyi.device.api.domain.DockAircraftVO;
|
||||||
import com.ruoyi.device.api.factory.RemoteAircraftFallbackFactory;
|
import com.ruoyi.device.api.factory.RemoteAircraftFallbackFactory;
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 无人机服务
|
* 无人机服务
|
||||||
*
|
*
|
||||||
|
|
@ -26,4 +29,13 @@ public interface RemoteAircraftService
|
||||||
*/
|
*/
|
||||||
@GetMapping("/aircraft/detail/{aircraftId}")
|
@GetMapping("/aircraft/detail/{aircraftId}")
|
||||||
R<AircraftDetailVO> getAircraftDetail(@PathVariable("aircraftId") Long aircraftId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
R<AircraftDetailVO> getAircraftDetail(@PathVariable("aircraftId") Long aircraftId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取所有机场和机场的无人机
|
||||||
|
*
|
||||||
|
* @param source 请求来源
|
||||||
|
* @return 结果
|
||||||
|
*/
|
||||||
|
@GetMapping("/aircraft/dock-aircraft-list")
|
||||||
|
R<List<DockAircraftVO>> getDockAircraftList(@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
package com.ruoyi.device.api.domain;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 机场无人机VO
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
* @date 2026-03-13
|
||||||
|
*/
|
||||||
|
public class DockAircraftVO {
|
||||||
|
|
||||||
|
/** 无人机设备SN */
|
||||||
|
private String deviceSn;
|
||||||
|
|
||||||
|
/** 无人机名称 */
|
||||||
|
private String aircraftName;
|
||||||
|
|
||||||
|
/** 机场名称 */
|
||||||
|
private String dockName;
|
||||||
|
|
||||||
|
public String getDeviceSn() {
|
||||||
|
return deviceSn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDeviceSn(String deviceSn) {
|
||||||
|
this.deviceSn = deviceSn;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAircraftName() {
|
||||||
|
return aircraftName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAircraftName(String aircraftName) {
|
||||||
|
this.aircraftName = aircraftName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDockName() {
|
||||||
|
return dockName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDockName(String dockName) {
|
||||||
|
this.dockName = dockName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3,11 +3,14 @@ package com.ruoyi.device.api.factory;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import com.ruoyi.common.core.domain.R;
|
||||||
import com.ruoyi.device.api.RemoteAircraftService;
|
import com.ruoyi.device.api.RemoteAircraftService;
|
||||||
import com.ruoyi.device.api.domain.AircraftDetailVO;
|
import com.ruoyi.device.api.domain.AircraftDetailVO;
|
||||||
|
import com.ruoyi.device.api.domain.DockAircraftVO;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 无人机服务降级处理
|
* 无人机服务降级处理
|
||||||
*
|
*
|
||||||
|
|
@ -30,6 +33,12 @@ public class RemoteAircraftFallbackFactory implements FallbackFactory<RemoteAirc
|
||||||
{
|
{
|
||||||
return R.fail("查看无人机详情失败:" + throwable.getMessage());
|
return R.fail("查看无人机详情失败:" + throwable.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public R<List<DockAircraftVO>> getDockAircraftList(String source)
|
||||||
|
{
|
||||||
|
return R.fail("获取机场无人机列表失败:" + throwable.getMessage());
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue