From 9d5ca88ac4a73020adbc7d8a63b3de56480c5f6a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 23 Jul 2021 15:33:14 +0800
Subject: [PATCH] 指令接口修改
---
src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java | 3 ++-
src/main/java/org/springblade/modules/location/controller/LiveLocationController.java | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java b/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
index 6059107..0793251 100644
--- a/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
+++ b/src/main/java/org/springblade/modules/directive/service/impl/DirectiveServiceImpl.java
@@ -51,7 +51,8 @@
for (DirectiveFile directiveFile : directiveFiles) {
builderFile.append(directiveFile.getUrl()).append(",");
}
- record.setUrl(builder.toString().substring(0, builderFile.toString().length() - 1));
+ String urls = builderFile.toString();
+ record.setUrl(urls.substring(0, urls.length() - 1));
}
record.setReceiveName(builder.toString().substring(0, builder.toString().length() - 1));
}
diff --git a/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java b/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java
index f8341b0..d6c33c2 100644
--- a/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java
+++ b/src/main/java/org/springblade/modules/location/controller/LiveLocationController.java
@@ -66,7 +66,7 @@
//先查询是否已有实时位置信息，如果有，则更新，没有则插入
LiveLocation liveLocationInfo = liveLocationService.getLiveLocationInfo(liveLocation);
boolean status = false;
- if (null == liveLocationInfo.getId()){
+ if (null == liveLocationInfo){
//新增
liveLocation.setRecordTime(new Date());
status = liveLocationService.save(liveLocation);
@@ -82,7 +82,7 @@
//新增轨迹
Locus locus = new Locus();
//封装数据
- if (null!=liveLocationInfo.getId()){
+ if (null!=liveLocationInfo){
locus.setLiveLocationId(liveLocationInfo.getId());
}else {
locus.setLiveLocationId(liveLocation.getId());
--
Gitblit v1.9.3