添加注解 返回默认图片

src/main/java/com/postcard/service/moudle/carrier/service/impl/CarrierInfoServiceImpl.java

@@ -102,8 +102,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
                 sj.add(DataUtil.dealProvince(provinceName, cityName))
                     .add(ObjectUtils.isEmpty(data.getRegionName())?"":data.getRegionName())
                     .add(ObjectUtils.isEmpty(data.getParkName())?"":data.getParkName())
+                    .add(ObjectUtils.isEmpty(data.getBuildingNumber()) ? "":data.getBuildingNumber())
+                    .add("-")
                     .add(ObjectUtils.isEmpty(area) ? "" : NumberUtil.roundStr(area, 0) + "㎡")
-                    .add(ObjectUtils.isEmpty(data.getType())?"":data.getParkName())
+                    .add(ObjectUtils.isEmpty(data.getType())?"":data.getType())
                     .toString();
             name = name.replace("null", "");
             data.setName(name);
@@ -159,8 +161,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
                         sj.add(DataUtil.dealProvince(provinceName, cityName))
                                 .add(ObjectUtils.isEmpty(data.getRegionName())?"":data.getRegionName())
                                 .add(ObjectUtils.isEmpty(data.getParkName())?"":data.getParkName())
+                                .add(ObjectUtils.isEmpty(data.getBuildingNumber()) ? "":data.getBuildingNumber())
+                                .add("-")
                                 .add(ObjectUtils.isEmpty(area) ? "" : NumberUtil.roundStr(area, 0) + "㎡")
-                                .add(ObjectUtils.isEmpty(data.getType())?"":data.getParkName())
+                                .add(ObjectUtils.isEmpty(data.getType())?"":data.getType())
                                 .toString();
                 name = name.replace("null", "");
                 data.setName(name);
@@ -205,11 +209,14 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
       Double area = carrierDetailVo.getArea();
       String name =
           sj.add(DataUtil.dealProvince(provinceName, cityName))
-              .add(carrierParkVo.getRegionName())
-              .add(carrierParkVo.getName())
+              .add(ObjectUtils.isEmpty(carrierParkVo.getRegionName())?"":carrierParkVo.getRegionName())
+              .add(ObjectUtils.isEmpty(carrierParkVo.getName())?"":carrierParkVo.getName())
+              .add(ObjectUtils.isEmpty(carrierParkVo.getBuildingNumber()) ? "":carrierParkVo.getBuildingNumber())
+              .add("-")
               .add(ObjectUtils.isEmpty(area) ? "" : NumberUtil.roundStr(area, 0) + "㎡")
-              .add(carrierDetailVo.getType())
+              .add(ObjectUtils.isEmpty(carrierDetailVo.getType())?"":carrierDetailVo.getType())
               .toString();
+
       name = name.replace("null", "");
       carrierDetailVo.setName(name);
     }

src/main/java/com/postcard/service/moudle/carrier/vo/CarrierPageVo.java

@@ -31,6 +31,8 @@ public class CarrierPageVo {
     private Double area;
     @ApiModelProperty(value = "载体类型")
     private String type;
+    @ApiModelProperty(value = "楼号")
+    private String buildingNumber;
     @ApiModelProperty(value = "图片")
     @JsonSerialize(nullsUsing = DefaultImgUrl.class)
     private String imgUrl;

src/main/java/com/postcard/service/moudle/carrier/vo/CarrierParkVo.java

@@ -71,4 +71,7 @@ public class CarrierParkVo {
 
   @ApiModelProperty(value = "电话")
   private String phone;
+
+  @ApiModelProperty(value = "楼号")
+  private String buildingNumber;
 }