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 a912a6754a..ab37358544 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 @@ -32,6 +32,7 @@ data class ShuttleEventRequest(val requestId: String, val sn: String,val vin:Str ) eventList4Request.add(tempEvent!!) } + eventList4Request.sortBy { it.eventData.businessTime } val md5Hex = DigestUtils.md5Hex(eventList4Request.toString()) return ShuttleEventRequest(md5Hex, SharedPrefsMgr.getInstance().sn, CheckVinManager.getVin(), businessTypeShuttle,eventList4Request) @@ -41,17 +42,17 @@ data class ShuttleEventRequest(val requestId: String, val sn: String,val vin:Str data class Event(var eventType: String?,val eventData: EventDataBase) -open class EventDataBase(val msgtype:String) +open class EventDataBase(val msgtype:String,var businessTime: Long?) data class EventData( var taskId: Long?, - var businessTime: Long?, + var businessTimeout: Long?, var writeVersion: Long?, var siteId: Long?, var seq: Int?, var driverId:Long?, var msgId:String? -):EventDataBase(msgtype = "lineEvent") +):EventDataBase(msgtype = "lineEvent", businessTime = businessTimeout) data class WriteOffEventData( var msgId: String?, @@ -59,6 +60,6 @@ data class WriteOffEventData( var siteId: Long?, var driverId: Long?, var orderNo: String?, - var businessTime: Long?, + var businessTimeout: Long?, var writeVersion: Long?, -):EventDataBase(msgtype = "writeoffEvent") \ No newline at end of file +):EventDataBase(msgtype = "writeoffEvent", businessTime = businessTimeout) \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/EventDataDao.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/EventDataDao.kt index d598068e2c..b16842740f 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/EventDataDao.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/EventDataDao.kt @@ -24,7 +24,7 @@ interface EventDataDao { @Query("DELETE FROM ${EventDataBean.evnetDataTable} WHERE event_save_time < :zeroTime") fun deleteObsoleteData(zeroTime: Long = DateTimeUtil.getCurrentDateZero()):Int - @Query("SELECT * FROM ${EventDataBean.evnetDataTable} WHERE update_status = ${EventDataBean.notUpdate} LIMIT 10 OFFSET 0") + @Query("SELECT * FROM ${EventDataBean.evnetDataTable} WHERE update_status = ${EventDataBean.notUpdate}") fun queryEventByStatusWithPage():List? @Query("SELECT count(1) FROM ${EventDataBean.evnetDataTable} WHERE update_status = ${EventDataBean.notUpdate}") diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/WriteOffDataDao.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/WriteOffDataDao.kt index 5b61daffa9..80d7cf2c3c 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/WriteOffDataDao.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/WriteOffDataDao.kt @@ -30,7 +30,7 @@ interface WriteOffDataDao { @Query("SELECT * FROM ${WriteOffDataBean.writeoffDataTable} WHERE event_save_time > :zeroTime and task_id = :taskId and update_status = ${WriteOffDataBean.notUpdate}") fun queryWaitWriteOffByTaskId(taskId:Long,zeroTime: Long = DateTimeUtil.getCurrentDateZero()): List? - @Query("SELECT * FROM ${WriteOffDataBean.writeoffDataTable} WHERE update_status = ${WriteOffDataBean.notUpdate} LIMIT 10 OFFSET 0") + @Query("SELECT * FROM ${WriteOffDataBean.writeoffDataTable} WHERE update_status = ${WriteOffDataBean.notUpdate}") fun queryWriteOffEventByStatusWithPage():List? @Query("SELECT * FROM ${WriteOffDataBean.writeoffDataTable} WHERE event_save_time > :zeroTime and task_id = :taskId and site_id = :siteId") diff --git a/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index 9fd52af8a0..1872937998 100644 --- a/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -1,8 +1,13 @@ package com.mogo.och.common.module import com.mogo.eagle.core.network.utils.digest.DigestUtils +import com.mogo.och.weaknet.bean.request.Event +import com.mogo.och.weaknet.bean.request.EventData +import com.mogo.och.weaknet.bean.request.WriteOffEventData +import com.mogo.och.weaknet.repository.db.bean.EventDataBean import com.mogo.och.weaknet.repository.db.bean.LineDataBean import com.mogo.och.weaknet.repository.db.bean.SiteDataBean +import com.mogo.och.weaknet.repository.db.bean.WriteOffDataBean import org.junit.Test /** @@ -92,6 +97,44 @@ class ExampleUnitTest { @Test fun testData() { + val waitUpdateEvent= mutableListOf() + val waitUpdateWriteOffEvent = mutableListOf() + + waitUpdateEvent.add(EventDataBean(businessTime = 1)) + waitUpdateEvent.add(EventDataBean(businessTime = 3)) + waitUpdateEvent.add(EventDataBean(businessTime = 5)) + waitUpdateEvent.add(EventDataBean(businessTime = 6)) + waitUpdateEvent.add(EventDataBean(businessTime = 7)) + waitUpdateEvent.add(EventDataBean(businessTime = 9)) + waitUpdateEvent.add(EventDataBean(businessTime = 11)) + + waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 2)) + waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 4)) + waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 5)) + waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 8)) + waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 10)) + waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 12)) + waitUpdateWriteOffEvent.add(WriteOffDataBean(businessTime = 14)) + + + val eventList4Request = mutableListOf() + var tempEvent: Event?=null + waitUpdateEvent?.forEach { + tempEvent = Event(it.eventType, + EventData(it.taskId,it.businessTime,it.writeVersion,it.siteId,it.seq,it.driverId,it.msgId) + ) + eventList4Request.add(tempEvent!!) + } + + waitUpdateWriteOffEvent?.forEach { + tempEvent = Event("WriteOff", + WriteOffEventData(it.msgId,it.taskId,it.siteId,it.driverId,it.orderNo,it.businessTime,it.businessTime) + ) + eventList4Request.add(tempEvent!!) + } + eventList4Request.sortBy { it.eventData.businessTime } + val md5Hex = DigestUtils.md5Hex(eventList4Request.toString()) + println(eventList4Request) }