修改添加房间，删除楼栋，小程序钟点房占用状态

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

@@ -26,4 +26,8 @@ public interface BuildingControllerAPI {
     @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,7 @@ 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;
@@ -48,12 +49,12 @@ public interface HouseNumberControllerAPI {
 
     @PostMapping("/saveHouseNuber")
     @ApiOperation(value = "添加房间", notes = "添加房间", httpMethod = "POST")
-    CommonResult saveHouseNuber(@RequestBody HouseNumber houseNumber);
+    CommonResult saveHouseNuber(@RequestBody HouseNumberDto houseNumberDto);
 
 
     @GetMapping("/listHouseNuber")
     @ApiOperation(value = "房间列表查询", notes = "房间列表查询", httpMethod = "GET")
-    CommonResult getPageHouseNuber(@RequestParam int page,@RequestParam int size, String keyWord,String building,String element,String house);
+    CommonResult getPageHouseNuber(@RequestParam int page,@RequestParam int size, String keyWord,Integer buildingId,Integer houseId);
 
     @PostMapping("/updateHouseNuber")
     @ApiOperation(value = "房间编辑", notes = "房间编辑", httpMethod = "POST")

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/controller/BuildingController.java

@@ -7,11 +7,18 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.BuildingControllerAPI;
 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>
  * 前端控制器
@@ -26,6 +33,9 @@ public class BuildingController implements BuildingControllerAPI {
     @Autowired
     BuildingService buildingService;
 
+    @Autowired
+    HouseNumberService houseNumberService;
+
     @Override
     public CommonResult save(Building building) {
         String building1 = building.getBuilding();
@@ -84,9 +94,42 @@ public class BuildingController implements BuildingControllerAPI {
 
     @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/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.*;
@@ -347,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);
@@ -365,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);
 
@@ -476,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,10 +11,12 @@ 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.*;
@@ -21,18 +24,21 @@ 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
@@ -59,6 +65,12 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     @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);
@@ -78,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);
 
@@ -110,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)) {
@@ -119,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("该水表设备不存在");
@@ -128,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);
@@ -158,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("非法进入");
@@ -177,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);
@@ -207,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)) {
@@ -216,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("该水表设备不存在");
@@ -225,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);
@@ -301,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);
 
 
 //        导出
@@ -319,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());
@@ -343,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++) {
@@ -356,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);
         }
@@ -403,12 +415,13 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     @Override
     public CommonResult houseNumberPullDown() {
 
-        LambdaQueryWrapper<HouseNumber> houseNumberWrapper=new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<HouseNumber> houseNumberWrapper = new LambdaQueryWrapper<>();
+        houseNumberWrapper.isNotNull(HouseNumber::getBuildingId);
         List<HouseNumber> list = houseNumberService.list(houseNumberWrapper);
 
-        LambdaQueryWrapper<Building> buildingWrapper=new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<Building> buildingWrapper = new LambdaQueryWrapper<>();
         buildingWrapper.orderByAsc(Building::getBuilding)
-                        .orderByAsc(Building::getElement);
+                .orderByAsc(Building::getElement);
         List<Building> buildingList = buildingService.list(buildingWrapper);
 
         ArrayList<HouseNumberPullDownVo> vos = new ArrayList<>();
@@ -428,49 +441,87 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    public CommonResult saveHouseNuber(HouseNumber houseNumber) {
-        String electricEquipmentMeterName = houseNumber.getElectricEquipmentMeterName();
-        LambdaQueryWrapper<ElectricEquipment> wrapperE=new LambdaQueryWrapper<>();
-        wrapperE.eq(ElectricEquipment::getMeterName,electricEquipmentMeterName);
+    @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 = houseNumber.getWaterEquipmentMeterName();
-        LambdaQueryWrapper<WaterEquipment> wrapperW=new LambdaQueryWrapper<>();
-        wrapperW.eq(WaterEquipment::getMeterName,waterEquipmentMeterName);
+        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());
+        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.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("门锁异常");
+                }
 
-        houseNumberService.save(houseNumber);
-
+//        设备连接状态
+                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, String building, String element, String house) {
+    public CommonResult getPageHouseNuber(int page, int size, String keyWord, Integer buildingId, Integer houseId) {
 
-        return null;
+        PageUtils<HouseNumberListVo> voPageUtils = houseNumberService.getpage(page, size, keyWord, buildingId, houseId);
+
+
+        return CommonResult.ok(voPageUtils);
     }
 
     @Override

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

@@ -2929,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/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/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/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/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/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>