|
|
@@ -74,6 +74,9 @@ public class HouseLockController implements HouseLockControllerAPI {
|
|
|
@Autowired
|
|
|
UnlockingEmployeeService unlockingEmployeeService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ BuildingService buildingService;
|
|
|
+
|
|
|
@Override
|
|
|
public CommonResult list(String permissionSettingId, String roomNumber, String roomName,Integer houseType,Integer buildingId) {
|
|
|
PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
|
|
|
@@ -408,11 +411,15 @@ public class HouseLockController implements HouseLockControllerAPI {
|
|
|
List<Object> head = Arrays.asList("房型类型","房型名称","房间号","门锁设备型号");
|
|
|
// 用户1数据
|
|
|
List<Object> user1 = new ArrayList<>();
|
|
|
+ user1.add("17栋");
|
|
|
+ user1.add("1单元");
|
|
|
user1.add("全日房");
|
|
|
user1.add("标准房");
|
|
|
user1.add("19-101");
|
|
|
user1.add("047863CA78E0");
|
|
|
List<Object> user2 = new ArrayList<>();
|
|
|
+ user1.add("17栋");
|
|
|
+ user1.add("2单元");
|
|
|
user2.add("钟点房");
|
|
|
user2.add("标准房");
|
|
|
user2.add("19-201");
|
|
|
@@ -437,6 +444,19 @@ public class HouseLockController implements HouseLockControllerAPI {
|
|
|
for (int i = 0; i < dtos.size(); i++) {
|
|
|
HouseLockListImportDto houseLockListImportDto = dtos.get(i);
|
|
|
|
|
|
+
|
|
|
+ // 判断是否存在该楼栋单元
|
|
|
+ String building = houseLockListImportDto.getBuilding();
|
|
|
+ String element = houseLockListImportDto.getElement();
|
|
|
+
|
|
|
+ LambdaQueryWrapper<Building> wrapperB = new LambdaQueryWrapper<>();
|
|
|
+ wrapperB.eq(Building::getBuilding, building)
|
|
|
+ .eq(Building::getElement, element);
|
|
|
+ Building one = buildingService.getOne(wrapperB);
|
|
|
+ if (ObjectUtils.isEmpty(one)) {
|
|
|
+ return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + building+"/"+element + "该楼栋单元");
|
|
|
+ }
|
|
|
+
|
|
|
Integer roomType = houseLockListImportDto.getRoomType();
|
|
|
// 房间号
|
|
|
String roomNumber = houseLockListImportDto.getRoomNumber();
|