Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robobus-d_241202_6.8.4_autopilot

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/response/CarExecutableTaskResponse.kt

@@ -96,6 +96,8 @@ data class CarExecutableTaskResponse(val data: List<Result>?) : BaseData(){
             LineDb.checkAndUpdate(lineList)
             ContraiDb.addOrUpdate(contrailList)
             SiteDb.addOrUpdate(siteList)
+
+            TaskDb.resetShiftsIdDetail()
         }
 
     }

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskDataBean.kt

@@ -83,6 +83,7 @@ data class TaskDataBean(
 
         if (taskId != other.taskId) return false
         if (lineId != other.lineId) return false
+        if (shiftsId != other.shiftsId) return false
 
         return true
     }

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/TaskDataDao.kt

@@ -72,6 +72,9 @@ interface TaskDataDao {
     @Query("DELETE FROM ${TaskDataBean.tableName} WHERE task_get_time < :zeroTime")
     fun deleteObsoleteData(zeroTime: Long = DateTimeUtil.getCurrentDateZero()): Int
 
+    @Query("UPDATE ${TaskDataBean.tableName} SET shifts_id = 0 WHERE shifts_id is null")
+    fun setShiftsIdDetail()
+
 
     //查询线路对应的轨迹信息 只要一个结果
     fun queryTaskByTaskIdOne(taskId: Long): TaskDataBean? {

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/TaskDb.kt

@@ -218,5 +218,9 @@ object TaskDb : IDbRepository {
         }
     }
 
+    fun resetShiftsIdDetail(){
+        taskDataDao?.setShiftsIdDetail()
+    }
+
 
 }

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt

@@ -409,7 +409,7 @@ class WeaknetRepository : ILineRepository {
                                 // 设置到站任务
                                 LineManager.getLineInfo { lineInfo ->
                                     EventDb.saveEventTaskArriveSite(
-                                        task.shiftsId!!,
+                                        task.shiftsId?:0L,
                                         task.taskId!!,
                                         task.lineId!!,
                                         end.siteId.toLong(),