|
@@ -11,6 +11,7 @@ import com.care.common.entity.CareStation;
|
|
import com.care.common.enums.DeviceActiveStatusEnum;
|
|
import com.care.common.enums.DeviceActiveStatusEnum;
|
|
import com.care.common.exception.BDException;
|
|
import com.care.common.exception.BDException;
|
|
import com.care.common.service.CareDeviceService;
|
|
import com.care.common.service.CareDeviceService;
|
|
|
|
+import com.care.common.service.CareOrganizationService;
|
|
import com.care.common.service.CareStationService;
|
|
import com.care.common.service.CareStationService;
|
|
import com.care.common.util.RandomCodeUtil;
|
|
import com.care.common.util.RandomCodeUtil;
|
|
import com.care.common.vo.PageReqVO;
|
|
import com.care.common.vo.PageReqVO;
|
|
@@ -37,6 +38,8 @@ public class StationService {
|
|
private CareStationService careStationService;
|
|
private CareStationService careStationService;
|
|
@Resource
|
|
@Resource
|
|
private CareDeviceService careDeviceService;
|
|
private CareDeviceService careDeviceService;
|
|
|
|
+ @Resource
|
|
|
|
+ private CareOrganizationService careOrganizationService;
|
|
/**
|
|
/**
|
|
* 查询服务站列表
|
|
* 查询服务站列表
|
|
* @return
|
|
* @return
|
|
@@ -84,6 +87,7 @@ public class StationService {
|
|
vo.setDeviceVOList(deviceVOList);
|
|
vo.setDeviceVOList(deviceVOList);
|
|
vo.setDevCount(deviceVOList.size());
|
|
vo.setDevCount(deviceVOList.size());
|
|
}
|
|
}
|
|
|
|
+ vo.setOrgName(this.careOrganizationService.getById(vo.getOrgId()).getName());
|
|
return vo;
|
|
return vo;
|
|
}
|
|
}
|
|
|
|
|