From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/DeviceVersionController.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/controller/DeviceVersionController.java b/src/main/java/com/moral/controller/DeviceVersionController.java
index a4a3563..06109c8 100644
--- a/src/main/java/com/moral/controller/DeviceVersionController.java
+++ b/src/main/java/com/moral/controller/DeviceVersionController.java
@@ -37,6 +37,14 @@
     public List<Integer> getSensorIds(Integer deviceVersionId){
         return deviceVersionService.getSensorIds(deviceVersionId);
     }
+    @GetMapping("get-maxverno")
+    public ResultBean<Integer> getMaxVersionNo(){
+        return new ResultBean<Integer>(deviceVersionService.queryMaxVersionNo());
+    }
+    @GetMapping("get-byversion")
+    public ResultBean<DeviceVersion> getByVersion(Integer version){
+        return new ResultBean<DeviceVersion>(deviceVersionService.queryByVersionNo(version));
+    }
     @PostMapping("version-sensor-config/{id}")
     public ResultBean versionSensorConfig(@PathVariable("id") Integer deviceVersionId,@RequestBody Integer [] sensorIds){
         ResultBean resultBean = new ResultBean();

--
Gitblit v1.8.0