打开开电接口

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

@@ -181,7 +181,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
                 if (ObjectUtils.isNotEmpty(houseStateVo.getReserveLiveTime())) {
                     reserveLiveTime = houseStateVo.getReserveLiveTime();
-                }else {
+                } else {
                     reserveLiveTime = houseStateVo.getStartTime();
                 }
 
@@ -191,8 +191,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
                 if (ObjectUtils.isNotEmpty(houseStateVo1.getReserveLiveTime())) {
                     reserveLiveTime1 = houseStateVo1.getReserveLiveTime();
-                }else {
-                    reserveLiveTime1 =  houseStateVo1.getStartTime();
+                } else {
+                    reserveLiveTime1 = houseStateVo1.getStartTime();
                 }
 
                 LocalDateTime parse = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
@@ -200,7 +200,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 LocalDateTime parse1 = LocalDateTime.parse(reserveLiveTime1, dateTimeFormatter1);
 
 
-
                 if (parse1.isAfter(parse)) {
                     map.put(houseNumberId, houseStateVo);
                 }
@@ -225,8 +224,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             List<HouseStateVo> ownerClasses = pageVo.stream().filter(e -> e.getHouseId().equals(house.getId() + "")).collect(Collectors.toList());
             if (ownerClasses != null && ownerClasses.size() > 0) {
                 vo.setVos(ownerClasses);
-                long freeCount=ownerClasses.stream().filter(e -> (e.getStatus()!=null?e.getStatus():e.getHouseStatus()+"").equals("1")).count();
-                long useCount = ownerClasses.size()-freeCount;
+                long freeCount = ownerClasses.stream().filter(e -> (e.getStatus() != null ? e.getStatus() : e.getHouseStatus() + "").equals("1")).count();
+                long useCount = ownerClasses.size() - freeCount;
                 vo.setUseCount(useCount);
                 vo.setFreeCount(freeCount);
             }
@@ -286,9 +285,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         for (int i = 0; i < 21; i++) {
             LocalDateTime localDate1 = localDateTime.plusDays(i);
             String format = localDate1.format(dateTimeFormatter1);
-            List<Map<String,Object>> useNumbers = houseNumberService.houseStateNumbers(keyWord, houseType, houseId, buildingId,format,1);
+            List<Map<String, Object>> useNumbers = houseNumberService.houseStateNumbers(keyWord, houseType, houseId, buildingId, format, 1);
             //0为空闲
-            List<Map<String,Object>> freeNumbers = houseNumberService.houseStateNumbers(keyWord, houseType, houseId, buildingId,format,0);
+            List<Map<String, Object>> freeNumbers = houseNumberService.houseStateNumbers(keyWord, houseType, houseId, buildingId, format, 0);
             HouseNumberStateDateVo houseNumberStateDateVo = new HouseNumberStateDateVo();
             houseNumberStateDateVo.setDate(format);
             int count = totalCount;
@@ -809,8 +808,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         wrapperU.eq(Users::getUserName, name)
                 .eq(Users::getPhone, phone);
         List<Users> usersList = usersService.list(wrapperU);
-        Users users=null;
-        if (usersList.size()>0) {
+        Users users = null;
+        if (usersList.size() > 0) {
             users = usersList.get(0);
         }
 
@@ -852,7 +851,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         LocalDate startDate = start.toLocalDate();
         LocalDate endDate = end.toLocalDate();
-        long diff =startDate.until(endDate, ChronoUnit.DAYS);
+        long diff = startDate.until(endDate, ChronoUnit.DAYS);
         houseOrder.setLiveDay(String.valueOf(diff));
 //        房间单价
         houseOrder.setPrice(priceVo.getPrice());
@@ -1001,15 +1000,15 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//        if (!aBoolean) {
-//            msg = "开电失败";
-//              //               设置关电状态
-//            houseNumber.setElectricType("2");
-//        }else {
-//            //                设置开电状态
-        houseNumber.setElectricType("1");
-//        }
+        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        if (!aBoolean) {
+            msg = "开电失败";
+            //               设置关电状态
+            houseNumber.setElectricType("2");
+        } else {
+            //                设置开电状态
+            houseNumber.setElectricType("1");
+        }
 
 
         String roomNumber = houseNumber.getRoomNumber();
@@ -1145,14 +1144,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 
 //        查找所有的上线的房型
-        LambdaQueryWrapper<House> wrapperH=new LambdaQueryWrapper<>();
-        wrapperH.eq(House::getIsAdded,1);
+        LambdaQueryWrapper<House> wrapperH = new LambdaQueryWrapper<>();
+        wrapperH.eq(House::getIsAdded, 1);
         List<House> houses = houseService.list(wrapperH);
 
-        String houseId="";
+        String houseId = "";
         for (int i = 0; i < houses.size(); i++) {
             House house = houses.get(i);
-            String id=house.getId()+"";
+            String id = house.getId() + "";
             if (i == 0) {
                 houseId = id;
             } else {
@@ -1188,7 +1187,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         ArrayList<RoomChangePageVo> vos = new ArrayList<>();
         for (House house : houses) {
             RoomChangePageVo vo = new RoomChangePageVo();
-            String hoId = house.getId()+"";
+            String hoId = house.getId() + "";
 
             List<HouseNumberVo> datas = list.stream().filter(e -> e.getHouseId().equals(hoId)).collect(Collectors.toList());
             vo.setName(house.getRoomName());
@@ -1229,7 +1228,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
 
         String orderStatus = houseOrder.getOrderStatus();
-        if("4".equals(orderStatus)){
+        if ("4".equals(orderStatus)) {
 
             Date liveTime = houseOrder.getLiveTime();
 
@@ -1342,16 +1341,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
             String msg = "";
-//        if (!aBoolean) {
-//            msg = "开电失败";
-//              //               设置关电状态
-//            houseNumber.setElectricType("2");
-//        }else {
-//            //                设置开电状态
-        houseNumber.setElectricType("1");
-//        }
+            if (!aBoolean) {
+                msg = "开电失败";
+                //               设置关电状态
+                houseNumber.setElectricType("2");
+            } else {
+                //                设置开电状态
+                houseNumber.setElectricType("1");
+            }
 
             houseNumberService.updateById(houseNumber);
 
@@ -1479,7 +1478,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             } else {
                 return CommonResult.ok(msg);
             }
-        }else {
+        } else {
 
             String reserveLiveTime = houseOrder.getReserveLiveTime();
             String reserveLeaveTime = houseOrder.getReserveLeaveTime();
@@ -1783,16 +1782,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-//        if (!aBoolean) {
-//            msg = "开电失败";
-//              //               设置关电状态
-//            houseNumber.setElectricType("2");
-//        }else {
-//            //                设置开电状态
-        houseNumber.setElectricType("1");
-//        }
+        if (!aBoolean) {
+            msg = "开电失败";
+            //               设置关电状态
+            houseNumber.setElectricType("2");
+        } else {
+            //                设置开电状态
+            houseNumber.setElectricType("1");
+        }
 
 
         houseNumberService.updateById(houseNumber);
@@ -1872,16 +1871,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-//        if (!aBoolean) {
-//            msg = "开电失败";
-//              //               设置关电状态
-//            houseNumber.setElectricType("2");
-//        }else {
-//            //                设置开电状态
-        houseNumber.setElectricType("1");
-//        }
+        if (!aBoolean) {
+            msg = "开电失败";
+            //               设置关电状态
+            houseNumber.setElectricType("2");
+        } else {
+            //                设置开电状态
+            houseNumber.setElectricType("1");
+        }
 
 
         houseNumber.setHouseStatus(2);
@@ -1894,7 +1893,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail(msg);
         }
     }
-//    Boolean aBoolean=true;
+
+    //    Boolean aBoolean=true;
     @Override
     public CommonResult cleanRoom(CleanRoomDto cleanRoomDto) {
         int adminId = cleanRoomDto.getAdminId();
@@ -1919,22 +1919,23 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         String msg = "";
 
+//        多线程关电
 //        MyGlobalThreadPool.execute(()->{
 //        try(
-//          Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
 //        )catch (Exception e) {
 //                    log.error("置净失败，失败原因：{}", e);
 //                }
 //        });
 
-//        if (!aBoolean) {
-//            msg = "关电失败";
-//            //        开电状态
-//            houseNumber.setElectricType("1");
-//        }else {
+        if (!aBoolean) {
+            msg = "关电失败";
+            //        开电状态
+            houseNumber.setElectricType("1");
+        } else {
 //            //        关电
             houseNumber.setElectricType("2");
-//        }
+        }
 
         houseNumberService.updateById(houseNumber);
         if (msg.equals("")) {
@@ -1966,15 +1967,15 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 return CommonResult.fail("房间异常");
             }
 //                开电
-//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//        if (!aBoolean) {
-//            msg = "开电失败";
-//              //               设置关电状态
-//            houseNumber.setElectricType("2");
-//        }else {
-//            //                设置开电状态
-        houseNumber.setElectricType("1");
-//        }
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            if (!aBoolean) {
+                msg = "开电失败";
+                //               设置关电状态
+                houseNumber.setElectricType("2");
+            } else {
+                //                设置开电状态
+                houseNumber.setElectricType("1");
+            }
 
             houseNumber.setHouseStatus(2);
 
@@ -2017,16 +2018,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             houseNumber.setHouseStatus(1);
 
 //         关电
-//            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
 
-//        if (!aBoolean) {
-//            msg = "关电失败";
-//            //        开电状态
-//            houseNumber.setElectricType("1");
-//        }else {
-//            //        关电
-            houseNumber.setElectricType("2");
-//        }
+            if (!aBoolean) {
+                msg = "关电失败";
+                //        开电状态
+                houseNumber.setElectricType("1");
+            } else {
+                //        关电
+                houseNumber.setElectricType("2");
+            }
             boolean update = houseNumberService.updateById(houseNumber);
             if (!update) {
                 return CommonResult.fail();
@@ -2375,16 +2376,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         houseNumber.setHouseStatus(1);
 
 //        关电
-//        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-//        if (!aBoolean) {
-//            msg = "关电失败";
-//            //        开电状态
-//            houseNumber.setElectricType("1");
-//        }else {
-//            //        关电
+        if (!aBoolean) {
+            msg = "关电失败";
+            //        开电状态
+            houseNumber.setElectricType("1");
+        } else {
+            //        关电
             houseNumber.setElectricType("2");
-//        }
+        }
         houseNumberService.updateById(houseNumber);
 
         if (msg.equals("")) {
@@ -2505,16 +2506,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //        关电
-//            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-//
-//        if (!aBoolean) {
-//            msg = "关电失败";
-//            //        开电状态
-//            houseNumber.setElectricType("1");
-//        }else {
-//            //        关电
-            houseNumber.setElectricType("2");
-//        }
+            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+
+            if (!aBoolean) {
+                msg = "关电失败";
+                //        开电状态
+                houseNumber.setElectricType("1");
+            } else {
+                //        关电
+                houseNumber.setElectricType("2");
+            }
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);
@@ -2535,16 +2536,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //            开电
-//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-
-//        if (!aBoolean) {
-//            msg = "开电失败";
-//              //               设置关电状态
-//            houseNumber.setElectricType("2");
-//        }else {
-//            //                设置开电状态
-        houseNumber.setElectricType("1");
-//        }
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+
+            if (!aBoolean) {
+                msg = "开电失败";
+                //               设置关电状态
+                houseNumber.setElectricType("2");
+            } else {
+                //                设置开电状态
+                houseNumber.setElectricType("1");
+            }
 
             list.add(houseNumber);
         }

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

@@ -631,16 +631,16 @@ public class HouseOrderController implements HouseOrderAPI {
 
         HouseNumber number = houseNumberService.getById(houseLock.getHouseNumberId());
 //                开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(number.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.openMeterControl(number.getElectricEquipmentId());
         String msg = "";
-//        if (!aBoolean) {
-//            msg = "开电失败";
-//              //               设置关电状态
-//            number.setElectricType("2");
-//        }else {
-//            //                设置开电状态
+        if (!aBoolean) {
+            msg = "开电失败";
+              //               设置关电状态
+            number.setElectricType("2");
+        }else {
+            //                设置开电状态
             number.setElectricType("1");
-//        }
+        }
 
 //                房间号设置成脏房需要退房后设置
 //                number.setHouseStatus(2);
@@ -980,16 +980,16 @@ public class HouseOrderController implements HouseOrderAPI {
         HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-//        if (!aBoolean) {
-//            msg = "开电失败";
-//              //               设置关电状态
-//            houseNumber.setElectricType("2");
-//        }else {
-//            //                设置开电状态
+        if (!aBoolean) {
+            msg = "开电失败";
+              //               设置关电状态
+            houseNumber.setElectricType("2");
+        }else {
+            //                设置开电状态
         houseNumber.setElectricType("1");
-//        }
+        }
 
         String roomNumber = houseNumber.getRoomNumber();
         String start = String.valueOf(liveDate.getTime());
@@ -1472,16 +1472,16 @@ public class HouseOrderController implements HouseOrderAPI {
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-//        if (!aBoolean) {
-//            msg = "开电失败";
-//              //               设置关电状态
-//            houseNumber.setElectricType("2");
-//        }else {
-//            //                设置开电状态
+        if (!aBoolean) {
+            msg = "开电失败";
+              //               设置关电状态
+            houseNumber.setElectricType("2");
+        }else {
+            //                设置开电状态
         houseNumber.setElectricType("1");
-//        }
+        }
 
         houseNumberService.updateById(houseNumber);
 
@@ -3936,8 +3936,12 @@ public class HouseOrderController implements HouseOrderAPI {
                 Unlocking unlocking = unlockingService.getOne(wrapperU);
                 if (ObjectUtils.isNotEmpty(unlocking)) {
 //                删除房间密码
+                    try {
                     passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
                     unlockingService.removeById(unlocking);
+                    }catch (Exception e){
+                        log.info("房间id是"+houseNumberId+": "+e);
+                    }
                 }
 
                 if (ObjectUtils.isNotEmpty(houseNumber)) {