修改设施编辑，设施删除接口，修改水电表导出，门锁导出示例接口

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

@@ -49,6 +49,11 @@ public class AppletLoginController implements AppletLoginControllerAPI {
     @Autowired
     PermissionSettingService permissionSettingService;
 
+    public static void main(String[] args) throws UnsupportedEncodingException {
+        String name ="\u571f\u6728\u5efa\u7b51\u5206\u9662";
+        String encodeName = URLEncoder.encode(name,"utf-8");
+        System.out.println("encodeName = " + encodeName);
+    }
     @Override
     @PassToken
     public String weixiaoAuth(String wxcode, String state) throws UnsupportedEncodingException {

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

@@ -7,13 +7,17 @@ import com.template.api.FacilityServicesControllerAPI;
 import com.template.model.dto.FacilityServicesSaveDto;
 import com.template.model.dto.FacilityServicesUpdateDto;
 import com.template.model.pojo.FacilityServices;
+import com.template.model.pojo.House;
 import com.template.model.pojo.PermissionSetting;
 import com.template.model.result.CommonResult;
 import com.template.services.FacilityServicesService;
+import com.template.services.HouseService;
 import com.template.services.PermissionSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -33,6 +37,9 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
     @Autowired
     PermissionSettingService permissionSettingService;
 
+    @Autowired
+    HouseService housesService;
+
     @Override
     public CommonResult save(FacilityServicesSaveDto facilityServicesSaveDto) {
         String permissionSettingId = facilityServicesSaveDto.getPermissionSettingId();
@@ -85,6 +92,7 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public CommonResult update(FacilityServicesUpdateDto facilityServicesUpdateDto) {
         String permissionSettingId = facilityServicesUpdateDto.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -115,16 +123,29 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
         facilityServices.setHouseService(facilityServicesUpdateDto.getHouseService());
         facilityServices.setId(facilityServicesUpdateDto.getId());
 
-        boolean update = facilityServicesService.updateById(facilityServices);
-
-        if (update) {
+//        修改房型设施
+        List<House> list=housesService.getHouseService(houseService1);
+        ArrayList<House> houses = new ArrayList<>();
+        for (House house : list) {
+            String roomConfiguration = house.getRoomConfiguration();
+            String configurations=roomConfiguration.replace(houseService1,houseService);
+            house.setRoomConfiguration(configurations);
+            houses.add(house);
+        }
+        try {
+            facilityServicesService.updateById(facilityServices);
+            housesService.updateBatchById(houses);
             return CommonResult.ok();
+        }catch (Exception e){
+            e.printStackTrace();
         }
 
+
         return CommonResult.fail();
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public CommonResult delete(String permissionSettingId, int id) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
@@ -139,17 +160,48 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
         if (ObjectUtils.isEmpty(id)) {
             return CommonResult.fail("参数异常");
         }
+        FacilityServices byId = facilityServicesService.getById(id);
+        String houseService = byId.getHouseService();
+        //        修改房型设施
+        List<House> list=housesService.getHouseService(houseService);
+        ArrayList<House> houses = new ArrayList<>();
+        for (House house : list) {
+            String roomConfiguration = house.getRoomConfiguration();
+            String configurations=roomConfiguration.replace(houseService,"");
+            String[] split = configurations.split(",");
+            String configs="";
+            for (int i = 0; i <split.length; i++) {
+                String s= split[i];
+                if (ObjectUtils.isNotEmpty(s)) {
+                    if (ObjectUtils.isNotEmpty(configs)) {
+                        configs=configs+","+s;
+                    }else {
+                       configs=s;
+                    }
+                }
+
+            }
+            house.setRoomConfiguration(configs);
+            houses.add(house);
+        }
 
-        boolean b = facilityServicesService.removeById(id);
 
-        if (b) {
+        try {
+            boolean b = facilityServicesService.removeById(id);
+            if (ObjectUtils.isNotEmpty(houses)) {
+                housesService.updateBatchById(houses);
+            }
+
             return CommonResult.ok();
+        }catch (Exception e){
+            e.printStackTrace();
         }
 
         return CommonResult.fail();
 
     }
 
+
     @Override
     public CommonResult appletList() {
         List<FacilityServices> list = facilityServicesService.list(new LambdaQueryWrapper<>());

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

@@ -421,8 +421,8 @@ public class HouseLockController implements HouseLockControllerAPI {
         user1.add("19-101");
         user1.add("047863CA78E0");
         List<Object> user2 = new ArrayList<>();
-        user1.add("17栋");
-        user1.add("2单元");
+        user2.add("17栋");
+        user2.add("2单元");
         user2.add("钟点房");
         user2.add("标准房");
         user2.add("19-201");

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

@@ -96,7 +96,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     ApartmentSettingService apartmentSettingService;
 
     @Override
-    public CommonResult page(String keyWord, String houseType,Integer houseId,Integer buildingId,Integer status) {
+    public CommonResult page(String keyWord, String houseType, Integer houseId, Integer buildingId, Integer status) {
 
 //        if (ObjectUtils.isEmpty(page) && page <= 0) {
 //            page = 1;
@@ -105,21 +105,21 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        if (ObjectUtils.isEmpty(size) && size <= 0) {
 //            size = 10;
 //        }
-        Integer houseNumberStatus=null;
-        Integer houseStatus=null;
+        Integer houseNumberStatus = null;
+        Integer houseStatus = null;
         if (ObjectUtils.isNotEmpty(status)) {
-            if (status==1) {
-                houseNumberStatus=1;
-            }else if (status==2){
-                houseNumberStatus=2;
-            } else if (status==3){
-                houseStatus=3;
-            } else if (status==4){
-                houseStatus=4;
-            } else if (status==5){
-                houseStatus=5;
-            } else if (status==6){
-                houseStatus=6;
+            if (status == 1) {
+                houseNumberStatus = 1;
+            } else if (status == 2) {
+                houseNumberStatus = 2;
+            } else if (status == 3) {
+                houseStatus = 3;
+            } else if (status == 4) {
+                houseStatus = 4;
+            } else if (status == 5) {
+                houseStatus = 5;
+            } else if (status == 6) {
+                houseStatus = 6;
             }
         }
 
@@ -129,7 +129,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         List<House> list = houseService.list(new LambdaQueryWrapper<>());
         LocalDateTime start = LocalDateTime.now();
         LocalDateTime end = start.withHour(23).withMinute(59).withSecond(59);
-        List<HouseStateVo> pageVo1 = houseNumberService.houseStatePage(keyWord, houseType, start, end,houseId,buildingId,houseStatus,houseNumberStatus);
+        List<HouseStateVo> pageVo1 = houseNumberService.houseStatePage(keyWord, houseType, start, end, houseId, buildingId, houseStatus, houseNumberStatus);
         HashMap<Integer, HouseStateVo> map = new HashMap<>();
         for (HouseStateVo houseStateVo : pageVo1) {
             Integer houseNumberId = houseStateVo.getHouseNumberId();
@@ -174,7 +174,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     }
 
     @Override
-    public CommonResult calendarPage(String dateTime, String keyWord, String houseType, int page, int size,Integer houseId,Integer buildingId) {
+    public CommonResult calendarPage(String dateTime, String keyWord, String houseType, int page, int size, Integer houseId, Integer buildingId) {
         if (ObjectUtils.isEmpty(page) && page <= 0) {
             page = 1;
         }
@@ -250,7 +250,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         map.put("dateTime", list);
 
 
-        PageUtils<CalendarPageVo> pageVo = houseNumberService.houseStateCalendarPage(keyWord, houseType, page, size,houseId,buildingId);
+        PageUtils<CalendarPageVo> pageVo = houseNumberService.houseStateCalendarPage(keyWord, houseType, page, size, houseId, buildingId);
 
         List<CalendarPageVo> listVo = pageVo.getList();
 
@@ -527,7 +527,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        String battery = data.getString("battery");
 
 
-
         return CommonResult.ok(vo);
 
 
@@ -564,16 +563,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         ArrayList<ReserveDayVo> reserveDayVos = new ArrayList<>();
         for (int i = 0; i <= 8; i++) {
-            LocalDateTime localDateTime=null;
-            if (i==0) {
+            LocalDateTime localDateTime = null;
+            if (i == 0) {
                 //        判断传过来的时间和当前时间比较
                 LocalDateTime now = LocalDateTime.now();
                 if (now.isAfter(start)) {
-                    localDateTime= now;
-                }else {
-                    localDateTime=start.plusDays(i);
+                    localDateTime = now;
+                } else {
+                    localDateTime = start.plusDays(i);
                 }
-            }else {
+            } else {
                 localDateTime = start.plusDays(i);
             }
 
@@ -862,7 +861,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         String idCard = checkIdCardDto.getIdCard();
 //        身份证特殊编码
         String idCardInformation = checkIdCardDto.getIdCardInformation();
-        String msg="";
+        String msg = "";
         try {
 
 //        判断是否有用户
@@ -877,6 +876,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             wrapperHo.eq(HouseOrder::getOrderNumber, orderNumber);
             HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
 
+//            判断订单是否支付
+            if (ObjectUtils.isEmpty(houseOrder)) {
+                return CommonResult.fail("不存在该订单");
+            }
+
+            String orderStatus = houseOrder.getOrderStatus();
+            if ((!"2".equals(orderStatus)) && (!"3".equals(orderStatus))) {
+                return CommonResult.fail("订单未支付");
+            }
+
 
 //                        入住人id
             if (ObjectUtils.isEmpty(users)) {
@@ -917,7 +926,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
             HouseNumberState houseNumberState = houseNumberStateService.getOne(wrapperHns);
             if (ObjectUtils.isEmpty(houseNumberState)) {
-               return CommonResult.fail("缺少入住房态");
+                return CommonResult.fail("缺少入住房态");
             }
             houseNumberState.setStatus(4);
             houseNumberState.setStartTime(liveTime);
@@ -950,10 +959,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
             operatingRecord.setContent("姓名:" + liveName);
             houseOrder.setKeyType(lockStatus);
-            if (5==lockStatus) {
+            if (5 == lockStatus) {
 //                默认未归还
                 houseOrder.setGiveBack(2);
-            }else {
+            } else {
                 //        获取设备id
                 LambdaQueryWrapper<HouseLock> wrapperHl = new LambdaQueryWrapper<>();
                 wrapperHl.eq(HouseLock::getHouseNumberId, houseNumberId);
@@ -963,7 +972,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 }
                 String equipmentState = houseLock.getEquipmentType();
 
-                if (1==lockStatus) {
+                if (1 == lockStatus) {
                     PasswordDto pr = new PasswordDto();
                     pr.setLuid(equipmentState);
                     pr.setStartTime(start);
@@ -980,7 +989,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //                ArrayList<String> strings = new ArrayList<>();
                     // strings.add(cardNumber);
                     // weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
-                } else if (2==lockStatus) {
+                } else if (2 == lockStatus) {
                     CardInfoDto cid = new CardInfoDto();
                     cid.setCard(idCardInformation);
                     cid.setLuid(equipmentState);
@@ -997,7 +1006,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     //                默认未归还
                     houseOrder.setGiveBack(2);
 
-                } else if (3==lockStatus) {
+                } else if (3 == lockStatus) {
                     FingerprintDataDto fd = new FingerprintDataDto();
                     fd.setLuid(equipmentState);
                     fd.setHouseNumberId(houseNumberId);
@@ -1009,7 +1018,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     unlockingService.save(unlocking);
                     //                添加锁的操作记录类型
                     operatingRecord.setType("添加指纹钥匙");
-                }else if (4==lockStatus){
+                } else if (4 == lockStatus) {
                     CardInfoDto cid = new CardInfoDto();
                     cid.setCard(idCardInformation);
                     cid.setLuid(equipmentState);
@@ -1037,12 +1046,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
             if (msg.equals("")) {
                 return CommonResult.ok();
-            }else {
+            } else {
                 return CommonResult.ok(msg);
             }
 
 
-
         } catch (Exception e) {
             e.printStackTrace();
             return CommonResult.fail();
@@ -1225,12 +1233,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-         //   Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-            String msg="";
-           // if (!aBoolean) {
+            //   Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            String msg = "";
+            // if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-          //      msg="开电失败";
-         //   }
+            //      msg="开电失败";
+            //   }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
 
@@ -1344,7 +1352,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
             if (msg.equals("")) {
                 return CommonResult.ok();
-            }else {
+            } else {
                 return CommonResult.ok(msg);
             }
 
@@ -1587,11 +1595,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         //                开电
 //        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-        String msg="";
-  //      if (!aBoolean) {
+        String msg = "";
+        //      if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-      //      msg="开电失败";
-     //   }
+        //      msg="开电失败";
+        //   }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1608,7 +1616,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         if (msg.equals("")) {
             return CommonResult.ok();
-        }else {
+        } else {
             return CommonResult.ok(msg);
         }
     }
@@ -1672,12 +1680,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-    //    Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-        String msg="";
-      //  if (!aBoolean) {
+        //    Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        String msg = "";
+        //  if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-      //      msg="开电失败";
-     //   }
+        //      msg="开电失败";
+        //   }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1687,7 +1695,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         if (msg.equals("")) {
             return CommonResult.ok();
-        }else {
+        } else {
             return CommonResult.ok(msg);
         }
     }
@@ -1715,8 +1723,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-       // Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-        String msg="";
+        // Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+        String msg = "";
 //        if (!aBoolean) {
 ////            return CommonResult.fail("关电失败");
 //            msg="关电失败";
@@ -1725,7 +1733,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         houseNumberService.updateById(houseNumber);
         if (msg.equals("")) {
             return CommonResult.ok();
-        }else {
+        } else {
             return CommonResult.ok(msg);
         }
 
@@ -1745,7 +1753,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("此账号暂无该权限");
         }
         List<String> list = dirtyRoomDtos.getHouseNumberIds();
-        String msg="";
+        String msg = "";
         try {
             for (String s : list) {
                 HouseNumber houseNumber = houseNumberService.getById(s);
@@ -1753,11 +1761,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     return CommonResult.fail("房间异常");
                 }
 //                开电
-       //         Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-          //      if (!aBoolean) {
+                //         Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+                //      if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-             //       msg="开电失败";
-             //   }
+                //       msg="开电失败";
+                //   }
                 //        开电
                 houseNumber.setElectricType("1");
                 houseNumber.setHouseStatus(2);
@@ -1774,7 +1782,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         if (msg.equals("")) {
             return CommonResult.ok();
-        }else {
+        } else {
             return CommonResult.ok(msg);
         }
     }
@@ -1793,7 +1801,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("此账号暂无该权限");
         }
         List<String> houseNumberIds = cleanRoomDtos.getHouseNumberIds();
-        String msg="";
+        String msg = "";
         try {
             for (String houseNumberId : houseNumberIds) {
                 HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
@@ -1823,7 +1831,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
         if (msg.equals("")) {
             return CommonResult.ok();
-        }else {
+        } else {
             return CommonResult.ok(msg);
         }
     }
@@ -1934,18 +1942,18 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime start = LocalDateTime.parse(startTime, dateTimeFormatter1);
 
-        start=start.withSecond(0).withMinute(0);
+        start = start.withSecond(0).withMinute(0);
         LocalDateTime end = start.plusHours(liveTime);
         String endTime = end.format(dateTimeFormatter1);
         String[] split = hourTime.split(",");
         ArrayList<ReserveDayVo> reserveDayVos = new ArrayList<>();
         for (int i = 0; i < 13; i++) {
-            LocalDateTime localDateTime=null;
-            LocalDateTime localDateTime2 =null;
-            if (i==0) {
+            LocalDateTime localDateTime = null;
+            LocalDateTime localDateTime2 = null;
+            if (i == 0) {
                 localDateTime = LocalDateTime.parse(startTime, dateTimeFormatter1);
                 localDateTime2 = localDateTime.plusHours(liveTime);
-            }else {
+            } else {
                 localDateTime = start.plusHours(i);
                 localDateTime2 = end.plusHours(i);
             }
@@ -2069,10 +2077,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             House house = houses.get(i);
             Integer id = house.getId();
             FreeDropDownShowVo vo = new FreeDropDownShowVo();
-            vo.setId(id+1000000);
+            vo.setId(id + 1000000);
             vo.setName(house.getRoomName());
             vo.setRoomType(house.getRoomType());
-            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id+ "")).collect(Collectors.toList());
+            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id + "")).collect(Collectors.toList());
             if (ownerClasses != null && ownerClasses.size() > 0) {
                 vo.setVos(ownerClasses);
             }
@@ -2092,10 +2100,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             House house = houses.get(i);
             Integer id = house.getId();
             FreeDropDownShowVo vo = new FreeDropDownShowVo();
-            vo.setId(id+1000000);
+            vo.setId(id + 1000000);
             vo.setName(house.getRoomName());
             vo.setRoomType(house.getRoomType());
-            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id+ "")).collect(Collectors.toList());
+            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id + "")).collect(Collectors.toList());
             if (ownerClasses != null && ownerClasses.size() > 0) {
                 vo.setVos(ownerClasses);
             }
@@ -2117,10 +2125,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             House house = houses.get(i);
             Integer id = house.getId();
             FreeDropDownShowVo vo = new FreeDropDownShowVo();
-            vo.setId(id+1000000);
+            vo.setId(id + 1000000);
             vo.setName(house.getRoomName());
             vo.setRoomType(house.getRoomType());
-            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id+ "")).collect(Collectors.toList());
+            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id + "")).collect(Collectors.toList());
             if (ownerClasses != null && ownerClasses.size() > 0) {
                 vo.setVos(ownerClasses);
             }
@@ -2166,7 +2174,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         houseNumber.setElectricType("2");
 //        关电
 //        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-        String msg="";
+        String msg = "";
 //        if (!aBoolean) {
 ////            return CommonResult.fail("关电失败");
 //            msg="关电失败";
@@ -2175,7 +2183,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         if (msg.equals("")) {
             return CommonResult.ok();
-        }else {
+        } else {
             return CommonResult.ok(msg);
         }
     }
@@ -2218,10 +2226,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             House house = houses.get(i);
             Integer id = house.getId();
             FreeDropDownShowVo vo = new FreeDropDownShowVo();
-            vo.setId(id+1000000);
+            vo.setId(id + 1000000);
             vo.setName(house.getRoomName());
             vo.setRoomType(house.getRoomType());
-            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id+ "")).collect(Collectors.toList());
+            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id + "")).collect(Collectors.toList());
             if (ownerClasses != null && ownerClasses.size() > 0) {
                 vo.setVos(ownerClasses);
             }
