关闭开电和关电接口

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

@@ -998,10 +998,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-        if (!aBoolean) {
-            msg = "开电失败";
-        }
+//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//        if (!aBoolean) {
+//            msg = "开电失败";
+//        }
         houseNumber.setElectricType("1");
 
         String roomNumber = houseNumber.getRoomNumber();
@@ -1323,11 +1323,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) {
-            msg = "开电失败";
-        }
+//        if (!aBoolean) {
+//            msg = "开电失败";
+//        }
         houseNumber.setElectricType("1");
         houseNumberService.updateById(houseNumber);
 
@@ -1730,11 +1730,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-        if (!aBoolean) {
-            msg = "开电失败";
-        }
+//        if (!aBoolean) {
+//            msg = "开电失败";
+//        }
 //                开电
         houseNumber.setElectricType("1");
 
@@ -1815,11 +1815,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
-        if (!aBoolean) {
-            msg = "开电失败";
-        }
+//        if (!aBoolean) {
+//            msg = "开电失败";
+//        }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1861,15 +1861,15 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 //        MyGlobalThreadPool.execute(()->{
 //        try(
-          Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//          Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
 //        )catch (Exception e) {
 //                    log.error("置净失败，失败原因：{}", e);
 //                }
 //        });
 
-        if (!aBoolean) {
-            msg = "关电失败";
-        }
+//        if (!aBoolean) {
+//            msg = "关电失败";
+//        }
 
         houseNumberService.updateById(houseNumber);
         if (msg.equals("")) {
@@ -1901,10 +1901,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 return CommonResult.fail("房间异常");
             }
 //                开电
-            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-            if (!aBoolean) {
-                msg = "开电失败";
-            }
+//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+//            if (!aBoolean) {
+//                msg = "开电失败";
+//            }
 //                        开电
             houseNumber.setElectricType("1");
             houseNumber.setHouseStatus(2);
@@ -1949,11 +1949,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
             houseNumber.setElectricType("2");
 //         关电
-            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
 
-            if (!aBoolean) {
-                msg = "关电失败";
-            }
+//            if (!aBoolean) {
+//                msg = "关电失败";
+//            }
 
             boolean update = houseNumberService.updateById(houseNumber);
             if (!update) {
@@ -2304,11 +2304,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) {
-            msg = "关电失败";
-        }
+//        if (!aBoolean) {
+//            msg = "关电失败";
+//        }
         houseNumberService.updateById(houseNumber);
 
         if (msg.equals("")) {
@@ -2430,11 +2430,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
             houseNumber.setElectricType("2");
 //        关电
-            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
 //
-            if (!aBoolean) {
-                msg = "关电失败";
-            }
+//            if (!aBoolean) {
+//                msg = "关电失败";
+//            }
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);
@@ -2455,12 +2455,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //            开电
-            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-
-            if (!aBoolean) {
+//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
 
-                msg = "开电失败";
-            }
+//            if (!aBoolean) {
+//
+//                msg = "开电失败";
+//            }
             houseNumber.setElectricType("1");
             list.add(houseNumber);
         }

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

@@ -630,11 +630,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) {
-            msg = "开电失败";
-        }
+//        if (!aBoolean) {
+//            msg = "开电失败";
+//        }
 //                设置开电状态
         number.setElectricType("1");
 //                房间号设置成脏房需要退房后设置
@@ -975,11 +975,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) {
-            msg = "开电失败";
-        }
+//        if (!aBoolean) {
+//            msg = "开电失败";
+//        }
         houseNumber.setElectricType("1");
 
         String roomNumber = houseNumber.getRoomNumber();
@@ -1463,11 +1463,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) {
-            msg = "开电失败";
-        }
+//        if (!aBoolean) {
+//            msg = "开电失败";
+//        }
         houseNumber.setElectricType("1");
         houseNumberService.updateById(houseNumber);