Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai into develop-wxl

src/main/java/com/template/api/BuildingControllerAPI.java

@@ -1,9 +1,33 @@
 package com.template.api;
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.template.model.pojo.Building;
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("/auto/building")
 public interface BuildingControllerAPI {
 
+    @PostMapping("/save")
+    @ApiOperation(value = "添加楼栋", notes = "房型楼栋", httpMethod = "POST")
+    CommonResult save(@RequestBody Building building);
+
+
+    @GetMapping("/list")
+    @ApiOperation(value = "楼栋查询", notes = "楼栋查询", httpMethod = "GET")
+    CommonResult getPage(@RequestParam int page,@RequestParam int size, String keyWord);
+
+    @PostMapping("/update")
+    @ApiOperation(value = "编辑楼栋", notes = "编辑楼栋", httpMethod = "POST")
+    CommonResult update(@RequestBody Building building);
+
+
+    @GetMapping("/delete")
+    @ApiOperation(value = "楼栋删除", notes = "楼栋删除", httpMethod = "GET")
+    CommonResult delete(@RequestParam Integer buildingId);
+
+    @GetMapping("/displayBar")
+    @ApiOperation(value = "楼栋下拉框查询", notes = "楼栋下拉框查询", httpMethod = "GET")
+    CommonResult displayBar();
 
 }

src/main/java/com/template/api/HouseAPI.java

@@ -48,4 +48,8 @@ public interface HouseAPI {
     @ApiOperation(value = "小程序——房型详情", notes = "小程序——房型详情", httpMethod = "GET")
     CommonResult getappletParticulars(@RequestParam Integer houseId);
 
+
+    @GetMapping("/displayBar")
+    @ApiOperation(value = "房型下拉列表", notes = "房型下拉列表", httpMethod = "GET")
+    CommonResult displayBar();
 }

src/main/java/com/template/api/HouseNumberControllerAPI.java

@@ -2,6 +2,8 @@ package com.template.api;
 
 import com.template.model.dto.HouseNumberBindingDto;
 import com.template.model.dto.HouseNumberDeleteBindingDto;
