代码优化

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/req/airport/QueryFlightStopDTOModel.java

-package org.dromara.common.ys.model.req.airport;
-
-import org.dromara.common.ys.model.BaseModel;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
-* @author hzh
-* @date 2024-11-15
-**/
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class QueryFlightStopDTOModel extends BaseModel {
-    /**
-     * 航班号
-     **/
-    private String flightNo;
-    /**
-     * 出发日期，格式：yyyy-MM-dd
-     **/
-    private String departDate;
-
-}

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/model/res/airport/QueryFlightStopModel.java

-package org.dromara.common.ys.model.res.airport;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author hzh
- * @date 2024-10-21
- * @desc 航班经停信息
- **/
-@Data
-public class QueryFlightStopModel {
-
-    /**
-     * 航班号
-     */
-    private String flightNo;
-
-    /**
-     * 起飞日期
-     */
-    private String departDate;
-
-    /**
-     * 起飞时间
-     */
-    private String departTime;
-
-    /**
-     * 机场三字码
-     */
-    private String departAirport;
-
-    /**
-     * 起飞机场名称
-     */
-    private String departAirportName;
-
-    /**
-     * 起飞城市名称
-     */
-    private String departCityName;
-
-    /**
-     * 到达日期
-     */
-    private String arriveDate;
-
-    /**
-     * 到达时间
-     */
-    private String arriveTime;
-
-    /**
-     * 到达机场三字码
-     */
-    private String arriveAirport;
-
-    /**
-     * 到达机场名称
-     */
-    private String arriveAirportName;
-
-    /**
-     * 到达城市名称
-     */
-    private String arriveCityName;
-
-    /**
-     * 经停信息
-     */
-    private List<FlightStopInfo> stopList;
-}
-
-@Data
-class FlightStopInfo {
-
-
-    /**
-     * 经停机场三字码
-     */
-    private String airport;
-
-    /**
-     * 经停机场三字码名称
-     */
-    private String airportName;
-
-    /**
-     * 经停城市名称
-     */
-    private String cityName;
-
-    /**
-     * 抵达时间
-     */
-    private String arriveTime;
-
-    /**
-     * 起飞时间
-     */
-    private String departTime;
-}

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/IAirportService.java

@@ -32,15 +32,6 @@ public interface IAirportService {
      */
     org.dromara.common.ys.model.res.airport.QueryFlightMinPriceModel queryFlightMinPrice(String userId, QueryFlightMinPriceModel model);
 
-    /**
-     * 查询航班停靠城市
-     *
-     * @param userId 用户id
-     * @param model  查询参数
-     * @return 查询结果
-     */
-    org.dromara.common.ys.model.res.airport.QueryFlightStopModel queryFlightStop(String userId, QueryFlightStopModel model);
-
     /**
      * 创建订单
      *
@@ -83,6 +74,6 @@ public interface IAirportService {
      * @param model  查询参数
      * @return 查询结果
      */
-    QueryFlightStopVOModel queryFlightStop(String userId, QueryFlightStopDTOModel model);
+    QueryFlightStopVOModel queryFlightStop(String userId, QueryFlightStopModel model);
 
 }

ruoyi-common/ruoyi-common-ys/src/main/java/org/dromara/common/ys/service/impl/AirPortServiceImpl.java

@@ -58,22 +58,6 @@ public class AirPortServiceImpl implements IAirportService {
         return JSON.parseObject(res.getData(), org.dromara.common.ys.model.res.airport.QueryFlightMinPriceModel.class);
     }
 
-    @Override
-    public org.dromara.common.ys.model.res.airport.QueryFlightStopModel queryFlightStop(String userId, QueryFlightStopModel model) {
-        ApiHttpResponse res = Api.v1(
-            RequestMethodEnum.POST,
-            DomainEnum.PROD.getDomain(),
-            AirportApiEnum.QUERY_FLIGHT_STOP.getUrl(),
-            userId,
-            null,
-            JSON.toJSONString(model)
-        );
-        if (!CharSequenceUtil.equals(res.getErrCode(), Code.SUCCESS.getCode())) {
-            throw new RuntimeException(res.getTips());
-        }
-        return JSON.parseObject(res.getData(), org.dromara.common.ys.model.res.airport.QueryFlightStopModel.class);
-    }
-
     @Override
     public List<org.dromara.common.ys.model.res.airport.BookOrderModel> bookOrder(String userId, BookOrderModel model) {
         ApiHttpResponse res = Api.v1(
@@ -130,10 +114,10 @@ public class AirPortServiceImpl implements IAirportService {
     }
 
     @Override
-    public QueryFlightStopVOModel queryFlightStop(String userId, QueryFlightStopDTOModel model) {
+    public QueryFlightStopVOModel queryFlightStop(String userId, QueryFlightStopModel model) {
         ApiHttpResponse res = Api.v1(
             RequestMethodEnum.POST,
-            DomainEnum.TEST.getDomain(),
+            DomainEnum.PROD.getDomain(),
             AirportApiEnum.QUERY_FLIGHT_STOP.getUrl(),
             userId,
             null,

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/airport/AirportController.java

@@ -15,7 +15,7 @@ import org.dromara.common.ys.common.PageInfo;
 import org.dromara.common.ys.constant.Cplx;
 import org.dromara.common.ys.constant.TripType;
 import org.dromara.common.ys.model.req.airport.OrderListModel;
-import org.dromara.common.ys.model.req.airport.QueryFlightStopDTOModel;
+import org.dromara.common.ys.model.req.airport.QueryFlightStopModel;
 import org.dromara.common.ys.model.req.airport.bookOrder.BookOrderModel;
 import org.dromara.common.ys.model.req.insurance.BxcpModel;
 import org.dromara.common.ys.model.res.airport.CancelOrderModel;
@@ -171,7 +171,7 @@ public class AirportController extends BaseController {
      */
     @GlobalTransactional(timeoutMills = 600000)
     @GetMapping("/queryFlightStop")
-    public R<QueryFlightStopVOModel> queryFlightStop(QueryFlightStopDTOModel model) {
-        return R.ok(airPortService.queryFlightStop(getUserId(), model));
+    public R<QueryFlightStopVOModel> queryFlightStop(QueryFlightStopModel model) {
+        return R.ok(airPortService.queryFlightStop("15301818478", model));
     }
 }