diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 55cb48a236..b8f17f3570 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -19,6 +19,7 @@ import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo import com.mogo.eagle.core.data.deva.chain.ChainConstant import com.mogo.eagle.core.data.deva.chain.ChainLogParam import com.mogo.eagle.core.data.deva.report.PadAddProblemReq +import com.mogo.eagle.core.data.deva.report.PadAddTakeOverReq import com.mogo.eagle.core.data.deva.report.WorkOrderReportInfo import com.mogo.eagle.core.data.deva.scene.SceneModule import com.mogo.eagle.core.data.deva.scene.SceneTAG @@ -601,6 +602,13 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener { WorkOrderManager.workOrderManager.problemPadAdd(padAddProblemReq) } + /** + * 上报接管到运营平台 + */ + override fun takeOverPadAdd(padAddTakeOverReq: PadAddTakeOverReq) { + WorkOrderManager.workOrderManager.takeOverPadAdd(padAddTakeOverReq) + } + override fun getCategories(tenantId: Long, level: Int, parentId: Int,type: Int,upType: Int) { WorkOrderManager.workOrderManager.getCategories(tenantId, level, parentId,type, upType) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt index ca5050d615..1b88a1b9ae 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/FaultReasonWindow.kt @@ -386,8 +386,7 @@ class FaultReasonWindow constructor(activity: Activity) : View.OnTouchListener, val padProblemInfo = PadProblemInfo( address, faultCodeList, millis2String(workOrderOccurrenceTime), level1Id, level2Id, level3Id, BadCaseConfig.lineName, note, reportType, - SharedPrefsMgr.getInstance().getString("och_account", ""), - 0L) + SharedPrefsMgr.getInstance().getString("och_account", "")) padProblemList.add(padProblemInfo) val padAddProblemReq = PadAddProblemReq(padProblemList, AppConfigInfo.plateNumber) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt index bcfc28c627..2bf54e5212 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/ReportTypeWindow.kt @@ -143,7 +143,7 @@ class ReportTypeWindow constructor(activity: Activity): IMoGoDevaToolsListener { val padProblemList= ArrayList() val padProblemInfo = PadProblemInfo(address,faultCodeList,millis2String(System.currentTimeMillis()),level1Id, level2Id,level3Id,BadCaseConfig.lineName,"${level1Name}-${level2Name}-${level3Name}",reportType, - SharedPrefsMgr.getInstance().getString("och_account",""),0L) + SharedPrefsMgr.getInstance().getString("och_account","")) padProblemList.add(padProblemInfo) val padAddProblemReq = PadAddProblemReq(padProblemList, AppConfigInfo.plateNumber) CallerDevaToolsManager.problemPadAdd(padAddProblemReq) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt index 721daa1d70..36821661e7 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/TakeOverRecordView.kt @@ -10,7 +10,9 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.deva.report.PadAddProblemReq +import com.mogo.eagle.core.data.deva.report.PadAddTakeOverReq import com.mogo.eagle.core.data.deva.report.PadProblemInfo +import com.mogo.eagle.core.data.deva.report.PadTakeOverInfo import com.mogo.eagle.core.data.deva.report.TakeOverRecordInfo import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager @@ -124,7 +126,7 @@ class TakeOverRecordView @JvmOverloads constructor( ToastUtils.showShort("请选择需要上传的接管记录") }else{ val recordIterator = selectedUploadRecord.iterator() - val padProblemList= ArrayList() + val padProblemList= ArrayList() while(recordIterator.hasNext()){ val uploadRecord = recordIterator.next() uploadRecord.let { @@ -137,7 +139,7 @@ class TakeOverRecordView @JvmOverloads constructor( }else{ "${it.level1Name}-${it.level2Name}-${it.level3Name}(${it.reportNote})" } - val padProblemInfo = PadProblemInfo(it.address, emptyList(), + val padProblemInfo = PadTakeOverInfo(it.address, emptyList(), millis2String(it.faultStartTime),it.level1Id,it.level2Id,it.level3Id, it.lineName,reason,1, SharedPrefsMgr.getInstance().getString("och_account",""), @@ -146,8 +148,8 @@ class TakeOverRecordView @JvmOverloads constructor( } } - val padAddProblemReq = PadAddProblemReq(padProblemList, AppConfigInfo.plateNumber) - CallerDevaToolsManager.problemPadAdd(padAddProblemReq) + val padAddProblemReq = PadAddTakeOverReq(padProblemList, AppConfigInfo.plateNumber) + CallerDevaToolsManager.takeOverPadAdd(padAddProblemReq) } } //删除 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderApiService.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderApiService.kt index cb491c8332..76be34d81e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderApiService.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderApiService.kt @@ -5,6 +5,7 @@ import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.Response import com.mogo.eagle.core.data.deva.report.CategoryInfo import com.mogo.eagle.core.data.deva.report.PadAddProblemReq +import com.mogo.eagle.core.data.deva.report.PadAddTakeOverReq import com.mogo.eagle.core.data.deva.report.WorkOrderReportInfo import retrofit2.http.Body import retrofit2.http.GET @@ -35,6 +36,16 @@ interface WorkOrderApiService { @Header("ticket") ticket: String= SharedPrefsMgr.getInstance().token, @Body padAddProblemReq: PadAddProblemReq): Response + /** + * 上报录包接管到运营平台 + */ + @Headers("Content-Type:application/json;charset=UTF-8") + @POST("/vehicle-data-service/problem/pad/add") + suspend fun problemPadAddTakeOver( + @Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId, + @Header("ticket") ticket: String= SharedPrefsMgr.getInstance().token, + @Body padAddProblemReq: PadAddTakeOverReq): Response + /** * 获取报障、接管、一键上报配置 */ diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt index d3b6dcb52d..49a625a94f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderManager.kt @@ -3,6 +3,7 @@ package com.zhjt.mogo_core_function_devatools.workorder import android.content.Context import android.view.WindowManager import com.mogo.eagle.core.data.deva.report.PadAddProblemReq +import com.mogo.eagle.core.data.deva.report.PadAddTakeOverReq import com.mogo.eagle.core.data.deva.report.WorkOrderReportInfo import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.zhjt.mogo_core_function_devatools.ext.enqueuePop @@ -80,6 +81,17 @@ class WorkOrderManager{ ) } + fun takeOverPadAdd(padAddTakeOverReq: PadAddTakeOverReq){ + workOrderNetWorkModel.takeOverPadAdd(padAddTakeOverReq, + onSuccess = { + CallerDevaToolsListenerManager.invokeProblemPadAddSuccess() + }, + onError = { + CallerDevaToolsListenerManager.invokeProblemPadAddError(it) + } + ) + } + /** * 获取报障、接管、一键上报配置 * @param tenantId 租户ID diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderNetWorkModel.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderNetWorkModel.kt index 626e00094d..13cedcfcb1 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/workorder/WorkOrderNetWorkModel.kt @@ -5,6 +5,7 @@ import com.mogo.commons.storage.SharedPrefsMgr import com.mogo.eagle.core.data.Response import com.mogo.eagle.core.data.deva.report.CategoryInfo import com.mogo.eagle.core.data.deva.report.PadAddProblemReq +import com.mogo.eagle.core.data.deva.report.PadAddTakeOverReq import com.mogo.eagle.core.data.deva.report.WorkOrderReportInfo import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.network.apiResponseCall @@ -60,6 +61,29 @@ class WorkOrderNetWorkModel { } } + /** + * 上报故障到运营平台 + */ + fun takeOverPadAdd(padAddTakeOverReq: PadAddTakeOverReq, + onSuccess: ((String) -> Unit), onError: ((String) -> Unit)){ + request>{ + loader{ + apiResponseCall{ + getNetWorkApi(getOchUrl()).problemPadAddTakeOver(MoGoAiCloudClientConfig.getInstance().serviceAppId, + SharedPrefsMgr.getInstance().token,padAddTakeOverReq) + } + } + onSuccess{ + onSuccess.invoke("") + } + onError{ + onError.invoke(it.message+"") + } + } + } + + + /** * 获取报障、接管、一键上报配置 */ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt index 2e5cb4bc88..59247d2321 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/FaultReasonView.kt @@ -337,7 +337,7 @@ class FaultReasonView @JvmOverloads constructor( val padProblemInfo = PadProblemInfo( address, faultCodeList, millis2String(workOrderOccurrenceTime), level1Id, level2Id, level3Id, BadCaseConfig.lineName, note, reportType, - SharedPrefsMgr.getInstance().getString("och_account", ""),0L + SharedPrefsMgr.getInstance().getString("och_account", "") ) padProblemList.add(padProblemInfo) val padAddProblemReq = diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt index 444078206c..82065a2c01 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/ReportTypeView.kt @@ -102,7 +102,7 @@ class ReportTypeView @JvmOverloads constructor( val padProblemList= ArrayList() val padProblemInfo = PadProblemInfo(address,faultCodeList,millis2String(System.currentTimeMillis()),level1Id, level2Id,level3Id,BadCaseConfig.lineName,"${level1Name}-${level2Name}-${level3Name}",reportType, - SharedPrefsMgr.getInstance().getString("och_account",""),0L) + SharedPrefsMgr.getInstance().getString("och_account","")) padProblemList.add(padProblemInfo) val padAddProblemReq = PadAddProblemReq(padProblemList, AppConfigInfo.plateNumber) CallerDevaToolsManager.problemPadAdd(padAddProblemReq) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadAddTakeOverReq.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadAddTakeOverReq.kt new file mode 100644 index 0000000000..481c65d48c --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadAddTakeOverReq.kt @@ -0,0 +1,6 @@ +package com.mogo.eagle.core.data.deva.report + +/** + * 上报接管到运营平台 + */ +data class PadAddTakeOverReq(var padProblemList: List,var plateNo: String) \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadProblemInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadProblemInfo.kt index 0cf82c6290..21908d7127 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadProblemInfo.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadProblemInfo.kt @@ -16,4 +16,4 @@ package com.mogo.eagle.core.data.deva.report */ data class PadProblemInfo(var address: String,var faultCodeList: List,var faultStartTime: String, var level1Id: Int,var level2Id: Int,var level3Id: Int,var lineName: String,var reportNote: String, - var reportType: Int,var reporterMark: String,var bagId: Long) \ No newline at end of file + var reportType: Int,var reporterMark: String) \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadTakeOverInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadTakeOverInfo.kt new file mode 100644 index 0000000000..c4ba43d60a --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/report/PadTakeOverInfo.kt @@ -0,0 +1,8 @@ +package com.mogo.eagle.core.data.deva.report + +/** + * 上报接管到运营平台 + */ +data class PadTakeOverInfo(var address: String,var faultCodeList: List,var faultStartTime: String, + var level1Id: Int,var level2Id: Int,var level3Id: Int,var lineName: String,var reportNote: String, + var reportType: Int,var reporterMark: String,var bagId: Long) \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index 54574db7db..9054729d6b 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -9,6 +9,7 @@ import com.mogo.eagle.core.data.EnvConfig import com.mogo.eagle.core.data.deva.bindingcar.ModifyBindingcarInfo import com.mogo.eagle.core.data.deva.chain.ChainLogParam import com.mogo.eagle.core.data.deva.report.PadAddProblemReq +import com.mogo.eagle.core.data.deva.report.PadAddTakeOverReq import com.mogo.eagle.core.data.deva.report.WorkOrderReportInfo import com.mogo.eagle.core.data.deva.scene.SceneModule import com.mogo.eagle.core.data.deva.scene.SceneTAG @@ -271,6 +272,11 @@ interface IDevaToolsProvider : IProvider { */ fun problemPadAdd(padAddProblemReq: PadAddProblemReq) + /** + * 上报接管到运营平台 + */ + fun takeOverPadAdd(padAddTakeOverReq: PadAddTakeOverReq) + /** * 获取报障、接管、一键上报配置 * @param tenantId 租户ID diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index 18d82a45d7..fc7d401cf0 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -11,6 +11,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.deva.chain.ChainLogParam import com.mogo.eagle.core.data.deva.report.PadAddProblemReq +import com.mogo.eagle.core.data.deva.report.PadAddTakeOverReq import com.mogo.eagle.core.data.deva.report.WorkOrderReportInfo import com.mogo.eagle.core.data.deva.scene.SceneModule import com.mogo.eagle.core.data.deva.scene.SceneTAG @@ -385,6 +386,13 @@ object CallerDevaToolsManager { devaToolsProviderApi?.problemPadAdd(padAddProblemReq) } + /** + * 上报接管到运营平台 + */ + fun takeOverPadAdd(padAddTakeOverReq: PadAddTakeOverReq){ + devaToolsProviderApi?.takeOverPadAdd(padAddTakeOverReq) + } + /** * 获取报障、接管、一键上报配置 * @param tenantId 租户ID