修改视频导入功能

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/VideoDownloadVO.java

@@ -13,10 +13,10 @@ import java.io.Serializable;
  */
 @Data
 public class VideoDownloadVO implements Serializable {
-    @ExcelProperty(value = "名称", index = 0)
+    @ExcelProperty(value = "名称(必填)", index = 0)
     private String name;
 
-    @ExcelProperty(value = "编号", index = 1)
+    @ExcelProperty(value = "编号(必填)", index = 1)
     private String code;
 
     @ExcelProperty(value = "视频地址", index = 2)
@@ -31,7 +31,7 @@ public class VideoDownloadVO implements Serializable {
     @ExcelProperty(value = "关联消防设备编码(多个分号分隔)", index = 5)
     private String equipmentSpecificCodes;
 
-    @ExcelProperty(value = "详细地址", index = 6)
+    @ExcelProperty(value = "详细地址(必填)", index = 6)
     private String address;
 
     @ExcelProperty(value = "备注", index = 7)
@@ -40,7 +40,7 @@ public class VideoDownloadVO implements Serializable {
     @ExcelProperty(value = "关联电力设备编码(多个分号分隔)", index = 8)
     private String importantEquipmentCodes;
     
-    @ExcelProperty(value = "视频类型(枪机/球机)", index = 9)
+    @ExcelProperty(value = "视频类型(枪机/球机)(必填)", index = 9)
     private String type;
     
     @ExcelProperty(value = "图片地址", index = 10)

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/VideoServiceImpl.java

@@ -404,7 +404,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
             VideoDownloadVO x = videoDownloadVOS.get(i);
             // 数据校验
             if (ValidationUtil.isEmpty(x.getName()) || ValidationUtil.isEmpty(x.getCode())
-                    || ValidationUtil.isEmpty(x.getUrl()) || ValidationUtil.isEmpty(x.getToken())
+//                    || ValidationUtil.isEmpty(x.getUrl()) || ValidationUtil.isEmpty(x.getToken())
                     || ValidationUtil.isEmpty(x.getAddress())) {
                 throw new RuntimeException("错误行" + rowNum + "：请检查非空字段");
             }
@@ -428,7 +428,7 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
             video.setAddress(x.getAddress());
             video.setImg(x.getImg());
             video.setType(x.getType());
-            video.setTypeCode(ObjectUtils.isEmpty(VideoTypeEnum.getCode(x.getType()))?VideoTypeEnum.getCode(x.getType()):"");
+            video.setTypeCode(!ObjectUtils.isEmpty(VideoTypeEnum.getCode(x.getType()))?VideoTypeEnum.getCode(x.getType()):"");
             videos.add(video);
             this.baseMapper.insert(video);
             // 处理监控和建筑关系