+import com.template.model.dto.HouseNumberDto;
+import com.template.model.pojo.HouseNumber;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +23,7 @@ public interface HouseNumberControllerAPI {
     CommonResult binding(@RequestBody HouseNumberBindingDto houseNumberBindingDto);
 
     @GetMapping("/list")
-    @ApiOperation(value = "房间页面展示", notes = "房间页面展示", httpMethod = "GET")
+    @ApiOperation(value = "房间页面展示——水电管理", notes = "房间页面展示——水电管理", httpMethod = "GET")
     CommonResult list(String permissionSettingId,int page, int size,String keyWord,String startTime,String endTime);
 
     @PostMapping("/update")
@@ -40,4 +42,27 @@ public interface HouseNumberControllerAPI {
     @ApiOperation(value = "房间水电编码导入", notes = "房间水电编码导入", httpMethod = "POST")
     CommonResult importList(@RequestParam("file") MultipartFile file) throws Exception;
 
+    @GetMapping("/houseNumberPullDown")
+    @ApiOperation(value = "房间下拉框", notes = "房间下拉框", httpMethod = "GET")
+    CommonResult houseNumberPullDown();
+
+
+    @PostMapping("/saveHouseNuber")
+    @ApiOperation(value = "添加房间", notes = "添加房间", httpMethod = "POST")
+    CommonResult saveHouseNuber(@RequestBody HouseNumberDto houseNumberDto);
+
+
+    @GetMapping("/listHouseNuber")
+    @ApiOperation(value = "房间列表查询", notes = "房间列表查询", httpMethod = "GET")
+    CommonResult getPageHouseNuber(@RequestParam int page,@RequestParam int size, String keyWord,Integer buildingId,Integer houseId);
+
+    @PostMapping("/updateHouseNuber")
+    @ApiOperation(value = "房间编辑", notes = "房间编辑", httpMethod = "POST")
+    CommonResult updateHouseNuber(@RequestBody HouseNumber houseNumber);
+
+
+    @GetMapping("/deleteHouseNuber")
+    @ApiOperation(value = "房间删除", notes = "房间删除", httpMethod = "GET")
+    CommonResult deleteHouseNuber(@RequestParam Integer houseNumberId);
+
 }

src/main/java/com/template/api/HouseOrderAPI.java

@@ -127,7 +127,7 @@ public interface HouseOrderAPI {
 
     @GetMapping("/appletReserveHour")
     @ApiOperation(value = "小程序-钟点房当天占用状态", notes = "小程序-钟点房当天占用状态", httpMethod = "GET")
-    CommonResult appletReserveHour(String houseNumberId, String startTime, int liveTime);
+    CommonResult appletReserveHour(String houseNumberId, String startTime, Integer liveTime);
 
     //微信支付订单号查询订单
     @PostMapping(value = "/getPayOpenId")

src/main/java/com/template/component/WeiXiaoComponent.java

@@ -11,13 +11,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 
 /**
  * @Author: codingliang
@@ -116,4 +114,6 @@ public class WeiXiaoComponent {
             throw new MyCustomException(ResponseStatusEnum.THIRD_PARTY_SERVICE_CALL_FAILED);
         }
     }
+
+
 }

src/main/java/com/template/controller/AdminController.java

@@ -129,6 +129,12 @@ public class AdminController implements AdminAPI {
         if (!"0".equals(accountManagement) && !accountManagement.contains("1")) {
             return CommonResult.fail("此账号暂无该权限");
         }
+        String userNumber = saveAdminDto.getUserNumber();
+        Admin result = adminService.getAdminByAccount(userNumber);
+        if (result == null) {
+            return CommonResult.fail("该账号已存在");
+        }
+
 
 //        通过cardNumber找到对应的用户
         String cardNumber = saveAdminDto.getCardNumber();
@@ -183,6 +189,12 @@ public class AdminController implements AdminAPI {
         }
 
         Admin admin = updateAdminDto.getAdmin();
+        String userNumber = admin.getUserNumber();
+        Admin result = adminService.getAdminByAccount(userNumber);
+        if (result == null) {
+            return CommonResult.fail("该账号已存在");
+        }
+
         try {
             String passWord = admin.getPassWord();
             String encrypt = RSAUtils.encrypt(passWord, RSAUtils.getPublicKey(mySecurity.publicKey));

src/main/java/com/template/controller/AppletLoginController.java

@@ -178,7 +178,7 @@ public class AppletLoginController implements AppletLoginControllerAPI {
 
 
           //  System.out.println("重定向路径=" + "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head);
-           return "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager;
+           return "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager+"&head_image="+headImage;
 //            return "redirect:"+ "http://192.168.161.33:8000/hotel/h5/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager;
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/template/controller/BuildingController.java

@@ -1,13 +1,27 @@
 package com.template.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.BuildingControllerAPI;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.template.model.pojo.Building;
+import com.template.model.pojo.HouseNumber;
+import com.template.model.result.CommonResult;
+import com.template.model.vo.BuildingBarVo;
+import com.template.services.BuildingService;
+import com.template.services.HouseNumberService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -16,5 +30,106 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class BuildingController implements BuildingControllerAPI {
 
+    @Autowired
+    BuildingService buildingService;
+
+    @Autowired
+    HouseNumberService houseNumberService;
+
+    @Override
+    public CommonResult save(Building building) {
+        String building1 = building.getBuilding();
+        String element = building.getElement();
+        if (ObjectUtils.isEmpty(building1) || ObjectUtils.isEmpty(element)) {
+            return CommonResult.fail("楼栋和单元不能为空");
+        }
+
+        LambdaQueryWrapper<Building> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Building::getBuilding, building1)
+                .eq(Building::getElement, element);
+        Building one = buildingService.getOne(wrapper);
+        if (ObjectUtils.isNotEmpty(one)) {
+            return CommonResult.fail("已存在");
+        }
+
+        buildingService.save(building);
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult getPage(int page, int size, String keyWord) {
+
+        IPage<Building> buildingPage = new Page<>(page, size);
+        LambdaQueryWrapper<Building> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(ObjectUtils.isNotEmpty(keyWord), Building::getBuilding, keyWord)
+                .or()
+                .like(ObjectUtils.isNotEmpty(keyWord),Building::getElement,keyWord);
+        wrapper.orderByAsc(Building::getBuilding)
+                .orderByAsc(Building::getElement);
+        IPage<Building> page1 = buildingService.page(buildingPage, wrapper);
+
+        return CommonResult.ok(page1);
+    }
+
+    @Override
+    public CommonResult update(Building building) {
+        String building1 = building.getBuilding();
+        String element = building.getElement();
+        if (ObjectUtils.isEmpty(building1) || ObjectUtils.isEmpty(element)) {
+            return CommonResult.fail("楼栋和单元不能为空");
+        }
+
+        LambdaQueryWrapper<Building> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Building::getBuilding, building1)
+                .eq(Building::getElement, element);
+        Building one = buildingService.getOne(wrapper);
+        if (ObjectUtils.isNotEmpty(one)) {
+            return CommonResult.fail("已存在该楼栋和单元");
+        }
+        buildingService.updateById(building);
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult delete(Integer buildingId) {
+        LambdaQueryWrapper<HouseNumber> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(HouseNumber::getBuildingId,buildingId);
+        List<HouseNumber> list = houseNumberService.list(wrapper);
+
+        if (ObjectUtils.isNotEmpty(list)) {
+            return CommonResult.fail("该楼栋下还存在房间");
+        }
+
+        buildingService.removeById(buildingId);
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult displayBar() {
+
+        List<String> buildings = buildingService.group();
+
+        List<Building> list = buildingService.list(new LambdaQueryWrapper<>());
+
+        ArrayList<BuildingBarVo> vos = new ArrayList<>();
+        for (int i = 0; i < buildings.size(); i++) {
+            String b = buildings.get(i);
+
+            BuildingBarVo vo = new BuildingBarVo();
+            vo.setId(1000000+i);
+            vo.setElement(b);
+
+            List<Building> ownerClasses = list.stream().filter(e -> e.getBuilding().equals(b)).collect(Collectors.toList());
+            if (ownerClasses != null && ownerClasses.size() > 0) {
+                vo.setBuildings(ownerClasses);
+            }
+            vos.add(vo);
+        }
+
+        return CommonResult.ok(vos);
+    }
 }
 

src/main/java/com/template/controller/FacilityServicesController.java

@@ -45,6 +45,13 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
         if (!"0".equals(systemManagement) && !systemManagement.contains("5")) {
             return CommonResult.fail("此账号暂无该权限");
         }
+        String houseService = facilityServicesSaveDto.getHouseService();
+        LambdaQueryWrapper<FacilityServices> wrapperRC=new LambdaQueryWrapper<>();
+        wrapperRC.eq(FacilityServices::getHouseService,houseService);
+        FacilityServices one = facilityServicesService.getOne(wrapperRC);
+        if (ObjectUtils.isNotEmpty(one)) {
+            return CommonResult.fail("该设施已存在");
+        }
 
         FacilityServices facilityServices = new FacilityServices();
         facilityServices.setIconPath(facilityServicesSaveDto.getIconPath());
@@ -89,6 +96,19 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
         if (!"0".equals(systemManagement) && !systemManagement.contains("5")) {
             return CommonResult.fail("此账号暂无该权限");
         }
+        FacilityServices byId = facilityServicesService.getById(facilityServicesUpdateDto.getId());
+        String houseService1 = byId.getHouseService();
+        String houseService = facilityServicesUpdateDto.getHouseService();
+
+        if (!houseService1.equals(houseService)) {
+            LambdaQueryWrapper<FacilityServices> wrapperRC=new LambdaQueryWrapper<>();
+            wrapperRC.eq(FacilityServices::getHouseService,houseService);
+            FacilityServices one = facilityServicesService.getOne(wrapperRC);
+            if (ObjectUtils.isNotEmpty(one)) {
+                return CommonResult.fail("该设施已存在");
+            }
+        }
+
 
         FacilityServices facilityServices = new FacilityServices();
         facilityServices.setIconPath(facilityServicesUpdateDto.getIconPath());

src/main/java/com/template/controller/HouseController.java

@@ -14,6 +14,7 @@ import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.HouseAppletPageVo;
+import com.template.model.vo.HouseDisplayBarVo;
 import com.template.model.vo.HouseVo;
 import com.template.model.vo.HousedetailsVo;
 import com.template.services.*;
@@ -56,6 +57,8 @@ public class HouseController implements HouseAPI {
     @Autowired
     HousePriceService housePriceService;
 
+    @Autowired
+    FacilityServicesService facilityServicesService;
 
     @Override
     @Encrypt
@@ -345,6 +348,13 @@ public class HouseController implements HouseAPI {
         }
 
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        //        判断传过来的时间和当前时间比较
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime date = LocalDateTime.parse(startTime, dateTimeFormatter1);
+        if (now.isAfter(date)) {
+            startTime = now.format(dateTimeFormatter1);
+        }
+
 
         LambdaQueryWrapper<House> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(House::getRoomType, type);
@@ -363,7 +373,7 @@ public class HouseController implements HouseAPI {
         }
 
 //        获取今天的所有的改价记录
-        LocalDateTime now = LocalDateTime.now();
+//        LocalDateTime now = LocalDateTime.now();
         LocalDateTime start = now.withHour(0).withMinute(0).withSecond(0);
         LocalDateTime end = now.withHour(23).withMinute(59).withSecond(59);
 
@@ -375,6 +385,23 @@ public class HouseController implements HouseAPI {
 
             BeanUtils.copyProperties(record, houseAppletPageVo);
 
+//            获取设置图片
+            String roomConfiguration = record.getRoomConfiguration();
+            String[] split1 = roomConfiguration.split(",");
+            ArrayList<FacilityServices> strings = new ArrayList<>();
+            for (int i = 0; i < split1.length; i++) {
+                String name=split1[0];
+                LambdaQueryWrapper<FacilityServices> wrapperRC=new LambdaQueryWrapper<>();
+                wrapperRC.eq(FacilityServices::getHouseService,name);
+                FacilityServices one = facilityServicesService.getOne(wrapperRC);
+                if (ObjectUtils.isNotEmpty(one)) {
+                    strings.add(one);
+                }
+
+            }
+
+            houseAppletPageVo.setRoomConfigurationPicture(strings);
+
             String id = String.valueOf(record.getId());
 
             //                判断这个时间内是否有
@@ -457,6 +484,14 @@ public class HouseController implements HouseAPI {
         return CommonResult.ok(jsonObject);
     }
 
+    @Override
+    public CommonResult displayBar() {
+        List<HouseDisplayBarVo> list = houseService.displayBar();
+
+        return CommonResult.ok(list);
+
+    }
+
 
 }
 

src/main/java/com/template/controller/HouseNumberController.java

@@ -1,6 +1,7 @@
 package com.template.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -10,27 +11,34 @@ import com.template.common.utils.ExcelUtils;
 import com.template.common.utils.ExcelUtils2;
 import com.template.model.dto.HouseNumberBindingDto;
 import com.template.model.dto.HouseNumberDeleteBindingDto;
+import com.template.model.dto.HouseNumberDto;
 import com.template.model.dto.HouseNumberImportDto;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.HouseNumberListVo;
 import com.template.model.vo.HouseNumberPageVo;
+import com.template.model.vo.HouseNumberPullDownVo;
 import com.template.services.*;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -53,6 +61,16 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 
     @Autowired
     HouseService houseService;
+
+    @Autowired
+    BuildingService buildingService;
+
+    @Autowired
+    PasswordIssController passwordIssController;
+
+    @Autowired
+    HouseLockService houseLockService;
+
     @Override
     public CommonResult pullDownList(String permissionSettingId, int page, int size, String keyWord) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -72,8 +90,8 @@ public class HouseNumberController implements HouseNumberControllerAPI {
             size = 10;
         }
 
-        LambdaQueryWrapper<HouseNumber> wrapper=new LambdaQueryWrapper<>();
-        wrapper.like(ObjectUtils.isNotEmpty(keyWord),HouseNumber::getRoomNumber,keyWord)
+        LambdaQueryWrapper<HouseNumber> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(ObjectUtils.isNotEmpty(keyWord), HouseNumber::getRoomNumber, keyWord)
                 .orderByDesc(HouseNumber::getRoomNumber);
         IPage<HouseNumber> page1 = houseNumberService.page(new Page<>(page, size), wrapper);
 
@@ -104,8 +122,8 @@ public class HouseNumberController implements HouseNumberControllerAPI {
             return CommonResult.fail("该房间不存在");
         }
 
-        LambdaQueryWrapper<ElectricEquipment> wrapperEE=new LambdaQueryWrapper<>();
-        wrapperEE.eq(ElectricEquipment::getMeterName,meterNameElectric);
+        LambdaQueryWrapper<ElectricEquipment> wrapperEE = new LambdaQueryWrapper<>();
+        wrapperEE.eq(ElectricEquipment::getMeterName, meterNameElectric);
         ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperEE);
 
         if (ObjectUtils.isEmpty(electricEquipment)) {
@@ -113,8 +131,8 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         }
 
         String meterNameWater = houseNumberBindingDto.getMeterNameWater();
-        LambdaQueryWrapper<WaterEquipment> wrapperWE=new LambdaQueryWrapper<>();
-        wrapperWE.eq(WaterEquipment::getMeterName,meterNameWater);
+        LambdaQueryWrapper<WaterEquipment> wrapperWE = new LambdaQueryWrapper<>();
+        wrapperWE.eq(WaterEquipment::getMeterName, meterNameWater);
         WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperWE);
         if (ObjectUtils.isEmpty(waterEquipment)) {
             return CommonResult.fail("该水表设备不存在");
@@ -122,27 +140,27 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 
 
 //        判断电表设备id是否已经被绑定了
-        LambdaQueryWrapper<HouseNumber> wrarpperHN=new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<HouseNumber> wrarpperHN = new LambdaQueryWrapper<>();
         Integer electricEquipmentId = electricEquipment.getId();
-        wrarpperHN.eq(HouseNumber::getElectricEquipmentId,electricEquipmentId);
+        wrarpperHN.eq(HouseNumber::getElectricEquipmentId, electricEquipmentId);
         List<HouseNumber> list = houseNumberService.list(wrarpperHN);
         if (ObjectUtils.isNotEmpty(list)) {
             return CommonResult.fail("该电表设备已经被绑定");
         }
 
 //        绑定电表
-        houseNumber.setElectricEquipmentId(electricEquipmentId+"");
+        houseNumber.setElectricEquipmentId(electricEquipmentId + "");
         houseNumber.setElectricEquipmentMeterName(meterNameElectric);
 //        判断水表设备id是否已经被绑定了
-        LambdaQueryWrapper<HouseNumber> wrarpperHN2=new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<HouseNumber> wrarpperHN2 = new LambdaQueryWrapper<>();
         Integer waterEquipmentId = waterEquipment.getId();
-        wrarpperHN2.eq(HouseNumber::getWaterEquipmentId,waterEquipmentId);
+        wrarpperHN2.eq(HouseNumber::getWaterEquipmentId, waterEquipmentId);
         List<HouseNumber> list2 = houseNumberService.list(wrarpperHN2);
         if (ObjectUtils.isNotEmpty(list2)) {
             return CommonResult.fail("该水表设备已经被绑定");
         }
 //        绑定水表
-        houseNumber.setWaterEquipmentId(electricEquipmentId+"");
+        houseNumber.setWaterEquipmentId(electricEquipmentId + "");
         houseNumber.setWaterEquipmentMeterName(meterNameWater);
 
         houseNumberService.updateById(houseNumber);
@@ -152,7 +170,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    public CommonResult list(String permissionSettingId, int page, int size, String keyWord,String startTime,String endTime) {
+    public CommonResult list(String permissionSettingId, int page, int size, String keyWord, String startTime, String endTime) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -171,7 +189,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         }
 
 
-        PageUtils<HouseNumberPageVo> pageList =houseNumberService.pageList(page,size,keyWord,startTime,endTime);
+        PageUtils<HouseNumberPageVo> pageList = houseNumberService.pageList(page, size, keyWord, startTime, endTime);
 
 
         return CommonResult.ok(pageList);
@@ -201,8 +219,8 @@ public class HouseNumberController implements HouseNumberControllerAPI {
             return CommonResult.fail("该房间不存在");
         }
 
-        LambdaQueryWrapper<ElectricEquipment> wrapperEE=new LambdaQueryWrapper<>();
-        wrapperEE.eq(ElectricEquipment::getMeterName,meterNameElectric);
+        LambdaQueryWrapper<ElectricEquipment> wrapperEE = new LambdaQueryWrapper<>();
+        wrapperEE.eq(ElectricEquipment::getMeterName, meterNameElectric);
         ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperEE);
 
         if (ObjectUtils.isEmpty(electricEquipment)) {
@@ -210,8 +228,8 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         }
 
         String meterNameWater = houseNumberBindingDto.getMeterNameWater();
-        LambdaQueryWrapper<WaterEquipment> wrapperWE=new LambdaQueryWrapper<>();
-        wrapperWE.eq(WaterEquipment::getMeterName,meterNameWater);
+        LambdaQueryWrapper<WaterEquipment> wrapperWE = new LambdaQueryWrapper<>();
+        wrapperWE.eq(WaterEquipment::getMeterName, meterNameWater);
         WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperWE);
         if (ObjectUtils.isEmpty(waterEquipment)) {
             return CommonResult.fail("该水表设备不存在");
@@ -219,27 +237,27 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 
 
 //        判断电表设备id是否已经被绑定了
-        LambdaQueryWrapper<HouseNumber> wrarpperHN=new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<HouseNumber> wrarpperHN = new LambdaQueryWrapper<>();
         Integer electricEquipmentId = electricEquipment.getId();
-        wrarpperHN.eq(HouseNumber::getElectricEquipmentId,electricEquipmentId);
+        wrarpperHN.eq(HouseNumber::getElectricEquipmentId, electricEquipmentId);
         List<HouseNumber> list = houseNumberService.list(wrarpperHN);
         if (ObjectUtils.isNotEmpty(list)) {
             return CommonResult.fail("该电表设备已经被绑定");
         }
 
 //        绑定电表
-        houseNumber.setElectricEquipmentId(electricEquipmentId+"");
+        houseNumber.setElectricEquipmentId(electricEquipmentId + "");
         houseNumber.setElectricEquipmentMeterName(meterNameElectric);
 //        判断水表设备id是否已经被绑定了
-        LambdaQueryWrapper<HouseNumber> wrarpperHN2=new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<HouseNumber> wrarpperHN2 = new LambdaQueryWrapper<>();
         Integer waterEquipmentId = waterEquipment.getId();
-        wrarpperHN2.eq(HouseNumber::getWaterEquipmentId,waterEquipmentId);
+        wrarpperHN2.eq(HouseNumber::getWaterEquipmentId, waterEquipmentId);
         List<HouseNumber> list2 = houseNumberService.list(wrarpperHN2);
         if (ObjectUtils.isNotEmpty(list2)) {
             return CommonResult.fail("该水表设备已经被绑定");
         }
 //        绑定水表
-        houseNumber.setWaterEquipmentId(electricEquipmentId+"");
+        houseNumber.setWaterEquipmentId(electricEquipmentId + "");
         houseNumber.setWaterEquipmentMeterName(meterNameWater);
 
         houseNumberService.updateById(houseNumber);
@@ -295,7 +313,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 //            return CommonResult.fail("此账号暂无该权限");
 //        }
 
-        List<HouseNumberPageVo> vos =houseNumberService.listExport(keyWord,startTime,endTime);
+        List<HouseNumberPageVo> vos = houseNumberService.listExport(keyWord, startTime, endTime);
 
 
 //        导出
@@ -313,15 +331,15 @@ public class HouseNumberController implements HouseNumberControllerAPI {
             for (int i = 0; i < vos.size(); i++) {
                 Row dataRow1 = sheet.createRow(i + 1);
                 HouseNumberPageVo vo = vos.get(i);
-                dataRow1.createCell(0).setCellValue(i+1);
+                dataRow1.createCell(0).setCellValue(i + 1);
                 dataRow1.createCell(1).setCellValue(vo.getWaterEquipmentMeterName());
                 dataRow1.createCell(2).setCellValue(vo.getElectricEquipmentMeterName());
                 Integer roomType = vo.getRoomType();
-                String houseType="";
-                if (1==roomType) {
-                    houseType="全日房";
-                }else {
-                    houseType="钟点房";
+                String houseType = "";
+                if (1 == roomType) {
+                    houseType = "全日房";
+                } else {
+                    houseType = "钟点房";
                 }
                 dataRow1.createCell(3).setCellValue(houseType);
                 dataRow1.createCell(4).setCellValue(vo.getHouseName());
@@ -337,7 +355,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 
     @Override
     public CommonResult importList(MultipartFile file) throws Exception {
-        List<HouseNumberImportDto> dtos= ExcelUtils.readMultipartFile(file, HouseNumberImportDto.class);
+        List<HouseNumberImportDto> dtos = ExcelUtils.readMultipartFile(file, HouseNumberImportDto.class);
 
         ArrayList<HouseNumber> houseNumbers = new ArrayList<>();
         for (int i = 0; i < dtos.size(); i++) {
@@ -350,39 +368,39 @@ public class HouseNumberController implements HouseNumberControllerAPI {
             String houseName = dto.getHouseName();
 
             //            判断当前房型是否存在当前房间号
-            House house=houseService.getHouseName(houseName,roomType);
+            House house = houseService.getHouseName(houseName, roomType);
             if (ObjectUtils.isEmpty(house)) {
-                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+houseName+"该房型");
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + houseName + "该房型");
             }
 
             Integer houseId = house.getId();
 
-            HouseNumber houseNumber=houseNumberService.getRoomNumber(houseId,roomNumber);
+            HouseNumber houseNumber = houseNumberService.getRoomNumber(houseId, roomNumber);
             if (ObjectUtils.isEmpty(houseNumber)) {
-                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+roomNumber+"该房间号");
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + roomNumber + "该房间号");
             }
 
 
             String electricEquipmentMeterName = dto.getElectricEquipmentMeterName();
-            LambdaQueryWrapper<ElectricEquipment> wrapperEE=new LambdaQueryWrapper<>();
-            wrapperEE.eq(ElectricEquipment::getMeterName,electricEquipmentMeterName);
+            LambdaQueryWrapper<ElectricEquipment> wrapperEE = new LambdaQueryWrapper<>();
+            wrapperEE.eq(ElectricEquipment::getMeterName, electricEquipmentMeterName);
             ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperEE);
 
             if (ObjectUtils.isEmpty(electricEquipment)) {
-                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+electricEquipmentMeterName+"该电表设备号");
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + electricEquipmentMeterName + "该电表设备号");
             }
 
             String waterEquipmentMeterName = dto.getWaterEquipmentMeterName();
-            LambdaQueryWrapper<WaterEquipment> wrapperWE=new LambdaQueryWrapper<>();
-            wrapperWE.eq(WaterEquipment::getMeterName,waterEquipmentMeterName);
+            LambdaQueryWrapper<WaterEquipment> wrapperWE = new LambdaQueryWrapper<>();
+            wrapperWE.eq(WaterEquipment::getMeterName, waterEquipmentMeterName);
             WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperWE);
             if (ObjectUtils.isEmpty(waterEquipment)) {
-                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+waterEquipmentMeterName+"该水表设备号");
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + waterEquipmentMeterName + "该水表设备号");
             }
 
-            houseNumber.setElectricEquipmentId(electricEquipment.getId()+"");
+            houseNumber.setElectricEquipmentId(electricEquipment.getId() + "");
             houseNumber.setElectricEquipmentMeterName(electricEquipment.getMeterName());
-            houseNumber.setWaterEquipmentId(waterEquipment.getId()+"");
+            houseNumber.setWaterEquipmentId(waterEquipment.getId() + "");
             houseNumber.setWaterEquipmentMeterName(waterEquipment.getMeterName());
             houseNumbers.add(houseNumber);
         }
@@ -394,6 +412,128 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         return CommonResult.fail();
     }
 
+    @Override
+    public CommonResult houseNumberPullDown() {
+
+        LambdaQueryWrapper<HouseNumber> houseNumberWrapper = new LambdaQueryWrapper<>();
+        houseNumberWrapper.isNotNull(HouseNumber::getBuildingId);
+        List<HouseNumber> list = houseNumberService.list(houseNumberWrapper);
+
+        LambdaQueryWrapper<Building> buildingWrapper = new LambdaQueryWrapper<>();
+        buildingWrapper.orderByAsc(Building::getBuilding)
+                .orderByAsc(Building::getElement);
+        List<Building> buildingList = buildingService.list(buildingWrapper);
+
+        ArrayList<HouseNumberPullDownVo> vos = new ArrayList<>();
+        for (Building building : buildingList) {
+            HouseNumberPullDownVo vo = new HouseNumberPullDownVo();
+            vo.setBuilding(building.getBuilding());
+            vo.setElement(building.getElement());
+            List<HouseNumber> ownerClasses = list.stream().filter(e -> e.getBuildingId().equals(building.getId())).collect(Collectors.toList());
+            if (ownerClasses != null && ownerClasses.size() > 0) {
+                vo.setVos(ownerClasses);
+            }
+            vos.add(vo);
+        }
+
+        return CommonResult.ok(vos);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public CommonResult saveHouseNuber(HouseNumberDto houseNumberDto) {
+        String electricEquipmentMeterName = houseNumberDto.getElectricEquipmentMeterName();
+        LambdaQueryWrapper<ElectricEquipment> wrapperE = new LambdaQueryWrapper<>();
+        wrapperE.eq(ElectricEquipment::getMeterName, electricEquipmentMeterName);
+        ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperE);
+        if (ObjectUtils.isEmpty(electricEquipment)) {
+            return CommonResult.fail("电表设备不存在");
+        }
+
+        String waterEquipmentMeterName = houseNumberDto.getWaterEquipmentMeterName();
+        LambdaQueryWrapper<WaterEquipment> wrapperW = new LambdaQueryWrapper<>();
+        wrapperW.eq(WaterEquipment::getMeterName, waterEquipmentMeterName);
+        WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperW);
+        if (ObjectUtils.isEmpty(waterEquipment)) {
+            return CommonResult.fail("水表设备不存在");
+        }
+        HouseNumber houseNumber = new HouseNumber();
+        BeanUtils.copyProperties(houseNumberDto, houseNumber);
+//        同一楼栋单元下不能有同样的房间
+        Integer buildingId = houseNumber.getBuildingId();
+        LambdaQueryWrapper<HouseNumber> wrapperHn = new LambdaQueryWrapper<>();
+        wrapperHn.eq(HouseNumber::getBuildingId, buildingId)
+                .eq(HouseNumber::getRoomNumber, houseNumber.getRoomNumber());
+        HouseNumber hn = houseNumberService.getOne(wrapperHn);
+        if (ObjectUtils.isNotEmpty(hn)) {
+            return CommonResult.fail("已存在该房间");
+        }
+
+        houseNumber.setElectricEquipmentId(electricEquipment.getId() + "");
+        houseNumber.setWaterEquipmentId(waterEquipment.getId() + "");
+        //                默认净房
+        houseNumber.setHouseStatus(1);
+//                默认关电
+        houseNumber.setElectricType("2");
+        try {
+
+            houseNumberService.save(houseNumber);
+
+            String doorLock = houseNumberDto.getDoorLock();
+            if (ObjectUtils.isNotEmpty(doorLock)) {
+                HouseLock houseLock = new HouseLock();
+                houseLock.setHouseNumberId(houseNumber.getId());
+                houseLock.setEquipmentType(doorLock);
+                //            绑定时间
+                houseLock.setBindingTime(new Date());
+                JSONObject particular = null;
+                try {
+                    particular = passwordIssController.particular(doorLock);
+                } catch (Exception e) {
+                    return CommonResult.fail("门锁异常");
+                }
+
+//        设备连接状态
+                String state = particular.getString("state");
+//        电量
+                String battery = particular.getString("battery");
+//            网络状态
+                houseLock.setNetworkState("1");
+//            设备状态
+                houseLock.setEquipmentState("1");
+//            房 间号
+                houseLock.setNetworkType("WiFi");
+                houseLock.setWifiMac("WIFIMAC");
+                houseLock.setNfcFunction(0);
+                houseLockService.save(houseLock);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return CommonResult.fail();
+        }
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult getPageHouseNuber(int page, int size, String keyWord, Integer buildingId, Integer houseId) {
+
+        PageUtils<HouseNumberListVo> voPageUtils = houseNumberService.getpage(page, size, keyWord, buildingId, houseId);
+
+
+        return CommonResult.ok(voPageUtils);
+    }
+
+    @Override
+    public CommonResult updateHouseNuber(HouseNumber houseNumber) {
+        return null;
+    }
+
+    @Override
+    public CommonResult deleteHouseNuber(Integer houseNumberId) {
+        return null;
+    }
+
 
 }
 

src/main/java/com/template/controller/HouseOrderController.java

@@ -209,6 +209,7 @@ public class HouseOrderController implements HouseOrderAPI {
         LocalDateTime date = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
         if (now.isAfter(date)) {
             reserveLiveTime = now.format(dateTimeFormatter1);
+            establishOrderDto.setReserveLeaveTime(reserveLeaveTime);
         }
 
 //        获取该时间段内的所有使用的房间
@@ -492,6 +493,10 @@ public class HouseOrderController implements HouseOrderAPI {
 //              获取工号
                 Users users = usersService.getById(userId);
                 String cardNumber = users.getCardNumber();
+                if (ObjectUtils.isEmpty(cardNumber)) {
+                    return CommonResult.fail("无微校卡号");
+                }
+                log.info("微校卡号【{}】", cardNumber);
                 ArrayList<String> strings = new ArrayList<>();
                 strings.add(cardNumber);
                 //        获取手机号,酒店名字
@@ -2390,14 +2395,14 @@ public class HouseOrderController implements HouseOrderAPI {
             houseNumber.setHouseStatus(2);
 
 //            判断该房间是否免费的房间，是则需要支付水电费，并改成带结账状态
-            BigDecimal payPrice = houseOrder.getPayPrice();
-            if (ObjectUtils.isNotEmpty(payPrice) && payPrice.doubleValue() <= 0) {
-                houseOrder.setOrderStatus("5");
-                BigDecimal electricCost = houseOrder.getElectricCost();
-                BigDecimal waterCost = houseOrder.getWaterCost();
-                BigDecimal total = electricCost.add(waterCost);
-                houseOrder.setPayPrice(total);
-            }
+//            BigDecimal payPrice = houseOrder.getPayPrice();
+//            if (ObjectUtils.isNotEmpty(payPrice) && payPrice.doubleValue() <= 0) {
+//                houseOrder.setOrderStatus("5");
+//                BigDecimal electricCost = houseOrder.getElectricCost();
+//                BigDecimal waterCost = houseOrder.getWaterCost();
+//                BigDecimal total = electricCost.add(waterCost);
+//                houseOrder.setPayPrice(total);
+//            }
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
@@ -2924,7 +2929,7 @@ public class HouseOrderController implements HouseOrderAPI {
     }
 
     @Override
-    public CommonResult appletReserveHour(String houseNumberId, String startTime, int liveTime) {
+    public CommonResult appletReserveHour(String houseNumberId, String startTime, Integer liveTime) {
         //        获取钟点房可用时间段
         List<ApartmentSetting> list = apartmentSettingService.list(new LambdaQueryWrapper<>());
         ApartmentSetting apartmentSetting = list.get(0);

src/main/java/com/template/controller/LoginController.java

@@ -183,7 +183,7 @@ public class LoginController implements LoginControllerAPI {
             menuBarVo.setName("房态管理");
             ArrayList<FunctionPointVo> strings = new ArrayList<>();
 
-            if (houseStatusManagement.contains("0")) {
+            if (contains(houseStatusManagement, "0")) {
                 FunctionPointVo functionPointVo = new FunctionPointVo();
                 functionPointVo.setFunctionPoint("预定");
                 functionPointVo.setStatus(1);
@@ -254,6 +254,17 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo16.setStatus(1);
                 strings.add(functionPointVo16);
 
+                FunctionPointVo functionPointVo17 = new FunctionPointVo();
+                functionPointVo17.setFunctionPoint("取消预定");
+                functionPointVo17.setStatus(1);
+                strings.add(functionPointVo17);
+
+                FunctionPointVo functionPointVo18 = new FunctionPointVo();
+                functionPointVo18.setFunctionPoint("取消维修");
+                functionPointVo18.setStatus(1);
+                strings.add(functionPointVo18);
+
+
             } else {
 
                 FunctionPointVo functionPointVo = ifContains(houseStatusManagement, "1");
@@ -314,12 +325,72 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo16.setFunctionPoint("关电");
                 strings.add(functionPointVo16);
 
+                FunctionPointVo functionPointVo17 = ifContains(houseStatusManagement, "17");
+                functionPointVo17.setFunctionPoint("取消预定");
+                strings.add(functionPointVo17);
+
+                FunctionPointVo functionPointVo18 = ifContains(houseStatusManagement, "18");
+                functionPointVo18.setFunctionPoint("取消维修");
+                strings.add(functionPointVo18);
+
             }
 
             menuBarVo.setFunctionPoints(strings);
             menuBarVos.add(menuBarVo);
         }
 
+
+        //      楼栋单元管理
+        String buildingManagement = one.getBuildingManagement();
+        if (ObjectUtils.isNotEmpty(buildingManagement)) {
+
+            MenuBarVo menuBarVo14 = new MenuBarVo();
+            menuBarVo14.setName("楼栋单元管理");
+            ArrayList<FunctionPointVo> vos14 = new ArrayList<>();
+
+            if (contains(buildingManagement, "0")) {
+                FunctionPointVo functionPointVo1 = new FunctionPointVo();
+                functionPointVo1.setFunctionPoint("添加");
+                functionPointVo1.setStatus(1);
+                vos14.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = new FunctionPointVo();
+                functionPointVo2.setFunctionPoint("编辑");
+                functionPointVo2.setStatus(1);
+                vos14.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = new FunctionPointVo();
+                functionPointVo3.setFunctionPoint("删除");
+                functionPointVo3.setStatus(1);
+                vos14.add(functionPointVo3);
+
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setStatus(1);
+                vos14.add(functionPointVo4);
+
+            } else {
+                FunctionPointVo functionPointVo1 = ifContains(buildingManagement, "1");
+                functionPointVo1.setFunctionPoint("添加");
+                vos14.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = ifContains(buildingManagement, "2");
+                functionPointVo2.setFunctionPoint("编辑");
+                vos14.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = ifContains(buildingManagement, "3");
+                functionPointVo3.setFunctionPoint("删除");
+                vos14.add(functionPointVo3);
+
+                FunctionPointVo functionPointVo4 = ifContains(buildingManagement, "4");
+                functionPointVo4.setFunctionPoint("查看界面");
+                vos14.add(functionPointVo4);
+
+            }
+            menuBarVo14.setFunctionPoints(vos14);
+            menuBarVos.add(menuBarVo14);
+        }
+
         //            房型
         String houseTypeManagement = one.getHouseTypeManagement();
         if (ObjectUtils.isNotEmpty(houseTypeManagement)) {
@@ -329,7 +400,7 @@ public class LoginController implements LoginControllerAPI {
             ArrayList<FunctionPointVo> vos2 = new ArrayList<>();
 
 
-            if (houseTypeManagement.contains("0")) {
+            if (contains(houseTypeManagement, "0")) {
 
                 FunctionPointVo functionPointVo = new FunctionPointVo();
                 functionPointVo.setFunctionPoint("添加");
@@ -377,16 +448,67 @@ public class LoginController implements LoginControllerAPI {
 
             menuBarVos.add(menuBarVo2);
         }
+
+
+        //      房间管理
+        String houseNumberManagement = one.getHouseNumberManagement();
+        if (ObjectUtils.isNotEmpty(houseNumberManagement)) {
+
+            MenuBarVo menuBarVo15 = new MenuBarVo();
+            menuBarVo15.setName("房间列表");
+            ArrayList<FunctionPointVo> vos15 = new ArrayList<>();
+
+            if (contains(houseNumberManagement, "0")) {
+                FunctionPointVo functionPointVo1 = new FunctionPointVo();
+                functionPointVo1.setFunctionPoint("添加");
+                functionPointVo1.setStatus(1);
+                vos15.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = new FunctionPointVo();
+                functionPointVo2.setFunctionPoint("编辑");
+                functionPointVo2.setStatus(1);
+                vos15.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = new FunctionPointVo();
+                functionPointVo3.setFunctionPoint("删除");
+                functionPointVo3.setStatus(1);
+                vos15.add(functionPointVo3);
+
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setStatus(1);
+                vos15.add(functionPointVo4);
+
+            } else {
+                FunctionPointVo functionPointVo1 = ifContains(houseNumberManagement, "1");
+                functionPointVo1.setFunctionPoint("添加");
+                vos15.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = ifContains(houseNumberManagement, "2");
+                functionPointVo2.setFunctionPoint("编辑");
+                vos15.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = ifContains(houseNumberManagement, "3");
+                functionPointVo3.setFunctionPoint("删除");
+                vos15.add(functionPointVo3);
+
+                FunctionPointVo functionPointVo4 = ifContains(houseNumberManagement, "4");
+                functionPointVo4.setFunctionPoint("查看界面");
+                vos15.add(functionPointVo4);
+
+            }
+            menuBarVo15.setFunctionPoints(vos15);
+            menuBarVos.add(menuBarVo15);
+        }
+
         String housePriceManagement = one.getHousePriceManagement();
         if (ObjectUtils.isNotEmpty(housePriceManagement)) {
 
             MenuBarVo menuBarVo3 = new MenuBarVo();
             menuBarVo3.setName("房价管理");
             ArrayList<FunctionPointVo> vos3 = new ArrayList<>();
-            if (ObjectUtils.isEmpty(housePriceManagement)) {
-                housePriceManagement = "";
-            }
-            if (housePriceManagement.contains("0")) {
+
+            if (contains(housePriceManagement, "0")) {
                 FunctionPointVo functionPointVo4 = new FunctionPointVo();
                 functionPointVo4.setFunctionPoint("批量改价");
                 functionPointVo4.setStatus(1);
@@ -430,7 +552,7 @@ public class LoginController implements LoginControllerAPI {
             menuBarVo4.setName("订单管理");
 
             ArrayList<FunctionPointVo> vos4 = new ArrayList<>();
-            if (houseOrderManagement.contains("0")) {
+            if (contains(houseOrderManagement, "0")) {
                 FunctionPointVo functionPointVo = new FunctionPointVo();
                 functionPointVo.setFunctionPoint("取消");
                 functionPointVo.setStatus(1);
@@ -514,7 +636,7 @@ public class LoginController implements LoginControllerAPI {
             MenuBarVo menuBarVo5 = new MenuBarVo();
             menuBarVo5.setName("课表管理");
             ArrayList<FunctionPointVo> vos5 = new ArrayList<>();
-            if (dutyManagement.contains("0")) {
+            if (contains(dutyManagement, "0")) {
                 FunctionPointVo functionPointVo = new FunctionPointVo();
                 functionPointVo.setFunctionPoint("导入值班");
                 functionPointVo.setStatus(1);
@@ -547,13 +669,13 @@ public class LoginController implements LoginControllerAPI {
             menuBarVos.add(menuBarVo5);
         }
 //        流程管理
-            String processManagement = one.getProcessManagement();
-            if (ObjectUtils.isNotEmpty(processManagement)) {
+        String processManagement = one.getProcessManagement();
+        if (ObjectUtils.isNotEmpty(processManagement)) {
 
             MenuBarVo menuBarVo6 = new MenuBarVo();
             menuBarVo6.setName("流程管理");
             ArrayList<FunctionPointVo> vos6 = new ArrayList<>();
-            if (processManagement.contains("0")) {
+            if (contains(processManagement, "0")) {
                 FunctionPointVo functionPointVo3 = new FunctionPointVo();
                 functionPointVo3.setFunctionPoint("同意");
                 functionPointVo3.setStatus(1);
@@ -602,7 +724,7 @@ public class LoginController implements LoginControllerAPI {
             MenuBarVo menuBarVo7 = new MenuBarVo();
             menuBarVo7.setName("统计报表");
             ArrayList<FunctionPointVo> vos7 = new ArrayList<>();
-            if (reportManagement.contains("0")) {
+            if (contains(reportManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
                 functionPointVo1.setFunctionPoint("查看界面");
                 functionPointVo1.setStatus(1);
@@ -642,7 +764,7 @@ public class LoginController implements LoginControllerAPI {
             MenuBarVo menuBarVo8 = new MenuBarVo();
             menuBarVo8.setName("门锁管理");
             ArrayList<FunctionPointVo> vos8 = new ArrayList<>();
-            if (doorLockManagement.contains("0")) {
+            if (contains(doorLockManagement, "0")) {
                 FunctionPointVo functionPointVo4 = new FunctionPointVo();
                 functionPointVo4.setFunctionPoint("查看界面");
                 functionPointVo4.setStatus(1);
@@ -729,7 +851,7 @@ public class LoginController implements LoginControllerAPI {
             MenuBarVo menuBarVo9 = new MenuBarVo();
             menuBarVo9.setName("水电表管理");
             ArrayList<FunctionPointVo> vos9 = new ArrayList<>();
-            if (hydropowerManagement.contains("0")) {
+            if (contains(hydropowerManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
                 functionPointVo1.setFunctionPoint("添加");
                 functionPointVo1.setStatus(1);
@@ -788,56 +910,7 @@ public class LoginController implements LoginControllerAPI {
             menuBarVo9.setFunctionPoints(vos9);
             menuBarVos.add(menuBarVo9);
         }
-//        用户管理
-        String userManagement = one.getUserManagement();
-        if (ObjectUtils.isNotEmpty(userManagement)) {
 
-            MenuBarVo menuBarVo10 = new MenuBarVo();
-            menuBarVo10.setName("用户管理");
-            ArrayList<FunctionPointVo> vos10 = new ArrayList<>();
-            if (userManagement.contains("0")) {
-                FunctionPointVo functionPointVo1 = new FunctionPointVo();
-                functionPointVo1.setFunctionPoint("添加");
-                functionPointVo1.setStatus(1);
-                vos10.add(functionPointVo1);
-
-                FunctionPointVo functionPointVo2 = new FunctionPointVo();
-                functionPointVo2.setFunctionPoint("编辑");
-                functionPointVo2.setStatus(1);
-                vos10.add(functionPointVo2);
-
-                FunctionPointVo functionPointVo3 = new FunctionPointVo();
-                functionPointVo3.setFunctionPoint("删除");
-                functionPointVo3.setStatus(1);
-                vos10.add(functionPointVo3);
-
-                FunctionPointVo functionPointVo4 = new FunctionPointVo();
-                functionPointVo4.setFunctionPoint("查看界面");
-                functionPointVo4.setStatus(1);
-                vos10.add(functionPointVo4);
-
-
-            } else {
-                FunctionPointVo functionPointVo1 = ifContains(userManagement, "1");
-                functionPointVo1.setFunctionPoint("添加");
-                vos10.add(functionPointVo1);
-
-                FunctionPointVo functionPointVo2 = ifContains(userManagement, "2");
-                functionPointVo2.setFunctionPoint("编辑");
-                vos10.add(functionPointVo2);
-
-                FunctionPointVo functionPointVo3 = ifContains(userManagement, "3");
-                functionPointVo3.setFunctionPoint("删除");
-                vos10.add(functionPointVo3);
-
-                FunctionPointVo functionPointVo4 = ifContains(userManagement, "4");
-                functionPointVo4.setFunctionPoint("查看界面");
-                vos10.add(functionPointVo4);
-
-            }
-            menuBarVo10.setFunctionPoints(vos10);
-            menuBarVos.add(menuBarVo10);
-        }
 //        角色管理
         String roleManagement = one.getRoleManagement();
         if (ObjectUtils.isNotEmpty(roleManagement)) {
@@ -845,7 +918,7 @@ public class LoginController implements LoginControllerAPI {
             MenuBarVo menuBarVo11 = new MenuBarVo();
             menuBarVo11.setName("角色管理");
             ArrayList<FunctionPointVo> vos11 = new ArrayList<>();
-            if (roleManagement.contains("0")) {
+            if (contains(roleManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
                 functionPointVo1.setFunctionPoint("添加");
                 functionPointVo1.setStatus(1);
@@ -895,7 +968,7 @@ public class LoginController implements LoginControllerAPI {
             MenuBarVo menuBarVo12 = new MenuBarVo();
             menuBarVo12.setName("账号管理");
             ArrayList<FunctionPointVo> vos12 = new ArrayList<>();
-            if (accountManagement.contains("0")) {
+            if (contains(accountManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
                 functionPointVo1.setFunctionPoint("添加");
                 functionPointVo1.setStatus(1);
@@ -937,14 +1010,118 @@ public class LoginController implements LoginControllerAPI {
             menuBarVo12.setFunctionPoints(vos12);
             menuBarVos.add(menuBarVo12);
         }
+
+        //      员工管理
+        String staffManagement = one.getStaffManagement();
+        if (ObjectUtils.isNotEmpty(staffManagement)) {
+
+            MenuBarVo menuBarVo16 = new MenuBarVo();
+            menuBarVo16.setName("员工管理");
+            ArrayList<FunctionPointVo> vos16 = new ArrayList<>();
+
+            if (contains(staffManagement, "0")) {
+                FunctionPointVo functionPointVo1 = new FunctionPointVo();
+                functionPointVo1.setFunctionPoint("添加");
+                functionPointVo1.setStatus(1);
+                vos16.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = new FunctionPointVo();
+                functionPointVo2.setFunctionPoint("编辑");
+                functionPointVo2.setStatus(1);
+                vos16.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = new FunctionPointVo();
+                functionPointVo3.setFunctionPoint("删除");
+                functionPointVo3.setStatus(1);
+                vos16.add(functionPointVo3);
+
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setStatus(1);
+                vos16.add(functionPointVo4);
+
+            } else {
+                FunctionPointVo functionPointVo1 = ifContains(staffManagement, "1");
+                functionPointVo1.setFunctionPoint("添加");
+                vos16.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = ifContains(staffManagement, "2");
+                functionPointVo2.setFunctionPoint("编辑");
+                vos16.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = ifContains(staffManagement, "3");
+                functionPointVo3.setFunctionPoint("删除");
+                vos16.add(functionPointVo3);
+
+                FunctionPointVo functionPointVo4 = ifContains(staffManagement, "4");
+                functionPointVo4.setFunctionPoint("查看界面");
+                vos16.add(functionPointVo4);
+
+            }
+            menuBarVo16.setFunctionPoints(vos16);
+            menuBarVos.add(menuBarVo16);
+        }
+
+//        用户管理
+        String userManagement = one.getUserManagement();
+        if (ObjectUtils.isNotEmpty(userManagement)) {
+
+            MenuBarVo menuBarVo10 = new MenuBarVo();
+            menuBarVo10.setName("用户管理");
+            ArrayList<FunctionPointVo> vos10 = new ArrayList<>();
+            if (contains(userManagement, "0")) {
+                FunctionPointVo functionPointVo1 = new FunctionPointVo();
+                functionPointVo1.setFunctionPoint("添加");
+                functionPointVo1.setStatus(1);
+                vos10.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = new FunctionPointVo();
+                functionPointVo2.setFunctionPoint("编辑");
+                functionPointVo2.setStatus(1);
+                vos10.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = new FunctionPointVo();
+                functionPointVo3.setFunctionPoint("删除");
+                functionPointVo3.setStatus(1);
+                vos10.add(functionPointVo3);
+
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setStatus(1);
+                vos10.add(functionPointVo4);
+
+
+            } else {
+                FunctionPointVo functionPointVo1 = ifContains(userManagement, "1");
+                functionPointVo1.setFunctionPoint("添加");
+                vos10.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = ifContains(userManagement, "2");
+                functionPointVo2.setFunctionPoint("编辑");
+                vos10.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = ifContains(userManagement, "3");
+                functionPointVo3.setFunctionPoint("删除");
+                vos10.add(functionPointVo3);
+
+                FunctionPointVo functionPointVo4 = ifContains(userManagement, "4");
+                functionPointVo4.setFunctionPoint("查看界面");
+                vos10.add(functionPointVo4);
+
+            }
+            menuBarVo10.setFunctionPoints(vos10);
+            menuBarVos.add(menuBarVo10);
+        }
+
+
 //        系统管理
         String systemManagement = one.getSystemManagement();
         if (ObjectUtils.isNotEmpty(systemManagement)) {
 
             MenuBarVo menuBarVo13 = new MenuBarVo();
-            menuBarVo13.setName("系统管理");
+            menuBarVo13.setName("系统设置");
             ArrayList<FunctionPointVo> vos13 = new ArrayList<>();
-            if (systemManagement.contains("0")) {
+            if (contains(systemManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
                 functionPointVo1.setFunctionPoint("退房设置");
                 functionPointVo1.setStatus(1);
@@ -1009,12 +1186,27 @@ public class LoginController implements LoginControllerAPI {
 
     public FunctionPointVo ifContains(String total, String s) {
         FunctionPointVo vo = new FunctionPointVo();
-        if (total.contains(s)) {
-            vo.setStatus(1);
-        } else {
-            vo.setStatus(0);
+        String[] split = total.split(",");
+        for (int i = 0; i < split.length; i++) {
+            String ss = split[i];
+            if (ss.equals(s)) {
+                vo.setStatus(1);
+                return vo;
+            }
         }
+        vo.setStatus(0);
         return vo;
     }
 
+    public Boolean contains(String total, String s) {
+        String[] split = total.split(",");
+        for (int i = 0; i < split.length; i++) {
+            String ss = split[i];
+            if (ss.equals(s)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
 }

src/main/java/com/template/mapper/BuildingMapper.java

@@ -4,6 +4,8 @@ import com.template.model.pojo.Building;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -15,4 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BuildingMapper extends BaseMapper<Building> {
 
+    List<String> group();
+
 }

src/main/java/com/template/mapper/HouseMapper.java

@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.House;
-import com.template.model.vo.HouseAppletPageVo;
-import com.template.model.vo.HouseVo;
-import com.template.model.vo.HousedetailsVo;
-import com.template.model.vo.RoomTypeVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,4 +30,6 @@ public interface HouseMapper extends BaseMapper<House> {
 
     List<String> group();
 
+    List<HouseDisplayBarVo> displayBar();
+
 }

src/main/java/com/template/mapper/HouseNumberMapper.java

@@ -49,5 +49,5 @@ public interface HouseNumberMapper extends BaseMapper<HouseNumber> {
     List<HouseNumberPageVo> listExport(@Param("keyWord") String keyWord, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
 
-
+    IPage<HouseNumberListVo> getpage(Page<HouseNumberListVo> pageVo,@Param("keyWord") String keyWord,@Param("buildingId") Integer buildingId,@Param("houseId") Integer houseId);
 }

src/main/java/com/template/model/dto/BuildingDto.java

@@ -0,0 +1,8 @@
+package com.template.model.dto;
+
+import lombok.Data;
+
+@Data
+public class BuildingDto {
+
+}

src/main/java/com/template/model/dto/HouseNumberDto.java

@@ -0,0 +1,26 @@
+package com.template.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HouseNumberDto {
+    @ApiModelProperty(value = "楼栋id")
+    private Integer buildingId;
+
+    @ApiModelProperty(value = "房型id")
+    private String houseId;
+
+    @ApiModelProperty(value = "房间号")
+    private String roomNumber;
+
+
+    @ApiModelProperty(value = "电表设备编码")
+    private String electricEquipmentMeterName;
+
+
+    @ApiModelProperty(value = "水表设备编码")
+    private String waterEquipmentMeterName;
+
+    private String doorLock;
+}

src/main/java/com/template/model/dto/UpdateMenuPermissionSettingDto.java

@@ -22,6 +22,17 @@ public class UpdateMenuPermissionSettingDto {
     @ApiModelProperty(value = "房型管理 0.全部 1.添加，2.修改，3.删除")
     private String houseTypeManagement;
 
+
+    @ApiModelProperty(value = "楼栋管理 0.全部 1.添加，2.修改，3.删除，4.查询")
+    private String buildingManagement;
+
+    @ApiModelProperty(value = "房间管理 0.全部 1.添加，2.修改，3.删除，4.查询")
+    private String houseNumberManagement;
+
+    @ApiModelProperty(value = "员工管理 0.全部 1.添加，2.修改，3.删除，4.查询")
+    private String staffManagement;
+
+
     @ApiModelProperty(value = "房价管理 0.全部 4.批量改价，5.改价记录")
     private String housePriceManagement;
 

src/main/java/com/template/model/pojo/Building.java

@@ -26,7 +26,7 @@ public class Building implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "楼栋表")
-    @TableId(value = "id", type = IdType.UUID)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     @ApiModelProperty(value = "楼栋")

src/main/java/com/template/model/pojo/HouseNumber.java

@@ -1,19 +1,14 @@
 package com.template.model.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -34,6 +29,9 @@ public class HouseNumber implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty(value = "楼栋id")
+    private Integer buildingId;
+
     @ApiModelProperty(value = "房型id")
     private String houseId;
 

src/main/java/com/template/model/pojo/PermissionSetting.java

@@ -35,9 +35,18 @@ public class PermissionSetting implements Serializable {
     @ApiModelProperty(value = "房态管理 0.全部 1.预定，2退房，3.维修，4.关房，5.置脏，6.置净，7.退款，8.入住，9.锁房，10.日志，11.换房，12.开房，13.门锁管理")
     private String houseStatusManagement;
 
-    @ApiModelProperty(value = "房型管理 0.全部 1.添加，2.修改，3.删除，4.批量改价，5.改价记录")
+    @ApiModelProperty(value = "房型管理  0.全部 1.添加，2.修改，3.删除，6.查询")
     private String houseTypeManagement;
 
+    @ApiModelProperty(value = "楼栋管理 0.全部 1.添加，2.修改，3.删除，4.查询")
+    private String buildingManagement;
+
+    @ApiModelProperty(value = "房间管理 0.全部 1.添加，2.修改，3.删除，4.查询")
+    private String houseNumberManagement;
+
+    @ApiModelProperty(value = "员工管理 0.全部 1.添加，2.修改，3.删除，4.查询")
+    private String staffManagement;
+
     @ApiModelProperty(value = "房价管理 0.全部 4.批量改价，5.改价记录")
     private String housePriceManagement;
 

src/main/java/com/template/model/vo/BuildingBarVo.java

@@ -0,0 +1,15 @@
+package com.template.model.vo;
+
+import com.template.model.pojo.Building;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BuildingBarVo {
+    private int id;
+
+    private String element;
+
+    private List<Building> buildings;
+}

src/main/java/com/template/model/vo/HouseAppletPageVo.java

@@ -1,9 +1,11 @@
 package com.template.model.vo;
 
+import com.template.model.pojo.FacilityServices;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class HouseAppletPageVo {
@@ -36,6 +38,9 @@ public class HouseAppletPageVo {
     @ApiModelProperty(value = "房间配置")
     private String roomConfiguration;
 
+    @ApiModelProperty(value = "房间配置图片")
+    private List<FacilityServices> roomConfigurationPicture;
+
     @ApiModelProperty(value = "房间图片")
     private String roomPicture;
 

src/main/java/com/template/model/vo/HouseDisplayBarVo.java

@@ -0,0 +1,16 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HouseDisplayBarVo {
+    private Integer id;
+
+    @ApiModelProperty(value = "房间名称")
+    private String roomName;
+
+    @ApiModelProperty(value = "房间类型（1:全日房，2：钟点房）")
+    private Integer roomType;
+
+}

src/main/java/com/template/model/vo/HouseNumberListVo.java

@@ -0,0 +1,36 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class HouseNumberListVo {
+    private Integer id;
+
+    @ApiModelProperty(value = "楼栋id")
+    private Integer buildingId;
+
+    @ApiModelProperty(value = "房型id")
+    private String houseId;
+
+    @ApiModelProperty(value = "房间号")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "房间状态 1.净房 2.脏房")
+    private Integer houseStatus;
+
+    @ApiModelProperty(value = "电开关操作 1开电，2关电")
+    private String electricType;
+
+    @ApiModelProperty(value = "电表设备id")
+    private String electricEquipmentId;
+
+    @ApiModelProperty(value = "电表设备编码")
+    private String electricEquipmentMeterName;
+
+    @ApiModelProperty(value = "水表设备id")
+    private String waterEquipmentId;
+
+    private String lock;
+
+}

src/main/java/com/template/model/vo/HouseNumberPullDownVo.java

@@ -0,0 +1,19 @@
+package com.template.model.vo;
+
+import com.template.model.pojo.HouseNumber;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HouseNumberPullDownVo {
+
+    @ApiModelProperty(value = "楼栋")
+    private String building;
+    @ApiModelProperty(value = "单元")
+    private String element;
+
+    private List<HouseNumber> vos;
+
+}

src/main/java/com/template/services/BuildingService.java

@@ -3,6 +3,8 @@ package com.template.services;
 import com.template.model.pojo.Building;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface BuildingService extends IService<Building> {
 
+    List<String> group();
+
 }

src/main/java/com/template/services/HouseNumberService.java

@@ -45,4 +45,9 @@ public interface HouseNumberService extends IService<HouseNumber> {
 
     List<HouseNumberPageVo> listExport(String keyWord, String startTime, String endTime);
 
+    PageUtils<HouseNumberListVo> getpage(int page, int size, String keyWord, Integer buildingId, Integer houseId);
+
+
+
+
 }

src/main/java/com/template/services/HouseService.java

@@ -3,6 +3,7 @@ package com.template.services;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.pojo.House;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.HouseDisplayBarVo;
 import com.template.model.vo.HouseVo;
 import com.template.model.vo.HousedetailsVo;
 import com.template.model.vo.RoomTypeVo;
@@ -30,4 +31,6 @@ public interface HouseService extends IService<House> {
 
 
     House getHouseName(String houseName,Integer roomType);
+
+    List<HouseDisplayBarVo> displayBar();
 }

src/main/java/com/template/services/impl/BuildingServiceImpl.java

@@ -4,8 +4,11 @@ import com.template.model.pojo.Building;
 import com.template.mapper.BuildingMapper;
 import com.template.services.BuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> implements BuildingService {
 
+    @Autowired
+    BuildingMapper buildingMapper;
+
+    @Override
+    public List<String> group() {
+        return buildingMapper.group();
+    }
 }

src/main/java/com/template/services/impl/HouseNumberServiceImpl.java

@@ -109,5 +109,12 @@ public class HouseNumberServiceImpl extends ServiceImpl<HouseNumberMapper, House
         return houseNumberMapper.listExport(keyWord,startTime,endTime);
     }
 
+    @Override
+    public PageUtils<HouseNumberListVo> getpage(int page, int size, String keyWord, Integer buildingId, Integer houseId) {
+        Page<HouseNumberListVo> pageVo = new Page<>(page,size);
+        IPage<HouseNumberListVo> result=houseNumberMapper.getpage(pageVo,keyWord,buildingId,houseId);
+        return new PageUtils(result);
+    }
+
 
 }

src/main/java/com/template/services/impl/HouseServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.mapper.HouseMapper;
 import com.template.model.pojo.House;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.HouseDisplayBarVo;
 import com.template.model.vo.HouseVo;
 import com.template.model.vo.HousedetailsVo;
 import com.template.model.vo.RoomTypeVo;
@@ -63,5 +64,10 @@ public class HouseServiceImpl extends ServiceImpl<HouseMapper, House> implements
         return house;
     }
 
+    @Override
+    public List<HouseDisplayBarVo> displayBar() {
+        return houseMapper.displayBar();
+    }
+
 
 }

src/main/resources/mapper/template/BuildingMapper.xml

@@ -2,4 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.BuildingMapper">
 
+    <select id="group" resultType="java.lang.String">
+        SELECT
+            building
+        FROM
+            `building`
+        where deleted=0
+        GROUP BY building
+    </select>
 </mapper>

src/main/resources/mapper/template/HouseMapper.xml

@@ -70,8 +70,14 @@
     <select id="group" resultType="java.lang.String">
         select  room_name from house where deleted = 0 group by room_name
     </select>
-
-
+    <select id="displayBar" resultType="com.template.model.vo.HouseDisplayBarVo">
+        SELECT
+            id,room_name as roomName,room_type as roomType
+        FROM
+            house
+        WHERE
+            deleted=0
+    </select>
 
 
 </mapper>

src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -284,6 +284,9 @@
         </if>
         ORDER BY h.id
     </select>
+    <select id="getpage" resultType="com.template.model.vo.HouseNumberListVo">
+
+    </select>
 
 
 </mapper>