|
|
@@ -119,11 +119,12 @@ public class SecondGoodsReportingServiceImpl implements SecondGoodsReportingServ
|
|
|
secondReportingVo.setReportingTime(lifeNotice.getCreatedTime());
|
|
|
secondReportingVo.setFeedbackTime(lifeNotice.getCreatedTime());
|
|
|
List<Map<String, Object>> list = new ArrayList<>();
|
|
|
- List<String> urlList = Arrays.asList(lifeUserViolation.getReportEvidenceImg().split(","));
|
|
|
+
|
|
|
// 存放已存在文件list
|
|
|
List<String> videoList = new ArrayList<>();
|
|
|
|
|
|
if (lifeUserViolation.getReportContextType().equals("1") || lifeUserViolation.getReportContextType().equals("2") || lifeUserViolation.getReportContextType().equals("3")) {
|
|
|
+ List<String> urlList = Arrays.asList(lifeUserViolation.getReportEvidenceImg().split(","));
|
|
|
for (int i = 0; i < urlList.size(); i++) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
|
@@ -158,7 +159,7 @@ public class SecondGoodsReportingServiceImpl implements SecondGoodsReportingServ
|
|
|
for (int i = 0; i < imgList.size(); i++) {
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
|
- String fileType = urlList.get(i).substring(imgList.get(i).getImgUrl().lastIndexOf(".") + 1);
|
|
|
+ String fileType = imgList.get(i).getImgUrl().substring(imgList.get(i).getImgUrl().lastIndexOf(".") + 1);
|
|
|
|
|
|
if (videoFileType.contains(fileType.toLowerCase())) {
|
|
|
map.put("type", "video");
|
|
|
@@ -166,7 +167,9 @@ public class SecondGoodsReportingServiceImpl implements SecondGoodsReportingServ
|
|
|
map.put("type", "image");
|
|
|
}
|
|
|
map.put("imgUrl", imgList.get(i).getImgUrl());
|
|
|
+ list.add(map);
|
|
|
}
|
|
|
+ secondReportingVo.setVideoFirstFrame(lifeUserViolation.getVideoFirstFrame());
|
|
|
}
|
|
|
|
|
|
secondReportingVo.setImgList(list);
|