增加航空器接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/IotFeignClient.java

@@ -31,4 +31,7 @@ public interface IotFeignClient {
     
     @RequestMapping(value = "/v1/iot/DynamicFlightInfo/detail/{dynamicFlightId}", method = RequestMethod.GET)
     ResponseModel<Map<String, Object>> findImgByDynamicFlightId(@PathVariable String dynamicFlightId);
+
+    @RequestMapping(value = "/v1/iot/DynamicFlightInfo/plane/{dynamicFlightId}", method = RequestMethod.GET)
+    ResponseModel<Map<String, Object>> DynamicFlightInfo(@PathVariable String dynamicFlightId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -35,6 +35,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
+import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyCarService;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyPersonService;
 import com.yeejoin.amos.boot.module.common.api.service.IFireChemicalService;
@@ -161,7 +162,8 @@ public class CommandController extends BaseController {
 
     @Autowired
     IDutyCarService iDutyCarService;
-
+    @Autowired
+    IotFeignClient iotFeignClient;
     /**
      * 警情列表
      *
@@ -1140,4 +1142,36 @@ public class CommandController extends BaseController {
     public ResponseModel<Object> isFireCarDriver() {
         return ResponseHelper.buildResponse(iDutyCarService.isFireCarDriver());
     }
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/DynamicFlightInfo/{dynamicFlightId}")
+    @ApiOperation(httpMethod = "GET", value = "航班信息", notes = "航班信息")
+    public ResponseModel<Object> DynamicFlightInfo(@PathVariable String dynamicFlightId) {
+
+
+        ResponseModel<Map<String, Object>> dataModel = iotFeignClient.DynamicFlightInfo(dynamicFlightId);
+        if (dataModel != null) {
+
+            return ResponseHelper.buildResponse(dataModel.getResult());
+        }
+
+        return ResponseHelper.buildResponse(null);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/AircraftServiceImpl.java

@@ -303,6 +303,8 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
         return map;
     }
 
+
+
     @Override
     public Aircraft queryAircraftInfoByModel(String aircraftModel) {
         return this.baseMapper.selectOne(new LambdaQueryWrapper<Aircraft>().eq(Aircraft::getAircraftModel, aircraftModel));