1、用户人脸权限获取接口

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

@@ -92,6 +92,11 @@ public class UserAccessPermissions extends BaseEntity {
 	*/
 		@ApiModelProperty(value = "单元ID")
 		private Long unitId;
+	/**
+	 * 楼层ID
+	 */
+	@ApiModelProperty(value = "楼层ID")
+	private Long floorId;
 	/**
 	* 房间ID
 	*/

blade-service-api/estate-api/src/main/java/org/springblade/estate/vo/UserAccessPermissionsVO.java

@@ -33,4 +33,12 @@ import io.swagger.annotations.ApiModel;
 public class UserAccessPermissionsVO extends UserAccessPermissions {
 	private static final long serialVersionUID = 1L;
 
+	private String agencyName;
+	private String residentialName;
+	private String buildingName;
+	private String unitName;
+	private String roomName;
+	private String enterpriseName;
+	private String floorName;
+
 }

blade-service/device/src/main/java/org/springblade/device/wrapper/DoorDeviceWrapper.java

@@ -116,13 +116,6 @@ public class DoorDeviceWrapper extends BaseEntityWrapper<DoorDevice, DoorDeviceV
 			}
 		}
 
-		if (!Objects.isNull(doorDevice.getFloorId())) {
-			Floor floor = floorClient.getById(doorDevice.getFloorId());
-			if (!Objects.isNull(floor)) {
-				doorDeviceVO.setFloorName(floor.getName());
-			}
-		}
-
 		return doorDeviceVO;
 	}
 

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

@@ -39,6 +39,8 @@ import org.springblade.estate.wrapper.UserAccessPermissionsWrapper;
 import org.springblade.estate.service.IUserAccessPermissionsService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.List;
+
 /**
  *  控制器
  *
@@ -143,12 +145,23 @@ public class UserAccessPermissionsController extends BladeController {
 	 * 禁用/删除人脸权限
 	 */
 	@PostMapping("/deleteFace")
-	@ApiOperationSupport(order = 8)
+	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "禁用/删除人脸权限")
 	public R deleteFace(@RequestBody UserAccessPermissionsDTO userAccessPermissionsDTO) {
 		R result = userAccessPermissionsService.deleteFace(userAccessPermissionsDTO);
 		return result;
 	}
 
+	/**
+	 * 获取个人权限列表
+	 */
+	@PostMapping("/listByUser")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "获取个人权限列表")
+	public R listByUser(@RequestBody UserAccessPermissionsDTO userAccessPermissionsDTO) {
+		List<UserAccessPermissions> userAccessPermissions = userAccessPermissionsService.listByUser(userAccessPermissionsDTO.getUserId(), userAccessPermissionsDTO.getUserType());
+		return R.data(userAccessPermissions);
+	}
+
 
 }

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

@@ -23,6 +23,7 @@
         <result column="residential_id" property="residentialId"/>
         <result column="building_id" property="buildingId"/>
         <result column="unit_id" property="unitId"/>
+        <result column="floor_id" property="floorId"/>
         <result column="room_id" property="roomId"/>
         <result column="enterprise_id" property="enterpriseId"/>
         <result column="device_factory" property="deviceFactory"/>

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

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.device.entity.DoorDevice;
 import org.springblade.device.feign.IDoorDeviceClient;
 import org.springblade.enterprise.entity.Staff;
@@ -183,7 +184,7 @@ public class UserAccessPermissionsServiceImpl extends BaseServiceImpl<UserAccess
 	public List<UserAccessPermissions> listByUser(String userId, String userType) {
 		LambdaQueryWrapper<UserAccessPermissions> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(UserAccessPermissions::getUserId, userId);
-		lambdaQueryWrapper.eq(UserAccessPermissions::getUserType, userType);
+		lambdaQueryWrapper.eq(StringUtil.isNotBlank(userType), UserAccessPermissions::getUserType, userType);
 		lambdaQueryWrapper.orderByDesc(UserAccessPermissions::getCreateTime);
 		return this.list(lambdaQueryWrapper);
 	}

