1、门禁录入

blade-service-api/device-api/src/main/java/org/springblade/device/entity/DoorDevice.java

@@ -71,6 +71,12 @@ public class DoorDevice extends BaseEntity {
 	@ApiModelProperty(value = "所属单元")
 	private Long unitId;
 
+	/**
+	 * 所属单元
+	 */
+	@ApiModelProperty(value = "所属楼层ID")
+	private Long floorId;
+
 	/**
 	 * 房间ID
 	 */

blade-service-api/device-api/src/main/java/org/springblade/device/vo/DoorDeviceVO.java

@@ -37,6 +37,7 @@ public class DoorDeviceVO extends DoorDevice {
 	private String residentialName;
 	private String buildingName;
 	private String unitName;
+	private String floorName;
 	private String roomName;
 	private String enterpriseName;
 

blade-service/community/src/main/java/org/springblade/community/controller/AgencyController.java

@@ -83,9 +83,9 @@ public class AgencyController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入agency")
 	public R<IPage<AgencyVO>> list(@RequestParam Map<String,Object> agency, Query query, BladeUser bladeUser) {
-		LambdaQueryWrapper<Agency> basicQueryWrapper = new QueryWrapperUtil<Agency>().getBasicQueryWrapperByMap(Agency::getOrgPosition, agency,new Agency(), bladeUser, orgPositionClient);
-		basicQueryWrapper.ne(Agency::getTenantId, "000000");
-		IPage<Agency> pages = agencyService.page(Condition.getPage(query), basicQueryWrapper);
+//		LambdaQueryWrapper<Agency> basicQueryWrapper = new QueryWrapperUtil<Agency>().getBasicQueryWrapperByMap(Agency::getOrgPosition, agency,new Agency(), bladeUser, orgPositionClient);
+//		basicQueryWrapper.ne(Agency::getTenantId, "000000");
+		IPage<Agency> pages = agencyService.page(Condition.getPage(query), Condition.getQueryWrapper(agency, Agency.class));
 		return R.data(AgencyWrapper.build(confClient).pageVO(pages));
 	}
 

blade-service/community/src/main/java/org/springblade/community/controller/FloorController.java

@@ -90,8 +90,7 @@ public class FloorController extends BladeController {
 			unitId = Long.parseLong(String.valueOf(floor.get("unitId")));
 			floor.remove("unitId");
 		}
-		LambdaQueryWrapper<Floor> floorLambdaQueryWrapper = new QueryWrapperUtil<Floor>().getBasicQueryWrapperByMap(Floor::getOrgPosition, floor, new Floor(), bladeUser, orgPositionClient);
-		IPage<Floor> pages = floorService.page(Condition.getPage(query), floorLambdaQueryWrapper.eq(unitId != null, Floor::getUnitId, unitId));
+		IPage<Floor> pages = floorService.page(Condition.getPage(query), Condition.getQueryWrapper(floor, Floor.class).lambda().eq(unitId != null, Floor::getUnitId, unitId));
 		return R.data(FloorWrapper.build().pageVO(pages));
 	}
 

blade-service/device/src/main/java/org/springblade/device/mapper/DoorDeviceMapper.xml

@@ -23,6 +23,7 @@
         <result column="agency_id" property="agencyId"/>
         <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="is_out" property="isOut"/>

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

@@ -45,6 +45,7 @@ public class DoorDeviceWrapper extends BaseEntityWrapper<DoorDevice, DoorDeviceV
 	private static IResidentialClient residentialClient;
 	private static IBuildingClient buildingClient;
 	private static IUnitClient unitClient;
+	private static IFloorClient floorClient;
 	private static IRoomClient roomClient;
 
 	static {
@@ -53,6 +54,7 @@ public class DoorDeviceWrapper extends BaseEntityWrapper<DoorDevice, DoorDeviceV
 		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);
 
 	}
@@ -96,6 +98,12 @@ public class DoorDeviceWrapper extends BaseEntityWrapper<DoorDevice, DoorDeviceV
 				doorDeviceVO.setUnitName(unit.getName());
 			}
 		}
+		if(doorDevice.getFloorId() != null){
+			Floor floor = floorClient.getById(doorDevice.getFloorId());
+			if(floor != null){
+				doorDeviceVO.setFloorName(floor.getName());
+			}
+		}
 		if(doorDevice.getRoomId() != null){
 			Room room = roomClient.getById(doorDevice.getRoomId());
 			if(room != null){