添加楼栋的添加，编辑，查询，删除功能，修改菜单栏接口

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

@@ -1,9 +1,29 @@
 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);
 
 }

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

@@ -2,6 +2,7 @@ package com.template.api;
 
 import com.template.model.dto.HouseNumberBindingDto;
 import com.template.model.dto.HouseNumberDeleteBindingDto;
+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 +22,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 +41,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 HouseNumber houseNumber);
+
+
+    @GetMapping("/listHouseNuber")
+    @ApiOperation(value = "房间列表查询", notes = "房间列表查询", httpMethod = "GET")
+    CommonResult getPageHouseNuber(@RequestParam int page,@RequestParam int size, String keyWord,String building,String element,String house);
+
+    @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/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,20 @@
 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.result.CommonResult;
+import com.template.services.BuildingService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -16,5 +23,70 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class BuildingController implements BuildingControllerAPI {
 
+    @Autowired
+    BuildingService buildingService;
+
+    @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) {
+        buildingService.removeById(buildingId);
+
+        return CommonResult.ok();
+    }
 }
 

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

@@ -15,6 +15,7 @@ import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 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;
@@ -27,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -53,6 +55,10 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 
     @Autowired
     HouseService houseService;
+
+    @Autowired
+    BuildingService buildingService;
+
     @Override
     public CommonResult pullDownList(String permissionSettingId, int page, int size, String keyWord) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -394,6 +400,53 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         return CommonResult.fail();
     }
 
+    @Override
+    public CommonResult houseNumberPullDown() {
+
+        LambdaQueryWrapper<HouseNumber> houseNumberWrapper=new LambdaQueryWrapper<>();
+        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
+    public CommonResult saveHouseNuber(HouseNumber houseNumber) {
+        return null;
+    }
+
+    @Override
+    public CommonResult getPageHouseNuber(int page, int size, String keyWord, String building, String element, String house) {
+        return null;
+    }
+
+    @Override
+    public CommonResult updateHouseNuber(HouseNumber houseNumber) {
+        return null;
+    }
+
+    @Override
+    public CommonResult deleteHouseNuber(Integer houseNumberId) {
+        return null;
+    }
+
 
 }
 

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);
@@ -348,7 +348,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("添加");
@@ -402,10 +402,8 @@ public class LoginController implements LoginControllerAPI {
             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);
@@ -449,7 +447,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);
@@ -533,7 +531,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);
@@ -566,13 +564,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);
@@ -621,7 +619,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);
@@ -661,7 +659,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);
@@ -748,7 +746,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);
@@ -814,7 +812,7 @@ public class LoginController implements LoginControllerAPI {
             MenuBarVo menuBarVo10 = new MenuBarVo();
             menuBarVo10.setName("用户管理");
             ArrayList<FunctionPointVo> vos10 = new ArrayList<>();
-            if (userManagement.contains("0")) {
+            if (contains(userManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
                 functionPointVo1.setFunctionPoint("添加");
                 functionPointVo1.setStatus(1);
@@ -864,7 +862,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);
@@ -914,7 +912,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);
@@ -963,7 +961,7 @@ public class LoginController implements LoginControllerAPI {
             MenuBarVo menuBarVo13 = new MenuBarVo();
             menuBarVo13.setName("系统管理");
             ArrayList<FunctionPointVo> vos13 = new ArrayList<>();
-            if (systemManagement.contains("0")) {
+            if (contains(systemManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
                 functionPointVo1.setFunctionPoint("退房设置");
                 functionPointVo1.setStatus(1);
@@ -1022,18 +1020,186 @@ public class LoginController implements LoginControllerAPI {
             menuBarVo13.setFunctionPoints(vos13);
             menuBarVos.add(menuBarVo13);
         }
+//      楼栋管理
+        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 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 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);
+        }
 
         return CommonResult.ok(menuBarVos);
     }
 
     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/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/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/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;
+
+}