From d5e8aa62a11352f228ba449b204d53d4e17897a5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 05 九月 2022 17:10:21 +0800
Subject: [PATCH] 添加对海康平台录像回放的兼容,修复录像信息发送失败, 级联平台支持开启rtcp保活

---
 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java |  217 +++++++++++++++++++++++-------------------------------
 1 files changed, 92 insertions(+), 125 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
index 767e9c4..9c7d203 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
 import com.genersoft.iot.vmp.gb28181.bean.Device;
 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
 import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
@@ -12,16 +13,17 @@
 import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
 import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.service.IDeviceChannelService;
 import com.genersoft.iot.vmp.service.IDeviceService;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
 import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
 import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
 import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.apache.commons.compress.utils.IOUtils;
 import org.apache.http.HttpResponse;
 import org.slf4j.Logger;
@@ -30,6 +32,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.async.DeferredResult;
@@ -40,7 +43,7 @@
 import java.nio.file.Files;
 import java.util.*;
 
-@Api(tags = "鍥芥爣璁惧鏌ヨ", value = "鍥芥爣璁惧鏌ヨ")
+@Tag(name  = "鍥芥爣璁惧鏌ヨ", description = "鍥芥爣璁惧鏌ヨ")
 @SuppressWarnings("rawtypes")
 @CrossOrigin
 @RestController
@@ -51,6 +54,9 @@
 	
 	@Autowired
 	private IVideoManagerStorage storager;
+
+	@Autowired
+	private IDeviceChannelService deviceChannelService;
 
 	@Autowired
 	private IRedisCatchStorage redisCatchStorage;
@@ -75,19 +81,12 @@
 	 * @param deviceId 鍥芥爣ID
 	 * @return 鍥芥爣璁惧
 	 */
-	@ApiOperation("浣跨敤ID鏌ヨ鍥芥爣璁惧")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
-	})
+	@Operation(summary = "鏌ヨ鍥芥爣璁惧")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
 	@GetMapping("/devices/{deviceId}")
-	public ResponseEntity<Device> devices(@PathVariable String deviceId){
+	public Device devices(@PathVariable String deviceId){
 		
-//		if (logger.isDebugEnabled()) {
-//			logger.debug("鏌ヨ瑙嗛璁惧API璋冪敤锛宒eviceId锛�" + deviceId);
-//		}
-		
-		Device device = storager.queryVideoDevice(deviceId);
-		return new ResponseEntity<>(device,HttpStatus.OK);
+		return storager.queryVideoDevice(deviceId);
 	}
 
 	/**
@@ -96,17 +95,11 @@
 	 * @param count 姣忛〉鏌ヨ鏁伴噺
 	 * @return 鍒嗛〉鍥芥爣鍒楄〃
 	 */
-	@ApiOperation("鍒嗛〉鏌ヨ鍥芥爣璁惧")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
-			@ApiImplicitParam(name = "count", value = "姣忛〉鏌ヨ鏁伴噺", required = true, dataTypeClass = Integer.class),
-	})
+	@Operation(summary = "鍒嗛〉鏌ヨ鍥芥爣璁惧")
+	@Parameter(name = "page", description = "褰撳墠椤�", required = true)
+	@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
 	@GetMapping("/devices")
 	public PageInfo<Device> devices(int page, int count){
-		
-//		if (logger.isDebugEnabled()) {
-//			logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
-//		}
 		
 		return storager.queryVideoDeviceList(page, count);
 	}
@@ -120,34 +113,29 @@
 	 * @param query 鏌ヨ鍐呭
 	 * @param online 鏄惁鍦ㄧ嚎  鍦ㄧ嚎 true / 绂荤嚎 false
 	 * @param channelType 璁惧 false/瀛愮洰褰� true
+	 * @param catalogUnderDevice 鏄惁鐩村睘涓庤澶囩殑鐩綍
 	 * @return 閫氶亾鍒楄〃
 	 */
-	@ApiOperation("鍒嗛〉鏌ヨ閫氶亾")
 	@GetMapping("/devices/{deviceId}/channels")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name="deviceId", value = "璁惧id", required = true ,dataTypeClass = String.class),
