From a004a978fa54779425d7498b4737c970b8c71f7b Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期日, 11 四月 2021 22:32:28 +0800
Subject: [PATCH] 规范api

---
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java |   35 ++++++++++++++++++-----------------
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
similarity index 92%
rename from src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java
rename to src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
index ae517af..220d321 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
@@ -5,7 +5,7 @@
  * @date 2021骞�2鏈�1鏃�
  */
 
-package com.genersoft.iot.vmp.vmanager.device;
+package com.genersoft.iot.vmp.vmanager.gb28181.device;
 
 import javax.sip.message.Response;
 
@@ -53,7 +53,7 @@
      */
 	@ApiOperation("杩滅▼鍚姩鎺у埗鍛戒护")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value ="璁惧ID", required = true),
+			@ApiImplicitParam(name = "deviceId", value ="璁惧ID", required = true, dataTypeClass = String.class),
 	})
     @GetMapping("/teleboot/{deviceId}")
     public ResponseEntity<String> teleBootApi(@PathVariable String deviceId) {
@@ -82,10 +82,10 @@
      */
     @ApiOperation("褰曞儚鎺у埗鍛戒护")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value ="璁惧ID", required = true),
-			@ApiImplicitParam(name = "channelId", value ="閫氶亾缂栫爜"),
+			@ApiImplicitParam(name = "deviceId", value ="璁惧ID", required = true, dataTypeClass = String.class),
+			@ApiImplicitParam(name = "channelId", value ="閫氶亾缂栫爜" ,dataTypeClass = String.class),
 			@ApiImplicitParam(name = "recordCmdStr", value ="鍛戒护锛� 鍙�夊�硷細Record锛堟墜鍔ㄥ綍鍍忥級锛孲topRecord锛堝仠姝㈡墜鍔ㄥ綍鍍忥級",
-					required = true),
+					required = true ,dataTypeClass = String.class),
 	})
     @GetMapping("/record/{deviceId}/{recordCmdStr}")
     public DeferredResult<ResponseEntity<String>> recordApi(@PathVariable String deviceId,
@@ -122,8 +122,9 @@
 	 */
 	@ApiOperation("褰曞儚鎺у埗鍛戒护")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true),
-			@ApiImplicitParam(name = "guardCmdStr", value ="鍛戒护锛� 鍙�夊�硷細SetGuard锛堝竷闃诧級锛孯esetGuard锛堟挙闃诧級", required = true)
+			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
+			@ApiImplicitParam(name = "guardCmdStr", value ="鍛戒护锛� 鍙�夊�硷細SetGuard锛堝竷闃诧級锛孯esetGuard锛堟挙闃诧級", required = true,
+					dataTypeClass = String.class)
 	})
 	@GetMapping("/guard/{deviceId}/{guardCmdStr}")
 	public DeferredResult<ResponseEntity<String>> guardApi(@PathVariable String deviceId, @PathVariable String guardCmdStr) {
@@ -160,9 +161,9 @@
 	 */
 	@ApiOperation("鎶ヨ澶嶄綅")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true),
-			@ApiImplicitParam(name = "alarmMethod", value ="鎶ヨ鏂瑰紡"),
-			@ApiImplicitParam(name = "alarmType", value ="鎶ヨ绫诲瀷"),
+			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
+			@ApiImplicitParam(name = "alarmMethod", value ="鎶ヨ鏂瑰紡", dataTypeClass = String.class),
+			@ApiImplicitParam(name = "alarmType", value ="鎶ヨ绫诲瀷", dataTypeClass = String.class),
 	})
 	@GetMapping("/reset_alarm/{deviceId}")
 	public DeferredResult<ResponseEntity<String>> resetAlarmApi(@PathVariable String deviceId, 
@@ -200,8 +201,8 @@
 	 */
 	@ApiOperation("寮哄埗鍏抽敭甯�")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true),
-			@ApiImplicitParam(name = "channelId", value ="閫氶亾ID", required = true),
+			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
+			@ApiImplicitParam(name = "channelId", value ="閫氶亾ID", required = true, dataTypeClass = String.class),
 	})
 	@GetMapping("/i_frame/{deviceId}")
 	public ResponseEntity<String> iFrame(@PathVariable String deviceId,
@@ -234,11 +235,11 @@
 	 */
 	@ApiOperation("鐪嬪畧浣嶆帶鍒�")
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true),
-			@ApiImplicitParam(name = "enabled", value = "鏄惁寮�鍚湅瀹堜綅 1:寮�鍚�,0:鍏抽棴", required = true),
-			@ApiImplicitParam(name = "resetTime", value = "鑷姩褰掍綅鏃堕棿闂撮殧"),
-			@ApiImplicitParam(name = "presetIndex", value = "璋冪敤棰勭疆浣嶇紪鍙�"),
-			@ApiImplicitParam(name = "channelId", value ="閫氶亾ID"),
+			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
+			@ApiImplicitParam(name = "enabled", value = "鏄惁寮�鍚湅瀹堜綅 1:寮�鍚�,0:鍏抽棴", required = true, dataTypeClass = String.class),
+			@ApiImplicitParam(name = "resetTime", value = "鑷姩褰掍綅鏃堕棿闂撮殧", dataTypeClass = String.class),
+			@ApiImplicitParam(name = "presetIndex", value = "璋冪敤棰勭疆浣嶇紪鍙�", dataTypeClass = String.class),
+			@ApiImplicitParam(name = "channelId", value ="閫氶亾ID", dataTypeClass = String.class),
 	})
 	@GetMapping("/home_position/{deviceId}/{enabled}")
 	public DeferredResult<ResponseEntity<String>> homePositionApi(@PathVariable String deviceId,

--
Gitblit v1.8.0