add:添加房间，update:菜单栏，移动端订单详情，预定

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/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

@@ -56,6 +56,8 @@ public class HouseController implements HouseAPI {
     @Autowired
     HousePriceService housePriceService;
 
+    @Autowired
+    FacilityServicesService facilityServicesService;
 
     @Override
     @Encrypt
@@ -375,6 +377,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());
 
             //                判断这个时间内是否有

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

@@ -429,11 +429,47 @@ public class HouseNumberController implements HouseNumberControllerAPI {
 
     @Override
     public CommonResult saveHouseNuber(HouseNumber houseNumber) {
-        return null;
+        String electricEquipmentMeterName = houseNumber.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 = houseNumber.getWaterEquipmentMeterName();
+        LambdaQueryWrapper<WaterEquipment> wrapperW=new LambdaQueryWrapper<>();
+        wrapperW.eq(WaterEquipment::getMeterName,waterEquipmentMeterName);
+        WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperW);
+        if (ObjectUtils.isEmpty(waterEquipment)) {
+            return CommonResult.fail("水表设备不存在");
+        }
+
+//        同一楼栋单元下不能有同样的房间
+        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");
+
+        houseNumberService.save(houseNumber);
+
+        return CommonResult.ok();
     }
 
     @Override
     public CommonResult getPageHouseNuber(int page, int size, String keyWord, String building, String element, String house) {
+
         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);

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

