From 4278478b3c9abbb45c40f568c67afa3ac9b945e7 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 20 May 2025 14:51:32 +0800 Subject: [PATCH] =?UTF-8?q?[routing]=20[fea]=20[=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=88=87=E6=8D=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/biz/routing/net/RoutingServiceApi.kt | 40 +++++++++++-------- .../biz/routing/net/RoutingServiceManager.kt | 39 +++++++++++------- 2 files changed, 48 insertions(+), 31 deletions(-) diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceApi.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceApi.kt index 54f145306e..da3ff6df7d 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceApi.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceApi.kt @@ -3,6 +3,13 @@ package com.mogo.och.biz.routing.net import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData +import com.mogo.och.biz.routing.bean.QueryGrayContrailListRsp +import com.mogo.och.biz.routing.bean.QueryPointErrorReasonsRsp +import com.mogo.och.biz.routing.bean.QueryRoutingContrailByIdRsp +import com.mogo.och.biz.routing.bean.SaveGrayContrailErrorReasons +import com.mogo.och.biz.routing.bean.StartGrayContrailTaskReq +import com.mogo.och.biz.routing.bean.StartGrayContrailTaskRsp +import com.mogo.och.biz.routing.bean.SubmitGrayLineIssueLocationReq import io.reactivex.Observable import retrofit2.http.Body import retrofit2.http.GET @@ -17,55 +24,56 @@ interface RoutingServiceApi { * 查询灰度线路列表 */ @Headers("Content-type:application/json;charset=UTF-8") - @GET("/och-taxi-cabin/api/business/v1/queryGrayContrailList") + @GET("/och-contrail/contrail/queryGrayContrailList") fun queryRoutingGrayLineList( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, @Query("sn") sn: String? - ): Observable + ): Observable /** * 开始一个路线的灰度任务 */ @Headers("Content-type:application/json;charset=UTF-8") - @POST("/och-taxi-cabin/api/business/v1/startGray") + @POST("/och-contrail/grayFeedback/saveFeedback") fun startGrayTask( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, - @Body data: com.mogo.och.biz.routing.bean.StartGrayContrailTaskReq - ): Observable + @Body data: StartGrayContrailTaskReq + ): Observable /** - * 根据id查询灰度轨迹详情 + * 根据轨迹id查询轨迹信息 */ @Headers("Content-type:application/json;charset=UTF-8") - @GET("/och-taxi-cabin/api/business/v1/gray/contrail") + @GET("/och-contrail/contrail/queryCabinContrailById") fun queryRoutingContrailById( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, - @Query("id") contrailId: Long - ): Observable + @Query("contrailId") contrailId: Long + ): Observable /** * 上报路线打点 */ @Headers("Content-type:application/json;charset=UTF-8") - @POST("/och-taxi-cabin/api/business/v1/saveDotDetail") + @POST("/och-contrail/dotDetail/save") fun submitGrayLineIssueLocation( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, - @Body data: com.mogo.och.biz.routing.bean.SubmitGrayLineIssueLocationReq + @Body data: SubmitGrayLineIssueLocationReq ): Observable /** * 结束一个路线的灰度任务 */ @Headers("Content-type:application/json;charset=UTF-8") - @POST("/och-taxi-cabin/api/business/v1/endGray") + @GET("/och-contrail/grayFeedback/update") fun endGrayTask( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, - @Body data: com.mogo.och.biz.routing.bean.EndGrayContrailTaskReq + @Query("id") id:Long, + @Query("feedback") feedback:Int, ): Observable /** @@ -76,16 +84,16 @@ interface RoutingServiceApi { fun getDotErrorList( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, - ): Observable + ): Observable /** * 结束一个路线的灰度任务 */ @Headers("Content-type:application/json;charset=UTF-8") - @POST("/och-taxi-cabin/api/business/v1/saveDotDetail") + @POST("/och-contrail/dotDetail/save") fun saveDotDetail( @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, @Header("ticket") ticket: String = SharedPrefsMgr.getInstance().token, - @Body data: com.mogo.och.biz.routing.bean.SaveGrayContrailErrorReasons + @Body data: SaveGrayContrailErrorReasons ): Observable } \ No newline at end of file diff --git a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceManager.kt b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceManager.kt index b38f12244c..a8224d5e9b 100644 --- a/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceManager.kt +++ b/OCH/common/biz/src/main/java/com/mogo/och/biz/routing/net/RoutingServiceManager.kt @@ -4,6 +4,16 @@ import android.content.Context import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.BaseData import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.och.biz.routing.bean.EndGrayContrailTaskReq +import com.mogo.och.biz.routing.bean.GrayLineBean +import com.mogo.och.biz.routing.bean.QueryGrayContrailListRsp +import com.mogo.och.biz.routing.bean.QueryPointErrorReasonsRsp +import com.mogo.och.biz.routing.bean.QueryRoutingContrailByIdRsp +import com.mogo.och.biz.routing.bean.SaveGrayContrailErrorReasons +import com.mogo.och.biz.routing.bean.StartGrayAndQueryContrailRsp +import com.mogo.och.biz.routing.bean.StartGrayContrailTaskReq +import com.mogo.och.biz.routing.bean.StartGrayContrailTaskRsp +import com.mogo.och.biz.routing.bean.SubmitGrayLineIssueLocationReq import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.network.OchCommonServiceCallback import com.mogo.och.common.module.network.OchCommonSubscribeImpl @@ -22,7 +32,7 @@ object RoutingServiceManager { */ fun queryRoutingGrayLineList( context: Context, - callback: OchCommonServiceCallback + callback: OchCommonServiceCallback ) { mRoutingServiceApi.queryRoutingGrayLineList( sn = SharedPrefsMgr.getInstance().sn @@ -36,8 +46,8 @@ object RoutingServiceManager { */ fun startGrayTask( context: Context, - data: com.mogo.och.biz.routing.bean.StartGrayContrailTaskReq, - callback: OchCommonServiceCallback + data: StartGrayContrailTaskReq, + callback: OchCommonServiceCallback ) { mRoutingServiceApi.startGrayTask(data = data).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "startGrayTask")) @@ -49,7 +59,7 @@ object RoutingServiceManager { fun queryRoutingContrailById( context: Context, contrailId: Long, - callback: OchCommonServiceCallback + callback: OchCommonServiceCallback ) { mRoutingServiceApi.queryRoutingContrailById(contrailId = contrailId).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "queryRoutingContrailById")) @@ -60,7 +70,7 @@ object RoutingServiceManager { */ fun submitGrayLineIssueLocation( context: Context, - data: com.mogo.och.biz.routing.bean.SubmitGrayLineIssueLocationReq, + data: SubmitGrayLineIssueLocationReq, callback: OchCommonServiceCallback ) { mRoutingServiceApi.submitGrayLineIssueLocation(data = data).transformTry() @@ -72,23 +82,23 @@ object RoutingServiceManager { */ fun endGrayTask( context: Context, - data: com.mogo.och.biz.routing.bean.EndGrayContrailTaskReq, + data: EndGrayContrailTaskReq, callback: OchCommonServiceCallback ) { - mRoutingServiceApi.endGrayTask(data = data).transformTry() + mRoutingServiceApi.endGrayTask(id = data.grayId, feedback = data.feedback).transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "endGrayTask")) } fun getErrorPointReasons( context: Context, - callback: OchCommonServiceCallback + callback: OchCommonServiceCallback ) { mRoutingServiceApi.getDotErrorList().transformTry() .subscribe(OchCommonSubscribeImpl(context, callback, "dot/list")) } fun saveDotDetail( context: Context, - data: com.mogo.och.biz.routing.bean.SaveGrayContrailErrorReasons, + data: SaveGrayContrailErrorReasons, callback: OchCommonServiceCallback ) { mRoutingServiceApi.saveDotDetail(data = data).transformTry() @@ -102,17 +112,16 @@ object RoutingServiceManager { context: Context, sn: String, contrailId: Long, - grayLineBean: com.mogo.och.biz.routing.bean.GrayLineBean, - callback: OchCommonServiceCallback + grayLineBean: GrayLineBean, + callback: OchCommonServiceCallback ) { - val data = - com.mogo.och.biz.routing.bean.StartGrayContrailTaskReq(sn = sn, contrailId = contrailId) + val data = StartGrayContrailTaskReq(sn = sn, contrailId = contrailId) var taskId: Long mRoutingServiceApi.startGrayTask(data = data) .flatMap { startGrayRsp -> if (startGrayRsp.data == null) { taskId = -1L - val result = com.mogo.och.biz.routing.bean.StartGrayAndQueryContrailRsp( + val result = StartGrayAndQueryContrailRsp( taskId = taskId, contrail = null, grayLineBean = grayLineBean @@ -124,7 +133,7 @@ object RoutingServiceManager { taskId = startGrayRsp.data!! return@flatMap mRoutingServiceApi.queryRoutingContrailById(contrailId = contrailId) .map { queryRoutingContrailRsp -> - val result = com.mogo.och.biz.routing.bean.StartGrayAndQueryContrailRsp( + val result = StartGrayAndQueryContrailRsp( taskId = taskId, contrail = queryRoutingContrailRsp.data, grayLineBean = grayLineBean