修改

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

@@ -81,4 +81,7 @@ public interface IUserAccessPermissionsClient  {
 	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
 										, @RequestParam(value = "permissions", required = false) Integer permissions);
+
+	@PostMapping("/autoPushPermissions")
+	R autoPushPermissions(@RequestBody UserAccessPermissionsDTO userAccessPermissionsDTO);
 }

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

@@ -92,4 +92,9 @@ public class UserAccessPermissionsClientFallback implements IUserAccessPermissio
 		return null;
 	}
 
+	@Override
+	public R autoPushPermissions(UserAccessPermissionsDTO userAccessPermissionsDTO) {
+		return null;
+	}
+
 }

blade-service/device/src/main/java/org/springblade/device/controller/DoorDeviceController.java

@@ -106,6 +106,7 @@ public class DoorDeviceController extends BladeController {
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "新增", notes = "传入doorDevice")
 	public R save(@Valid @RequestBody DoorDevice doorDevice) {
+		doorDevice.setDeviceFactory("zongheng");
 		return R.status(doorDeviceService.save(doorDevice));
 	}
 
@@ -148,6 +149,7 @@ public class DoorDeviceController extends BladeController {
 			List<DoorDevice> deviceList = doorDeviceService.list(lambdaQueryWrapper);
 			Assert.isTrue(deviceList.size() == 0,"设备序列号已存在");
 		}
+		doorDevice.setDeviceFactory("zongheng");
 		doorDeviceService.saveOrUpdate(doorDevice);
 //		if(saveOrUpdate && isNewDoorDevice){
 //			doorDeviceButtClient.addDevices(Arrays.asList(doorDevice));

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

@@ -131,5 +131,9 @@ public class UserAccessPermissionsClient implements IUserAccessPermissionsClient
 		return userAccessPermissionsService.getListByUserAndAddress(userId, userType, residentialId, buildingId, unitId, permissions);
 	}
 
-
+	@Override
+	@PostMapping("/autoPushPermissions")
+	public R autoPushPermissions(@RequestBody UserAccessPermissionsDTO userAccessPermissionsDTO){
+		return userAccessPermissionsService.autoPushPermissions(userAccessPermissionsDTO);
+	}
 }

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

@@ -39,6 +39,7 @@ import org.springblade.estate.dto.AuthorizeRecordsDTO;
 import org.springblade.estate.dto.UserAccessPermissionsDTO;
 import org.springblade.estate.entity.AuthorizeRecords;
 import org.springblade.estate.entity.UserAccessPermissions;
+import org.springblade.estate.feign.IUserAccessPermissionsClient;
 import org.springblade.estate.vo.UserAccessPermissionsVO;
 import org.springblade.estate.mapper.UserAccessPermissionsMapper;
 import org.springblade.estate.service.IUserAccessPermissionsService;
@@ -115,6 +116,8 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 		String authReqData = authorizeRecordsDTO.getAuthReqData();
 		JSONObject reqData = JSONObject.parseObject(authReqData);
 		permissions.setUserFace(confClient.removePrefix(reqData.getString("userFaceUrl")));
+		//把house_user表的face_enable设为1
+
 		return R.status(saveOrUpdate(permissions));
 	}
 

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.UserAccessPermissionsDTO;
 import org.springblade.estate.feign.IUserAccessPermissionsClient;
 import org.springblade.person.dto.HouseUserDTO;
 import org.springblade.person.entity.*;
@@ -163,6 +164,19 @@ public class HouseUserController extends BladeController {
 		boolean save = houseUserService.save(houseUser);
 		if (save) {
 			houseUserService.submitUserTags(houseUser);
+			Residential residential = residentialClient.getById(houseUser.getResidentialId());
+			//下发默认开门权限
+			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());
+			userAccessPermissionsDTO.setUnitId(houseUser.getUnitId());
+			userAccessPermissionsDTO.setRoomId(houseUser.getRoomId());
+//			userAccessPermissionsDTO.setUserFace(faceUrl);
+			userAccessPermissionsDTO.setTenantId(residential.getTenantId());
+			userAccessPermissionsClient.autoPushPermissions(userAccessPermissionsDTO);
 		}
 		return R.status(save);
 

blade-service/person/src/main/java/org/springblade/person/service/impl/HouseUserServiceImpl.java

@@ -30,12 +30,15 @@ import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.device.dto.DispatchTask;
 import org.springblade.device.dto.UserInfoDto;
 import org.springblade.device.feign.IDoorDeviceClient;
+import org.springblade.estate.dto.UserAccessPermissionsDTO;
 import org.springblade.estate.entity.ApplyUser;
 import org.springblade.estate.feign.IApplyUserClient;
