|
@@ -129,31 +129,31 @@ public class HouseResourceMapService {
|
|
|
if (dto.getLeftLng() == null || dto.getRightLng() == null || dto.getLeftLat() == null || dto.getRightLat() == null) {
|
|
|
if ("省本部".equals(dto.getCity())) {
|
|
|
List<GetBuildingMapVo> vo = houseResourceMapMapper.getSbbBuildings(dto);
|
|
|
- vo.forEach(t -> {
|
|
|
+ for (GetBuildingMapVo t : vo) {
|
|
|
String buildingImg = getBuildingImg(t.getBuildingImg());
|
|
|
t.setBuildingImg(buildingImg);
|
|
|
- String siteUrl = getSiteUrl(token, t.getSiteNum());
|
|
|
+ String siteUrl = getSiteUrl(token, t.getSiteNum(), endDate);
|
|
|
t.setSiteUrl(siteUrl);
|
|
|
- });
|
|
|
+ }
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
List<GetBuildingMapVo> vo = houseResourceMapMapper.getBuildingByDistrict(dto);
|
|
|
- vo.forEach(t -> {
|
|
|
+ for (GetBuildingMapVo t : vo) {
|
|
|
String buildingImg = getBuildingImg(t.getBuildingImg());
|
|
|
t.setBuildingImg(buildingImg);
|
|
|
- String siteUrl = getSiteUrl(token, t.getSiteNum());
|
|
|
+ String siteUrl = getSiteUrl(token, t.getSiteNum(), endDate);
|
|
|
t.setSiteUrl(siteUrl);
|
|
|
- });
|
|
|
+ }
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
// 查询坐标范围内的建筑
|
|
|
List<GetBuildingMapVo> vo = houseResourceMapMapper.getBuildingByCoordinate(dto);
|
|
|
- vo.forEach(t -> {
|
|
|
+ for (GetBuildingMapVo t : vo) {
|
|
|
String buildingImg = getBuildingImg(t.getBuildingImg());
|
|
|
t.setBuildingImg(buildingImg);
|
|
|
- String siteUrl = getSiteUrl(token, t.getSiteNum());
|
|
|
+ String siteUrl = getSiteUrl(token, t.getSiteNum(), endDate);
|
|
|
t.setSiteUrl(siteUrl);
|
|
|
- });
|
|
|
+ }
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
|
|
@@ -269,26 +269,28 @@ public class HouseResourceMapService {
|
|
|
dto.setStartDate(startDate);
|
|
|
if ("省本部".equals(dto.getCity())) {
|
|
|
List<GetBuildingOptionsVo> vo = houseResourceMapMapper.getSbbBuildingOptions(dto);
|
|
|
- vo.forEach(t -> {
|
|
|
+ for (GetBuildingOptionsVo t : vo) {
|
|
|
String buildingImg = getBuildingImg(t.getBuildingImg());
|
|
|
t.setBuildingImg(buildingImg);
|
|
|
- String siteUrl = getSiteUrl(token, t.getSiteNum());
|
|
|
+ String siteUrl = getSiteUrl(token, t.getSiteNum(), endDate);
|
|
|
t.setSiteUrl(siteUrl);
|
|
|
- });
|
|
|
+ }
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
List<GetBuildingOptionsVo> vo = houseResourceMapMapper.getBuildingOptions(dto);
|
|
|
- vo.forEach(t -> {
|
|
|
+ for (GetBuildingOptionsVo t : vo) {
|
|
|
String buildingImg = getBuildingImg(t.getBuildingImg());
|
|
|
t.setBuildingImg(buildingImg);
|
|
|
- String siteUrl = getSiteUrl(token, t.getSiteNum());
|
|
|
+ String siteUrl = getSiteUrl(token, t.getSiteNum(), endDate);
|
|
|
t.setSiteUrl(siteUrl);
|
|
|
- });
|
|
|
+ }
|
|
|
return R.ok(vo);
|
|
|
}
|
|
|
|
|
|
- private String getSiteUrl(String token, String siteNum) {
|
|
|
- return housePages.getSiteUrl() + "?data=" + token + "&building_address_number=" + siteNum;
|
|
|
+ private String getSiteUrl(String token, String siteNum, Integer endDate) {
|
|
|
+ String endDateString = endDate == null ? "" : endDate.toString();
|
|
|
+ return housePages.getSiteUrl() + "?data=" + token + "&statistical_month=" + endDateString
|
|
|
+ + "&building_address_number=" + siteNum;
|
|
|
}
|
|
|
|
|
|
private String getBuildingImg(String buildingImg) {
|