修改禁用人脸

blade-service/estate/src/main/java/org/springblade/estate/controller/UserAccessPermissionsController.java

@@ -73,6 +73,8 @@ public class UserAccessPermissionsController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入userAccessPermissions")
 	public R<IPage<UserAccessPermissionsVO>> list(UserAccessPermissions userAccessPermissions, Query query) {
+		//筛选出permission=3的记录
+		userAccessPermissions.setPermissions(Integer.parseInt(CommonConstant.UserAccessPermissions.FACE_OPEN_DOOR.getValue()));
 		IPage<UserAccessPermissions> pages = userAccessPermissionsService.page(Condition.getPage(query), Condition.getQueryWrapper(userAccessPermissions));
 		return R.data(UserAccessPermissionsWrapper.build().pageVO(pages));
 	}

blade-service/estate/src/main/java/org/springblade/estate/mapper/UserAccessPermissionsMapper.xml

@@ -37,7 +37,7 @@
 
     <delete id="deleteUserAccessPermissions">
         delete from estate_user_access_permissions
-		WHERE device_serial_num = #{authorizeRecords.deviceSerialNum} and user_id = #{authorizeRecords.userId} and tenant_id = #{authorizeRecords.tenantId}
+		WHERE device_serial_num = #{authorizeRecords.deviceSerialNum} and user_id = #{authorizeRecords.userId} and tenant_id = #{authorizeRecords.tenantId} and permissions = #{authorizeRecords.permissions}
     </delete>
 
 </mapper>

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

@@ -103,9 +103,9 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 	public R generateUserAccessPermissions(AuthorizeRecordsDTO authorizeRecordsDTO) {
 		UserAccessPermissions permissions = null;
 		List<UserAccessPermissions> permissionsList = this.getByCondition(authorizeRecordsDTO.getDeviceSerialNum(), authorizeRecordsDTO.getUserId());
-		long facePermissionsCount = permissionsList.stream().filter(p -> p.getPermissions() == 3).count();
-		if (facePermissionsCount > 0) {
-			permissions = permissionsList.get(0);
+		List<UserAccessPermissions> facePermissionsList = permissionsList.stream().filter(p -> p.getPermissions() == 3).collect(Collectors.toList());
+		if (facePermissionsList.size() > 0) {
+			permissions = facePermissionsList.get(0);
 		} else {
 			permissions = new UserAccessPermissions();
 		}
@@ -154,6 +154,25 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 
 	@Override
 	public R deleteUserAccessPermissions(AuthorizeRecordsDTO authorizeRecordsDTO) {
+		//把house_user表的face_enable设为0
+		if (authorizeRecordsDTO.getUserType().equals(CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue())){
+			HouseUser houseUser = new HouseUser();
+			houseUser.setId(Long.parseLong(authorizeRecordsDTO.getUserId()));
+			houseUser.setFaceEnable(0);
+			houseUserClient.updateById(houseUser);
+		}
+		if (authorizeRecordsDTO.getUserType().equals(CommonConstant.UserFlag.GUEST_FLAG.getValue())){
+			GuestRecord guestRecord = new GuestRecord();
+			guestRecord.setId(Long.parseLong(authorizeRecordsDTO.getUserId()));
+			guestRecord.setFaceEnable(0);
+			guestRecordService.updateById(guestRecord);
+		}
+		if (authorizeRecordsDTO.getUserType().equals(CommonConstant.UserFlag.SERVER_USER_FLAG.getValue())){
+			ServerUser serverUser = new ServerUser();
+			serverUser.setId(Long.parseLong(authorizeRecordsDTO.getUserId()));
+			serverUser.setFaceEnable(0);
+			serverUserService.updateById(serverUser);
+		}
 		return R.status(baseMapper.deleteUserAccessPermissions(authorizeRecordsDTO) > 0);
 	}
 
@@ -317,16 +336,28 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 	@Override
 	public R deleteFace(String userId, String userType) {
 		List<UserAccessPermissions> permissionsList = this.listByUser(userId, userType);
-		for (UserAccessPermissions permissions : permissionsList) {
-			String deviceSerialNum = permissions.getDeviceSerialNum();
+		List<UserAccessPermissions> permissions = permissionsList.stream().filter(p -> p.getPermissions() == 3).collect(Collectors.toList());
+		if (permissions.size() > 0){
+			UserAccessPermissions permission = permissions.get(0);
+			String deviceSerialNum = permission.getDeviceSerialNum();
 			UserDeviceDTO userDeviceDTO = new UserDeviceDTO();
 			userDeviceDTO.setSerialNum(deviceSerialNum);
 			userDeviceDTO.setUserId(userId);
 			userDeviceDTO.setUserType(userType);
-			userDeviceDTO.setDeviceFactory(permissions.getDeviceFactory());
-			userDeviceDTO.setUserName(permissions.getUserName());
+			userDeviceDTO.setDeviceFactory(permission.getDeviceFactory());
+			userDeviceDTO.setUserName(permission.getUserName());
 			doorDeviceButtClient.deleteFace(userDeviceDTO);
 		}
+//		for (UserAccessPermissions permissions : permissionsList) {
+//			String deviceSerialNum = permissions.getDeviceSerialNum();
+//			UserDeviceDTO userDeviceDTO = new UserDeviceDTO();
+//			userDeviceDTO.setSerialNum(deviceSerialNum);
+//			userDeviceDTO.setUserId(userId);
+//			userDeviceDTO.setUserType(userType);
+//			userDeviceDTO.setDeviceFactory(permissions.getDeviceFactory());
+//			userDeviceDTO.setUserName(permissions.getUserName());
+//			doorDeviceButtClient.deleteFace(userDeviceDTO);
+//		}
 		return R.status(true);
 	}