续单通电，一分钟后自动通电去掉

share-quartz/src/main/java/share/quartz/task/RedisTask.java

@@ -286,9 +286,6 @@ public class RedisTask {
                     //延时3分钟断电
                 deviceOpService.openOrCloseDevice(sOrder.getRoomId(), sOrder.getConsumerPhone(), OpTypeEnum.CUT_ELECTRIC.getCode(), false, 0L,
                             DeviceOpSourceEnum.DEVICE_SOURCE_20.getCode());
-                //延时一分钟通电
-                deviceOpService.openOrCloseDevice(sOrder.getRoomId(), sOrder.getConsumerPhone(), OpTypeEnum.GET_ELECTRIC.getCode(), true, ONE_MINUTES,
-                        DeviceOpSourceEnum.DEVICE_SOURCE_20.getCode());
                 Map<String, String> map = new HashMap<>();
                 map.put("orderNo", sOrder.getOrderNo());
                 //当前时间加15分钟

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -854,6 +854,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 sOrder.setStartDate(sOrder.getPreStartDate());
                 sOrder.setEndDate(sOrder.getPreEndDate());
                 sOrder.setStatus(OrderStatusEnum.INUSE.getCode());
+                sOrder.setArrivalTime(new Date());
                 if (room.getStatus().equals(RoomStatusEnum.FREE.getValue())) {
                     room.setStatus(RoomStatusEnum.HOLD.getValue());
                     roomService.updateById(room);
@@ -874,6 +875,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                                 cn.hutool.core.date.DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN),
                                 cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.offsetMinute(new Date(), 1), DatePattern.NORM_DATETIME_PATTERN), "1",
                                 DeviceOpSourceEnum.DEVICE_SOURCE_20.getCode());
+                        //通电
+                        deviceOpService.openOrCloseDevice(sOrder.getRoomId(), sOrder.getConsumerPhone(), OpTypeEnum.GET_ELECTRIC.getCode(), true, 5L,
+                                DeviceOpSourceEnum.DEVICE_SOURCE_20.getCode());
 //                        SRoom sRoom = roomService.getById(sOrder.getRoomId());
                         //通知保洁人员
                         sConsumerService.selectListByStoreId(sOrder.getStoreId()).stream().forEach(item -> {