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

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

@@ -592,6 +592,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         String reserveLeaveTime = reserveDto.getReserveLeaveTime();
         String houseId = reserveDto.getHouseId();
 
+//        判断传过来的时间和当前时间比较
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime date = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
+        if (now.isAfter(date)) {
+            reserveLiveTime = now.format(dateTimeFormatter1);
+        }
+
 //       管理端 计算总金额
         PriceVo priceVo = houseOrderService.reservePrice(houseId, cardNumber, reserveLiveTime, reserveLeaveTime);
         BigDecimal totalPrice = priceVo.getTotalPrice();
@@ -619,7 +627,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 return CommonResult.fail("该时间段无法预定");
             }
         } else {
-            DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             LocalDateTime localDateTime = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
             LocalDateTime localDateTime2 = LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1);
 
@@ -757,6 +764,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
     }
 
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonResult checkIdCard(CheckIdCardDto checkIdCardDto) {
@@ -861,14 +870,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             wrapperHns.eq(HouseNumberState::getOrderNumber, houseOrder.getOrderNumber())
                     .eq(HouseNumberState::getHouseNumberId, houseNumberId);
 
-            HouseNumberState houseNumberState1 = houseNumberStateService.getOne(wrapperHns);
-            HouseNumberState houseNumberState = new HouseNumberState();
-            if (ObjectUtils.isEmpty(houseNumberState1)) {
-                houseNumberState.setHouseNumberId(houseNumberId);
-                houseNumberState.setEndTime(leaveTime);
-                houseNumberState.setOrderNumber(houseOrder.getOrderNumber());
-            } else {
-                BeanUtils.copyProperties(houseNumberState1, houseNumberState);
+            HouseNumberState houseNumberState = houseNumberStateService.getOne(wrapperHns);
+            if (ObjectUtils.isEmpty(houseNumberState)) {
+               return CommonResult.fail("缺少入住房态");
             }
             houseNumberState.setStatus(4);
             houseNumberState.setStartTime(liveTime);
@@ -886,7 +890,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-            electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            if (!aBoolean) {
+//                return CommonResult.fail("开电失败");
+//            }
             houseNumber.setElectricType("1");
 
             String roomNumber = houseNumber.getRoomNumber();
@@ -948,8 +955,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             }
 
 
-            houseOrderService.saveOrUpdate(houseOrder);
-            houseNumberStateService.saveOrUpdate(houseNumberState);
+            houseOrderService.updateById(houseOrder);
+            houseNumberStateService.updateById(houseNumberState);
 
             houseNumberService.updateById(houseNumber);
 
@@ -986,16 +993,17 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("该房间不存在");
         }
 
-        LambdaQueryWrapper<HouseNumber> wrapperHn = new LambdaQueryWrapper<>();
-        wrapperHn.eq(HouseNumber::getHouseId, houseNumber.getHouseId());
-//       房间必须是净房
-        wrapperHn.eq(HouseNumber::getHouseStatus, 1);
-
-        List<HouseNumber> houseNumberList = houseNumberService.list(wrapperHn);
+//        LambdaQueryWrapper<HouseNumber> wrapperHn = new LambdaQueryWrapper<>();
+//        wrapperHn.eq(HouseNumber::getHouseId, houseNumber.getHouseId());
+////       房间必须是净房
+//        wrapperHn.eq(HouseNumber::getHouseStatus, 1);
+//
+//        List<HouseNumber> houseNumberList2 = houseNumberService.list(wrapperHn);
+        List<HouseNumberVo> houseNumberList = houseNumberService.roomChangePage(houseNumber.getHouseId());
 
         String houseNumberIds = "";
         for (int i = 0; i < houseNumberList.size(); i++) {
-            HouseNumber number = houseNumberList.get(i);
+            HouseNumberVo number = houseNumberList.get(i);
 
             String id = number.getId() + "";
             if (i == 0) {
@@ -1008,14 +1016,15 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberIds, liveTime, leaveTime);
 
         //        重新组合没有使用过的房间
-        ArrayList<HouseNumber> list = new ArrayList<>();
-        for (HouseNumber houseNumber2 : houseNumberList) {
+        ArrayList<HouseNumberVo> list = new ArrayList<>();
+        for (HouseNumberVo houseNumber2 : houseNumberList) {
             String id = houseNumber2.getId() + "";
             if (!houseNumberStateList.stream().anyMatch(houseNumberState -> houseNumberState.getHouseNumberId().equals(id))) {
                 list.add(houseNumber2);
             }
         }
 
+
         return CommonResult.ok(list);
     }
 
@@ -1130,13 +1139,17 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             one.setEndTime(sdf.format(new Date()));
 
             houseNumberStateService.updateById(one);
+            houseNumberStateService.removeById(one);
 
 //        修改换的房间
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-            electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            if (!aBoolean) {
+//                return CommonResult.fail("开电失败");
+//            }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
 
@@ -1381,6 +1394,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState);
             houseNumberService.updateById(houseNumber);
 
             return CommonResult.ok();
@@ -1429,7 +1443,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-        electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//        if (!aBoolean) {
+//            return CommonResult.fail("开电失败");
+//        }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1506,7 +1523,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-        electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//        if (!aBoolean) {
+//            return CommonResult.fail("开电失败");
+//        }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1540,7 +1560,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-        electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//        if (!aBoolean) {
+//            return CommonResult.fail("关电失败");
+//        }
 
         houseNumberService.updateById(houseNumber);
 
@@ -1568,7 +1591,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     return CommonResult.fail("房间异常");
                 }
 //                开电
-                electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//                Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//                if (!aBoolean) {
+//                    return CommonResult.fail("开电失败");
+//                }
                 //        开电
                 houseNumber.setElectricType("1");
                 houseNumber.setHouseStatus(2);
@@ -1611,7 +1637,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
                 houseNumber.setElectricType("2");
 //         关电
-                electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//                Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//                if (!aBoolean) {
+//                    return CommonResult.fail("关电失败");
+//                }
 
                 boolean update = houseNumberService.updateById(houseNumber);
                 if (!update) {
@@ -1699,6 +1728,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("无锁定房间");
         }
         houseNumberStateService.updateBatchById(list);
+        houseNumberStateService.removeByIds(list);
 
 
         return CommonResult.ok();
@@ -1950,13 +1980,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
         houseNumberState.setEndTime(format);
         houseNumberStateService.updateById(houseNumberState);
+        houseNumberStateService.removeById(houseNumberState);
 
         houseNumber.setHouseStatus(1);
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-        electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-
+//        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//        if (!aBoolean) {
+//            return CommonResult.fail("关电失败");
+//        }
         houseNumberService.updateById(houseNumber);
 
         return CommonResult.ok();
@@ -2072,7 +2105,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
             houseNumber.setElectricType("2");
 //        关电
-            electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//            if (!aBoolean) {
+//                return CommonResult.fail("关电失败");
+//            }
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);
@@ -2088,7 +2124,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //            开电
-            electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            if (!aBoolean) {
+//                return CommonResult.fail("开电失败");
+//            }
             houseNumber.setElectricType("1");
             list.add(houseNumber);
         }

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

