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/ObdThresholdValueDaoImpl.kt |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdThresholdValueDaoImpl.kt b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdThresholdValueDaoImpl.kt
index e469391..df5ac6a 100644
--- a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdThresholdValueDaoImpl.kt
+++ b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdThresholdValueDaoImpl.kt
@@ -15,16 +15,26 @@
 @Repository
 class ObdThresholdValueDaoImpl(val obdThresholdValueMapper: ThresholdValueMapper) : ObdThresholdValueRepository {
 
-    override fun save(thresholdValueVo: ThresholdValueVo): Boolean {
+    override fun save(userId: String, thresholdValueVo: ThresholdValueVo): Boolean {
         val thresholdValue = ThresholdValue()
         BeanUtils.copyProperties(thresholdValueVo, thresholdValue)
-        return obdThresholdValueMapper.insert(thresholdValue) == 1
+        val example = Example(ThresholdValue::class.java).apply {
+            createCriteria().andEqualTo("obdVin", thresholdValueVo.obdVin)
+        }
+        val tempResult = obdThresholdValueMapper.selectByExample(example)
+        return if (tempResult.isNotEmpty())
+            false
+        else
+            obdThresholdValueMapper.insert(thresholdValue) == 1
     }
 
-    override fun update(thresholdValueVo: ThresholdValueVo): Boolean {
+    override fun update(userId: String, thresholdValueVo: ThresholdValueVo): Boolean {
         val thresholdValue = ThresholdValue()
         BeanUtils.copyProperties(thresholdValueVo, thresholdValue)
-        return obdThresholdValueMapper.updateByPrimaryKey(thresholdValue) == 1
+        val example = Example(ThresholdValue::class.java).apply {
+            createCriteria().andEqualTo("obdVin", thresholdValue.obdVin)
+        }
+        return obdThresholdValueMapper.updateByExample(thresholdValue, example) == 1
     }
 
     override fun getByVinCode(vinCode: String): ThresholdValueVo? {
@@ -36,7 +46,7 @@
 
         if (result.isNotEmpty()) {
             val vo = ThresholdValueVo()
-            BeanUtils.copyProperties(vo, result[0])
+            BeanUtils.copyProperties(result[0], vo)
             return vo
         }
 

--
Gitblit v1.9.3