From 28b10b7255483c8e2eb5e3e828f8cda658e94c44 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 05 九月 2019 11:41:22 +0800
Subject: [PATCH] 调试完成警报、阈值的插入、更新、获取等接口
---
src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdThresholdController.kt | 12 +++--
src/main/kotlin/com/flightfeather/obd/repository/impl/ObdThresholdValueDaoImpl.kt | 20 +++++++--
src/main/kotlin/com/flightfeather/obd/lightshare/service/impl/ObdThresholdValueServiceImpl.kt | 8 ++--
src/main/kotlin/com/flightfeather/obd/repository/impl/ObdAlarmDaoImpl.kt | 2
src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdAlarmController.kt | 6 +-
src/main/kotlin/com/flightfeather/obd/lightshare/service/ObdThresholdValueService.kt | 4 +-
src/main/kotlin/com/flightfeather/obd/repository/ObdThresholdValueRepository.kt | 4 +-
src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdDataController.kt | 6 +-
src/main/kotlin/com/flightfeather/obd/socket/MessageManager.kt | 2
src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt | 5 --
10 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/obd/lightshare/service/ObdThresholdValueService.kt b/src/main/kotlin/com/flightfeather/obd/lightshare/service/ObdThresholdValueService.kt
index 9778905..12cc771 100644
--- a/src/main/kotlin/com/flightfeather/obd/lightshare/service/ObdThresholdValueService.kt
+++ b/src/main/kotlin/com/flightfeather/obd/lightshare/service/ObdThresholdValueService.kt
@@ -11,12 +11,12 @@
/**
* 淇濆瓨
*/
- fun save(thresholdValueVo: ThresholdValueVo): Boolean
+ fun save(userId: String, thresholdValueVo: ThresholdValueVo): Boolean
/**
* 鏇存柊
*/
- fun update(thresholdValueVo: ThresholdValueVo): Boolean
+ fun update(userId: String, thresholdValueVo: ThresholdValueVo): Boolean
/**
* 鏍规嵁vin鐮佽幏鍙栧搴旈槇鍊�
diff --git a/src/main/kotlin/com/flightfeather/obd/lightshare/service/impl/ObdThresholdValueServiceImpl.kt b/src/main/kotlin/com/flightfeather/obd/lightshare/service/impl/ObdThresholdValueServiceImpl.kt
index 100c77d..3fe96cc 100644
--- a/src/main/kotlin/com/flightfeather/obd/lightshare/service/impl/ObdThresholdValueServiceImpl.kt
+++ b/src/main/kotlin/com/flightfeather/obd/lightshare/service/impl/ObdThresholdValueServiceImpl.kt
@@ -12,12 +12,12 @@
@Service
class ObdThresholdValueServiceImpl(val obdThresholdValueRepository: ObdThresholdValueRepository) : ObdThresholdValueService {
- override fun save(thresholdValueVo: ThresholdValueVo): Boolean {
- return obdThresholdValueRepository.save(thresholdValueVo)
+ override fun save(userId: String, thresholdValueVo: ThresholdValueVo): Boolean {
+ return obdThresholdValueRepository.save(userId, thresholdValueVo)
}
- override fun update(thresholdValueVo: ThresholdValueVo): Boolean {
- return obdThresholdValueRepository.update(thresholdValueVo)
+ override fun update(userId: String, thresholdValueVo: ThresholdValueVo): Boolean {
+ return obdThresholdValueRepository.update(userId, thresholdValueVo)
}
override fun getDataByVinCode(vinCode: String): ThresholdValueVo? {
diff --git a/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdAlarmController.kt b/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdAlarmController.kt
index c942820..2330e98 100644
--- a/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdAlarmController.kt
+++ b/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdAlarmController.kt
@@ -11,11 +11,11 @@
@RequestMapping("obd/alarm")
class ObdAlarmController(val obdAlarmService: ObdAlarmService) {
- @GetMapping("/{id}")
+ @GetMapping("/{vinCode}")
fun getAlarmByVinCode(
- @PathVariable("id") id: String,
+ @PathVariable("vinCode") vinCode: String,
@RequestParam("page", required = false) pageNum: Int?,
@RequestParam("per_page", required = false) pageSize: Int?
- ) = obdAlarmService.getAlarmByVinCode(id, pageNum, pageSize)
+ ) = obdAlarmService.getAlarmByVinCode(vinCode, pageNum, pageSize)
}
\ No newline at end of file
diff --git a/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdDataController.kt b/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdDataController.kt
index 17de186..31b2e7c 100644
--- a/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdDataController.kt
+++ b/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdDataController.kt
@@ -11,10 +11,10 @@
@RequestMapping("obd/data")
class ObdDataController(val obdDataService: ObdDataService) {
- @GetMapping("/{id}")
+ @GetMapping("/{vinCode}")
fun getById(
- @PathVariable("id") id: String,
+ @PathVariable("vinCode") vinCode: String,
@RequestParam("page", required = false) pageNum: Int?,
@RequestParam("per_page", required = false) pageSize: Int?
- ) = obdDataService.getDataByVinCode(id, pageNum, pageSize)
+ ) = obdDataService.getDataByVinCode(vinCode, pageNum, pageSize)
}
\ No newline at end of file
diff --git a/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdThresholdController.kt b/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdThresholdController.kt
index 11f93b5..d5d11d3 100644
--- a/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdThresholdController.kt
+++ b/src/main/kotlin/com/flightfeather/obd/lightshare/web/ObdThresholdController.kt
@@ -12,19 +12,21 @@
@RequestMapping("obd/threshold")
class ObdThresholdController(val obdThresholdValueService: ObdThresholdValueService) {
- @GetMapping("/{id}")
+ @GetMapping("/{vinCode}")
fun getDataByVinCode(
- @PathVariable("id") id: String
- ) = obdThresholdValueService.getDataByVinCode(id)
+ @PathVariable("vinCode") vinCode: String
+ ) = obdThresholdValueService.getDataByVinCode(vinCode)
@PostMapping("/update")
fun update(
+ @RequestParam("userId") userId: String,
@RequestBody thresholdValueVo: ThresholdValueVo
- ) = obdThresholdValueService.update(thresholdValueVo)
+ ) = obdThresholdValueService.update(userId, thresholdValueVo)
@PutMapping("/save")
fun save(
+ @RequestParam("userId") userId: String,
@RequestBody thresholdValueVo: ThresholdValueVo
- ) = obdThresholdValueService.save(thresholdValueVo)
+ ) = obdThresholdValueService.save(userId, thresholdValueVo)
}
\ No newline at end of file
diff --git a/src/main/kotlin/com/flightfeather/obd/repository/ObdThresholdValueRepository.kt b/src/main/kotlin/com/flightfeather/obd/repository/ObdThresholdValueRepository.kt
index 7698518..4ee2103 100644
--- a/src/main/kotlin/com/flightfeather/obd/repository/ObdThresholdValueRepository.kt
+++ b/src/main/kotlin/com/flightfeather/obd/repository/ObdThresholdValueRepository.kt
@@ -12,12 +12,12 @@
/**
* 瀛樺偍闃堝��
*/
- fun save(thresholdValueVo: ThresholdValueVo): Boolean
+ fun save(userId: String, thresholdValueVo: ThresholdValueVo): Boolean
/**
* 鏇存柊闃堝��
*/
- fun update(thresholdValueVo: ThresholdValueVo): Boolean
+ fun update(userId: String, thresholdValueVo: ThresholdValueVo): Boolean
/**
* 閫氳繃姹借溅vin鐮佽幏鍙栭槇鍊兼暟鎹�
diff --git a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdAlarmDaoImpl.kt b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdAlarmDaoImpl.kt
index 0f18f55..5315d38 100644
--- a/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdAlarmDaoImpl.kt
+++ b/src/main/kotlin/com/flightfeather/obd/repository/impl/ObdAlarmDaoImpl.kt
@@ -25,7 +25,7 @@
override fun getAlarmByVinCode(vinCode: String, pageNum: Int?, pageSize: Int?): MutableList<AlarmDataVo> {
val example = Example(AlarmData::class.java).apply {
createCriteria().andEqualTo("obdVin", vinCode)
- orderBy("obdTime").desc()
+ orderBy("alarmTime").desc()
}
//鍒嗛〉
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
}
diff --git a/src/main/kotlin/com/flightfeather/obd/socket/MessageManager.kt b/src/main/kotlin/com/flightfeather/obd/socket/MessageManager.kt
index 5d99a6e..b709839 100644
--- a/src/main/kotlin/com/flightfeather/obd/socket/MessageManager.kt
+++ b/src/main/kotlin/com/flightfeather/obd/socket/MessageManager.kt
@@ -43,7 +43,7 @@
}
}
} catch (e: Throwable) {
- println("------鏀跺埌鏍煎紡閿欒鐨勬暟鎹細$msg")
+// println("------鏀跺埌鏍煎紡閿欒鐨勬暟鎹細$msg")
}
}
}
\ No newline at end of file
diff --git a/src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt b/src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt
index 9dd08db..a71b02e 100644
--- a/src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt
+++ b/src/main/kotlin/com/flightfeather/obd/socket/ServerHandler.kt
@@ -1,8 +1,5 @@
package com.flightfeather.obd.socket
-import com.flightfeather.obd.domain.entity.ObdData
-import com.google.gson.Gson
-import io.netty.channel.ChannelHandler
import io.netty.channel.ChannelHandlerContext
import io.netty.channel.ChannelInboundHandlerAdapter
import io.netty.util.AttributeKey
@@ -22,7 +19,7 @@
override fun channelRead(ctx: ChannelHandlerContext?, msg: Any?) {
super.channelRead(ctx, msg)
- println("------鏀跺埌鐨勫師濮嬫暟鎹細$msg")
+ println("------鏀跺埌鐨勫師濮嬫暟鎹細[ip:${ctx?.channel()?.remoteAddress()}]\r\n$msg")
if (msg is String) {
MessageManager().dealMsg(msg, ctx)
}
--
Gitblit v1.9.3