浏览代码

修改后台的删除访客

xuanyan 4 年之前
父节点
当前提交
5d953ee158

+ 3 - 1
blade-service/estate/src/main/java/org/springblade/estate/controller/GuestRecordController.java

@@ -202,7 +202,9 @@ public class GuestRecordController extends BladeController {
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		List<Long> idList = Func.toLongList(ids);
 		for(Long id : idList){
-			return this.guestRecordService.deleteGuestRecord(id);
+			userAccessPermissionsClient.deleteFaceAndUserPermission(String.valueOf(id),CommonConstant.UserFlag.GUEST_FLAG.getValue());
+			guestRecordService.removeById(id);
+//			return this.guestRecordService.deleteGuestRecord(id);
 		}
 		return R.status(true);
 	}

+ 0 - 1
blade-service/estate/src/main/java/org/springblade/estate/service/IGuestRecordService.java

@@ -57,5 +57,4 @@ public interface IGuestRecordService extends BaseService<GuestRecord> {
 
     Integer guestStat(String beginDate, String endDate);
 
-    R deleteGuestRecord(Long id);
 }

+ 0 - 9
blade-service/estate/src/main/java/org/springblade/estate/service/impl/GuestRecordServiceImpl.java

@@ -66,8 +66,6 @@ public class GuestRecordServiceImpl extends BaseServiceImpl<GuestRecordMapper, G
 	private IDoorDeviceClient doorDeviceClient;
 	@Autowired
 	private IDoorDeviceButtClient doorDeviceButtClient;
-	@Autowired
-	private IUserAccessPermissionsService userAccessPermissionsService;
 
 	@Override
 	public IPage<GuestRecordVO> selectGuestPage(IPage<GuestRecordVO> page, GuestRecordVO guest) {
@@ -165,11 +163,4 @@ public class GuestRecordServiceImpl extends BaseServiceImpl<GuestRecordMapper, G
 		return this.count(queryWrapper);
 	}
 
-	@Override
-	public R deleteGuestRecord(Long id) {
-		userAccessPermissionsService.deleteFace(id.toString(), CommonConstant.UserFlag.GUEST_FLAG.getValue());
-		this.removeById(id);
-		return R.status(true);
-	}
-
 }

+ 1 - 1
blade-service/estate/src/main/java/org/springblade/estate/service/impl/UserAccessPermissionsServiceImpl.java

@@ -89,7 +89,7 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 	private IDictBizClient dictBizClient;
 	@Autowired
 	private IHouseUserClient houseUserClient;
-	@Lazy
+	@Autowired
 	private GuestRecordServiceImpl guestRecordService;
 	@Lazy
 	private ServerUserServiceImpl serverUserService;