Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc into develop

tuoheng-admin/src/main/java/com/tuoheng/admin/controller/IndexGisController.java

@@ -5,6 +5,7 @@ import com.tuoheng.admin.entity.request.index.GetQuestionListDto;
 import com.tuoheng.admin.service.IndexService;
 import com.tuoheng.common.common.BaseQuery;
 import com.tuoheng.common.utils.JsonResult;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,13 +39,13 @@ public class IndexGisController {
 
     /**
      * 获取机场详细信息
-     * @param getAirportDetailDto
+     * @param airportId
      * @return
      */
-    @PostMapping("/getAirportDetail")
-    public JsonResult getAirportDetail(@RequestBody GetAirportDetailDto getAirportDetailDto) {
-        log.info("Index getAirportDetail start... param:{}", getAirportDetailDto.toString());
-        return indexService.getAirportDetail(getAirportDetailDto);
+    @GetMapping("/getAirportDetail")
+    public JsonResult getAirportDetail(@PathVariable("airportId") Integer airportId) {
+        log.info("Index getAirportDetail start... param:{}", airportId.toString());
+        return indexService.getAirportDetail(airportId);
     }
 
     /**

tuoheng-admin/src/main/java/com/tuoheng/admin/service/IndexService.java

@@ -19,7 +19,7 @@ public interface IndexService {
 
     IPage<MissionVO> getMissionList(BaseQuery baseQuery);
 
-    JsonResult getAirportDetail(GetAirportDetailDto getAirportDetailDto);
+    JsonResult getAirportDetail(Integer airportId);
 
     List<QuestionListDto> getQuestionList(GetQuestionListDto getQuestionListDto);
 

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/IndexServiceImpl.java

@@ -86,10 +86,10 @@ public class IndexServiceImpl implements IndexService {
     }
 
     @Override
-    public JsonResult getAirportDetail(GetAirportDetailDto getAirportDetailDto){
+    public JsonResult getAirportDetail(Integer airportId){
         Tenant tenant = tenantMapper.selectById(ShiroUtils.getTenantId());
         String url = tenant.getAirportUrl() +"/api/airportInterface/getAirportStatus";
-        String param = "airportId=" + getAirportDetailDto.getAirportId();
+        String param = "airportId=" + airportId;
         String result = HttpUtils.sendGet(url, param);
         JsonResult jsonResult = JacksonUtil.json2pojo(result, JsonResult.class);
         AirportDetailDto airportDetailDto = new AirportDetailDto();