-			@ApiImplicitParam(name="page", value = "褰撳墠椤�", required = true ,dataTypeClass = Integer.class),
-			@ApiImplicitParam(name="count", value = "姣忛〉鏌ヨ鏁伴噺", required = true ,dataTypeClass = Integer.class),
-			@ApiImplicitParam(name="query", value = "鏌ヨ鍐呭" ,dataTypeClass = String.class),
-			@ApiImplicitParam(name="online", value = "鏄惁鍦ㄧ嚎"  ,dataTypeClass = Boolean.class),
-			@ApiImplicitParam(name="channelType", value = "璁惧/瀛愮洰褰�-> false/true" ,dataTypeClass = Boolean.class),
-			@ApiImplicitParam(name="catalogUnderDevice", value = "鏄惁鐩村睘涓庤澶囩殑鐩綍" ,dataTypeClass = Boolean.class),
-	})
-	public ResponseEntity<PageInfo> channels(@PathVariable String deviceId,
+	@Operation(summary = "鍒嗛〉鏌ヨ閫氶亾")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+	@Parameter(name = "page", description = "褰撳墠椤�", required = true)
+	@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
+	@Parameter(name = "query", description = "鏌ヨ鍐呭")
+	@Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
+	@Parameter(name = "channelType", description = "璁惧/瀛愮洰褰�-> false/true")
+	@Parameter(name = "catalogUnderDevice", description = "鏄惁鐩村睘涓庤澶囩殑鐩綍")
+	public PageInfo channels(@PathVariable String deviceId,
 											   int page, int count,
 											   @RequestParam(required = false) String query,
 											   @RequestParam(required = false) Boolean online,
 											   @RequestParam(required = false) Boolean channelType,
 											   @RequestParam(required = false) Boolean catalogUnderDevice) {
-//		if (logger.isDebugEnabled()) {
-//			logger.debug("鏌ヨ瑙嗛璁惧閫氶亾API璋冪敤");
-//		}
-		if (StringUtils.isEmpty(query)) {
+		if (ObjectUtils.isEmpty(query)) {
 			query = null;
 		}
 
-		PageInfo pageResult = storager.queryChannelsByDeviceId(deviceId, query, channelType, online, catalogUnderDevice, page, count);
-		return new ResponseEntity<>(pageResult,HttpStatus.OK);
+		return storager.queryChannelsByDeviceId(deviceId, query, channelType, online, catalogUnderDevice, page, count);
 	}
 
 	/**
@@ -155,10 +143,8 @@
 	 * @param deviceId 璁惧id
 	 * @return
 	 */
-	@ApiOperation("鍚屾璁惧閫氶亾")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name="deviceId", value = "璁惧id", required = true, dataTypeClass = String.class),
-	})
+	@Operation(summary = "鍚屾璁惧閫氶亾")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
 	@PostMapping("/devices/{deviceId}/sync")
 	public WVPResult<SyncStatus> devicesSync(@PathVariable String deviceId){
 		
@@ -169,11 +155,8 @@
 		boolean status = deviceService.isSyncRunning(deviceId);
 		// 宸插瓨鍦ㄥ垯杩斿洖杩涘害
 		if (status) {
-			WVPResult<SyncStatus> wvpResult = new WVPResult<>();
-			wvpResult.setCode(0);
 			SyncStatus channelSyncStatus = deviceService.getChannelSyncStatus(deviceId);
-			wvpResult.setData(channelSyncStatus);
-			return wvpResult;
+			return WVPResult.success(channelSyncStatus);
 		}
 		deviceService.sync(device);
 
@@ -188,12 +171,10 @@
 	 * @param deviceId 璁惧id
 	 * @return
 	 */
-	@ApiOperation("绉婚櫎璁惧")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name="deviceId", value = "璁惧id", required = true, dataTypeClass = String.class),
-	})
+	@Operation(summary = "绉婚櫎璁惧")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
 	@DeleteMapping("/devices/{deviceId}/delete")
-	public ResponseEntity<String> delete(@PathVariable String deviceId){
+	public String delete(@PathVariable String deviceId){
 		
 		if (logger.isDebugEnabled()) {
 			logger.debug("璁惧淇℃伅鍒犻櫎API璋冪敤锛宒eviceId锛�" + deviceId);
@@ -217,10 +198,10 @@
 			}
 			JSONObject json = new JSONObject();
 			json.put("deviceId", deviceId);
-			return new ResponseEntity<>(json.toString(),HttpStatus.OK);
+			return json.toString();
 		} else {
 			logger.warn("璁惧淇℃伅鍒犻櫎API璋冪敤澶辫触锛�");
-			return new ResponseEntity<String>("璁惧淇℃伅鍒犻櫎API璋冪敤澶辫触锛�", HttpStatus.INTERNAL_SERVER_ERROR);
+			throw new ControllerException(ErrorCode.ERROR100.getCode(), "璁惧淇℃伅鍒犻櫎API璋冪敤澶辫触锛�");
 		}
 	}
 
