diff --git a/servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java b/servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java index 6002baf..c2651c7 100644 --- a/servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java +++ b/servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java @@ -174,13 +174,11 @@ public class LogisticsRuntime { break; case BLOCKED: - // AGV上线 sender.setIsBlocked(true); FrontendMessagePushService.INSTANCE.pushDeviceAlive(this, sender.id, sender.getT(), true); break; case BLOCKED_RECOVER: - // AGV上线 sender.setIsBlocked(false); FrontendMessagePushService.INSTANCE.pushDeviceAlive(this, sender.id, sender.getT(), true); break; @@ -198,6 +196,10 @@ public class LogisticsRuntime { case DIRECTION_CHANGED: case LOW_BATTERY: case MODE_CHANGED: + if (!sender.isOnline) { + sender.setIsOnline(true); + FrontendMessagePushService.INSTANCE.pushDeviceAlive(this, sender.id, sender.getT(), true); + } // 设备状态变化 if (sender instanceof PtrAgvItem) { var ptr = (PtrAgvItem) sender; diff --git a/servo/src/main/java/com/yvan/workbench/controller/LccController.java b/servo/src/main/java/com/yvan/workbench/controller/LccController.java index 70516bc..b4eddee 100644 --- a/servo/src/main/java/com/yvan/workbench/controller/LccController.java +++ b/servo/src/main/java/com/yvan/workbench/controller/LccController.java @@ -96,15 +96,11 @@ public class LccController { public static R saveAndSyncScripts(@RequestBody Map params) { String projectUuid = Conv.asString(params.get("projectUUID")); - Long envId = Conv.asLong(params.get("envId")); List> scriptList = (List>) (params.get("scriptList")); if (Strings.isNullOrEmpty(projectUuid)) { return R.fail("projectUUID Must not be empty"); } - if (envId == null || envId <= 0) { - return R.fail("envId Must not be empty"); - } // 保存脚本内容到文件系统 var mapService = SpringContext.HOLDER.getBean(LccMapService.class); diff --git a/servo/src/main/java/com/yvan/workbench/service/LccMapService.java b/servo/src/main/java/com/yvan/workbench/service/LccMapService.java index 99f8b77..124b7fc 100644 --- a/servo/src/main/java/com/yvan/workbench/service/LccMapService.java +++ b/servo/src/main/java/com/yvan/workbench/service/LccMapService.java @@ -214,9 +214,7 @@ public class LccMapService { // 扫描 mapLoc 目录下所有的文件夹,并且文件夹中包含有 project.json 文件存在,就讲她反序列化为 LccProject 对象 if (!envLoc.exists() || !envLoc.isDirectory()) { - throw new RuntimeException( - String.format("LccMapService.getAllProjects() - mapLoc '%s' does not exist or is not a directory", envLoc.getAbsolutePath()) - ); + envLoc.mkdirs(); } List list = Lists.newArrayList(); diff --git a/servo/src/main/resources/application-dev.yml b/servo/src/main/resources/application-dev.yml index 1ee0f98..1473b22 100644 --- a/servo/src/main/resources/application-dev.yml +++ b/servo/src/main/resources/application-dev.yml @@ -10,10 +10,10 @@ lcc: # - projectUuid: tw_test # envId: 1 frontend-mqtt: - brokerUrl: tcp://127.0.0.1:1883 + brokerUrl: tcp://10.10.101.8:1883 username: user password: user - websocket: mqtt://127.0.0.1:7883 + websocket: mqtt://10.10.101.8:7883 mybatis: enable: true