Commit 07fb0caf authored by tangwei's avatar tangwei

修改bug

parent 87482ed6
...@@ -18,10 +18,11 @@ public class OrgusrDataxDto { ...@@ -18,10 +18,11 @@ public class OrgusrDataxDto {
@ApiModelProperty(value = "单位基本信息") @ApiModelProperty(value = "单位基本信息")
private OrgUsrzhDto OrgUsrzhDto; private OrgUsrzhDto OrgUsrzhDto;
@ApiModelProperty(value = "现场图片") @ApiModelProperty(value = "消防通道布置图")
private List<String> scenePicture; private List<String> scenePicture;
@ApiModelProperty(value = "平面图") @ApiModelProperty(value = "建筑平面图")
private List<String> planePicture; private List<String> planePicture;
@ApiModelProperty(value = "建筑立面图")
private List<String> facadePicture;
} }
...@@ -845,11 +845,7 @@ public class CommandController extends BaseController { ...@@ -845,11 +845,7 @@ public class CommandController extends BaseController {
buildId = orgUsrzhDto.get(0).getBuildId(); buildId = orgUsrzhDto.get(0).getBuildId();
} }
} }
if (buildId != null) {
//现场照片 待完成,
//平面图。待完成orgUsrzhDto.getBuildId()
if (buildId != null) {
List<Map<String, Object>> list = equipFeignClient.findImgByFileCategory(buildId, "fourImg").getResult(); List<Map<String, Object>> list = equipFeignClient.findImgByFileCategory(buildId, "fourImg").getResult();
List<String> url = new ArrayList<>(); List<String> url = new ArrayList<>();
if (list != null && list.size() > 0) { if (list != null && list.size() > 0) {
...@@ -857,7 +853,26 @@ public class CommandController extends BaseController { ...@@ -857,7 +853,26 @@ public class CommandController extends BaseController {
url.add(map.get("filePath").toString()); url.add(map.get("filePath").toString());
}); });
} }
//通道
List<Map<String, Object>> list1 = equipFeignClient.findImgByFileCategory(buildId, "secondImg").getResult();
List<String> url1 = new ArrayList<>();
if (list1 != null && list1.size() > 0) {
list1.stream().forEach(map -> {
url1.add(map.get("filePath").toString());
});
}
//立面
List<Map<String, Object>> list2 = equipFeignClient.findImgByFileCategory(buildId, "threeImg").getResult();
List<String> url2 = new ArrayList<>();
if (list2 != null && list2.size() > 0) {
list2.stream().forEach(map -> {
url2.add(map.get("filePath").toString());
});
}
orgusrDataxDto.setPlanePicture(url); orgusrDataxDto.setPlanePicture(url);
orgusrDataxDto.setScenePicture(url1);
orgusrDataxDto.setFacadePicture(url2);
} }
return ResponseHelper.buildResponse(orgusrDataxDto); return ResponseHelper.buildResponse(orgusrDataxDto);
} }
......
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