添加门牌号

src/main/java/com/care/bms/service/DeviceService.java

@@ -88,6 +88,7 @@ public class DeviceService {
             CareHouse house = this.careHouseService.getById(vo.getHouseId());
             if (house!=null){
                 vo.setHouseAddr(house.getAddr());
+                vo.setHouseNumber(house.getHouseNumber());
             }
             QueryWrapper<CareHouseOlderRel> queryWrapper = new QueryWrapper<>();
             queryWrapper.lambda().eq(CareHouseOlderRel::getHouseId,dev.getHouseId());
@@ -187,7 +188,12 @@ public class DeviceService {
         if (device.getHouseId() == null) { //新增
             CareHouse careHouse = new CareHouse();
             careHouse.setAddr(vo.getHouseAddr());
-            careHouse.setName(vo.getHouseAddr());
+            careHouse.setHouseNumber(vo.getHouseNumber());
+            if(StringUtils.isNotEmpty(vo.getHouseNumber())){
+                careHouse.setName(vo.getHouseAddr() + vo.getHouseNumber());
+            } else {
+                careHouse.setName(vo.getHouseAddr());
+            }
             careHouse.setLatitude(vo.getLatitude());
             careHouse.setLongitude(vo.getLongitude());
             careHouse.setCreateTime(new Date());
@@ -199,7 +205,12 @@ public class DeviceService {
         } else { //修改
             CareHouse careHouse = this.careHouseService.getById(device.getHouseId());
             careHouse.setAddr(vo.getHouseAddr());
-            careHouse.setName(vo.getHouseAddr());
+            careHouse.setHouseNumber(vo.getHouseNumber());
+            if(StringUtils.isNotEmpty(vo.getHouseNumber())){
+                careHouse.setName(vo.getHouseAddr() + vo.getHouseNumber());
+            } else {
+                careHouse.setName(vo.getHouseAddr());
+            }
             careHouse.setLatitude(vo.getLatitude());
             careHouse.setLongitude(vo.getLongitude());
             careHouse.setModifyTime(new Date());

src/main/java/com/care/common/vo/device/DeviceVO.java

@@ -31,9 +31,13 @@ public class DeviceVO {
 
     @ApiModelProperty("房屋ID")
     private Long houseId;
+
     @ApiModelProperty("房屋地址")
     private String houseAddr;
 
+    @ApiModelProperty("门牌号")
+    private String houseNumber;
+
     @ApiModelProperty("关联管家ID")
     private Long chambId;
 

src/main/java/com/care/installation/service/DevInstallService.java

@@ -56,6 +56,7 @@ public class DevInstallService {
                 if (careHouse != null) {
                     vo.setHouseId(careDevice.getHouseId());
                     vo.setHouseAddr(careHouse.getAddr());
+                    vo.setHouseNumber(careHouse.getHouseNumber());
                     vo.setLatitude(careHouse.getLatitude());
                     vo.setLongitude(careHouse.getLongitude());
                 }
@@ -99,8 +100,13 @@ public class DevInstallService {
         if(StringUtils.isNotEmpty(vo.getHouseAddr())) {
             CareHouse careHouse = new CareHouse();
             careHouse.setId(vo.getHouseId());
-            careHouse.setName(vo.getHouseAddr());
             careHouse.setAddr(vo.getHouseAddr());
+            careHouse.setHouseNumber(vo.getHouseNumber());
+            if(StringUtils.isNotEmpty(vo.getHouseNumber())){
+                careHouse.setName(vo.getHouseAddr() + vo.getHouseNumber());
+            } else {
+                careHouse.setName(vo.getHouseAddr());
+            }
             careHouse.setLongitude(vo.getLongitude());
             careHouse.setLatitude(vo.getLatitude());
             if(careDevice.getMemberId() != null && careDevice.getMemberId() != 0L){