blade-service/estate/src/main/java/org/springblade/estate/wrapper/UserAccessPermissionsWrapper.java

@@ -16,10 +16,14 @@
  */
 package org.springblade.estate.wrapper;
 
+import org.springblade.community.entity.*;
+import org.springblade.community.feign.*;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.estate.entity.UserAccessPermissions;
 import org.springblade.estate.vo.UserAccessPermissionsVO;
+
 import java.util.Objects;
 
 /**
@@ -30,6 +34,23 @@ import java.util.Objects;
  */
 public class UserAccessPermissionsWrapper extends BaseEntityWrapper<UserAccessPermissions, UserAccessPermissionsVO>  {
 
+	private static IAgencyClient agencyClient;
+	private static IResidentialClient residentialClient;
+	private static IBuildingClient buildingClient;
+	private static IUnitClient unitClient;
+	private static IFloorClient floorClient;
+	private static IRoomClient roomClient;
+
+	static {
+		agencyClient = SpringUtil.getBean(IAgencyClient.class);
+		residentialClient = SpringUtil.getBean(IResidentialClient.class);
+		buildingClient = SpringUtil.getBean(IBuildingClient.class);
+		unitClient = SpringUtil.getBean(IUnitClient.class);
+		floorClient = SpringUtil.getBean(IFloorClient.class);
+		roomClient = SpringUtil.getBean(IRoomClient.class);
+		floorClient = SpringUtil.getBean(IFloorClient.class);
+	}
+
 	public static UserAccessPermissionsWrapper build() {
 		return new UserAccessPermissionsWrapper();
  	}
@@ -37,11 +58,43 @@ public class UserAccessPermissionsWrapper extends BaseEntityWrapper<UserAccessPe
 	@Override
 	public UserAccessPermissionsVO entityVO(UserAccessPermissions userAccessPermissions) {
 		UserAccessPermissionsVO userAccessPermissionsVO = Objects.requireNonNull(BeanUtil.copy(userAccessPermissions, UserAccessPermissionsVO.class));
+		if (userAccessPermissionsVO.getAgencyId()!=null) {
+			Agency agency = agencyClient.getById(userAccessPermissionsVO.getAgencyId());
+			if (agency!=null) {
+				userAccessPermissionsVO.setAgencyName(agency.getName());
+			}
+		}
 
-		//User createUser = UserCache.getUser(userAccessPermissions.getCreateUser());
-		//User updateUser = UserCache.getUser(userAccessPermissions.getUpdateUser());
-		//userAccessPermissionsVO.setCreateUserName(createUser.getName());
-		//userAccessPermissionsVO.setUpdateUserName(updateUser.getName());
+		if(userAccessPermissionsVO.getResidentialId() != null){
+			Residential residential = residentialClient.getById(userAccessPermissionsVO.getResidentialId());
+			if(residential != null){
+				userAccessPermissionsVO.setResidentialName(residential.getName());
+			}
+		}
+		if(userAccessPermissionsVO.getBuildingId() != null){
+			Building building = buildingClient.getById(userAccessPermissionsVO.getBuildingId());
+			if(building != null){
+				userAccessPermissionsVO.setBuildingName(building.getName());
+			}
+		}
+		if(userAccessPermissionsVO.getUnitId() != null){
+			Unit unit = unitClient.getById(userAccessPermissionsVO.getUnitId());
+			if(unit != null){
+				userAccessPermissionsVO.setUnitName(unit.getName());
+			}
+		}
+		if(userAccessPermissionsVO.getFloorId() != null){
+			Floor floor = floorClient.getById(userAccessPermissionsVO.getFloorId());
+			if(floor != null){
+				userAccessPermissionsVO.setFloorName(floor.getName());
+			}
+		}
+		if(userAccessPermissionsVO.getRoomId() != null){
+			Room room = roomClient.getById(userAccessPermissionsVO.getRoomId());
+			if(room != null){
+				userAccessPermissionsVO.setRoomName(room.getName());
+			}
+		}
 
 		return userAccessPermissionsVO;
 	}