qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
磷叶 2025-05-11 16:56:52 +08:00
parent 67d52614bb
commit a2dfc8f1a7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java
View File

@ -446,13 +446,13 @@ public class ReceiveController {
noOrderMarkers.put(sn, currentTime); // 设置标记时间 noOrderMarkers.put(sn, currentTime); // 设置标记时间
// 设置定时任务，5分钟后检查状态 // 设置定时任务，5分钟后检查状态
Executors.newSingleThreadScheduledExecutor().schedule(() -> { // Executors.newSingleThreadScheduledExecutor().schedule(() -> {
if (!etOrderService.isInOrderBySn(sn)) { // if (!etOrderService.isInOrderBySn(sn)) {
// 5分钟后仍然没有正在骑行中的订单 // // 5分钟后仍然没有正在骑行中的订单
executeLockCommand(asDevice, msg); // executeLockCommand(asDevice, msg);
} // }
noOrderMarkers.remove(sn); // 清除标记 // noOrderMarkers.remove(sn); // 清除标记
}, COMMAND_COOLDOWN_MS, TimeUnit.MILLISECONDS); // }, COMMAND_COOLDOWN_MS, TimeUnit.MILLISECONDS);
} }
} }
} }

2
electripper-admin/src/main/resources/application-druid.yml
View File

@ -7,7 +7,7 @@ spring:
# 主库数据源 # 主库数据源
master: master:
# url: jdbc:mysql://47.120.68.19: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
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 username: root
password: 123456 password: 123456
# url: jdbc:mysql://117.26.179.22:61110/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://117.26.179.22:61110/electripper?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8