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/CarLoginDaoImpl.kt | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/src/main/kotlin/com/flightfeather/obd/repository/impl/CarLoginDaoImpl.kt b/src/main/kotlin/com/flightfeather/obd/repository/impl/CarLoginDaoImpl.kt index 2142299..a86b8f8 100644 --- a/src/main/kotlin/com/flightfeather/obd/repository/impl/CarLoginDaoImpl.kt +++ b/src/main/kotlin/com/flightfeather/obd/repository/impl/CarLoginDaoImpl.kt @@ -2,11 +2,15 @@ import com.flightfeather.obd.domain.entity.CarLogin import com.flightfeather.obd.domain.mapper.CarLoginMapper +import com.flightfeather.obd.lightshare.bean.CarLoginVo import com.flightfeather.obd.repository.CarLoginRepository import com.flightfeather.obd.socket.bean.CarRegisterData import com.flightfeather.obd.socket.bean.ObdPackageData import com.flightfeather.obd.socket.eunm.ObdCommandUnit +import com.github.pagehelper.PageHelper +import org.springframework.beans.BeanUtils import org.springframework.stereotype.Repository +import tk.mybatis.mapper.entity.Example /** * @author riku @@ -37,4 +41,28 @@ false } } + + override fun getLoginData(deviceCode: String, pageNum: Int?, pageSize: Int?, startTime: String?, endTime: String?): List<CarLoginVo> { + val example = Example(CarLogin::class.java).apply { + createCriteria().andEqualTo("obdDeviceCode", deviceCode).run { + startTime?.let { andGreaterThanOrEqualTo("loginDataTime", it) } + endTime?.let { andLessThanOrEqualTo("loginDataTime", it) } + orderBy("loginDataTime").desc() + } + } + + //鍒嗛〉 + val offset = (pageSize?.times(pageNum?.minus(1) ?: 0)) ?: 0 + PageHelper.offsetPage<CarLogin>(offset, pageSize ?: 10) + val result = carLoginMapper.selectByExample(example) + + val resultList = mutableListOf<CarLoginVo>() + result.forEach { + val vo = CarLoginVo() + BeanUtils.copyProperties(it, vo) + resultList.add(vo) + } + + return resultList + } } \ No newline at end of file -- Gitblit v1.9.3