@@ -235,16 +216,14 @@
 	 * @param channelType 閫氶亾绫诲瀷
 	 * @return 瀛愰�氶亾鍒楄〃
 	 */
-	@ApiOperation("鍒嗛〉鏌ヨ瀛愮洰褰曢�氶亾")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name="deviceId", value = "璁惧id", required = true, dataTypeClass = String.class),
-			@ApiImplicitParam(name="channelId", value = "閫氶亾id", required = true, dataTypeClass = String.class),
-			@ApiImplicitParam(name="page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
-			@ApiImplicitParam(name="count", value = "姣忛〉鏉℃暟", required = true, dataTypeClass = Integer.class),
-			@ApiImplicitParam(name="query", value = "鏌ヨ鍐呭", dataTypeClass = String.class),
-			@ApiImplicitParam(name="online", value = "鏄惁鍦ㄧ嚎", dataTypeClass = Boolean.class),
-			@ApiImplicitParam(name="channelType", value = "閫氶亾绫诲瀷锛� 瀛愮洰褰�", dataTypeClass = Boolean.class),
-	})
+	@Operation(summary = "鍒嗛〉鏌ヨ瀛愮洰褰曢�氶亾")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+	@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
+	@Parameter(name = "page", description = "褰撳墠椤�", required = true)
+	@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
+	@Parameter(name = "query", description = "鏌ヨ鍐呭")
+	@Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
+	@Parameter(name = "channelType", description = "璁惧/瀛愮洰褰�-> false/true")
 	@GetMapping("/sub_channels/{deviceId}/{channelId}/channels")
 	public ResponseEntity<PageInfo> subChannels(@PathVariable String deviceId,
 												  @PathVariable String channelId,
@@ -254,9 +233,6 @@
 												  @RequestParam(required = false) Boolean online,
 												  @RequestParam(required = false) Boolean channelType){
 
-//		if (logger.isDebugEnabled()) {
-//			logger.debug("鏌ヨ鎵�鏈夎棰戦�氶亾API璋冪敤");
-//		}
 		DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId);
 		if (deviceChannel == null) {
 			PageInfo<DeviceChannel> deviceChannelPageResult = new PageInfo<>();
@@ -273,14 +249,12 @@
 	 * @param channel 閫氶亾
 	 * @return
 	 */
-	@ApiOperation("鏇存柊閫氶亾淇℃伅")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name="deviceId", value = "璁惧id", required = true, dataTypeClass = String.class),
-			@ApiImplicitParam(name="channel", value = "閫氶亾", required = true, dataTypeClass = String.class),
-	})
+	@Operation(summary = "鏇存柊閫氶亾淇℃伅")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+	@Parameter(name = "channel", description = "閫氶亾淇℃伅", required = true)
 	@PostMapping("/channel/update/{deviceId}")
-	public ResponseEntity<PageInfo> updateChannel(@PathVariable String deviceId,DeviceChannel channel){
-		storager.updateChannel(deviceId, channel);
+	public ResponseEntity updateChannel(@PathVariable String deviceId,DeviceChannel channel){
+		deviceChannelService.updateChannel(deviceId, channel);
 		return new ResponseEntity<>(null,HttpStatus.OK);
 	}
 
@@ -290,17 +264,14 @@
 	 * @param streamMode 鏁版嵁娴佷紶杈撴ā寮�
 	 * @return
 	 */
-	@ApiOperation("淇敼鏁版嵁娴佷紶杈撴ā寮�")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧id", required = true, dataTypeClass = String.class),
-			@ApiImplicitParam(name = "streamMode", value = "鏁版嵁娴佷紶杈撴ā寮�, 鍙栧�硷細" +
-					"UDP锛坲dp浼犺緭锛夛紝TCP-ACTIVE锛坱cp涓诲姩妯″紡,鏆備笉鏀寔锛夛紝TCP-PASSIVE锛坱cp琚姩妯″紡锛�", dataTypeClass = String.class),
-	})
+	@Operation(summary = "淇敼鏁版嵁娴佷紶杈撴ā寮�")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+	@Parameter(name = "streamMode", description = "鏁版嵁娴佷紶杈撴ā寮�, 鍙栧�硷細" +
+			"UDP锛坲dp浼犺緭锛夛紝TCP-ACTIVE锛坱cp涓诲姩妯″紡,鏆備笉鏀寔锛夛紝TCP-PASSIVE锛坱cp琚姩妯″紡锛�", required = true)
 	@PostMapping("/transport/{deviceId}/{streamMode}")
