添加门牌号

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

@@ -61,10 +61,6 @@ public class BmsEventOrderService {
     @Resource
     private CareHouseService careHouseService;
     @Resource
-    private CareHouseContactService careHouseContactService;
-    @Resource
-    private CareOlderService careOlderService;
-    @Resource
     private SmsSendService smsSendService;
 
     @Resource
@@ -575,8 +571,9 @@ public class BmsEventOrderService {
         List<CareHouse> houses = Lists.newArrayList();
         CareHouse house = new CareHouse();
         house.setId(1L);
-        house.setName("201室");
-        house.setAddr("北太平庄21号院1单元201室");
+        house.setName("北太平庄21号院1单元201室");
+        house.setAddr("北太平庄21号院1单元");
+        house.setHouseNumber("201室");
         houses.add(house);
         CareEventOrder order = new CareEventOrder();
         order.setOrgId(1L);
@@ -587,7 +584,7 @@ public class BmsEventOrderService {
         order.setDevId(1L);
         order.setDevName("卧室");
         order.setHouseName(house.getName());
-        order.setTitle(house.getAddr());
+        order.setTitle(house.getAddr() + house.getHouseNumber());
         order.setOrderType(OrderTypeEnum.values()[RandomUtil.randomInt(0,4)].getValue());
         order.setStatus("0");
         order.setCreateTime(DateUtil.date());

src/main/java/com/care/common/entity/CareHouse.java

@@ -61,6 +61,9 @@ public class CareHouse implements Serializable {
     @TableField("ADDR")
     private String addr;
 
+    @ApiModelProperty("门牌号")
+    @TableField("HOUSE_NUMBER")
+    private String houseNumber;
 
     @ApiModelProperty("经度")
     @TableField("LONGITUDE")

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

@@ -46,6 +46,8 @@ public class HouseVO implements Serializable {
     @ApiModelProperty("地址")
     private String addr;
 
+    @ApiModelProperty("门牌号")
+    private String houseNumber;
 
     @ApiModelProperty("经度")
     private Double longitude;

src/main/java/com/care/common/vo/order/CareHouseVO.java

@@ -47,6 +47,8 @@ public class CareHouseVO implements Serializable {
     @ApiModelProperty("地址")
     private String addr;
 
+    @ApiModelProperty("门牌号")
+    private String houseNumber;
 
     @ApiModelProperty("经度")
     private Double longitude;

src/main/java/com/care/installation/vo/DeviceInstallationVO.java

@@ -29,6 +29,9 @@ public class DeviceInstallationVO {
     @ApiModelProperty("房屋地址")
     private String houseAddr;
 
+    @ApiModelProperty("门牌号")
+    private String houseNumber;
+
     @ApiModelProperty("经度")
     private Double longitude;
 

src/main/java/com/care/mqtt/service/MqttMsgService.java

@@ -243,7 +243,12 @@ public class MqttMsgService {
       order.setDevName(careDevice.getDevName());
       order.setHouseName(careHouse.getName());
       order.setMemberId(careDevice.getMemberId());
-      order.setTitle(careHouse.getAddr());
+      if(careHouse.getHouseNumber() != null ){
+          order.setTitle(careHouse.getAddr() + careHouse.getHouseNumber());
+      } else {
+          order.setTitle(careHouse.getAddr());
+      }
+
       return order;
   }