Merge remote-tracking branch 'origin/master'

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

@@ -109,8 +109,8 @@ public class EstateController {
 								}
 								roomVO.setRelationshipType(user.getType());
 								roomVO.setResidentialId(user.getResidentialId());
-								if (StringUtils.isNotBlank(user.getImageUri())) {
-									roomVO.setImageUri(user.getImageUri());
+								if (StringUtils.isNotBlank(user.getFaceUrl())) {
+									roomVO.setImageUri(user.getFaceUrl());
 								}
 								roomVO.setUserId(user.getId());
 								roomVO.setIdcard(user.getIdCard());

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

@@ -310,14 +310,14 @@ public class HouseUserController {
 						if (OperationConstant.ZERO == Integer.parseInt(operUserType) && OperationConstant.ZERO != Integer.parseInt(type)) {
 							//如果不是审核的业主信息，就直接通过
 							boolean needPushFace = false;
-							if (!user.getImageUri().equals(image_uri)) {
+							if (!user.getFaceUrl().equals(image_uri)) {
 								needPushFace = true;
 							}
 							if(StringUtil.isNotBlank(image_uri)){
-								user.setImageUri(confClient.removePrefix(image_uri));
+								user.setFaceUrl(confClient.removePrefix(image_uri));
 								user.setImageMd5(face_code);
 							}else{
-								user.setImageUri(confClient.removePrefix(user.getImageUri()));
+								user.setFaceUrl(confClient.removePrefix(user.getFaceUrl()));
 							}
 							user.setIdCard(id_card);
 							user.setSex(Integer.parseInt(sex));
@@ -394,7 +394,7 @@ public class HouseUserController {
 					if (StringUtils.isNotEmpty(applyUser1.getImageUri())) {
 						applyUser.setOldImageUri(applyUser1.getImageUri());
 					}else{
-						applyUser.setOldImageUri(user.getImageUri());
+						applyUser.setOldImageUri(user.getFaceUrl());
 					}
 //					applyUser.setId(Long.valueOf(user_id));
 					applyUser.setType(Integer.valueOf(type));
@@ -413,7 +413,7 @@ public class HouseUserController {
 						applyUser.setImageUri(confClient.removePrefix(image_uri));
 						applyUser.setImageMd5(face_code);
 					}else{
-						applyUser.setImageUri(confClient.removePrefix(user.getImageUri()));
+						applyUser.setImageUri(confClient.removePrefix(user.getFaceUrl()));
 						applyUser.setImageMd5(user.getImageMd5());
 					}
 					if (StringUtils.isNotBlank(passport_img_uri)) {
@@ -554,17 +554,17 @@ public class HouseUserController {
 	private void pushFace(HouseUser user, Integer operType) {
 		log.warn("/app/user/editUser-pushFace?userId=" + user.getId());
 
-		if (StringUtils.isNotBlank(user.getImageUri())) {
+		if (StringUtils.isNotBlank(user.getFaceUrl())) {
 			String imgHost = this.confClient.getValueByToken(CommonConstant.SystemConf.FILESERVER.getValue());
 			List<Map<String, Object>> userFaceList = new ArrayList<>(1);
 			Map<String, Object> map = new HashMap<>(3);
 			map.put("imgMd5", user.getImageMd5());
-			String faceUrl = imgHost + user.getImageUri();
+			String faceUrl = imgHost + user.getFaceUrl();
 			map.put("imgSrc", faceUrl);
 			userFaceList.add(map);
 			//  下发人脸-到通用设备
 			UserInfoDto dto = new UserInfoDto();
-			dto.setId(CommonConstant.UserFlag.USER_NUMBER_FLAG.getValue() + user.getId());
+			dto.setId(CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue() + user.getId());
 			dto.setFaceCodeList(userFaceList);
 			dto.setFaceUrl(faceUrl);
 			dto.setBeginDate(user.getFaceBeginDate());

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

@@ -629,7 +629,7 @@ public class MemberController {
 						return hashMap;
 					}
 				}
-				doorDeviceDTO.setUserId(CommonConstant.UserFlag.USER_NUMBER_FLAG.getValue() + user_id);
+				doorDeviceDTO.setUserId(CommonConstant.UserFlag.HOUSE_USER_FLAG.getValue() + user_id);
 			}
 
 			//下发开门指令