修改小程序审核访客

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

@@ -164,6 +164,17 @@ public class GuestRecordController extends BladeController {
 		}
 		guestRecordService.updateById(guestRecord);
 		if(guestRecord.getAuditStatus() == 1){
+			//审核通过下发远程开门和人脸权限
+			UserAccessPermissionsDTO userAccessPermissionsDTO = new UserAccessPermissionsDTO();
+			userAccessPermissionsDTO.setUserId(Func.toStr(guestRecord.getId()));
+			userAccessPermissionsDTO.setUserName(guestRecord.getGuestName());
+			userAccessPermissionsDTO.setUserType(CommonConstant.UserFlag.GUEST_FLAG.getValue());
+			userAccessPermissionsDTO.setTargetType(1);
+			userAccessPermissionsDTO.setResidentialId(guestRecord.getResidentialId());
+			userAccessPermissionsDTO.setUnitId(guestRecord.getUnitId());
+			userAccessPermissionsDTO.setRoomId(guestRecord.getRoomId());
+			userAccessPermissionsDTO.setTenantId(guestRecord.getTenantId());
+			userAccessPermissionsClient.autoPushGuestPermissions(userAccessPermissionsDTO);
 			guestRecordService.pushFace(guestRecord.getId());
 		}else if(guestRecord.getAuditStatus() == 2) {
 			guestRecordService.deleteFace(guestRecord.getId());

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

@@ -289,9 +289,9 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 		ApplyUser applyUser = this.getById(applyUserDTO.getId());
 		if (applyUser.getAuditStatus() == OperationConstant.ZERO) {
 			//更新记录状态
-			applyUserDTO.setFaceUrl(confClient.removePrefix(applyUserDTO.getFaceUrl()));
-			applyUserDTO.setPassportImgUri(confClient.removePrefix(applyUserDTO.getPassportImgUri()));
-			applyUserDTO.setEntryImgUri(confClient.removePrefix(applyUserDTO.getEntryImgUri()));
+			applyUserDTO.setFaceUrl(confClient.removePrefix(applyUser.getFaceUrl()));
+			applyUserDTO.setPassportImgUri(confClient.removePrefix(applyUser.getPassportImgUri()));
+			applyUserDTO.setEntryImgUri(confClient.removePrefix(applyUser.getEntryImgUri()));
 			applyUserDTO.setCheckDate(new Date());
 			boolean applyUpdate = this.updateById(applyUserDTO);
 			if(applyUpdate){
@@ -301,13 +301,14 @@ public class ApplyUserServiceImpl extends BaseServiceImpl<ApplyUserMapper, Apply
 					//申请记录转User
 					HouseUser houseUser = this.applyUserToUser(applyUser);
 					houseUser.setMemberId(applyUser.getMemberId());
-					R r = this.houseUserClient.applySave(houseUser);
-					if(r.isSuccess()){
+					houseUser = this.houseUserClient.saveReturnHouseUser(houseUser);
+					if(null != houseUser){
 						member.setState(OperationConstant.TWO);
 						this.memberClient.update(member);
 						//下发默认开门权限
 						UserAccessPermissionsDTO userAccessPermissionsDTO = new UserAccessPermissionsDTO();
 						userAccessPermissionsDTO.setUserId(Func.toStr(houseUser.getId()));
+						userAccessPermissionsDTO.setUserName(houseUser.getName());
 						userAccessPermissionsDTO.setUserType(CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue());
 						userAccessPermissionsDTO.setTargetType(1);
 						userAccessPermissionsDTO.setResidentialId(houseUser.getResidentialId());

community-app-gateway/src/main/java/org/springblade/app/controller/GuestRecordController.java

@@ -13,13 +13,17 @@ import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.estate.dto.GuestRecordDTO;
+import org.springblade.estate.dto.UserAccessPermissionsDTO;
 import org.springblade.estate.entity.ApplyUser;
 import org.springblade.estate.entity.GuestAuthorize;
 import org.springblade.estate.entity.GuestRecord;
 import org.springblade.estate.feign.IApplyUserClient;
 import org.springblade.estate.feign.IGuestAuthorizeClient;
 import org.springblade.estate.feign.IGuestRecordClient;
+import org.springblade.estate.feign.IUserAccessPermissionsClient;
 import org.springblade.estate.vo.ApplyUserVO;
 import org.springblade.estate.vo.GuestAuthorizeVO;
 import org.springblade.estate.vo.GuestRecordVO;
@@ -41,6 +45,7 @@ public class GuestRecordController {
 	private final IApplyUserClient applyUserClient;
 	private final IGuestRecordClient guestRecordClient;
 	private final IGuestAuthorizeClient guestAuthorizeClient;
+	private final IUserAccessPermissionsClient userAccessPermissionsClient;
 
 
 
@@ -65,7 +70,7 @@ public class GuestRecordController {
 
 	@PostMapping("submit")
 	public R submit(@RequestBody GuestRecord guestRecord){
-		//园区
+		//社区
 		guestRecord.setTenantType(OperationConstant.ZERO);
 		if (Objects.isNull(guestRecord.getId())) {
 			//新增
@@ -89,6 +94,24 @@ public class GuestRecordController {
 			authorizeVO.setGuestTel(guestRecord.getGuestTel());
 			authorizeVO.setGuestName(guestRecord.getGuestName());
 			guestAuthorizeClient.submit(authorizeVO);
+		}else {
+			//修改，审核
+			GuestRecord guestRec = this.guestRecordClient.getById(guestRecord.getId());
+			//下发访客远程开门权限
+			UserAccessPermissionsDTO userAccessPermissionsDTO = new UserAccessPermissionsDTO();
+			userAccessPermissionsDTO.setUserId(Func.toStr(guestRecord.getId()));
+			userAccessPermissionsDTO.setUserName(guestRec.getGuestName());
+			userAccessPermissionsDTO.setUserType(CommonConstant.UserFlag.GUEST_FLAG.getValue());
+			userAccessPermissionsDTO.setTargetType(1);
+			userAccessPermissionsDTO.setResidentialId(guestRec.getResidentialId());
+			userAccessPermissionsDTO.setUnitId(guestRec.getUnitId());
+			userAccessPermissionsDTO.setRoomId(guestRec.getRoomId());
+			userAccessPermissionsDTO.setTenantId(guestRecord.getTenantId());
+			if(guestRecord.getAuditStatus() == 1 && StringUtil.isNotBlank(guestRecord.getFaceUrl())){
+//				R result = this.guestRecordService.pushFace(guestRecord.getId());
+				userAccessPermissionsDTO.setUserFace(guestRecord.getFaceUrl());
+			}
+			userAccessPermissionsClient.autoPushGuestPermissions(userAccessPermissionsDTO);
 		}
 		return R.status(this.guestRecordClient.submit(guestRecord));
 	}