From 81bd0388494d45463de42cd91bd8c33f10f0030a Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期四, 17 六月 2021 10:27:21 +0800 Subject: [PATCH] 1. 新增用电量数据的接收协议 2. 调整socket接收模块的代码结构 --- src/test/kotlin/com/flightfeather/uav/UAVApplicationTests.kt | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/test/kotlin/com/flightfeather/uav/UAVApplicationTests.kt b/src/test/kotlin/com/flightfeather/uav/UAVApplicationTests.kt index 0f0e75f..6bc811e 100644 --- a/src/test/kotlin/com/flightfeather/uav/UAVApplicationTests.kt +++ b/src/test/kotlin/com/flightfeather/uav/UAVApplicationTests.kt @@ -1,8 +1,6 @@ package com.flightfeather.uav -import com.flightfeather.uav.domain.mapper.ObdDataMapper -import com.flightfeather.uav.lightshare.bean.ObdDataVo -import com.google.gson.Gson +import com.flightfeather.uav.lightshare.service.RealTimeDataService import org.junit.Test import org.junit.runner.RunWith import org.slf4j.LoggerFactory @@ -15,7 +13,7 @@ class UAVApplicationTests { @Autowired - lateinit var obdDataMapper: ObdDataMapper + lateinit var realTimeDataService: RealTimeDataService @Test fun contextLoads() { @@ -23,16 +21,7 @@ @Test fun foo1(): Unit { -// val map = GsonJsonParser().parseMap("{\"vin\":\"vin001\",\"protocol\":2}") - val map = Gson().fromJson("{\"vin\":\"vin001\",\"protocol\":2,\"cmdCode\":2001}", ObdDataVo::class.java) - val res = obdDataMapper.selectAll() - res.forEach { - println(it.obdVin) - println(it.obdTime) - } - println(map.obdVin) - println(map.obdProtocol) - println(map.cmdCode) + } @Test @@ -45,4 +34,10 @@ log.error("error") } + @Test + fun foo2() { + val r = realTimeDataService.getSecondData(null, "2021-01-13 14:30:00", "2021-01-13 14:45:00", null, 10) + println(r) + } + } -- Gitblit v1.9.3