diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java index f64a6be..da14e67 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java @@ -446,13 +446,13 @@ public class ReceiveController { noOrderMarkers.put(sn, currentTime); // 设置标记时间 // 设置定时任务,5分钟后检查状态 - Executors.newSingleThreadScheduledExecutor().schedule(() -> { - if (!etOrderService.isInOrderBySn(sn)) { - // 5分钟后仍然没有正在骑行中的订单 - executeLockCommand(asDevice, msg); - } - noOrderMarkers.remove(sn); // 清除标记 - }, COMMAND_COOLDOWN_MS, TimeUnit.MILLISECONDS); +// Executors.newSingleThreadScheduledExecutor().schedule(() -> { +// if (!etOrderService.isInOrderBySn(sn)) { +// // 5分钟后仍然没有正在骑行中的订单 +// executeLockCommand(asDevice, msg); +// } +// noOrderMarkers.remove(sn); // 清除标记 +// }, COMMAND_COOLDOWN_MS, TimeUnit.MILLISECONDS); } } } diff --git a/electripper-admin/src/main/resources/application-druid.yml b/electripper-admin/src/main/resources/application-druid.yml index 410c5ba..f9d1188 100644 --- a/electripper-admin/src/main/resources/application-druid.yml +++ b/electripper-admin/src/main/resources/application-druid.yml @@ -7,7 +7,7 @@ spring: # 主库数据源 master: # url: jdbc:mysql://47.120.68.19:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:mysql://localhost:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://47.120.68.19:3306/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: 123456 # url: jdbc:mysql://117.26.179.22:61110/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8