From 0191e937683b194733c7d4bcc1ba2d40099b8917 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 23 二月 2022 21:55:46 +0800
Subject: [PATCH] 同步主线
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 120 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 81 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
index 9111844..36545b3 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java
@@ -10,6 +10,7 @@
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.service.impl.StreamPushUploadFileHandler;
+import com.genersoft.iot.vmp.vmanager.bean.BatchGBStreamParam;
import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
@@ -24,6 +25,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
import org.springframework.web.multipart.MultipartFile;
@@ -57,16 +59,24 @@
@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="pushing", value = "鏄惁姝ｅ湪鎺ㄦ祦", dataTypeClass = Boolean.class),
+ @ApiImplicitParam(name="mediaServerId", value = "娴佸獟浣揑D", dataTypeClass = String.class),
})
@GetMapping(value = "/list")
@ResponseBody
public PageInfo<StreamPushItem> list(@RequestParam(required = false)Integer page,
@RequestParam(required = false)Integer count,
@RequestParam(required = false)String query,
- @RequestParam(required = false)Boolean online ){
+ @RequestParam(required = false)Boolean pushing,
+ @RequestParam(required = false)String mediaServerId ){
- PageInfo<StreamPushItem> pushList = streamPushService.getPushList(page, count);
+ if (StringUtils.isEmpty(query)) {
+ query = null;
+ }
+ if (StringUtils.isEmpty(mediaServerId)) {
+ mediaServerId = null;
+ }
+ PageInfo<StreamPushItem> pushList = streamPushService.getPushList(page, count, query, pushing, mediaServerId);
return pushList;
}
@@ -107,13 +117,32 @@
})
@PostMapping(value = "/stop")
@ResponseBody
- public Object removeFormGB(@RequestParam(required = true)String app, @RequestParam(required = true)String streamId){
+ public Object stop(String app, String streamId){
if (streamPushService.stop(app, streamId)){
return "success";
}else {
return "fail";
}
}
+
+ @ApiOperation("涓澶氫釜鎺ㄦ祦")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "app", value = "搴旂敤鍚�", required = true, dataTypeClass = String.class),
+ @ApiImplicitParam(name = "streamId", value = "娴両D", required = true, dataTypeClass = String.class),
+ })
+ @DeleteMapping(value = "/batchStop")
+ @ResponseBody
+ public Object batchStop(@RequestBody BatchGBStreamParam batchGBStreamParam){
+ if (batchGBStreamParam.getGbStreams().size() == 0) {
+ return "fail";
+ }
+ if (streamPushService.batchStop(batchGBStreamParam.getGbStreams())){
+ return "success";
+ }else {
+ return "fail";
+ }
+ }
+
@PostMapping(value = "upload")
@ResponseBody
public DeferredResult<ResponseEntity<WVPResult<Object>>> uploadChannelFile(@RequestParam(value = "file") MultipartFile file){
@@ -123,7 +152,7 @@
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
String key = DeferredResultHolder.UPLOAD_FILE_CHANNEL;
String uuid = UUID.randomUUID().toString();
-
+ logger.info("閫氶亾瀵煎叆鏂囦欢绫诲瀷: {}",file.getContentType() );
if (file.isEmpty()) {
logger.warn("閫氶亾瀵煎叆鏂囦欢涓虹┖");
WVPResult<Object> wvpResult = new WVPResult<>();
@@ -139,16 +168,16 @@
result.setResult(ResponseEntity.status(HttpStatus.BAD_REQUEST).body(wvpResult));
return result;
}
- if (!file.getContentType().endsWith(".xls")
- && !file.getContentType().endsWith(".csv")
- && !file.getContentType().endsWith(".xlsx") ) {
- logger.warn("閫氶亾瀵煎叆鏂囦欢绫诲瀷閿欒");
- WVPResult<Object> wvpResult = new WVPResult<>();
- wvpResult.setCode(-1);
- wvpResult.setMsg("鏂囦欢绫诲瀷閿欒锛岃浣跨敤");
- result.setResult(ResponseEntity.status(HttpStatus.BAD_REQUEST).body(wvpResult));
- return result;
- }
+// if (!file.getContentType().endsWith(".xls")
+// && !file.getContentType().endsWith(".csv")
+// && !file.getContentType().endsWith(".xlsx") ) {
+// logger.warn("閫氶亾瀵煎叆鏂囦欢绫诲瀷閿欒: {}",file.getContentType() );
+// WVPResult<Object> wvpResult = new WVPResult<>();
+// wvpResult.setCode(-1);
+// wvpResult.setMsg("鏂囦欢绫诲瀷閿欒锛岃浣跨敤");
+// result.setResult(ResponseEntity.status(HttpStatus.BAD_REQUEST).body(wvpResult));
+// return result;
+// }
// 鍚屾椂鍙鐞嗕竴涓枃浠�
if (resultHolder.exist(key, null)) {
logger.warn("宸叉湁瀵煎叆浠诲姟姝ｅ湪鎵ц");
@@ -178,30 +207,43 @@
} catch (IOException e) {
e.printStackTrace();
}
- //浼犲叆鍙傛暟
- ExcelReader excelReader = EasyExcel.read(inputStream, StreamPushExcelDto.class,
- new StreamPushUploadFileHandler(streamPushService, mediaServerService.getDefaultMediaServer().getId(), (errorStreams, errorGBs)->{
- logger.info("閫氶亾瀵煎叆鎴愬姛锛屽瓨鍦ㄩ噸澶岮pp+Stream涓簕}涓紝瀛樺湪鍥芥爣ID涓簕}涓�", errorStreams.size(), errorGBs.size());
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- WVPResult<Map<String, List<String>>> wvpResult = new WVPResult<>();
- if (errorStreams.size() == 0 && errorGBs.size() == 0) {
- wvpResult.setCode(0);
- wvpResult.setMsg("鎴愬姛");
- }else {
- wvpResult.setCode(1);
- wvpResult.setMsg("瀵煎叆鎴愬姛銆備絾鏄瓨鍦ㄩ噸澶嶆暟鎹�");
- Map<String, List<String>> errorData = new HashMap<>();
- errorData.put("gbId", errorGBs);
- errorData.put("stream", errorStreams);
- wvpResult.setData(errorData);
- }
- msg.setData(wvpResult);
- resultHolder.invokeAllResult(msg);
- })).build();
- ReadSheet readSheet = EasyExcel.readSheet(0).build();
- excelReader.read(readSheet);
- excelReader.finish();
+ try {
+ //浼犲叆鍙傛暟
+ ExcelReader excelReader = EasyExcel.read(inputStream, StreamPushExcelDto.class,
+ new StreamPushUploadFileHandler(streamPushService, mediaServerService.getDefaultMediaServer().getId(), (errorStreams, errorGBs)->{
+ logger.info("閫氶亾瀵煎叆鎴愬姛锛屽瓨鍦ㄩ噸澶岮pp+Stream涓簕}涓紝瀛樺湪鍥芥爣ID涓簕}涓�", errorStreams.size(), errorGBs.size());
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ WVPResult<Map<String, List<String>>> wvpResult = new WVPResult<>();
+ if (errorStreams.size() == 0 && errorGBs.size() == 0) {
+ wvpResult.setCode(0);
+ wvpResult.setMsg("鎴愬姛");
+ }else {
+ wvpResult.setCode(1);
+ wvpResult.setMsg("瀵煎叆鎴愬姛銆備絾鏄瓨鍦ㄩ噸澶嶆暟鎹�");
+ Map<String, List<String>> errorData = new HashMap<>();
+ errorData.put("gbId", errorGBs);
+ errorData.put("stream", errorStreams);
+ wvpResult.setData(errorData);
+ }
+ msg.setData(wvpResult);
+ resultHolder.invokeAllResult(msg);
+ })).build();
+ ReadSheet readSheet = EasyExcel.readSheet(0).build();
+ excelReader.read(readSheet);
+ excelReader.finish();
+ }catch (Exception e) {
+ logger.warn("閫氶亾瀵煎叆澶辫触锛�", e);
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ WVPResult<Object> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("閫氶亾瀵煎叆澶辫触: " + e.getMessage() );
+ msg.setData(wvpResult);
+ resultHolder.invokeAllResult(msg);
+ }
+
+
return result;
}
--
Gitblit v1.8.0