From b4aa377b5e7898cd2ef018cc385a19af67a56839 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 26 Mar 2018 14:05:58 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git
---
src/main/java/com/moral/controller/DeviceVersionController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/DeviceVersionController.java b/src/main/java/com/moral/controller/DeviceVersionController.java
index 82bcd73..a4a3563 100644
--- a/src/main/java/com/moral/controller/DeviceVersionController.java
+++ b/src/main/java/com/moral/controller/DeviceVersionController.java
@@ -8,6 +8,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.UnsupportedEncodingException;
+import java.util.List;
@RestController
@RequestMapping("device-version")
@@ -32,4 +33,21 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+ @GetMapping("get-sensor-ids")
+ public List<Integer> getSensorIds(Integer deviceVersionId){
+ return deviceVersionService.getSensorIds(deviceVersionId);
+ }
+ @PostMapping("version-sensor-config/{id}")
+ public ResultBean versionSensorConfig(@PathVariable("id") Integer deviceVersionId,@RequestBody Integer [] sensorIds){
+ ResultBean resultBean = new ResultBean();
+ if(deviceVersionId==null){
+ resultBean.setCode(ResultBean.NO_PERMISSION);
+ resultBean.setMessage("������������ID���������null");
+ return resultBean;
+ }else{
+ deviceVersionService.versionSensorConfig(deviceVersionId,sensorIds);
+ resultBean.setCode(ResultBean.SUCCESS);
+ }
+ return resultBean;
+ }
}
--
Gitblit v1.8.0