@@ -339,6 +339,58 @@ public class LoginController implements LoginControllerAPI {
             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)) {
@@ -396,6 +448,59 @@ 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)) {
 
@@ -805,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 (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 roleManagement = one.getRoleManagement();
         if (ObjectUtils.isNotEmpty(roleManagement)) {
@@ -954,224 +1010,175 @@ public class LoginController implements LoginControllerAPI {
             menuBarVo12.setFunctionPoints(vos12);
             menuBarVos.add(menuBarVo12);
         }
-//        系统管理
-        String systemManagement = one.getSystemManagement();
-        if (ObjectUtils.isNotEmpty(systemManagement)) {
-
-            MenuBarVo menuBarVo13 = new MenuBarVo();
-            menuBarVo13.setName("系统管理");
-            ArrayList<FunctionPointVo> vos13 = new ArrayList<>();
-            if (contains(systemManagement, "0")) {
-                FunctionPointVo functionPointVo1 = new FunctionPointVo();
-                functionPointVo1.setFunctionPoint("退房设置");
-                functionPointVo1.setStatus(1);
-                vos13.add(functionPointVo1);
-
-                FunctionPointVo functionPointVo2 = new FunctionPointVo();
-                functionPointVo2.setFunctionPoint("公寓设置");
-                functionPointVo2.setStatus(1);
-                vos13.add(functionPointVo2);
-
-                FunctionPointVo functionPointVo3 = new FunctionPointVo();
-                functionPointVo3.setFunctionPoint("补助设置");
-                functionPointVo3.setStatus(1);
-                vos13.add(functionPointVo3);
-
-                FunctionPointVo functionPointVo4 = new FunctionPointVo();
-                functionPointVo4.setFunctionPoint("催缴设置");
-                functionPointVo4.setStatus(1);
-                vos13.add(functionPointVo4);
-
-                FunctionPointVo functionPointVo5 = new FunctionPointVo();
-                functionPointVo5.setFunctionPoint("设施服务设置");
-                functionPointVo5.setStatus(1);
-                vos13.add(functionPointVo5);
-
-                FunctionPointVo functionPointVo6 = new FunctionPointVo();
-                functionPointVo6.setFunctionPoint("查看界面");
-                functionPointVo6.setStatus(1);
-                vos13.add(functionPointVo6);
 
-            } else {
-                FunctionPointVo functionPointVo1 = ifContains(systemManagement, "1");
-                functionPointVo1.setFunctionPoint("退房设置");
-                vos13.add(functionPointVo1);
-
-                FunctionPointVo functionPointVo2 = ifContains(systemManagement, "2");
-                functionPointVo2.setFunctionPoint("公寓设置");
-                vos13.add(functionPointVo2);
-
-                FunctionPointVo functionPointVo3 = ifContains(systemManagement, "3");
-                functionPointVo3.setFunctionPoint("补助设置");
-                vos13.add(functionPointVo3);
-
-                FunctionPointVo functionPointVo4 = ifContains(systemManagement, "4");
-                functionPointVo4.setFunctionPoint("催缴设置");
-                vos13.add(functionPointVo4);
-
-                FunctionPointVo functionPointVo5 = ifContains(systemManagement, "5");
-                functionPointVo5.setFunctionPoint("设施服务设置");
-                vos13.add(functionPointVo5);
-
-                FunctionPointVo functionPointVo6 = ifContains(systemManagement, "6");
-                functionPointVo6.setFunctionPoint("查看界面");
-                vos13.add(functionPointVo6);
-            }
-            menuBarVo13.setFunctionPoints(vos13);
-            menuBarVos.add(menuBarVo13);
-        }
-//      楼栋管理
-        String buildingManagement = one.getBuildingManagement();
-        if (ObjectUtils.isNotEmpty(buildingManagement)) {
+        //      员工管理
+        String staffManagement = one.getStaffManagement();
+        if (ObjectUtils.isNotEmpty(staffManagement)) {
 
-            MenuBarVo menuBarVo14 = new MenuBarVo();
-            menuBarVo14.setName("楼栋单元管理");
-            ArrayList<FunctionPointVo> vos14 = new ArrayList<>();
+            MenuBarVo menuBarVo16 = new MenuBarVo();
+            menuBarVo16.setName("员工管理");
+            ArrayList<FunctionPointVo> vos16 = new ArrayList<>();
 
-            if (contains(buildingManagement, "0")) {
+            if (contains(staffManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
                 functionPointVo1.setFunctionPoint("添加");
                 functionPointVo1.setStatus(1);
-                vos14.add(functionPointVo1);
+                vos16.add(functionPointVo1);
 
                 FunctionPointVo functionPointVo2 = new FunctionPointVo();
                 functionPointVo2.setFunctionPoint("编辑");
                 functionPointVo2.setStatus(1);
-                vos14.add(functionPointVo2);
+                vos16.add(functionPointVo2);
 
                 FunctionPointVo functionPointVo3 = new FunctionPointVo();
                 functionPointVo3.setFunctionPoint("删除");
                 functionPointVo3.setStatus(1);
-                vos14.add(functionPointVo3);
+                vos16.add(functionPointVo3);
 
                 FunctionPointVo functionPointVo4 = new FunctionPointVo();
                 functionPointVo4.setFunctionPoint("查看界面");
                 functionPointVo4.setStatus(1);
-                vos14.add(functionPointVo4);
+                vos16.add(functionPointVo4);
 
             } else {
-                FunctionPointVo functionPointVo1 = ifContains(buildingManagement, "1");
+                FunctionPointVo functionPointVo1 = ifContains(staffManagement, "1");
                 functionPointVo1.setFunctionPoint("添加");
-                vos14.add(functionPointVo1);
+                vos16.add(functionPointVo1);
 
-                FunctionPointVo functionPointVo2 = ifContains(buildingManagement, "2");
+                FunctionPointVo functionPointVo2 = ifContains(staffManagement, "2");
                 functionPointVo2.setFunctionPoint("编辑");
-                vos14.add(functionPointVo2);
+                vos16.add(functionPointVo2);
 
-                FunctionPointVo functionPointVo3 = ifContains(buildingManagement, "3");
+                FunctionPointVo functionPointVo3 = ifContains(staffManagement, "3");
                 functionPointVo3.setFunctionPoint("删除");
-                vos14.add(functionPointVo3);
+                vos16.add(functionPointVo3);
 
-                FunctionPointVo functionPointVo4 = ifContains(buildingManagement, "4");
+                FunctionPointVo functionPointVo4 = ifContains(staffManagement, "4");
                 functionPointVo4.setFunctionPoint("查看界面");
-                vos14.add(functionPointVo4);
+                vos16.add(functionPointVo4);
 
             }
-            menuBarVo14.setFunctionPoints(vos14);
-            menuBarVos.add(menuBarVo14);
+            menuBarVo16.setFunctionPoints(vos16);
+            menuBarVos.add(menuBarVo16);
         }
 
-        //      房间管理
-        String houseNumberManagement = one.getHouseNumberManagement();
-        if (ObjectUtils.isNotEmpty(houseNumberManagement)) {
-
-            MenuBarVo menuBarVo15 = new MenuBarVo();
-            menuBarVo15.setName("房间列表");
-            ArrayList<FunctionPointVo> vos15 = new ArrayList<>();
+//        用户管理
+        String userManagement = one.getUserManagement();
+        if (ObjectUtils.isNotEmpty(userManagement)) {
 
-            if (contains(houseNumberManagement, "0")) {
+            MenuBarVo menuBarVo10 = new MenuBarVo();
+            menuBarVo10.setName("用户管理");
+            ArrayList<FunctionPointVo> vos10 = new ArrayList<>();
+            if (contains(userManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
                 functionPointVo1.setFunctionPoint("添加");
                 functionPointVo1.setStatus(1);
-                vos15.add(functionPointVo1);
+                vos10.add(functionPointVo1);
 
                 FunctionPointVo functionPointVo2 = new FunctionPointVo();
                 functionPointVo2.setFunctionPoint("编辑");
                 functionPointVo2.setStatus(1);
-                vos15.add(functionPointVo2);
+                vos10.add(functionPointVo2);
 
                 FunctionPointVo functionPointVo3 = new FunctionPointVo();
                 functionPointVo3.setFunctionPoint("删除");
                 functionPointVo3.setStatus(1);
-                vos15.add(functionPointVo3);
+                vos10.add(functionPointVo3);
 
                 FunctionPointVo functionPointVo4 = new FunctionPointVo();
                 functionPointVo4.setFunctionPoint("查看界面");
                 functionPointVo4.setStatus(1);
-                vos15.add(functionPointVo4);
+                vos10.add(functionPointVo4);
+
 
             } else {
-                FunctionPointVo functionPointVo1 = ifContains(houseNumberManagement, "1");
+                FunctionPointVo functionPointVo1 = ifContains(userManagement, "1");
                 functionPointVo1.setFunctionPoint("添加");
-                vos15.add(functionPointVo1);
+                vos10.add(functionPointVo1);
 
-                FunctionPointVo functionPointVo2 = ifContains(houseNumberManagement, "2");
+                FunctionPointVo functionPointVo2 = ifContains(userManagement, "2");
                 functionPointVo2.setFunctionPoint("编辑");
-                vos15.add(functionPointVo2);
+                vos10.add(functionPointVo2);
 
-                FunctionPointVo functionPointVo3 = ifContains(houseNumberManagement, "3");
+                FunctionPointVo functionPointVo3 = ifContains(userManagement, "3");
                 functionPointVo3.setFunctionPoint("删除");
-                vos15.add(functionPointVo3);
+                vos10.add(functionPointVo3);
 
-                FunctionPointVo functionPointVo4 = ifContains(houseNumberManagement, "4");
+                FunctionPointVo functionPointVo4 = ifContains(userManagement, "4");
                 functionPointVo4.setFunctionPoint("查看界面");
-                vos15.add(functionPointVo4);
+                vos10.add(functionPointVo4);
 
             }
-            menuBarVo15.setFunctionPoints(vos15);
-            menuBarVos.add(menuBarVo15);
+            menuBarVo10.setFunctionPoints(vos10);
+            menuBarVos.add(menuBarVo10);
         }
 
 
-        //      员工管理
-        String staffManagement = one.getStaffManagement();
-        if (ObjectUtils.isNotEmpty(staffManagement)) {
-
-            MenuBarVo menuBarVo16 = new MenuBarVo();
-            menuBarVo16.setName("员工管理");
-            ArrayList<FunctionPointVo> vos16 = new ArrayList<>();
+//        系统管理
+        String systemManagement = one.getSystemManagement();
+        if (ObjectUtils.isNotEmpty(systemManagement)) {
 
-            if (contains(staffManagement, "0")) {
+            MenuBarVo menuBarVo13 = new MenuBarVo();
+            menuBarVo13.setName("系统设置");
+            ArrayList<FunctionPointVo> vos13 = new ArrayList<>();
+            if (contains(systemManagement, "0")) {
                 FunctionPointVo functionPointVo1 = new FunctionPointVo();
-                functionPointVo1.setFunctionPoint("添加");
+                functionPointVo1.setFunctionPoint("退房设置");
                 functionPointVo1.setStatus(1);
-                vos16.add(functionPointVo1);
+                vos13.add(functionPointVo1);
 
                 FunctionPointVo functionPointVo2 = new FunctionPointVo();
-                functionPointVo2.setFunctionPoint("编辑");
+                functionPointVo2.setFunctionPoint("公寓设置");
                 functionPointVo2.setStatus(1);
-                vos16.add(functionPointVo2);
+                vos13.add(functionPointVo2);
 
                 FunctionPointVo functionPointVo3 = new FunctionPointVo();
-                functionPointVo3.setFunctionPoint("删除");
+                functionPointVo3.setFunctionPoint("补助设置");
                 functionPointVo3.setStatus(1);
-                vos16.add(functionPointVo3);
+                vos13.add(functionPointVo3);
 
                 FunctionPointVo functionPointVo4 = new FunctionPointVo();
-                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setFunctionPoint("催缴设置");
                 functionPointVo4.setStatus(1);
-                vos16.add(functionPointVo4);
+                vos13.add(functionPointVo4);
+
+                FunctionPointVo functionPointVo5 = new FunctionPointVo();
+                functionPointVo5.setFunctionPoint("设施服务设置");
+                functionPointVo5.setStatus(1);
+                vos13.add(functionPointVo5);
+
+                FunctionPointVo functionPointVo6 = new FunctionPointVo();
+                functionPointVo6.setFunctionPoint("查看界面");
+                functionPointVo6.setStatus(1);
+                vos13.add(functionPointVo6);
 
             } else {
-                FunctionPointVo functionPointVo1 = ifContains(staffManagement, "1");
-                functionPointVo1.setFunctionPoint("添加");
-                vos16.add(functionPointVo1);
+                FunctionPointVo functionPointVo1 = ifContains(systemManagement, "1");
+                functionPointVo1.setFunctionPoint("退房设置");
+                vos13.add(functionPointVo1);
 
-                FunctionPointVo functionPointVo2 = ifContains(staffManagement, "2");
-                functionPointVo2.setFunctionPoint("编辑");
-                vos16.add(functionPointVo2);
+                FunctionPointVo functionPointVo2 = ifContains(systemManagement, "2");
+                functionPointVo2.setFunctionPoint("公寓设置");
+                vos13.add(functionPointVo2);
 
-                FunctionPointVo functionPointVo3 = ifContains(staffManagement, "3");
-                functionPointVo3.setFunctionPoint("删除");
-                vos16.add(functionPointVo3);
+                FunctionPointVo functionPointVo3 = ifContains(systemManagement, "3");
+                functionPointVo3.setFunctionPoint("补助设置");
+                vos13.add(functionPointVo3);
 
-                FunctionPointVo functionPointVo4 = ifContains(staffManagement, "4");
-                functionPointVo4.setFunctionPoint("查看界面");
-                vos16.add(functionPointVo4);
+                FunctionPointVo functionPointVo4 = ifContains(systemManagement, "4");
+                functionPointVo4.setFunctionPoint("催缴设置");
+                vos13.add(functionPointVo4);
 
+                FunctionPointVo functionPointVo5 = ifContains(systemManagement, "5");
+                functionPointVo5.setFunctionPoint("设施服务设置");
+                vos13.add(functionPointVo5);
+
+                FunctionPointVo functionPointVo6 = ifContains(systemManagement, "6");
+                functionPointVo6.setFunctionPoint("查看界面");
+                vos13.add(functionPointVo6);
             }
-            menuBarVo16.setFunctionPoints(vos16);
-            menuBarVos.add(menuBarVo16);
+            menuBarVo13.setFunctionPoints(vos13);
+            menuBarVos.add(menuBarVo13);
         }
 
         return CommonResult.ok(menuBarVos);

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/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;