From 2e60339e0a9db9548d4523399c87ec02cd1fb625 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 25 一月 2022 12:20:52 +0800
Subject: [PATCH] 修复候选通道查询bug
---
src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 c0fafd3..9111844 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
@@ -118,7 +118,6 @@
@ResponseBody
public DeferredResult<ResponseEntity<WVPResult<Object>>> uploadChannelFile(@RequestParam(value = "file") MultipartFile file){
-
// 鏈�澶氬鐞嗘枃浠朵竴涓皬鏃�
DeferredResult<ResponseEntity<WVPResult<Object>>> result = new DeferredResult<>(60*60*1000L);
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
@@ -133,6 +132,23 @@
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("閫氶亾瀵煎叆鏂囦欢绫诲瀷閿欒");
+ 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("宸叉湁瀵煎叆浠诲姟姝ｅ湪鎵ц");
--
Gitblit v1.8.0