修改后台的删除住户

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/IUserAccessPermissionsClient.java

@@ -78,6 +78,9 @@ public interface IUserAccessPermissionsClient  {
 	@PostMapping("/deleteFace")
 	R deleteFace(@RequestParam(value = "userId") String userId, @RequestParam(value = "userType") String userType);
 
+	@PostMapping("/deleteFaceAndUserPermission")
+	R deleteFaceAndUserPermission(@RequestParam(value = "userId") String userId, @RequestParam(value = "userType") String userType);
+
 	@PostMapping("/getListByUserAndAddress")
 	List<UserAccessPermissionsVO> getListByUserAndAddress(@RequestParam(value = "userId") String userId, @RequestParam(value = "userType") String userType, @RequestParam(value = "residentialId", required =  false) Long residentialId,
 														  @RequestParam(value = "buildingId", required =  false) Long buildingId, @RequestParam(value = "unitId", required = false) Long unitId

blade-service-api/estate-api/src/main/java/org/springblade/estate/feign/UserAccessPermissionsClientFallback.java

@@ -87,6 +87,11 @@ public class UserAccessPermissionsClientFallback implements IUserAccessPermissio
 		return null;
 	}
 
+	@Override
+	public R deleteFaceAndUserPermission(String userId, String userType) {
+		return null;
+	}
+
 	@Override
 	public List<UserAccessPermissionsVO> getListByUserAndAddress(String userId, String userType, Long residentialId, Long buildingId, Long unitId, Integer permissions) {
 		return null;

blade-service/estate/src/main/java/org/springblade/estate/feign/UserAccessPermissionsClient.java

@@ -123,6 +123,12 @@ public class UserAccessPermissionsClient implements IUserAccessPermissionsClient
 		return userAccessPermissionsService.deleteFace(userId, userType);
 	}
 
+	@Override
+	@PostMapping("/deleteFaceAndUserPermission")
+	public R deleteFaceAndUserPermission(@RequestParam(value = "userId") String userId, @RequestParam(value = "userType") String userType){
+		return userAccessPermissionsService.deleteFaceAndUserPermission(userId, userType);
+	}
+
 	@Override
 	@PostMapping("/getListByUserAndAddress")
 	public List<UserAccessPermissionsVO> getListByUserAndAddress(@RequestParam(value = "userId") String userId, @RequestParam(value = "userType") String userType,

blade-service/estate/src/main/java/org/springblade/estate/service/IUserAccessPermissionsService.java

@@ -71,6 +71,8 @@ public interface IUserAccessPermissionsService extends BaseService<UserAccessPer
 
 	R deleteFace(String userId, String userType);
 
+	R deleteFaceAndUserPermission(String userId, String userType);
+
     List<UserAccessPermissions> listByUser(String userId, String userType);
 
     List<UserAccessPermissionsVO> getListByUserAndAddress(String userId, String userType, Long residentialId, Long buildingId, Long unitId, Integer permissions);

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

@@ -333,6 +333,12 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 		return R.status(true);
 	}
 
+	/**
+	 * 删除权限是人脸的数据
+	 * @param userId
+	 * @param userType
+	 * @return
+	 */
 	@Override
 	public R deleteFace(String userId, String userType) {
 		List<UserAccessPermissions> permissionsList = this.listByUser(userId, userType);
@@ -361,6 +367,37 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 		return R.status(true);
 	}
 
+	/**
+	 * 删除用户所有权限
+	 * @param userId
+	 * @param userType
+	 * @return
+	 */
+	@Override
+	public R deleteFaceAndUserPermission(String userId, String userType){
+		List<UserAccessPermissions> permissionsList = this.listByUser(userId, userType);
+		permissionsList.forEach(permissions -> {
+			if (permissions.getPermissions() == Integer.parseInt(CommonConstant.UserAccessPermissions.FACE_OPEN_DOOR.getValue())){
+				UserDeviceDTO userDeviceDTO = new UserDeviceDTO();
+				userDeviceDTO.setSerialNum(permissions.getDeviceSerialNum());
+				userDeviceDTO.setUserId(userId);
+				userDeviceDTO.setUserType(userType);
+				userDeviceDTO.setDeviceFactory(permissions.getDeviceFactory());
+				userDeviceDTO.setUserName(permissions.getUserName());
+				doorDeviceButtClient.deleteFace(userDeviceDTO);
+			}else {
+				AuthorizeRecordsDTO authorizeRecordsDTO = new AuthorizeRecordsDTO();
+				authorizeRecordsDTO.setDeviceSerialNum(permissions.getDeviceSerialNum());
+				authorizeRecordsDTO.setUserId(userId);
+				authorizeRecordsDTO.setUserType(userType);
+				authorizeRecordsDTO.setTenantId(permissions.getTenantId());
+				authorizeRecordsDTO.setPermissions(permissions.getPermissions());
+				deleteUserAccessPermissions(authorizeRecordsDTO);
+			}
+		});
+		return R.status(true);
+	}
+
 	@Override
 	public List<UserAccessPermissions> listByUser(String userId, String userType) {
 		LambdaQueryWrapper<UserAccessPermissions> lambdaQueryWrapper = new LambdaQueryWrapper<>();

blade-service/person/src/main/java/org/springblade/person/controller/HouseUserController.java

@@ -42,6 +42,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.enterprise.vo.ChartDataVO;
 import org.springblade.enterprise.vo.EnterpriseBizTypePieDataVO;
+import org.springblade.estate.dto.AuthorizeRecordsDTO;
 import org.springblade.estate.dto.UserAccessPermissionsDTO;
 import org.springblade.estate.entity.UserAccessPermissions;
 import org.springblade.estate.feign.IUserAccessPermissionsClient;
@@ -263,14 +264,12 @@ public class HouseUserController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-
 		List<Long> idsList = Arrays.stream(ids.split(",")).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
-		;
 		//批量关联删除
-		List<HouseUser> houseUserList = null;
-		if (idsList != null && idsList.size() > 0) {
-			houseUserList = houseUserService.listByIds(idsList);
-		}
+//		List<HouseUser> houseUserList = null;
+//		if (idsList != null && idsList.size() > 0) {
+//			houseUserList = houseUserService.listByIds(idsList);
+//		}
 		for (Long id : idsList) {
 			QueryWrapper queryWrapper = new QueryWrapper();
 			queryWrapper.eq("parent_id", id);
@@ -280,25 +279,26 @@ public class HouseUserController extends BladeController {
 			adolescentService.getBaseMapper().delete(queryWrapper);
 			aidsService.getBaseMapper().delete(queryWrapper);
 			correctionalStaffService.getBaseMapper().delete(queryWrapper);
-			disablerService.getBaseMapper().delete(queryWrapper);
+//			disablerService.getBaseMapper().delete(queryWrapper);
 			drugService.getBaseMapper().delete(queryWrapper);
-			elderlyPeopleService.getBaseMapper().delete(queryWrapper);
+//			elderlyPeopleService.getBaseMapper().delete(queryWrapper);
 			establishFilecardService.getBaseMapper().delete(queryWrapper);
 			prisonerService.getBaseMapper().delete(queryWrapper);
 			psychiatricService.getBaseMapper().delete(queryWrapper);
 			veteransService.getBaseMapper().delete(queryWrapper);
+
+			//删除
+			userAccessPermissionsClient.deleteFaceAndUserPermission(String.valueOf(id),CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue());
 		}
-		boolean b = houseUserService.deleteLogic(Func.toLongList(ids));
-		if (b) {
-			//下发删除人脸指令
-			if (houseUserList != null && houseUserList.size() > 0) {
-				return userService.pushDelFace(houseUserList, new HashMap<>());
-			} else {
-				return R.status(true);
-			}
-		} else {
-			return R.status(false);
-		}
+		return R.status(houseUserService.deleteLogic(Func.toLongList(ids)));
+			//权限表的数据
+
+//			if (houseUserList != null && houseUserList.size() > 0) {
+//
+//				return userService.pushDelFace(houseUserList, new HashMap<>());
+//			} else {
+//				return R.status(true);
+//			}
 	}
 
 	/**