From 89244932c6185cd39e9a9f8aa8bf3acf99329335 Mon Sep 17 00:00:00 2001 From: panlinlin <648540858@qq.com> Date: 星期日, 11 四月 2021 15:00:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java | 70 +++++++++++++++++++++++++++-------- 1 files changed, 54 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java index 7221359..ae517af 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/device/DeviceControl.java @@ -17,6 +17,10 @@ import com.genersoft.iot.vmp.gb28181.utils.XmlUtil; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -25,9 +29,10 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.context.request.async.DeferredResult; +@Api(tags = "鍥芥爣璁惧鎺у埗") @CrossOrigin @RestController -@RequestMapping("/api") +@RequestMapping("/api/device/control") public class DeviceControl { private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class); @@ -44,10 +49,13 @@ /** * 杩滅▼鍚姩鎺у埗鍛戒护API鎺ュ彛 * - * @param deviceId + * @param deviceId 璁惧ID */ - @GetMapping("/control/{deviceId}/teleboot") - @PostMapping("/control/{deviceId}/teleboot") + @ApiOperation("杩滅▼鍚姩鎺у埗鍛戒护") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value ="璁惧ID", required = true), + }) + @GetMapping("/teleboot/{deviceId}") public ResponseEntity<String> teleBootApi(@PathVariable String deviceId) { if (logger.isDebugEnabled()) { logger.debug("璁惧杩滅▼鍚姩API璋冪敤"); @@ -68,11 +76,18 @@ /** * 褰曞儚鎺у埗鍛戒护API鎺ュ彛 * - * @param deviceId + * @param deviceId 璁惧ID * @param recordCmdStr Record锛氭墜鍔ㄥ綍鍍忥紝StopRecord锛氬仠姝㈡墜鍔ㄥ綍鍍� * @param channelId 閫氶亾缂栫爜锛堝彲閫夛級 */ - @GetMapping("/control/{deviceId}/record/{recordCmdStr}") + @ApiOperation("褰曞儚鎺у埗鍛戒护") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value ="璁惧ID", required = true), + @ApiImplicitParam(name = "channelId", value ="閫氶亾缂栫爜"), + @ApiImplicitParam(name = "recordCmdStr", value ="鍛戒护锛� 鍙�夊�硷細Record锛堟墜鍔ㄥ綍鍍忥級锛孲topRecord锛堝仠姝㈡墜鍔ㄥ綍鍍忥級", + required = true), + }) + @GetMapping("/record/{deviceId}/{recordCmdStr}") public DeferredResult<ResponseEntity<String>> recordApi(@PathVariable String deviceId, @PathVariable String recordCmdStr, @RequestParam(required = false) String channelId) { if (logger.isDebugEnabled()) { @@ -102,10 +117,15 @@ /** * 鎶ヨ甯冮槻/鎾ら槻鍛戒护API鎺ュ彛 * - * @param deviceId + * @param deviceId 璁惧ID * @param guardCmdStr SetGuard锛氬竷闃诧紝ResetGuard锛氭挙闃� */ - @GetMapping("/control/{deviceId}/guard/{guardCmdStr}") + @ApiOperation("褰曞儚鎺у埗鍛戒护") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true), + @ApiImplicitParam(name = "guardCmdStr", value ="鍛戒护锛� 鍙�夊�硷細SetGuard锛堝竷闃诧級锛孯esetGuard锛堟挙闃诧級", required = true) + }) + @GetMapping("/guard/{deviceId}/{guardCmdStr}") public DeferredResult<ResponseEntity<String>> guardApi(@PathVariable String deviceId, @PathVariable String guardCmdStr) { if (logger.isDebugEnabled()) { logger.debug("甯冮槻/鎾ら槻API璋冪敤"); @@ -134,11 +154,17 @@ /** * 鎶ヨ澶嶄綅API鎺ュ彛 * - * @param deviceId + * @param deviceId 璁惧ID * @param alarmMethod 鎶ヨ鏂瑰紡锛堝彲閫夛級 * @param alarmType 鎶ヨ绫诲瀷锛堝彲閫夛級 */ - @GetMapping("/control/{deviceId}/resetAlarm") + @ApiOperation("鎶ヨ澶嶄綅") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true), + @ApiImplicitParam(name = "alarmMethod", value ="鎶ヨ鏂瑰紡"), + @ApiImplicitParam(name = "alarmType", value ="鎶ヨ绫诲瀷"), + }) + @GetMapping("/reset_alarm/{deviceId}") public DeferredResult<ResponseEntity<String>> resetAlarmApi(@PathVariable String deviceId, @RequestParam(required = false) String alarmMethod, @RequestParam(required = false) String alarmType) { @@ -169,11 +195,15 @@ /** * 寮哄埗鍏抽敭甯PI鎺ュ彛 * - * @param deviceId - * @param channelId + * @param deviceId 璁惧ID + * @param channelId 閫氶亾ID */ - @GetMapping("/control/{deviceId}/iFrame") - @PostMapping("/control/{deviceId}/iFrame") + @ApiOperation("寮哄埗鍏抽敭甯�") + @ApiImplicitParams({ + @ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true), + @ApiImplicitParam(name = "channelId", value ="閫氶亾ID", required = true), + }) + @GetMapping("/i_frame/{deviceId}") public ResponseEntity<String> iFrame(@PathVariable String deviceId, @RequestParam(required = false) String channelId) { if (logger.isDebugEnabled()) { @@ -196,13 +226,21 @@ /** * 鐪嬪畧浣嶆帶鍒跺懡浠PI鎺ュ彛 * - * @param deviceId + * @param deviceId 璁惧ID * @param enabled 鐪嬪畧浣嶄娇鑳�1:寮�鍚�,0:鍏抽棴 * @param resetTime 鑷姩褰掍綅鏃堕棿闂撮殧锛堝彲閫夛級 * @param presetIndex 璋冪敤棰勭疆浣嶇紪鍙凤紙鍙�夛級 * @param channelId 閫氶亾缂栫爜锛堝彲閫夛級 */ - @GetMapping("/control/{deviceId}/homePosition/{enabled}") + @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"), + }) + @GetMapping("/home_position/{deviceId}/{enabled}") public DeferredResult<ResponseEntity<String>> homePositionApi(@PathVariable String deviceId, @PathVariable String enabled, @RequestParam(required = false) String resetTime, -- Gitblit v1.8.0