-	public ResponseEntity<PageInfo> updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
+	public ResponseEntity updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
 		Device device = storager.queryVideoDevice(deviceId);
 		device.setStreamMode(streamMode);
-//		storager.updateDevice(device);
 		deviceService.updateDevice(device);
 		return new ResponseEntity<>(null,HttpStatus.OK);
 	}
@@ -310,10 +281,8 @@
 	 * @param device 璁惧淇℃伅
 	 * @return
 	 */
-	@ApiOperation("鏇存柊璁惧淇℃伅")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "device", value = "璁惧淇℃伅", required = true, dataTypeClass = Device.class)
-	})
+	@Operation(summary = "鏇存柊璁惧淇℃伅")
+	@Parameter(name = "device", description = "璁惧", required = true)
 	@PostMapping("/device/update/")
 	public ResponseEntity<WVPResult<String>> updateDevice(Device device){
 
@@ -331,10 +300,8 @@
 	 * 
 	 * @param deviceId 璁惧id
 	 */
-	@ApiOperation("璁惧鐘舵�佹煡璇�")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧id", required = true, dataTypeClass = String.class),
-	})
+	@Operation(summary = "璁惧鐘舵�佹煡璇�")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
 	@GetMapping("/devices/{deviceId}/status")
 	public DeferredResult<ResponseEntity<String>> deviceStatusApi(@PathVariable String deviceId) {
 		if (logger.isDebugEnabled()) {
@@ -379,16 +346,14 @@
 	 * @param endTime		鎶ヨ鍙戠敓缁堟鏃堕棿锛堝彲閫夛級
 	 * @return				true = 鍛戒护鍙戦�佹垚鍔�
 	 */
-	@ApiOperation("璁惧鎶ヨ鏌ヨ")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧id", required = true, dataTypeClass = String.class),
-			@ApiImplicitParam(name = "startPriority", value = "鎶ヨ璧峰绾у埆", dataTypeClass = String.class),
-			@ApiImplicitParam(name = "endPriority", value = "鎶ヨ缁堟绾у埆", dataTypeClass = String.class),
-			@ApiImplicitParam(name = "alarmMethod", value = "鎶ヨ鏂瑰紡鏉′欢", dataTypeClass = String.class),
-			@ApiImplicitParam(name = "alarmType", value = "鎶ヨ绫诲瀷", dataTypeClass = String.class),
-			@ApiImplicitParam(name = "startTime", value = "鎶ヨ鍙戠敓璧峰鏃堕棿", dataTypeClass = String.class),
-			@ApiImplicitParam(name = "endTime", value = "鎶ヨ鍙戠敓缁堟鏃堕棿", dataTypeClass = String.class),
-	})
+	@Operation(summary = "璁惧鐘舵�佹煡璇�")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+	@Parameter(name = "startPriority", description = "鎶ヨ璧峰绾у埆")
+	@Parameter(name = "endPriority", description = "鎶ヨ缁堟绾у埆")
+	@Parameter(name = "alarmMethod", description = "鎶ヨ鏂瑰紡鏉′欢")
+	@Parameter(name = "alarmType", description = "鎶ヨ绫诲瀷")
+	@Parameter(name = "startTime", description = "鎶ヨ鍙戠敓璧峰鏃堕棿")
+	@Parameter(name = "endTime", description = "鎶ヨ鍙戠敓缁堟鏃堕棿")
 	@GetMapping("/alarm/{deviceId}")
 	public DeferredResult<ResponseEntity<String>> alarmApi(@PathVariable String deviceId,
 														@RequestParam(required = false) String startPriority, 
@@ -426,7 +391,8 @@
 
 
 	@GetMapping("/{deviceId}/sync_status")
-	@ApiOperation(value = "鑾峰彇閫氶亾鍚屾杩涘害", notes = "鑾峰彇閫氶亾鍚屾杩涘害")
+	@Operation(summary = "鑾峰彇閫氶亾鍚屾杩涘害")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
 	public WVPResult<SyncStatus> getSyncStatus(@PathVariable String deviceId) {
 		SyncStatus channelSyncStatus = deviceService.getChannelSyncStatus(deviceId);
 		WVPResult<SyncStatus> wvpResult = new WVPResult<>();
@@ -434,7 +400,8 @@
 			wvpResult.setCode(-1);
 			wvpResult.setMsg("鍚屾灏氭湭寮�濮�");
 		}else {
-			wvpResult.setCode(0);
+			wvpResult.setCode(ErrorCode.SUCCESS.getCode());
+			wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());
 			wvpResult.setData(channelSyncStatus);
 			if (channelSyncStatus.getErrorMsg() != null) {
 				wvpResult.setMsg(channelSyncStatus.getErrorMsg());
@@ -444,7 +411,8 @@
 	}
 
 	@GetMapping("/{deviceId}/subscribe_info")
-	@ApiOperation(value = "鑾峰彇璁惧鐨勮闃呯姸鎬�", notes = "鑾峰彇璁惧鐨勮闃呯姸鎬�")
+	@Operation(summary = "鑾峰彇璁惧鐨勮闃呯姸鎬�")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
 	public WVPResult<Map<String, String>> getSubscribeInfo(@PathVariable String deviceId) {
 		Set<String> allKeys = dynamicTask.getAllKeys();
 		Map<String, String> dialogStateMap = new HashMap<>();
@@ -469,7 +437,9 @@
 	}
 
 	@GetMapping("/snap/{deviceId}/{channelId}")
-	@ApiOperation(value = "璇锋眰鎴浘", notes = "璇锋眰鎴浘")
+	@Operation(summary = "璇锋眰鎴浘")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+	@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
 	public void getSnap(HttpServletResponse resp, @PathVariable String deviceId, @PathVariable String channelId) {
 
 		try {
@@ -489,16 +459,17 @@
 	 * @param count 姣忛〉鏉℃暟
 	 * @return 鍥芥爣璁惧
 	 */
-	@ApiOperation("鏌ヨ鍥芥爣鏍�")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
-			@ApiImplicitParam(name = "parentId", value = "鐖禝D", required = false, dataTypeClass = String.class),
-			@ApiImplicitParam(name = "onlyCatalog", value = "鍙幏鍙栫洰褰�", required = false, dataTypeClass = Boolean.class),
-			@ApiImplicitParam(name="page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
-			@ApiImplicitParam(name="count", value = "姣忛〉鏉℃暟", required = true, dataTypeClass = Integer.class),
-	})
+	@Operation(summary = "鏌ヨ鍥芥爣鏍�")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+	@Parameter(name = "parentId", description = "鐖剁骇鍥芥爣缂栧彿")
+	@Parameter(name = "onlyCatalog", description = "鍙幏鍙栫洰褰�")
+	@Parameter(name = "page", description = "褰撳墠椤�", required = true)
+	@Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
 	@GetMapping("/tree/{deviceId}")
-	public ResponseEntity<PageInfo> getTree(@PathVariable String deviceId, @RequestParam(required = false) String parentId, @RequestParam(required = false) Boolean onlyCatalog, int page, int count){
+	public ResponseEntity<PageInfo> getTree(@PathVariable String deviceId,
+											@RequestParam(required = false) String parentId,
+											@RequestParam(required = false) Boolean onlyCatalog,
+											int page, int count){
 
 
 		if (page <= 0) {
@@ -530,7 +501,6 @@
 		return new ResponseEntity<>(pageInfo,HttpStatus.OK);
 	}
 
-
 	/**
 	 * 鏌ヨ鍥芥爣鏍戜笅鐨勯�氶亾
 	 * @param deviceId 璁惧ID
@@ -539,16 +509,13 @@
 	 * @param count 姣忛〉鏉℃暟
 	 * @return 鍥芥爣璁惧
 	 */
-	@ApiOperation("鏌ヨ鍥芥爣鏍戜笅鐨勯�氶亾")
-	@ApiImplicitParams({
-			@ApiImplicitParam(name = "deviceId", value = "璁惧ID", required = true, dataTypeClass = String.class),
-			@ApiImplicitParam(name = "parentId", value = "鐖禝D", required = false, dataTypeClass = String.class),
-			@ApiImplicitParam(name="page", value = "褰撳墠椤�", required = true, dataTypeClass = Integer.class),
-			@ApiImplicitParam(name="count", value = "姣忛〉鏉℃暟", required = true, dataTypeClass = Integer.class),
-	})
+	@Operation(summary = "鏌ヨ鍥芥爣鏍戜笅鐨勯�氶亾")
+	@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
+	@Parameter(name = "parentId", description = "鐖剁骇鍥芥爣缂栧彿")
+	@Parameter(name = "page", description = "褰撳墠椤�", required = true)
+	@Parameter(name = "count", description = "姣忛〉鏉℃暟", required = true)
 	@GetMapping("/tree/channel/{deviceId}")
 	public ResponseEntity<PageInfo> getChannelInTreeNode(@PathVariable String deviceId, @RequestParam(required = false) String parentId, int page, int count){
-
 
 		if (page <= 0) {
 			page = 1;

--
Gitblit v1.8.0