1、人脸下发禁用

blade-service-api/estate-api/src/main/java/org/springblade/estate/entity/UserAccessPermissions.java

@@ -105,5 +105,11 @@ public class UserAccessPermissions extends BaseEntity {
 
 		private String tenantId;
 
+	/**
+	 * 设备厂家
+	 */
+	private String deviceFactory;
+
+
 
 }

blade-service/estate/src/main/java/org/springblade/estate/mapper/UserAccessPermissionsMapper.xml

@@ -25,6 +25,7 @@
         <result column="unit_id" property="unitId"/>
         <result column="room_id" property="roomId"/>
         <result column="enterprise_id" property="enterpriseId"/>
+        <result column="device_factory" property="deviceFactory"/>
     </resultMap>
 
 

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

@@ -18,6 +18,7 @@ package org.springblade.estate.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springblade.common.constant.CommonConstant;
@@ -34,6 +35,7 @@ import org.springblade.estate.vo.UserAccessPermissionsVO;
 import org.springblade.estate.mapper.UserAccessPermissionsMapper;
 import org.springblade.estate.service.IUserAccessPermissionsService;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.system.expand.feign.IConfClient;
 import org.springblade.third.doordevice.dto.UserDeviceDTO;
 import org.springblade.third.doordevice.feign.IDoorDeviceButtClient;
 import org.springblade.third.dto.DeviceDTO;
@@ -58,6 +60,8 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 	private IDoorDeviceClient doorDeviceClient;
 	@Autowired
 	private IDoorDeviceButtClient doorDeviceButtClient;
+	@Autowired
+	private IConfClient confClient;
 
 	@Override
 	public IPage<UserAccessPermissionsVO> selectUserAccessPermissionsPage(IPage<UserAccessPermissionsVO> page, UserAccessPermissionsVO userAccessPermissions) {
@@ -73,6 +77,7 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 		}else{
 			permissions = new UserAccessPermissions();
 		}
+		DoorDevice doorDevice = doorDeviceClient.getBySerialNum(authorizeRecordsDTO.getDeviceSerialNum());
 		permissions.setAgencyId(authorizeRecordsDTO.getAgencyId());
 		permissions.setResidentialId(authorizeRecordsDTO.getResidentialId());
 		permissions.setBuildingId(authorizeRecordsDTO.getBuildingId());
@@ -88,6 +93,10 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 		permissions.setDeviceName(authorizeRecordsDTO.getDeviceName());
 		permissions.setDeviceAddress(authorizeRecordsDTO.getDeviceAddress());
 		permissions.setTenantId(authorizeRecordsDTO.getTenantId());
+		permissions.setDeviceFactory(doorDevice.getDeviceFactory());
+		String authReqData = authorizeRecordsDTO.getAuthReqData();
+		JSONObject reqData = JSONObject.parseObject(authReqData);
+		permissions.setUserFace(confClient.removePrefix(reqData.getString("userFaceUrl")));
 		return R.status(saveOrUpdate(permissions));
 	}
 
@@ -164,6 +173,7 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 			UserDeviceDTO userDeviceDTO = new UserDeviceDTO();
 			userDeviceDTO.setSerialNum(deviceSerialNum);
 			userDeviceDTO.setUserId(userId);
+			userDeviceDTO.setDeviceFactory(permissions.getDeviceFactory());
 			doorDeviceButtClient.deleteFace(userDeviceDTO);
 		}
 		return R.status(true);