[3.3.0]merge

2023-06-15 16:30:47 +08:00
parent 489fb32adb
commit adf993b473
46 changed files with 440 additions and 461 deletions
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/MoGoAutopilotControlProvider.kt
@@ -66,7 +66,6 @@ import com.zhjt.mogo.adas.data.sweeper.task.SweeperTaskSuspendResume
 import com.zhjt.mogo.adas.data.sweeper.task.confirm.SweeperTaskConfirm
 import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop
 import com.zhjt.service.chain.ChainLog
-import com.zhjt.service.chain.TracingConstants
 import io.netty.channel.Channel
 import mogo.telematics.pad.MessagePad
 import java.util.*
@@ -344,10 +343,8 @@ class MoGoAutopilotControlProvider :
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = TracingConstants.Endpoint.PAD,
        nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_EAGLE_START_AUTOPILOT_RESULT,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0]
    )
    private fun invokeAutoPilotResult(status: String) {
        CallerLogger.e("$M_ADAS_IMPL$TAG", status)
@@ -874,10 +871,8 @@ class MoGoAutopilotControlProvider :
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = TracingConstants.Endpoint.PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_MULTI_CONNECT,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0]
    )
    private fun invokeNettyConnResult(status: String) {
        CallerLogger.d("$M_ADAS_IMPL$TAG", status)
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt
@@ -72,8 +72,6 @@ import com.zhjt.mogo.adas.data.sweeper.task.confirm.SweeperTaskConfirm
 import com.zhjt.mogo.adas.data.sweeper.task.status.SweeperTaskStatus
 import com.zhjt.mogo.adas.data.sweeper.task.stop.SweeperTaskStop
 import com.zhjt.service.chain.ChainLog
-import com.zhjt.service.chain.TracingConstants
-import com.zhjt.service.chain.TracingConstants.Endpoint.Companion.PAD
 import function_state_management.FunctionStates
 import mogo.telematics.pad.MessagePad
 import mogo.telematics.pad.MessagePad.TrackedObject
@@ -103,10 +101,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_TRAJECTORY,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onTrajectory(header: MessagePad.Header, trajectory: MessagePad.Trajectory?) {
        if (HdMapBuildConfig.isMapLoaded) {
@@ -120,10 +116,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
 //    @ChainLog(
 //        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA_TRACKED,
 //        linkCode = CHAIN_LINK_ADAS,
-//        endpoint = PAD,
 //        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA,
-//        paramIndexes = [0, 1],
-//        clientPkFileName = "sn"
+//        paramIndexes = [0, 1]
 //    )
    override fun onTrackedObjects(
        header: MessagePad.Header,
@@ -138,10 +132,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_GNSSINFO,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onGnssInfo(header: MessagePad.Header, gnssInfo: MessagePad.GnssInfo) {
        CallerChassisGnssListenerManager.invokeChassisGnssListener(gnssInfo)
@@ -169,10 +161,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onVehicleState(
        header: MessagePad.Header,
@@ -231,10 +221,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_VEHICLE,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_VEHICLE,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onChassisStates(
        header: MessagePad.Header,
@@ -292,10 +280,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onAutopilotState(
        header: MessagePad.Header,
@@ -335,10 +321,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onReportMessage(
        header: MessagePad.Header,
@@ -353,10 +337,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_TRAFFIC_LIGHT,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAFFIC_LIGHT,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onPerceptionTrafficLight(
        header: MessagePad.Header?,
@@ -386,10 +368,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_OBJECTS,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_OBJECTS,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onPlanningObjects(
        header: MessagePad.Header?,
@@ -412,10 +392,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_CONFIG,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onCarConfigResp(
        header: MessagePad.Header,
@@ -435,10 +413,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onGlobalPathResp(
        header: MessagePad.Header,
@@ -451,10 +427,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onRecordResult(
        header: MessagePad.Header,
@@ -469,10 +443,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
 //    @ChainLog(
 //        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
 //        linkCode = CHAIN_LINK_ADAS,
-//        endpoint = PAD,
 //        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN,
-//        paramIndexes = [0, 1],
-//        clientPkFileName = "sn"
+//        paramIndexes = [0, 1]
 //    )
    override fun onWarn(header: MessagePad.Header, warn: MessagePad.Warn?) {
        invokeAutopilotWarnMessage(warn)
@@ -482,10 +454,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onArrivalNotification(
        header: MessagePad.Header,
@@ -498,10 +468,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_AUTOPILOT,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_STATUS_QUERY_RESP,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onStatusQueryResp(
        header: MessagePad.Header?,
@@ -528,10 +496,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_PLANNING_ACTIONS,
        linkCode = CHAIN_LINK_ADAS,
-        endpoint = PAD,
        nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_PLANNING_ACTIONS,
-        paramIndexes = [0, 1],
-        clientPkFileName = "sn"
+        paramIndexes = [0, 1]
    )
    override fun onPlanningActionMsg(
        header: MessagePad.Header?,
@@ -754,10 +720,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = ChainConstant.CHAIN_LINK_LOG_CLOUD_V2N,
        linkCode = ChainConstant.CHAIN_LINK_CLOUD,
-        endpoint = PAD,
        nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_CLOUD_V2N,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0,1]
    )
    override fun onV2nCongestionEvent(header: MessagePad.Header, rsi: MogoV2X.RSI_PB) {
        CallerAutopilotIdentifyListenerManager.invokeAutopilotV2nCongestionEvent(header, rsi)
@@ -776,10 +740,8 @@ class MoGoAdasListenerImpl : OnAdasListener {
    @ChainLog(
        linkChainLog = ChainConstant.CHAIN_LINK_LOG_CLOUD_V2N,
        linkCode = ChainConstant.CHAIN_LINK_CLOUD,
-        endpoint = PAD,
        nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_CLOUD_V2N,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0]
    )
    override fun onV2nGlobalPathEvents(header: MessagePad.Header, roadOverview: RoadOverviewEvents.RoadOverviewData, construct: MogoV2X.RSI_PB?, triangle: MogoV2X.RSI_PB?, congestion: MogoV2X.RSI_PB?, parkingViolation: MogoV2X.RSM_PB?) {
        CallerV2XListenerManager.dispatchV2nGlobalPathEvents(roadOverview.eventCount, construct, triangle, congestion, parkingViolation)
--- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt
+++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/telematic/TeleMsgHandler.kt
@@ -28,7 +28,6 @@ import com.mogo.telematic.client.NettyTcpClient
 import com.mogo.telematic.client.status.ConnectState
 import com.zhidao.support.adas.high.AdasManager
 import com.zhjt.service.chain.ChainLog
-import com.zhjt.service.chain.TracingConstants
 import io.netty.channel.Channel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -296,10 +295,8 @@ class TeleMsgHandler : IMsgHandler {
    @ChainLog(
        linkChainLog = CHAIN_LINK_LOG_CONNECT_STATUS,
        linkCode = ChainConstant.CHAIN_LINK_ADAS,
-        endpoint = TracingConstants.Endpoint.PAD,
        nodeAliasCode = ChainConstant.CHAIN_ALIAS_CODE_MULTI_CONNECT,
-        paramIndexes = [0],
-        clientPkFileName = "sn"
+        paramIndexes = [0]
    )
    private fun invokeNettyConnResult(status: String) {
        CallerLogger.d("${SceneConstant.M_ADAS_IMPL}$TAG", status)