+import org.springblade.estate.feign.IUserAccessPermissionsClient;
 import org.springblade.estate.vo.ApplyUserVO;
 import org.springblade.person.dto.HouseUserDTO;
 import org.springblade.person.entity.*;
@@ -86,6 +89,7 @@ public class HouseUserServiceImpl extends BaseServiceImpl<HouseUserMapper, House
 	private final IPsychiatricService psychiatricService;
 	private final IVeteransService veteransService;
 	private final IAllowancesPeopleService allowancesPeopleService;
+	private final IUserAccessPermissionsClient userAccessPermissionsClient;
 
 	@Autowired
 	public HouseUserServiceImpl(ICommunityClient communityClient,IApplyUserClient applyUserClient,IMemberClient memberClient,
@@ -93,7 +97,7 @@ public class HouseUserServiceImpl extends BaseServiceImpl<HouseUserMapper, House
 		, IBuildingClient buildingClient, IUnitClient unitClient, IFloorClient floorClient, IRoomClient roomClient
 		, IElderlyPeopleService elderlyPeopleService, IKeyPeopleService keyPeopleService, IDisablerService disablerService, IDrugService drugService, IAdolescentService adolescentService
 		, IAidsService aidsService, ICorrectionalStaffService correctionalStaffService, IFertileWomanService fertileWomanService, IPrisonerService prisonerService
-		, IPsychiatricService psychiatricService, IVeteransService veteransService, IAllowancesPeopleService allowancesPeopleService, IEstablishFilecardService establishFilecardService){
+		, IPsychiatricService psychiatricService, IVeteransService veteransService, IAllowancesPeopleService allowancesPeopleService, IEstablishFilecardService establishFilecardService, IUserAccessPermissionsClient userAccessPermissionsClient){
 		this.communityClient = communityClient;
 		this.applyUserClient = applyUserClient;
 		this.memberClient = memberClient;
@@ -118,6 +122,7 @@ public class HouseUserServiceImpl extends BaseServiceImpl<HouseUserMapper, House
 		this.psychiatricService = psychiatricService;
 		this.veteransService = veteransService;
 		this.allowancesPeopleService = allowancesPeopleService;
+		this.userAccessPermissionsClient = userAccessPermissionsClient;
 	}
 
 	@Override
@@ -202,6 +207,18 @@ public class HouseUserServiceImpl extends BaseServiceImpl<HouseUserMapper, House
 		boolean saveOrUpdate = this.saveOrUpdate(houseUserDTO);
 		if(saveOrUpdate){
 			submitUserTags(houseUserDTO);
+			//下发默认开门权限
+			UserAccessPermissionsDTO userAccessPermissionsDTO = new UserAccessPermissionsDTO();
+			userAccessPermissionsDTO.setUserId(Func.toStr(houseUserDTO.getId()));
+			userAccessPermissionsDTO.setUserName(houseUserDTO.getName());
+			userAccessPermissionsDTO.setUserType(CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue());
+			userAccessPermissionsDTO.setTargetType(1);
+			userAccessPermissionsDTO.setResidentialId(houseUserDTO.getResidentialId());
+			userAccessPermissionsDTO.setUnitId(houseUserDTO.getUnitId());
+			userAccessPermissionsDTO.setRoomId(houseUserDTO.getRoomId());
+//			userAccessPermissionsDTO.setUserFace(houseUserDTO.getFaceUrl());
+			userAccessPermissionsDTO.setTenantId(residential.getTenantId());
+			userAccessPermissionsClient.autoPushPermissions(userAccessPermissionsDTO);
 		}
 		return R.status(saveOrUpdate);
 //		if (saveOrUpdate) {

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

@@ -182,8 +182,8 @@ public class MemberController {
 			String tel = map.get("tel");
 			String verify_code = map.get("verify_code");
 			String openid = map.get("openid");
-			String idCard = map.get("idCard");
-			Assert.notNull(idCard,"身份证不能为空");
+			String idCard = map.get("idcard");
+//			Assert.notNull(idCard,"身份证不能为空");
 			if (StringUtils.isBlank(name)) {
 				hashMap.put("result_msg", "姓名不能为空");
 				return hashMap;
@@ -200,6 +200,10 @@ public class MemberController {
 				hashMap.put("result_msg", "openid不能为空");
 				return hashMap;
 			}
+			if (StringUtils.isBlank(idCard)){
+				hashMap.put("result_msg", "身份证不能为空");
+				return hashMap;
+			}
 			//获取存在redis上的验证码
 //			String key = VERIFICATION_CODE + tel;
 //			String redis_verify_code = this.redisTemplate.opsForValue().get(key);