Browse Source

bugfix

master
修宁 5 months ago
parent
commit
72b26f078f
  1. 6
      servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java
  2. 4
      servo/src/main/java/com/yvan/workbench/controller/LccController.java
  3. 4
      servo/src/main/java/com/yvan/workbench/service/LccMapService.java
  4. 4
      servo/src/main/resources/application-dev.yml

6
servo/src/main/java/com/yvan/logisticsModel/LogisticsRuntime.java

@ -174,13 +174,11 @@ public class LogisticsRuntime {
break; break;
case BLOCKED: case BLOCKED:
// AGV上线
sender.setIsBlocked(true); sender.setIsBlocked(true);
FrontendMessagePushService.INSTANCE.pushDeviceAlive(this, sender.id, sender.getT(), true); FrontendMessagePushService.INSTANCE.pushDeviceAlive(this, sender.id, sender.getT(), true);
break; break;
case BLOCKED_RECOVER: case BLOCKED_RECOVER:
// AGV上线
sender.setIsBlocked(false); sender.setIsBlocked(false);
FrontendMessagePushService.INSTANCE.pushDeviceAlive(this, sender.id, sender.getT(), true); FrontendMessagePushService.INSTANCE.pushDeviceAlive(this, sender.id, sender.getT(), true);
break; break;
@ -198,6 +196,10 @@ public class LogisticsRuntime {
case DIRECTION_CHANGED: case DIRECTION_CHANGED:
case LOW_BATTERY: case LOW_BATTERY:
case MODE_CHANGED: case MODE_CHANGED:
if (!sender.isOnline) {
sender.setIsOnline(true);
FrontendMessagePushService.INSTANCE.pushDeviceAlive(this, sender.id, sender.getT(), true);
}
// 设备状态变化 // 设备状态变化
if (sender instanceof PtrAgvItem) { if (sender instanceof PtrAgvItem) {
var ptr = (PtrAgvItem) sender; var ptr = (PtrAgvItem) sender;

4
servo/src/main/java/com/yvan/workbench/controller/LccController.java

@ -96,15 +96,11 @@ public class LccController {
public static R<?> saveAndSyncScripts(@RequestBody Map<String, Object> params) { public static R<?> saveAndSyncScripts(@RequestBody Map<String, Object> params) {
String projectUuid = Conv.asString(params.get("projectUUID")); String projectUuid = Conv.asString(params.get("projectUUID"));
Long envId = Conv.asLong(params.get("envId"));
List<Map<String, Object>> scriptList = (List<Map<String, Object>>) (params.get("scriptList")); List<Map<String, Object>> scriptList = (List<Map<String, Object>>) (params.get("scriptList"));
if (Strings.isNullOrEmpty(projectUuid)) { if (Strings.isNullOrEmpty(projectUuid)) {
return R.fail("projectUUID Must not be empty"); 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); var mapService = SpringContext.HOLDER.getBean(LccMapService.class);

4
servo/src/main/java/com/yvan/workbench/service/LccMapService.java

@ -214,9 +214,7 @@ public class LccMapService {
// 扫描 mapLoc 目录下所有的文件夹,并且文件夹中包含有 project.json 文件存在,就讲她反序列化为 LccProject 对象 // 扫描 mapLoc 目录下所有的文件夹,并且文件夹中包含有 project.json 文件存在,就讲她反序列化为 LccProject 对象
if (!envLoc.exists() || !envLoc.isDirectory()) { if (!envLoc.exists() || !envLoc.isDirectory()) {
throw new RuntimeException( envLoc.mkdirs();
String.format("LccMapService.getAllProjects() - mapLoc '%s' does not exist or is not a directory", envLoc.getAbsolutePath())
);
} }
List<LccProjectEnv> list = Lists.newArrayList(); List<LccProjectEnv> list = Lists.newArrayList();

4
servo/src/main/resources/application-dev.yml

@ -10,10 +10,10 @@ lcc:
# - projectUuid: tw_test # - projectUuid: tw_test
# envId: 1 # envId: 1
frontend-mqtt: frontend-mqtt:
brokerUrl: tcp://127.0.0.1:1883 brokerUrl: tcp://10.10.101.8:1883
username: user username: user
password: user password: user
websocket: mqtt://127.0.0.1:7883 websocket: mqtt://10.10.101.8:7883
mybatis: mybatis:
enable: true enable: true

Loading…
Cancel
Save