修改bug

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

@@ -7,11 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.care.common.entity.CareDevice;
+import com.care.common.entity.CareHouse;
 import com.care.common.entity.CareOrganization;
 import com.care.common.entity.CareStation;
 import com.care.common.enums.DeviceActiveStatusEnum;
 import com.care.common.exception.BDException;
 import com.care.common.service.CareDeviceService;
+import com.care.common.service.CareHouseService;
 import com.care.common.service.CareOrganizationService;
 import com.care.common.service.CareStationService;
 import com.care.common.util.RandomCodeUtil;
@@ -41,6 +43,10 @@ public class StationService {
     private CareDeviceService careDeviceService;
     @Resource
     private CareOrganizationService careOrganizationService;
+    @Resource
+    private CareHouseService careHouseService;
+
+
     /**
      * 查询服务站列表
      * @return
@@ -89,6 +95,13 @@ public class StationService {
                 DeviceVO deviceVO = new DeviceVO();
                 BeanUtil.copyProperties(item,deviceVO);
                 deviceVO.setActiveStatusName(DeviceActiveStatusEnum.getCodeToName(deviceVO.getActiveStatus()));
+                CareHouse house = this.careHouseService.getById(deviceVO.getHouseId());
+                if (house!=null){
+                    deviceVO.setHouseAddr(house.getAddr());
+                    deviceVO.setHouseNumber(house.getHouseNumber());
+                    deviceVO.setLatitude(house.getLatitude());
+                    deviceVO.setLongitude(house.getLongitude());
+                }
                 deviceVOList.add(deviceVO);
             });
             vo.setDeviceVOList(deviceVOList);