yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[6.8.0]

Browse Source 
[fea]
[event 上报删除分页 并根据businessTime 排序]
This commit is contained in:
yangyakun
2024-11-28 17:31:38 +08:00
parent b04680ef37
commit 6e826f3446
4 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/bean/request/ShuttleEventRequest.kt
View File

@@ -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")
):EventDataBase(msgtype = "writeoffEvent", businessTime = businessTimeout)

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/EventDataDao.kt
View File

@@ -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<EventDataBean>?
@Query("SELECT count(1) FROM ${EventDataBean.evnetDataTable} WHERE update_status = ${EventDataBean.notUpdate}")

2
OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/dao/WriteOffDataDao.kt
View File

@@ -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<WriteOffDataBean>?
@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<WriteOffDataBean>?
@Query("SELECT * FROM ${WriteOffDataBean.writeoffDataTable} WHERE event_save_time > :zeroTime and task_id = :taskId and site_id = :siteId")

43
OCH/shuttle/driver_weaknet/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt
View File

@@ -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<EventDataBean>()
val waitUpdateWriteOffEvent = mutableListOf<WriteOffDataBean>()
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<Event>()
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)
}