From 75ee368c96a3db085c51a6ee32efb3f341a8333e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 25 一月 2022 20:21:36 +0800
Subject: [PATCH] 优化默认节点的展示
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 103 insertions(+), 9 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 0c80d11..3ea207a 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
@@ -4,11 +4,14 @@
import com.alibaba.excel.ExcelReader;
import com.alibaba.excel.read.metadata.ReadSheet;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
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.StreamPushExcelDto;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -18,12 +21,19 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.async.DeferredResult;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
@Api(tags = "鎺ㄦ祦淇℃伅绠＄悊")
@Controller
@@ -38,6 +48,9 @@
@Autowired
private IMediaServerService mediaServerService;
+
+ @Autowired
+ private DeferredResultHolder resultHolder;
@ApiOperation("鎺ㄦ祦鍒楄〃鏌ヨ")
@ApiImplicitParams({
@@ -103,10 +116,60 @@
}
@PostMapping(value = "upload")
@ResponseBody
- public String uploadChannelFile(@RequestParam(value = "file") MultipartFile file){
+ public DeferredResult<ResponseEntity<WVPResult<Object>>> uploadChannelFile(@RequestParam(value = "file") MultipartFile file){
+
+ // 鏈�澶氬鐞嗘枃浠朵竴涓皬鏃�
+ DeferredResult<ResponseEntity<WVPResult<Object>>> result = new DeferredResult<>(60*60*1000L);
+ // 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
+ String key = DeferredResultHolder.UPLOAD_FILE_CHANNEL;
+ String uuid = UUID.randomUUID().toString();
+ logger.info("閫氶亾瀵煎叆鏂囦欢绫诲瀷: {}",file.getContentType() );
if (file.isEmpty()) {
- return "fail";
+ 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() == null) {
+ 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("宸叉湁瀵煎叆浠诲姟姝ｅ湪鎵ц");
+ WVPResult<Object> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("宸叉湁瀵煎叆浠诲姟姝ｅ湪鎵ц");
+ result.setResult(ResponseEntity.status(HttpStatus.TOO_MANY_REQUESTS).body(wvpResult));
+ return result;
+ }
+
+ resultHolder.put(key, uuid, result);
+ result.onTimeout(()->{
+ logger.warn("閫氶亾瀵煎叆瓒呮椂锛屽彲鑳芥枃浠惰繃澶�");
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ WVPResult<Object> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("瀵煎叆瓒呮椂锛屽彲鑳芥枃浠惰繃澶�");
+ msg.setData(wvpResult);
+ resultHolder.invokeAllResult(msg);
+ });
//鑾峰彇鏂囦欢娴�
InputStream inputStream = null;
try {
@@ -115,13 +178,44 @@
} catch (IOException e) {
e.printStackTrace();
}
- //浼犲叆鍙傛暟
- ExcelReader excelReader = EasyExcel.read(inputStream, StreamPushExcelDto.class,
- new StreamPushUploadFileHandler(streamPushService, mediaServerService.getDefaultMediaServer().getId())).build();
- ReadSheet readSheet = EasyExcel.readSheet(0).build();
- excelReader.read(readSheet);
- excelReader.finish();
- return "success";
+ 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