1. 修改实时数据各项的转换逻辑

riku

2019-09-23 14ce5d2ccfae554497763da846ffb9eb39cd6d34

 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
    }
}