@@ -194,6 +194,15 @@ public class HouseOrderController implements HouseOrderAPI {
         }
         String reserveLiveTime = establishOrderDto.getReserveLiveTime();
         String reserveLeaveTime = establishOrderDto.getReserveLeaveTime();
+
+        //        判断传过来的时间和当前时间比较
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime date = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
+        if (now.isAfter(date)) {
+            reserveLiveTime = now.format(dateTimeFormatter1);
+        }
+
 //        获取该时间段内的所有使用的房间
         List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(ids, reserveLiveTime, reserveLeaveTime);
 
@@ -249,7 +258,7 @@ public class HouseOrderController implements HouseOrderAPI {
             houseNumberState.setStatus(3);
             Integer roomType = house.getRoomType();
             if (1==roomType) {
-                DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+//                DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                 LocalDateTime start = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1).withHour(0).withMinute(0).withSecond(0);
                 LocalDateTime end = LocalDateTime.parse(reserveLeaveTime,dateTimeFormatter1).withHour(0).withMinute(0).withSecond(0);
                 String startTime = start.format(dateTimeFormatter1);
@@ -488,7 +497,10 @@ public class HouseOrderController implements HouseOrderAPI {
 
                 HouseNumber number = houseNumberService.getById(houseLock.getHouseNumberId());
 //                开电
-                electricEquipmentService.openMeterControl(number.getElectricEquipmentId());
+//                Boolean aBoolean = electricEquipmentService.openMeterControl(number.getElectricEquipmentId());
+//                if (!aBoolean) {
+//                    return CommonResult.fail("开电失败");
+//                }
 //                设置开电状态
                 number.setElectricType("1");
 //                房间号设置成脏房需要退房后设置
@@ -617,6 +629,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState);
             return CommonResult.ok();
 
         } catch (Exception e) {
@@ -775,9 +788,7 @@ public class HouseOrderController implements HouseOrderAPI {
             HouseNumberState houseNumberState1 = houseNumberStateService.getOne(wrapperHns);
             HouseNumberState houseNumberState = new HouseNumberState();
             if (ObjectUtils.isEmpty(houseNumberState1)) {
-                houseNumberState.setHouseNumberId(houseNumberId);
-                houseNumberState.setEndTime(leaveTime);
-                houseNumberState.setOrderNumber(houseOrder.getOrderNumber());
+               return CommonResult.fail();
             } else {
                 BeanUtils.copyProperties(houseNumberState1, houseNumberState);
             }
@@ -794,7 +805,10 @@ public class HouseOrderController implements HouseOrderAPI {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-            electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            if (!aBoolean) {
+//                return CommonResult.fail("开电失败");
+//            }
             houseNumber.setElectricType("1");
 
             String roomNumber = houseNumber.getRoomNumber();
@@ -854,8 +868,8 @@ public class HouseOrderController implements HouseOrderAPI {
             }
 
 
-            houseOrderService.saveOrUpdate(houseOrder);
-            houseNumberStateService.saveOrUpdate(houseNumberState);
+            houseOrderService.updateById(houseOrder);
+            houseNumberStateService.updateById(houseNumberState);
 
             houseNumberService.updateById(houseNumber);
             operatingRecordService.save(operatingRecord);
@@ -995,6 +1009,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState);
             houseNumberService.updateById(houseNumber);
 
             return CommonResult.ok();
@@ -1120,13 +1135,17 @@ public class HouseOrderController implements HouseOrderAPI {
             one.setEndTime(sdf.format(new Date()));
 
             houseNumberStateService.updateById(one);
+            houseNumberStateService.removeById(one);
 
 //        修改换的房间
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-            electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            if (!aBoolean) {
+//                return CommonResult.fail("开电失败");
+//            }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
 
@@ -2122,6 +2141,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState);
             houseNumberService.updateById(houseNumber);
 
             return CommonResult.ok();
@@ -2260,6 +2280,7 @@ public class HouseOrderController implements HouseOrderAPI {
             houseOrder.setOrderStatus("9");
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState);
             return CommonResult.ok();
 
         } catch (Exception e) {

src/main/java/com/template/mapper/HouseNumberMapper.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.HouseNumber;
-import com.template.model.vo.CalendarPageVo;
-import com.template.model.vo.FreeVo;
-import com.template.model.vo.HouseStateVo;
-import com.template.model.vo.houseLockListVo;
+import com.template.model.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -45,4 +42,5 @@ public interface HouseNumberMapper extends BaseMapper<HouseNumber> {
 
     List<FreeVo> openDropDownShow(String houseNumberIds);
 
+    List<HouseNumberVo> roomChangePage(@Param("houseId") String houseId);
 }

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

@@ -0,0 +1,44 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class HouseNumberVo {
+    private Integer id;
+
+    @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;
+
+    @ApiModelProperty(value = "水表设备编码")
+    private String waterEquipmentMeterName;
+
+    @ApiModelProperty(value = "房间名称")
+    private String roomName;
+
+    @ApiModelProperty(value = "房间类型（1:全日房，2：钟点房）")
+    private Integer roomType;
+
+    @ApiModelProperty(value = "房间单价")
+    private BigDecimal roomPrice;
+}

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

@@ -3,10 +3,7 @@ package com.template.services;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.pojo.HouseNumber;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.CalendarPageVo;
-import com.template.model.vo.FreeVo;
-import com.template.model.vo.HouseStateVo;
-import com.template.model.vo.houseLockListVo;
+import com.template.model.vo.*;
 
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -39,4 +36,6 @@ public interface HouseNumberService extends IService<HouseNumber> {
     List<FreeVo> shutDropDownShow(String houseNumberIds);
 
     List<FreeVo> opneDropDownShow(String houseNumberIds);
+
+    List<HouseNumberVo> roomChangePage(String houseId);
 }

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

@@ -3,11 +3,10 @@ package com.template.services.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.template.model.pojo.ElectricEquipment;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.mapper.ElectricEquipmentMapper;
+import com.template.model.pojo.ElectricEquipment;
 import com.template.services.ElectricEquipmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
@@ -106,7 +105,7 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
     public Boolean openMeterControl(String electricEquipmentId) {
         ElectricEquipment electricEquipment = this.getById(electricEquipmentId);
         if (ObjectUtils.isEmpty(electricEquipment)) {
-            return null;
+            return false;
         }
         String meterId = electricEquipment.getMeterId();
         String url="http://172.16.20.87/api/wechat/main/meterControl?meterId="+meterId+"&ifOpen=Y&meterType=1";
@@ -135,7 +134,7 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
     public Boolean closeMeterControl(String electricEquipmentId) {
         ElectricEquipment electricEquipment = this.getById(electricEquipmentId);
         if (ObjectUtils.isEmpty(electricEquipment)) {
-            return null;
+            return false;
         }
         String meterId = electricEquipment.getMeterId();
         String url="http://172.16.20.87/api/wechat/main/meterControl?meterId="+meterId+"&ifOpen=N&meterType=1";
@@ -155,12 +154,13 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
         return state;
     }
 
-//    @Scheduled(cron = "0 40 * * * ? ")
-//    public void test(){
+//    @Scheduled(cron = "0 55 * * * ? ")
+    public void test(){
 //        JSONObject jsonObject = roomCostRecord("H1", "2024-04-02 08:10:10", "2024-04-03 07:00:00");
 //        System.out.println("jsonObject = " + jsonObject);
-//
-//    }
+        Boolean aBoolean = openMeterControl("2");
+        System.out.println("aBoolean = " + aBoolean);
+    }
 
 
 

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

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.mapper.HouseNumberMapper;
 import com.template.model.pojo.HouseNumber;
 import com.template.model.result.PageUtils;
-import com.template.model.vo.CalendarPageVo;
-import com.template.model.vo.FreeVo;
-import com.template.model.vo.HouseStateVo;
-import com.template.model.vo.houseLockListVo;
+import com.template.model.vo.*;
 import com.template.services.HouseNumberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -83,5 +80,10 @@ public class HouseNumberServiceImpl extends ServiceImpl<HouseNumberMapper, House
         return houseNumberMapper.openDropDownShow(houseNumberIds);
     }
 
+    @Override
+    public List<HouseNumberVo> roomChangePage(String houseId) {
+        return houseNumberMapper.roomChangePage(houseId);
+    }
+
 
 }

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

@@ -199,6 +199,25 @@
           AND hn.house_status=1
           AND hn.electric_type=2
     </select>
+    <select id="roomChangePage" resultType="com.template.model.vo.HouseNumberVo">
+        SELECT
+            hn.id,
+            hn.house_id as houseId,
+            hn.room_number as roomNumber,
+            hn.house_status as houseStatus,
+            hn.electric_type as electricType,
+            hn.electric_equipment_id as electricEquipmentId,
+            hn.electric_equipment_meter_name as electricEquipmentMeterName,
+            hn.water_equipment_id as waterEquipmentId,
+            hn.water_equipment_meter_name as waterEquipmentMeterName,
+            h.room_name as roomName,
+            h.room_type as roomType,
+            h.room_price as roomPrice
+        FROM
+            `house_number` hn
+                LEFT JOIN house h on h.id=hn.house_id and hn.deleted=0
+        WHERE hn.house_id=#{houseId} AND hn.deleted=0 and hn.house_status=1
+    </select>
 
 
 </mapper>