[6.7.2]接管记录上报增加BagId字段

2024-10-30 20:53:14 +08:00
parent 94835eb31f
commit c3ed29f29e
14 changed files with 94 additions and 10 deletions
--- 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)
    }
--- 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)
--- 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<PadProblemInfo>()
                    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)
--- 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<PadProblemInfo>()
+                val padProblemList= ArrayList<PadTakeOverInfo>()
                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)
            }
        }
        //删除
--- 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<Any>

+    /**
+     * 上报录包接管到运营平台
+     */
+    @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<Any>
+
    /**
     * 获取报障、接管、一键上报配置
     */
--- 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
--- 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<Response<Any>>{
+            loader{
+                apiResponseCall{
+                    getNetWorkApi(getOchUrl()).problemPadAddTakeOver(MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                        SharedPrefsMgr.getInstance().token,padAddTakeOverReq)
+                }
+            }
+            onSuccess{
+                onSuccess.invoke("")
+            }
+            onError{
+                onError.invoke(it.message+"")
+            }
+        }
+    }
+
+
+
    /**
     * 获取报障、接管、一键上报配置
     */