|
|
@@ -30,6 +30,7 @@ import org.springblade.device.dto.DispatchTask;
|
|
|
import org.springblade.device.dto.UserInfoDto;
|
|
|
import org.springblade.device.entity.DoorDevice;
|
|
|
import org.springblade.device.feign.IDoorDeviceClient;
|
|
|
+import org.springblade.device.vo.DoorDeviceVO;
|
|
|
import org.springblade.enterprise.entity.Staff;
|
|
|
import org.springblade.enterprise.service.IUserService;
|
|
|
import org.springblade.enterprise.vo.StaffVO;
|
|
|
@@ -100,7 +101,7 @@ public class StaffServiceImpl extends BaseServiceImpl<StaffMapper, Staff> implem
|
|
|
public R pushAddUserFace(Long staffId) {
|
|
|
Staff staff = StaffWrapper.build().entityVO(this.getById(staffId));
|
|
|
if (staff != null) {
|
|
|
- List<DoorDevice> deviceList = doorDeviceClient.getListByAgencyAndResidential(staff.getAgencyId(), staff.getResidentialId());
|
|
|
+ List<DoorDeviceVO> deviceList = doorDeviceClient.getListByAgencyAndResidential(staff.getAgencyId(), staff.getResidentialId());
|
|
|
if(deviceList != null && deviceList.size() > 0){
|
|
|
List<DeviceDTO> deviceDTOList = deviceList.stream().map(item -> {
|
|
|
DeviceDTO deviceDTO = new DeviceDTO();
|
|
|
@@ -129,7 +130,7 @@ public class StaffServiceImpl extends BaseServiceImpl<StaffMapper, Staff> implem
|
|
|
public R pushUpdateUserFace(Long staffId) {
|
|
|
Staff staff = StaffWrapper.build().entityVO(this.getById(staffId));
|
|
|
if (staff != null) {
|
|
|
- List<DoorDevice> deviceList = doorDeviceClient.getListByAgencyAndResidential(staff.getAgencyId(), staff.getResidentialId());
|
|
|
+ List<DoorDeviceVO> deviceList = doorDeviceClient.getListByAgencyAndResidential(staff.getAgencyId(), staff.getResidentialId());
|
|
|
if(deviceList != null && deviceList.size() > 0){
|
|
|
List<DeviceDTO> deviceDTOList = deviceList.stream().map(item -> {
|
|
|
DeviceDTO deviceDTO = new DeviceDTO();
|
|
|
@@ -158,7 +159,7 @@ public class StaffServiceImpl extends BaseServiceImpl<StaffMapper, Staff> implem
|
|
|
public R deleteUserFace(Long staffId) {
|
|
|
Staff staff = this.getById(staffId);
|
|
|
if (staff != null) {
|
|
|
- List<DoorDevice> deviceList = doorDeviceClient.getListByAgencyAndResidential(staff.getAgencyId(), staff.getResidentialId());
|
|
|
+ List<DoorDeviceVO> deviceList = doorDeviceClient.getListByAgencyAndResidential(staff.getAgencyId(), staff.getResidentialId());
|
|
|
if(deviceList != null && deviceList.size() > 0){
|
|
|
List<DeviceDTO> deviceDTOList = deviceList.stream().map(item -> {
|
|
|
DeviceDTO deviceDTO = new DeviceDTO();
|