@@ -2268,10 +2276,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             House house = houses.get(i);
             Integer id = house.getId();
             FreeDropDownShowVo vo = new FreeDropDownShowVo();
-            vo.setId(id+1000000);
+            vo.setId(id + 1000000);
             vo.setName(house.getRoomName());
             vo.setRoomType(house.getRoomType());
-            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id+ "")).collect(Collectors.toList());
+            List<FreeVo> ownerClasses = freeVos.stream().filter(e -> e.getHouseId().equals(id + "")).collect(Collectors.toList());
             if (ownerClasses != null && ownerClasses.size() > 0) {
                 vo.setVos(ownerClasses);
             }
@@ -2285,7 +2293,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         List<String> houseNumberIds = dtos.getHouseNumberIds();
 
         ArrayList<HouseNumber> list = new ArrayList<>();
-        String msg="";
+        String msg = "";
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //        关电
@@ -2303,7 +2311,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         if (msg.equals("")) {
             return CommonResult.ok();
-        }else {
+        } else {
             return CommonResult.ok(msg);
         }
 
@@ -2313,16 +2321,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     public CommonResult openERooms(OpenRoomsDto openRoomsDto) {
         List<String> houseNumberIds = openRoomsDto.getHouseNumberIds();
         ArrayList<HouseNumber> list = new ArrayList<>();
-        String msg="";
+        String msg = "";
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //            开电
-        //    Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            //    Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
 
-      //      if (!aBoolean) {
+            //      if (!aBoolean) {
 //                return CommonResult.fail("开电失败");
-       //         msg="开电失败";
-         //   }
+            //         msg="开电失败";
+            //   }
             houseNumber.setElectricType("1");
             list.add(houseNumber);
         }
