From 1074bb5c8473dcb99d6edea5fa67ae7aa78af248 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 17 九月 2019 15:54:59 +0800
Subject: [PATCH] 1. 按照数据分类添加新的数据库表格 2. 完成数据分表存储逻辑并debug完成
---
src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt b/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt
index e1067f6..ce920ae 100644
--- a/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt
+++ b/src/main/kotlin/com/flightfeather/obd/socket/decoder/impl/RealTimeDataDecoderImpl.kt
@@ -1,11 +1,10 @@
package com.flightfeather.obd.socket.decoder.impl
-import com.flightfeather.obd.socket.bean.EngineDataFlow
-import com.flightfeather.obd.socket.bean.ObdData
-import com.flightfeather.obd.socket.bean.SupplementDataFlow
+import com.flightfeather.obd.socket.bean.EngineDataStream
+import com.flightfeather.obd.socket.bean.ObdInfo
+import com.flightfeather.obd.socket.bean.SupplementDataStream
import com.flightfeather.obd.socket.decoder.RealTimeDataDecoder
import com.flightfeather.obd.socket.eunm.ObdDataType
-import org.springframework.stereotype.Component
import java.util.*
/**
@@ -13,7 +12,7 @@
* Date: 2019/9/15
*/
class RealTimeDataDecoderImpl : RealTimeDataDecoder {
- override fun getObdData(time: Date?, serialNum: Int, b: List<String>): ObdData? {
+ override fun getObdData(time: Date?, serialNum: Int, b: List<String>): ObdInfo? {
val dataList = mutableListOf<String>().apply { addAll(b) }
if (b.isNotEmpty()) {
//鍘婚櫎 淇℃伅绫诲瀷鏍囧織
@@ -47,15 +46,15 @@
}
}
- return ObdData(time, serialNum).apply {
+ return ObdInfo(time, serialNum).apply {
obdProtocol = dataList[0].toIntOrNull(16)
obdMil = dataList[1].toIntOrNull(16)
diagnosisSupportStatus = "${dataList[2]}${dataList[3]}".toIntOrNull(16)?.toString(2)
diagnosisReadyStatus = "${dataList[4]}${dataList[5]}".toIntOrNull(16)?.toString(2)
obdVin = vin.toString()
- obdSoftwareCode = softwareCode.toString()
+ obdCrn = softwareCode.toString()
obdCvn = cvn.toString()
- this.IUPR = IUPR.toString()
+ this.iupr = IUPR.toString()
obdFaultCodeNum = faultCodeNum
obdFaultCode = faultCode.toString()
}
@@ -64,7 +63,7 @@
}
}
- override fun getEngineDataFlow(time: Date?, serialNum: Int, b: List<String>): EngineDataFlow? {
+ override fun getEngineDataStream(time: Date?, serialNum: Int, b: List<String>): EngineDataStream? {
val dataList = mutableListOf<String>().apply { addAll(b) }
if (b.isNotEmpty()) {
//鍘婚櫎 淇℃伅绫诲瀷鏍囧織
@@ -72,15 +71,15 @@
}
return if (dataList.size >= 37) {
- EngineDataFlow(time, serialNum).apply {
+ EngineDataStream(time, serialNum).apply {
obdSpeed = "${dataList[0]}${dataList[1]}".toIntOrNull(16)?.toDouble()?.times((1 / 256).toDouble())
obdAirPressure = dataList[2].toIntOrNull(16)?.toDouble()?.times(0.5)
obdEngineTorque = dataList[3].toIntOrNull(16)?.minus(125)?.toDouble()?.div(100)
obdFrictionTorque = dataList[4].toIntOrNull(16)?.minus(125)?.toDouble()?.div(100)
obdEngineRpm = "${dataList[5]}${dataList[6]}".toIntOrNull(16)?.toDouble()?.times(0.125)
obdEngineFuelFlow = "${dataList[7]}${dataList[8]}".toIntOrNull(16)?.toDouble()?.times(0.05)
- obdScrUpstreamNo = "${dataList[9]}${dataList[10]}".toIntOrNull(16)?.minus(200)?.toDouble()?.times(0.05)
- obdScrDownstreamNo = "${dataList[11]}${dataList[12]}".toIntOrNull(16)?.minus(200)?.toDouble()?.times(0.05)
+ obdScrUpstreamNox = "${dataList[9]}${dataList[10]}".toIntOrNull(16)?.minus(200)?.toDouble()?.times(0.05)
+ obdScrDownstreamNox = "${dataList[11]}${dataList[12]}".toIntOrNull(16)?.minus(200)?.toDouble()?.times(0.05)
obdRemainReactant = dataList[13].toIntOrNull(16)?.toDouble()?.times(0.4)?.div(100)
obdAirInput = "${dataList[14]}${dataList[15]}".toIntOrNull(16)?.toDouble()?.times(0.05)
obdScrInputTemp = "${dataList[16]}${dataList[17]}".toIntOrNull(16)?.minus(273)?.toDouble()?.times(0.03125)
@@ -98,7 +97,7 @@
}
}
- override fun getSupplementDataFlow(time: Date?, serialNum: Int, b: List<String>): SupplementDataFlow? {
+ override fun getSupplementDataStream(time: Date?, serialNum: Int, b: List<String>): SupplementDataStream? {
val dataList = mutableListOf<String>().apply { addAll(b) }
if (b.isNotEmpty()) {
//鍘婚櫎 淇℃伅绫诲瀷鏍囧織
@@ -106,7 +105,7 @@
}
return if (dataList.size >= 17) {
- SupplementDataFlow(time, serialNum).apply {
+ SupplementDataStream(time, serialNum).apply {
obdEngineTorqueMode = dataList[0].toIntOrNull(16)
obdAcceleratorPedal = dataList[1].toIntOrNull(16)?.toDouble()?.times(0.4)?.div(100)
obdTotalOilConsumption = "${dataList[2]}${dataList[3]}${dataList[4]}${dataList[5]}".toIntOrNull(16)?.toDouble()?.times(0.5)
--
Gitblit v1.9.3