From a2fe4e1ccf10c42dbe7a8dac65cf57c66e7138ca Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 17 Dec 2024 17:10:36 +0800
Subject: [PATCH] [6.8.4] [fea] [detailId -> shiftsId]

---
 .../mogo/och/common/module/biz/login/LoginInfo.java    | 10 +++++-----
 .../och/weaknet/bean/request/ShuttleEventRequest.kt    |  4 ++--
 .../och/weaknet/repository/db/bean/TaskDataBean.kt     |  2 +-
 .../weaknet/repository/line/impl/WeaknetRepository.kt  |  8 ++++++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java
index ea0bf18ac7..6a927c1608 100644
--- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java
+++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/login/LoginInfo.java
@@ -16,7 +16,7 @@ public class LoginInfo {
     private Long siteId;//站点id 包车使用
     private Long currentSite;//当前站点 接驳、公交、班车使用
     private Boolean leaving;// 当前站点是否出发
-    private Long detailId;//模板id
+    private Long shiftsId;//模板id
     private Long taskDate;// 任务或模板的日期
     private String vin;//车辆唯一识别码
     private String cityCode;//城市编码
@@ -210,12 +210,12 @@ public class LoginInfo {
         this.siteId = siteId;
     }
 
-    public Long getDetailId() {
-        return detailId;
+    public Long getShiftsId() {
+        return shiftsId;
     }
 
-    public void setDetailId(Long detailId) {
-        this.detailId = detailId;
+    public void setShiftsId(Long shiftsId) {
+        this.shiftsId = shiftsId;
     }
 
     @Override
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
index feb5b7a02a..8de335317b 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
@@ -60,7 +60,7 @@ open class EventDataBase(val msgtype:String,var businessTime: Long?)
 
 data class EventData(
     var taskId: Long?,
-    var detailId: Long?,
+    var shiftsId: Long?,
     var taskDate: Long?,
     var businessTimeout: Long?,
     var writeVersion: Long?,
@@ -73,7 +73,7 @@ data class EventData(
 data class WriteOffEventData(
     var msgId: String?,
     var taskId: Long?,
-    var detailId: Long?,
+    var shiftsId: Long?,
     var taskDate: Long?,
     var siteId: Long?,
     var driverId: Long?,
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskDataBean.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskDataBean.kt
index c5a9ea7e0c..b93ea1c079 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskDataBean.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/bean/TaskDataBean.kt
@@ -16,7 +16,7 @@ data class TaskDataBean(
      * 任务id
      */
     @ColumnInfo(name = "task_id", typeAffinity = ColumnInfo.INTEGER, index = true)
-    @SerializedName("id", alternate = ["detailId"])
+    @SerializedName("id", alternate = ["shiftsId"])
     var taskId: Long? = null,
 
     /**
diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
index 2add5a800e..792ebc22e7 100644
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/line/impl/WeaknetRepository.kt
@@ -177,12 +177,11 @@ class WeaknetRepository : ILineRepository {
             val loginInfo = LoginStatusManager.getLoginInfo()
             return Observable.just(loginInfo).flatMap {
                 // check数据 是否正在之心
-
                 val taskId = if(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)||
                     AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
                     it.taskId 
                 }else{
-                    it.detailId
+                    it.shiftsId
                 }
                 val taskDate = it.taskDate
                 val currentSiteId = it.currentSite
@@ -215,6 +214,11 @@ class WeaknetRepository : ILineRepository {
                     CallerLogger.d(TAG,"服务端正在执行${taskId},本地没有此任务")
                     OchChainLogManager.writeChainLogDb("错误信息","服务端正在执行${taskId},本地没有此任务")
                     return@flatMap Observable.just(false)
+                }else{
+                    // 本地任务已经被执行
+                    if(queryTaskById.status == TaskDataBean.used){
+                        return@flatMap Observable.just(false)
+                    }
                 }
                 // endregion