Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -146,6 +146,19 @@ public class AircraftController extends BaseController {
         return ResponseHelper.buildResponse(aircraftServiceImpl.queryByAircraftSeq(RequestContext.getAgencyCode(),
                 sequenceNbr));
     }
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "findOne/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "查询航空器详情信息", notes = "查询航空器详情信息")
+    public ResponseModel<AircraftDto> queryBySeq(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(aircraftServiceImpl.queryBySeq(RequestContext.getAgencyCode(),
+                sequenceNbr));
+    }
 
     /**
      * 列表分页查询

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

@@ -143,7 +143,22 @@ public class AircraftServiceImpl extends BaseService<AircraftDto, Aircraft, Airc
         }
         return aircraftDto;
     }
+    public AircraftDto queryBySeq(String agencyCode, Long seq) {
+    	 AircraftDto aircraftDto = this.queryBySeq(seq);
+   
+        FeignClientResult<List<FileInfoModel>> fileInfoModelResult = Systemctl.fileInfoClient.queryByEntity(
+                agencyCode, Aircraft.class.getSimpleName(), String.valueOf(seq));
+        List<FileInfoModel> fileInfoModels = fileInfoModelResult.getResult();
 
+        if (!ValidationUtil.isEmpty(fileInfoModels)) {
+            aircraftDto.setAppearanceImages(processToStr(fileInfoModels, AircraftFileTypeEnum.APPEARANCE.getCode()));
+            aircraftDto.setPlaneImages(processToStr(fileInfoModels, AircraftFileTypeEnum.PLANE.getCode()));
+            aircraftDto.setRescueImages(processToStr(fileInfoModels, AircraftFileTypeEnum.RESCUE.getCode()));
+            aircraftDto.setPositionImages(processToStr(fileInfoModels, AircraftFileTypeEnum.POSITION.getCode()));
+            aircraftDto.setModels(processToStr(fileInfoModels, AircraftFileTypeEnum.MODEL.getCode()));
+        }
+        return aircraftDto;
+    }
 
     /**
      * <pre>