From 9e5624e78ef9ed74a7343f281ccd5426351f99fc Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Mon, 6 May 2024 15:16:08 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.0]FM=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...llerFaultManagementStateListenerManager.kt | 51 +++++++++++++++++--
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerFaultManagementStateListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerFaultManagementStateListenerManager.kt
index a8963eb918..64120bb31f 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerFaultManagementStateListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerFaultManagementStateListenerManager.kt
@@ -4,6 +4,7 @@ import com.mogo.eagle.core.data.msgbox.FMFilterInfoMsg
 import com.mogo.eagle.core.data.msgbox.FMInfoMsg
 import com.mogo.eagle.core.data.msgbox.MsgBoxBean
 import com.mogo.eagle.core.data.msgbox.MsgBoxType
+import com.mogo.eagle.core.data.msgbox.MsgFmData
 import com.mogo.eagle.core.function.api.autopilot.IMoGoFaultManagementStateListener
 import com.mogo.eagle.core.function.call.base.CallerBase
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
@@ -18,6 +19,11 @@ object CallerFaultManagementStateListenerManager : CallerBase<IMoGoFaultManageme
 
     private val cachePolicyMap = hashMapOf<String, FMFilterInfoMsg>()
 
+    private var currentHighAction: Int = 10 //故障Level,默认为10
+    private var faultIdStr: String = "" //故障信息内容
+    private var lastFaultTime: Long= 0 //故障时间
+    private var tempHighAction: Int = 9 //临时故障Level
+
     fun invokeFaultManagementState(fmInfo: FmInfo.FaultResultMsg) {
         val policyCode = fmInfo.downgradePolicyCode
         if (policyCode == null || policyCode.isEmpty()) {
@@ -32,6 +38,43 @@ object CallerFaultManagementStateListenerManager : CallerBase<IMoGoFaultManageme
             }
             return
         }
+        /**
+         * 6.4.0新增FM数据过滤
+         * 当最高优先级的actions无变化、故障信息内容对比上一次无变化时，10min内仅产生一条消息
+         * 当最高优先级的actions无变化、故障信息内容对比上一次有变化时，1min内仅产生一条消息
+         * 当最高优先级的actions有变化时，产生一条新的消息
+         */
+        //通过此遍历，获取当前INFO的最高优先级的Action和故障信息内容
+        val fmFaultReason = StringBuilder()
+        list.forEach {info ->
+            if(info.faultActionCount != 0){
+                info.faultActionList.forEach { action ->
+                    //如果此故障Level高于之前的最高优先级的故障，则进行赋值
+                    if(MsgFmData.FaultAction.getFaultLevel(action) < tempHighAction){
+                        tempHighAction = MsgFmData.FaultAction.getFaultLevel(action)
+                    }
+                }
+            }
+            fmFaultReason.append(info.faultId)
+        }
+        if(tempHighAction == currentHighAction){
+            //最高优先级的Action无变化,故障信息内容对比上一次无变化时，10min内仅产生一条消息
+            if(faultIdStr == fmFaultReason.toString()){
+                if(System.currentTimeMillis() - lastFaultTime < 10*60*1000){
+                    return
+                }
+            }else{
+                //当最高优先级的actions无变化、故障信息内容对比上一次有变化时，1min内仅产生一条消息
+                if(faultIdStr != fmFaultReason.toString()){
+                    if(System.currentTimeMillis() - lastFaultTime < 60*1000){
+                        return
+                    }
+                }
+            }
+        }else{
+            currentHighAction = tempHighAction
+        }
+        faultIdStr = fmFaultReason.toString()
         val fmFilterInfoMsg = cachePolicyMap[policyCode]
         val cacheFaultList = ArrayList<String>()
         val policyTime = fmInfo.time
@@ -40,11 +83,7 @@ object CallerFaultManagementStateListenerManager : CallerBase<IMoGoFaultManageme
                 //判断两个集合重复 true:return
                 var sameResult = false
                 list.forEach {
-                    if(fmFilterInfoMsg.cacheFilterList?.contains(it.faultId) == true){
-                        if(System.currentTimeMillis()-fmFilterInfoMsg.receiveTime < 10*60*1000){
-                            sameResult = true
-                        }
-                    }
+                    sameResult = fmFilterInfoMsg.cacheFilterList?.contains(it.faultId) == true
                 }
                 if (sameResult) {
                     return
@@ -60,6 +99,7 @@ object CallerFaultManagementStateListenerManager : CallerBase<IMoGoFaultManageme
             fmFilterInfoMsg.receiveTime = System.currentTimeMillis()
             cachePolicyMap[policyCode] = fmFilterInfoMsg
             CallerTrace.write("FaultMsg",fmInfo)
+            lastFaultTime = System.currentTimeMillis()
             CallerMsgBoxManager.saveMsgBoxHasPB(
                 MsgBoxBean(
                     MsgBoxType.FMINFO,
@@ -76,6 +116,7 @@ object CallerFaultManagementStateListenerManager : CallerBase<IMoGoFaultManageme
             }
             cachePolicyMap[policyCode] = FMFilterInfoMsg(list, policyCode, cacheFaultList,System.currentTimeMillis())
             CallerTrace.write("FaultMsg",fmInfo)
+            lastFaultTime = System.currentTimeMillis()
             CallerMsgBoxManager.saveMsgBoxHasPB(
                 MsgBoxBean(
                     MsgBoxType.FMINFO,