更新

src/main/java/com/template/api/HouseNumberStateAPI.java

@@ -97,7 +97,7 @@ public interface HouseNumberStateAPI {
     CommonResult checkInShow(@RequestParam String orderNumber);
 
     @GetMapping("/freeDropDownShow")
-    @ApiOperation(value = "房态管理-空闲房下拉框", notes = "房态管理-入住回显", httpMethod = "GET")
+    @ApiOperation(value = "房态管理-空闲房下拉框", notes = "房态管理-批量锁房下拉框", httpMethod = "GET")
     CommonResult freeDropDownShow();
 
     @GetMapping("/dirtyDropDownShow")

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

@@ -203,7 +203,9 @@ public class HouseOrderController implements HouseOrderAPI {
 
 //        需判断当前用户是能定这时间段的房
         String reserveLiveTime = establishOrderDto.getReserveLiveTime();
+        System.out.println("reserveLiveTime = " + reserveLiveTime);
         String reserveLeaveTime = establishOrderDto.getReserveLeaveTime();
+        System.out.println("reserveLeaveTime = " + reserveLeaveTime);
         Integer source = establishOrderDto.getSource();
 
 
@@ -3973,16 +3975,18 @@ public class HouseOrderController implements HouseOrderAPI {
                     houseOrders.add(houseOrder);
                     houseNumbers.add(houseNumber);
                 }
-                if (ObjectUtils.isNotEmpty(houseOrders)) {
-                    houseOrderService.updateBatchById(houseOrders);
-                }
-                if (ObjectUtils.isNotEmpty(houseNumbers)) {
-                    houseNumberService.updateBatchById(houseNumbers);
-                }
+
 
             }
         }
 
+        if (ObjectUtils.isNotEmpty(houseOrders)) {
+            houseOrderService.updateBatchById(houseOrders);
+        }
+        if (ObjectUtils.isNotEmpty(houseNumbers)) {
+            houseNumberService.updateBatchById(houseNumbers);
+        }
+
 
     }
 

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

@@ -138,7 +138,7 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
         Boolean state = false;
         if ("1000".equals(resultCode)) {
             state = true;
-            System.out.println(electricEquipment.getRoomNum()+"：开电成攻");
+            System.out.println(electricEquipment.getRoomNum()+"：开电成功");
         }else {
             System.out.println(electricEquipment.getRoomNum()+"：开电失败");
         }
@@ -180,7 +180,7 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
         Boolean state = false;
         if ("1000".equals(resultCode)) {
             state = true;
-            System.out.println(electricEquipment.getRoomNum()+"：关电成攻");
+            System.out.println(electricEquipment.getRoomNum()+"：关电成功");
         }else {
             System.out.println(electricEquipment.getRoomNum()+"：关电失败");
         }

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 
 spring:
   profiles:
-      active: test
+      active: dev
   main:
     allow-circular-references: true
   servlet: