开电，关电

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

@@ -131,9 +131,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         LocalDateTime end = start.withHour(23).withMinute(59).withSecond(59);
         List<HouseStateVo> pageVo1 = null;
 
-        if (ObjectUtils.isNotEmpty(houseNumberStatus)&&1==houseNumberStatus) {
+        if (ObjectUtils.isNotEmpty(houseNumberStatus) && 1 == houseNumberStatus) {
             //            有房态的id
-            List<Integer> ids3=houseNumberService.getStateHouseNumber(start,end);
+            List<Integer> ids3 = houseNumberService.getStateHouseNumber(start, end);
 
 //            ArrayList<Integer> ids3 = new ArrayList<>();
 //            for (HouseStateVo houseStateVo : pageVo1) {
@@ -141,9 +141,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //                ids3.add(houseNumberId);
 //            }
 //            全部房间id
-            List<Integer> ids=houseNumberService.getHouseNumberIds();
+            List<Integer> ids = houseNumberService.getHouseNumberIds();
 //            脏房房间id
-            List<Integer> ids2=houseNumberService.getHouserNumberStatusIds(2);
+            List<Integer> ids2 = houseNumberService.getHouserNumberStatusIds(2);
 //            空闲房间id
             ArrayList<Integer> integers = new ArrayList<>();
             for (Integer id : ids) {
@@ -156,17 +156,17 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             //      获取当前房型的所有id
             String houseNumberIds = "";
             for (int i = 0; i < integers.size(); i++) {
-                 Integer id = integers.get(i);
-                 String houseNumber=String.valueOf(id);
+                Integer id = integers.get(i);
+                String houseNumber = String.valueOf(id);
                 if (i == 0) {
                     houseNumberIds = houseNumberIds + houseNumber;
                 } else {
                     houseNumberIds = houseNumberIds + "," + houseNumber;
                 }
             }
-            pageVo1 = houseNumberService.houseStateLeisurePage(keyWord, houseType, start, end, houseId, buildingId,houseNumberIds);
+            pageVo1 = houseNumberService.houseStateLeisurePage(keyWord, houseType, start, end, houseId, buildingId, houseNumberIds);
 
-        }else {
+        } else {
             pageVo1 = houseNumberService.houseStatePage(keyWord, houseType, start, end, houseId, buildingId, houseStatus, houseNumberStatus);
         }
         HashMap<Integer, HouseStateVo> map = new HashMap<>();
@@ -850,7 +850,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     }
 
 
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonResult checkIdCard(CheckIdCardDto checkIdCardDto) {
@@ -975,11 +974,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//            if (!aBoolean) {
-////                return CommonResult.fail("开电失败");
-//                msg="开电失败";
-//            }
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            if (!aBoolean) {
+                msg = "开电失败";
+            }
             houseNumber.setElectricType("1");
 
             String roomNumber = houseNumber.getRoomNumber();
@@ -1272,12 +1270,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-            //   Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
             String msg = "";
-            // if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-            //      msg="开电失败";
-            //   }
+            if (!aBoolean) {
+                msg = "开电失败";
+            }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
 
@@ -1643,13 +1640,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-        //      if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-        //      msg="开电失败";
-        //   }
-        //        开电
+        if (!aBoolean) {
+            msg = "开电失败";
+        }
+//                开电
         houseNumber.setElectricType("1");
 
         houseNumberService.updateById(houseNumber);
@@ -1729,12 +1725,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-        //    Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-        //  if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-        //      msg="开电失败";
-        //   }
+        if (!aBoolean) {
+            msg = "开电失败";
+        }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1772,12 +1767,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-        // Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-//        if (!aBoolean) {
-////            return CommonResult.fail("关电失败");
-//            msg="关电失败";
-//        }
+        if (!aBoolean) {
+            msg = "关电失败";
+        }
 
         houseNumberService.updateById(houseNumber);
         if (msg.equals("")) {
@@ -1810,12 +1804,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     return CommonResult.fail("房间异常");
                 }
 //                开电
-                //         Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-                //      if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-                //       msg="开电失败";
-                //   }
-                //        开电
+                Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+                if (!aBoolean) {
+                    msg = "开电失败";
+                }
+//                        开电
                 houseNumber.setElectricType("1");
                 houseNumber.setHouseStatus(2);
 
@@ -1862,12 +1855,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
                 houseNumber.setElectricType("2");
 //         关电
-//                Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-//
-//                if (!aBoolean) {
-////            return CommonResult.fail("关电失败");
-//                    msg="关电失败";
-//                }
+                Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+
+                if (!aBoolean) {
+                    msg = "关电失败";
+                }
 
                 boolean update = houseNumberService.updateById(houseNumber);
                 if (!update) {
@@ -2222,12 +2214,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-//        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-//        if (!aBoolean) {
-////            return CommonResult.fail("关电失败");
-//            msg="关电失败";
-//        }
+        if (!aBoolean) {
+            msg = "关电失败";
+        }
         houseNumberService.updateById(houseNumber);
 
         if (msg.equals("")) {
@@ -2348,12 +2339,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
             houseNumber.setElectricType("2");
 //        关电
-//            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
 //
-//            if (!aBoolean) {
-////            return CommonResult.fail("关电失败");
-//                msg="关电失败";
-//            }
+            if (!aBoolean) {
+                msg = "关电失败";
+            }
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);
@@ -2374,12 +2364,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //            开电
-            //    Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
 
-            //      if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-            //         msg="开电失败";
-            //   }
+            if (!aBoolean) {
+
+                msg = "开电失败";
+            }
             houseNumber.setElectricType("1");
             list.add(houseNumber);
         }

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

@@ -162,7 +162,7 @@ public class HouseOrderController implements HouseOrderAPI {
     ApplicationProcedureTemporaryService applicationProcedureTemporaryService;
 
     @Override
-    public CommonResult getHouseOrderPrice(int houseOrderNumber, String userId, String houseId, String liveTime, String leaveTime,Integer source) {
+    public CommonResult getHouseOrderPrice(int houseOrderNumber, String userId, String houseId, String liveTime, String leaveTime, Integer source) {
         if (ObjectUtils.isEmpty(userId) && ObjectUtils.isEmpty(houseId) && ObjectUtils.isEmpty(leaveTime) && ObjectUtils.isEmpty(leaveTime) && ObjectUtils.isEmpty(houseOrderNumber) && houseOrderNumber <= 0) {
             return CommonResult.fail();
         }
@@ -180,7 +180,7 @@ public class HouseOrderController implements HouseOrderAPI {
 //            establishOrderDto.setReserveLiveTime(reserveLeaveTime);
         }
 //        计算总金额
-        BigDecimal totalPrice = houseOrderService.getHouseOrderPrice(houseOrderNumber, userId, houseId, liveTime, leaveTime,source);
+        BigDecimal totalPrice = houseOrderService.getHouseOrderPrice(houseOrderNumber, userId, houseId, liveTime, leaveTime, source);
 
         return CommonResult.ok(totalPrice);
 
@@ -215,11 +215,11 @@ public class HouseOrderController implements HouseOrderAPI {
         }
 
 //        计算总金额
-        BigDecimal totalPrice = houseOrderService.getHouseOrderPrice(establishOrderDto.getHouseOrderNumber(), userId, houseId, establishOrderDto.getReserveLiveTime(), establishOrderDto.getReserveLeaveTime(),source);
+        BigDecimal totalPrice = houseOrderService.getHouseOrderPrice(establishOrderDto.getHouseOrderNumber(), userId, houseId, establishOrderDto.getReserveLiveTime(), establishOrderDto.getReserveLeaveTime(), source);
         double v = totalPrice.doubleValue();
         Integer roomType = house.getRoomType();
 //        当金额不是0时,则判断时间是否为当天
-        if (roomType==1) {
+        if (roomType == 1) {
 
             if (v > 0) {
 //                判断是否到12点了
@@ -229,14 +229,14 @@ public class HouseOrderController implements HouseOrderAPI {
                     return CommonResult.fail("未到预定时间");
                 }
 
-                LocalDateTime start =now.withHour(0).withMinute(0).withSecond(0);
+                LocalDateTime start = now.withHour(0).withMinute(0).withSecond(0);
                 LocalDateTime end = start.plusDays(1);
                 LocalDateTime end2 = start.plusDays(2);
 //            预定时间在start和end之前,离店时间在
                 LocalDateTime time = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
                 LocalDateTime time2 = LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1);
 
-                if (!(time.isAfter(start)&&time.isBefore(end)&&time2.isAfter(end)&&time2.isBefore(end2))) {
+                if (!(time.isAfter(start) && time.isBefore(end) && time2.isAfter(end) && time2.isBefore(end2))) {
                     return CommonResult.fail("不支持跨天预定");
                 }
             }
@@ -265,7 +265,6 @@ public class HouseOrderController implements HouseOrderAPI {
         }
 
 
-
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime date = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
         if (now.isAfter(date)) {
@@ -293,8 +292,6 @@ public class HouseOrderController implements HouseOrderAPI {
         HouseOrder houseOrder = new HouseOrder();
 
 
-
-
         BigDecimal payPrice = establishOrderDto.getPayPrice();
 //        返回的结果是int类型,-1表示小于，0是等于，1是大于。
         if (payPrice.compareTo(totalPrice) != 0) {
@@ -616,12 +613,11 @@ 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) {
-////                    return CommonResult.fail("开电失败");
-//                    msg="开电失败";
-//                }
+            if (!aBoolean) {
+                msg = "开电失败";
+            }
 //                设置开电状态
             number.setElectricType("1");
 //                房间号设置成脏房需要退房后设置
@@ -951,12 +947,11 @@ 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) {
-//                return CommonResult.fail("开电失败");
-            //         msg="开电失败";
-            //  }
+            if (!aBoolean) {
+                msg = "开电失败";
+            }
             houseNumber.setElectricType("1");
 
             String roomNumber = houseNumber.getRoomNumber();
@@ -1391,12 +1386,11 @@ public class HouseOrderController implements HouseOrderAPI {
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-            //     Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
             String msg = "";
-            //    if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-            //        msg="开电失败";
-            //  }
+            if (!aBoolean) {
+                msg = "开电失败";
+            }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
 
@@ -3373,7 +3367,7 @@ public class HouseOrderController implements HouseOrderAPI {
         LocalDateTime endTime = LocalDateTime.parse(leaveTime, dateTimeFormatter1);
         long day = stateTime.until(endTime, ChronoUnit.DAYS);
 
-        if (day>2) {
+        if (day > 2) {
             return CommonResult.fail("超过限制的时间段");
         }
 
@@ -3387,8 +3381,8 @@ public class HouseOrderController implements HouseOrderAPI {
         vo1.setSource(2);
 
         //        先判断是否在黑名单中
-        LambdaQueryWrapper<Blacklist> wrapperB=new LambdaQueryWrapper<>();
-        wrapperB.eq(Blacklist::getReserveUserId,userId);
+        LambdaQueryWrapper<Blacklist> wrapperB = new LambdaQueryWrapper<>();
+        wrapperB.eq(Blacklist::getReserveUserId, userId);
         Blacklist one = blacklistService.getOne(wrapperB);
         if (ObjectUtils.isNotEmpty(one)) {
             vo.setCount(0);
@@ -3431,11 +3425,11 @@ public class HouseOrderController implements HouseOrderAPI {
         String endTimeXq = localEnd.format(dateTimeFormatter2);
 //        查询该星期是否满足有2天的订单
         LambdaQueryWrapper<HouseOrder> wrapperHO = new LambdaQueryWrapper<>();
-        wrapperHO.between(HouseOrder::getReserveLiveTime, stateTimeXq+" 00:00:00", endTimeXq+" 23:59:59")
+        wrapperHO.between(HouseOrder::getReserveLiveTime, stateTimeXq + " 00:00:00", endTimeXq + " 23:59:59")
                 .eq(HouseOrder::getReserveUserId, userId)
                 .eq(HouseOrder::getSource, 1)
                 .eq(HouseOrder::getPayPrice, 0)
-                .in(HouseOrder::getOrderStatus, 1,2,3,4,8);
+                .in(HouseOrder::getOrderStatus, 1, 2, 3, 4, 8);
         List<HouseOrder> orderList = houseOrderService.list(wrapperHO);
 
         long dayDiff = 0;
@@ -3455,7 +3449,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
         Integer count = 1;
         if (dayDiff + until > 2) {
-            count=0;
+            count = 0;
         } else {
             for (int i = 0; i < until; i++) {
                 LocalDateTime dateTime1 = stateTime.plusDays(i);
@@ -3482,34 +3476,34 @@ public class HouseOrderController implements HouseOrderAPI {
             }
         }
         vo.setCount(count);
-        if (count>0) {
+        if (count > 0) {
             vos.add(vo);
         }
 
 
 //        获取流程
-        List<ApplicationProcedureTemporary> aptList=applicationProcedureTemporaryService.getApt(state,end,userId);
+        List<ApplicationProcedureTemporary> aptList = applicationProcedureTemporaryService.getApt(state, end, userId);
         if (ObjectUtils.isEmpty(aptList)) {
             vo1.setCount(0);
-        }else {
+        } else {
             ApplicationProcedureTemporary applicationProcedureTemporary = aptList.get(0);
             String houseCount = applicationProcedureTemporary.getHouseCount();
             String startTime = applicationProcedureTemporary.getStartTime();
             String endTime1 = applicationProcedureTemporary.getEndTime();
 //            计算开始到结束时间有多少订单
-            LambdaQueryWrapper<HouseOrder> wrapper=new LambdaQueryWrapper<>();
-            wrapper.eq(HouseOrder::getReserveUserId,userId)
-                            .eq(HouseOrder::getSource,2)
-                    .between(HouseOrder::getReserveLiveTime,startTime,endTime1)
+            LambdaQueryWrapper<HouseOrder> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(HouseOrder::getReserveUserId, userId)
+                    .eq(HouseOrder::getSource, 2)
+                    .between(HouseOrder::getReserveLiveTime, startTime, endTime1)
                     .eq(HouseOrder::getPayPrice, 0)
-                    .in(HouseOrder::getOrderStatus, 1,2,3,4,8);
+                    .in(HouseOrder::getOrderStatus, 1, 2, 3, 4, 8);
             List<HouseOrder> list = houseOrderService.list(wrapper);
             Integer count2 = Integer.valueOf(houseCount);
-            count2=count2-list.size();
+            count2 = count2 - list.size();
             vo1.setCount(count2);
 
         }
-        if (vo1.getCount()>0) {
+        if (vo1.getCount() > 0) {
             vos.add(vo1);
         }