Commit d9a598c7 authored by maoying's avatar maoying

修改视频导入

parent 759b2387
...@@ -39,5 +39,11 @@ public class VideoDownloadVO implements Serializable { ...@@ -39,5 +39,11 @@ public class VideoDownloadVO implements Serializable {
@ExcelProperty(value = "关联电力设备编码(多个分号分隔)", index = 8) @ExcelProperty(value = "关联电力设备编码(多个分号分隔)", index = 8)
private String importantEquipmentCodes; private String importantEquipmentCodes;
@ExcelProperty(value = "视频类型(枪机/球机)", index = 9)
private String type;
@ExcelProperty(value = "图片地址", index = 10)
private String img;
} }
package com.yeejoin.equipmanage.common.enums;
/**
* 画布资源枚举
* @author DELL
*
*/
public enum VideoTypeEnum {
gun("枪机", "51000000"),
ball("球机", "52000000");
VideoTypeEnum(String name, String code) {
this.name = name;
this.code = code;
}
private String name;
private String code;
public String getName() {
return name;
}
public String getCode() {
return code;
}
public static String getCode(String name) {
for (VideoTypeEnum c : VideoTypeEnum.values()) {
if (c.getName() == name) {
return c.code;
}
}
return "";
}
}
...@@ -47,6 +47,7 @@ import com.yeejoin.equipmanage.common.entity.vo.VideoDownloadVO; ...@@ -47,6 +47,7 @@ import com.yeejoin.equipmanage.common.entity.vo.VideoDownloadVO;
import com.yeejoin.equipmanage.common.entity.vo.VideoListVo; import com.yeejoin.equipmanage.common.entity.vo.VideoListVo;
import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum; import com.yeejoin.equipmanage.common.enums.EquipmentSpeIndexEnum;
import com.yeejoin.equipmanage.common.enums.IndustryEnum; import com.yeejoin.equipmanage.common.enums.IndustryEnum;
import com.yeejoin.equipmanage.common.enums.VideoTypeEnum;
import com.yeejoin.equipmanage.common.utils.HttpContentTypeUtil; import com.yeejoin.equipmanage.common.utils.HttpContentTypeUtil;
import com.yeejoin.equipmanage.common.utils.StringUtil; import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.fegin.VideoFeignClient; import com.yeejoin.equipmanage.fegin.VideoFeignClient;
...@@ -425,6 +426,9 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements ...@@ -425,6 +426,9 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
video.setCode(x.getCode()); video.setCode(x.getCode());
video.setRemark(x.getRemark()); video.setRemark(x.getRemark());
video.setAddress(x.getAddress()); video.setAddress(x.getAddress());
video.setImg(x.getImg());
video.setType(x.getType());
video.setTypeCode(ObjectUtils.isEmpty(VideoTypeEnum.getCode(x.getType()))?VideoTypeEnum.getCode(x.getType()):"");
videos.add(video); videos.add(video);
this.baseMapper.insert(video); this.baseMapper.insert(video);
// 处理监控和建筑关系 // 处理监控和建筑关系
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment