修复候选通道查询bug

src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java

@@ -118,7 +118,6 @@ public class StreamPushController {
     @ResponseBody
     public DeferredResult<ResponseEntity<WVPResult<Object>>> uploadChannelFile(@RequestParam(value = "file") MultipartFile file){
 
-
         // 最多处理文件一个小时
         DeferredResult<ResponseEntity<WVPResult<Object>>> result = new DeferredResult<>(60*60*1000L);
         // 录像查询以channelId作为deviceId查询
@@ -133,6 +132,23 @@ public class StreamPushController {
             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("已有导入任务正在执行");