From 3a7da032ec18b2d5d36afb3fd9622c7d763257b7 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 17 十一月 2021 13:05:06 +0800
Subject: [PATCH] 1. 将用电量接口返回的参数动态化
---
src/main/kotlin/com/flightfeather/uav/socket/processor/UnderwayProcessor.kt | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/processor/UnderwayProcessor.kt b/src/main/kotlin/com/flightfeather/uav/socket/processor/UnderwayProcessor.kt
index 7df1965..ef5d308 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/processor/UnderwayProcessor.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/processor/UnderwayProcessor.kt
@@ -1,5 +1,6 @@
package com.flightfeather.uav.socket.processor
+import com.flightfeather.uav.model.epw.EPWDataPrep
import com.flightfeather.uav.repository.AirDataRepository
import com.flightfeather.uav.socket.bean.AirDataPackage
import com.flightfeather.uav.socket.decoder.AirDataDecoder
@@ -31,8 +32,11 @@
@Autowired
lateinit var airDataRepository: AirDataRepository
- val airDataDecoder = AirDataDecoder.instance
- val dataPackageDecoder = DataPackageDecoder()
+ private val airDataDecoder = AirDataDecoder.instance
+ private val dataPackageDecoder = DataPackageDecoder()
+
+ // 鏁版嵁棰勫鐞嗗嚱鏁�
+ private val dataProcessMap = mutableMapOf<String?, EPWDataPrep>()
@PostConstruct
fun init() {
@@ -63,6 +67,14 @@
AirCommandUnit.AirData.value -> {
// 浠son鏍煎紡瀛樺偍鍘熷鏁版嵁
instance.airDataRepository.saveAirData(dataPackage)
+ // 杩涜棰勫鐞嗗悗锛屽瓨鍌ㄨ嚦瀵瑰簲鏁版嵁琛�
+ if (!dataProcessMap.containsKey(dataPackage.deviceCode)) {
+ dataProcessMap[dataPackage.deviceCode] = EPWDataPrep()// 姣忓彴璁惧鏈夊崟鐙殑鏁版嵁棰勫鐞嗗璞�
+ }
+ dataProcessMap[dataPackage.deviceCode]?.run {
+ val list = this.mDataPrep2(dataPackage)// 鏁版嵁骞虫粦澶勭悊
+ instance.airDataRepository.savePrepData2(list)// 鎸夌収璁惧绫诲瀷瀛樺偍鑷冲搴旀暟鎹〃
+ }
}
}
}
--
Gitblit v1.9.3