From e5d89904d0e4593a948919c13963eaf8de2124a9 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 29 Aug 2025 11:50:06 +0800 Subject: [PATCH] =?UTF-8?q?[8.2.0][fix]=E8=A7=A3=E5=86=B3=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E5=92=8C=E7=AB=99=E7=82=B9=E6=9B=B4=E6=96=B0=E4=BD=86?= =?UTF-8?q?=E9=80=94=E7=BB=8F=E7=82=B9=E6=9C=AA=E6=9B=B4=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../weaknet/repository/db/repository/PointDb.kt | 4 ++++ .../weaknet/repository/db/repository/SiteDb.kt | 15 ++++++++++++++- .../mogo/och/weaknet/util/BusTrajectoryManager.kt | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/PointDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/PointDb.kt index f78320ebf2..8b6b596bfe 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/PointDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/PointDb.kt @@ -30,6 +30,10 @@ object PointDb: IDbRepository { return null } + fun deletePointByLineIds(lineIds: List) { + pointDao?.deleteByLineId(lineIds) + } + fun addOrUpdate(serverDataList:List) { val contaiBeans = mutableListOf() val needDelete = mutableListOf() diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt index 2cc9d55814..ab3091b5b3 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/repository/SiteDb.kt @@ -5,6 +5,7 @@ import com.mogo.eagle.core.network.utils.digest.DigestUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.weaknet.model.SynchDataModel import com.mogo.och.weaknet.repository.db.IDbRepository import com.mogo.och.weaknet.repository.db.MyDataBase import com.mogo.och.weaknet.repository.db.bean.SiteDataBean @@ -38,6 +39,7 @@ object SiteDb: IDbRepository { siteDataDao.insert(*serverDataList.toTypedArray()) return } + val delPointByLineIds = mutableSetOf() // 后台新增数据 val needAddDatas = serverDataList-localAllSites // 后台没有本地数据库有的未分配线路 @@ -49,6 +51,7 @@ object SiteDb: IDbRepository { val md5Source = it.toString() val md5Hex = DigestUtils.md5Hex(md5Source) it.md5 = md5Hex + it.lineId?.let { lineId -> delPointByLineIds.add(lineId) } } // 新增插入新数据 siteDataDao.insert(*needAddDatas.toTypedArray()) @@ -57,6 +60,9 @@ object SiteDb: IDbRepository { if (needMinusDatas.isNotEmpty()) { // 删除线路 siteDataDao.deleteById(*needMinusDatas.toTypedArray()) + needMinusDatas.forEach { + it.lineId?.let { it1 -> delPointByLineIds.add(it1) } + } } // 交集 服务器端 @@ -86,7 +92,7 @@ object SiteDb: IDbRepository { } }else{ needDelete.add(siteDataBean) - + siteDataBean.lineId?.let { it1 -> delPointByLineIds.add(it1) } } } } @@ -95,8 +101,15 @@ object SiteDb: IDbRepository { siteDataDao.updateInfo(updateDateItem.siteId,updateDateItem.lineId,updateDateItem.name,updateDateItem.nameKr, updateDateItem.seq,updateDateItem.gcjLon,updateDateItem.gcjLat,updateDateItem.lon,updateDateItem.lat, updateDateItem.introduction,updateDateItem.isPlayTts,updateDateItem.md5,updateDateItem.videoListDB,updateDateItem.id) + updateDateItem.lineId?.let { delPointByLineIds.add(it) } } siteDataDao.deleteById(*needDelete.toTypedArray()) + // 清除所有变更的站点 + if (delPointByLineIds.isNotEmpty()) { + val delPointList = delPointByLineIds.toMutableList() + PointDb.deletePointByLineIds(delPointList) + SynchDataModel.synContraiInfo(delPointList) + } checkData() } } diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt index 3f9f1fa396..07510a562c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/util/BusTrajectoryManager.kt @@ -157,7 +157,7 @@ object BusTrajectoryManager : ITrajectoryListListener { mAutopilotControlParameters?.let { OchChainLogManager.writeChainLogTrajectory( "轨迹监控", - "sendTrajectoryReq() 下发轨迹 轨迹id:${it.autoPilotLine!!.lineId}" + "sendTrajectoryReq() 下发轨迹:${GsonUtils.toJson(mAutopilotControlParameters)}" ) CallerAutoPilotControlManager.sendTrajectoryDownloadReq(it, 0) }