1

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

@@ -341,7 +341,6 @@ public class HouseUserController {
 									//新旧人脸不一致，要下发人脸
 									pushFace(user, OperationConstant.ONE);
 								}
-
 								hashMap.put("result_code", 1);
 								hashMap.put("result_msg", "修改成功");
 							} else {
@@ -537,33 +536,6 @@ public class HouseUserController {
 		log.warn("/app/user/editUser-pushFace?userId=" + user.getId());
 
 		if (StringUtils.isNotBlank(user.getImageUri())) {
-
-			Map<String, String> logMap = new HashMap<>();
-			//小区
-			if (!StringUtils.isEmpty(user.getResidentialName())) {
-				logMap.put("xqName", user.getResidentialName());
-			} else {
-				logMap.put("xqName", null);
-			}
-			//单元
-			if (!StringUtils.isEmpty(user.getUnitName())) {
-				logMap.put("unitName", user.getUnitName());
-			} else {
-				logMap.put("unitName", null);
-			}
-			//房间
-			if (!StringUtils.isEmpty(user.getRoomName())) {
-				logMap.put("roomName", user.getRoomName());
-			} else {
-				logMap.put("roomName", null);
-			}
-			//用户名
-			if (!StringUtils.isEmpty(user.getName())) {
-				logMap.put("userName", user.getName());
-			} else {
-				logMap.put("userName", null);
-			}
-
 			String imgHost = this.confClient.getValueByToken(CommonConstant.SystemConf.FILESERVER.getValue());
 			List<Map<String, Object>> userFaceList = new ArrayList<>(1);
 			Map<String, Object> map = new HashMap<>(3);
@@ -582,7 +554,7 @@ public class HouseUserController {
 			task.setUnitId(user.getUnitId());
 			task.setXqId(user.getResidentialId());
 			task.setData(dto);
-			this.doorDeviceClient.pushUserFaceToUniversalDevices(task, operType, logMap);
+			this.doorDeviceClient.pushUserFace(task, operType);
 		}
 	}
 

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

@@ -16,6 +16,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.api.ResultCode;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.device.dto.DoorDeviceDTO;
+import org.springblade.device.dto.UserInfoDto;
 import org.springblade.device.entity.DoorDevice;
 import org.springblade.device.feign.IDoorDeviceClient;
 import org.springblade.estate.entity.ApplyUser;
@@ -600,9 +601,9 @@ public class MemberController {
 			}
 
 			//下发开门指令
-			Map<String, Object> openDoorMap = new HashMap<>();
-			openDoorMap.put("userId", user_id);
-			R resultBean = doorDeviceButtClient.remoteOpenDoor(doorDevice, openDoorMap);
+			UserInfoDto userInfoDto = new UserInfoDto();
+			userInfoDto.setId(doorDeviceDTO.getUserId());
+			R resultBean = doorDeviceButtClient.remoteOpenDoor(doorDevice, userInfoDto);
 
 			if (resultBean != null && ResultCode.SUCCESS.getCode() == resultBean.getCode()) {
 				hashMap.put("result_code", 1);