@@ -2330,7 +2338,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         if (msg.equals("")) {
             return CommonResult.ok();
-        }else {
+        } else {
             return CommonResult.ok(msg);
         }
     }

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

@@ -2598,7 +2598,7 @@ public class HouseOrderController implements HouseOrderAPI {
                     .eq(HouseNumberState::getOrderNumber, orderNumber);
             HouseNumberState houseNumberState = houseNumberStateService.getOne(wrapperHns);
             if (ObjectUtils.isEmpty(houseNumberState)) {
-                return CommonResult.fail("无该订单房态");
+                return CommonResult.ok("无该订单房态");
             }
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             houseNumberState.setEndTime(sdf.format(new Date()));

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

@@ -32,4 +32,5 @@ public interface HouseMapper extends BaseMapper<House> {
 
     List<HouseDisplayBarVo> displayBar(@Param("type") Integer type);
 
+    List<House> getHouseService(@Param("houseService") String houseService);
 }

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

@@ -33,4 +33,6 @@ public interface HouseService extends IService<House> {
     House getHouseName(String houseName,Integer roomType);
 
     List<HouseDisplayBarVo> displayBar(Integer type);
+
+    List<House> getHouseService(String houseService);
 }

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

@@ -69,5 +69,10 @@ public class HouseServiceImpl extends ServiceImpl<HouseMapper, House> implements
         return houseMapper.displayBar(type);
     }
 
+    @Override
+    public List<House> getHouseService(String houseService) {
+        return houseMapper.getHouseService(houseService);
+    }
+
 
 }

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

@@ -82,5 +82,14 @@
         </if>
     </select>
 
+    <select id="getHouseService" resultType="com.template.model.pojo.House">
+        SELECT
+            *
+        FROM
+            `house`
+        WHERE deleted=0
+          AND FIND_IN_SET(#{houseService},room_configuration)
+    </select>
+
 
 </mapper>

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

@@ -314,7 +314,7 @@
         h.room_name as houseName,
         h.room_type as roomType,
         b.building as building,
-        b.element,
+        b.element
         FROM
         `house_number` hn
         LEFT JOIN house h on h.id=hn.house_id AND h.deleted=0