From 1f356649ce536b19b903d6f3a533983d4b8222bc Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 25 十月 2019 18:16:39 +0800
Subject: [PATCH] 新增接口： 1. 获取所有设备的最新一条数据 新增数据库表： 1. 车辆信息表
---
src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt
index 0781b69..54eeee9 100644
--- a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt
+++ b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdDataDaoImpl.kt
@@ -4,9 +4,7 @@
import com.flightfeather.obd.domain.mapper.ObdDataMapper
import com.flightfeather.obd.lightshare.bean.ObdDataVo
import com.flightfeather.obd.repository.ObdDataRepository
-import com.flightfeather.obd.socket.bean.EngineDataFlow
-import com.flightfeather.obd.socket.bean.ObdPackageData
-import com.flightfeather.obd.socket.bean.SupplementDataFlow
+import com.flightfeather.obd.socket.bean.*
import com.flightfeather.obd.socket.eunm.ObdCommandUnit
import com.github.pagehelper.PageHelper
import org.springframework.beans.BeanUtils
@@ -54,25 +52,34 @@
}
when (packageData.commandUnit) {
ObdCommandUnit.CarRegister.value -> {
-
+ packageData.dataUnit.forEach {
+ when (it) {
+ is CarRegisterData -> {
+ obdData.apply {
+ obdTime = it.time
+ }
+ }
+ }
+ }
}
ObdCommandUnit.RealTimeData.value,
ObdCommandUnit.ReplacementData.value -> {
packageData.dataUnit.forEach {
when (it) {
- is com.flightfeather.obd.socket.bean.ObdData -> {
+ is com.flightfeather.obd.socket.bean.ObdInfo -> {
obdData.apply {
obdTime = it.time
obdProtocol = it.obdProtocol
obdMil = it.obdMil
- obdIdCode = it.obdSoftwareCode
+ obdIdCode = it.obdCrn
obdVerificationCode = it.obdCvn
obdFaultCodeNum = it.obdFaultCodeNum
obdFaultCode = it.obdFaultCode
}
}
- is EngineDataFlow -> {
+ is EngineDataStream -> {
obdData.apply {
+ obdTime = it.time
obdLng = it.obdLong
obdLat = it.obdLat
obdSpeed = it.obdSpeed?.toInt()
@@ -81,8 +88,8 @@
obdFrictionTorque = it.obdFrictionTorque
obdEngineRpm = it.obdEngineRpm?.toInt()
obdStartFuelFlow = it.obdEngineFuelFlow
- obdScrUpstreamNo = it.obdScrUpstreamNo
- obdScrDownstreamNo = it.obdScrDownstreamNo
+ obdScrUpstreamNo = it.obdScrUpstreamNox
+ obdScrDownstreamNo = it.obdScrDownstreamNox
obdRemainReactant = it.obdRemainReactant
obdAirInput = it.obdAirInput
obdScrInputTemp = it.obdScrInputTemp
@@ -94,8 +101,9 @@
obdTotalMileage = it.obdTotalMileage
}
}
- is SupplementDataFlow -> {
+ is SupplementDataStream -> {
obdData.apply {
+ obdTime = it.time
obdEngineTorqueMode = it.obdEngineTorqueMode?.toString()
obdAcceleratorPedal = it.obdAcceleratorPedal
obdTotalOilConsumption = it.obdTotalOilConsumption
@@ -111,10 +119,26 @@
}
ObdCommandUnit.CarLogOut.value -> {
-
+ packageData.dataUnit.forEach {
+ when (it) {
+ is CarLogOutData -> {
+ obdData.apply {
+ obdTime = it.time
+ }
+ }
+ }
+ }
}
ObdCommandUnit.TimeCalibration.value -> {
-
+ packageData.dataUnit.forEach {
+ when (it) {
+ is TimeCalibrationData -> {
+ obdData.apply {
+ obdTime = it.time
+ }
+ }
+ }
+ }
}
}
--
Gitblit v1.9.3