From 747271c1432d13fba7513fd52017d25c8e2c454b Mon Sep 17 00:00:00 2001
From: Li Haoyu <lihaoyu@objecteye.com>
Date: Thu, 9 Jan 2020 10:19:19 +0800
Subject: [PATCH] 功能处理;

---
 src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java | 3 +++
 src/main/java/com/objecteye/service/impl/UploadFileServiceImpl.java | 4 ++--
 src/main/java/com/objecteye/utils/RelationMappingUtil.java          | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java b/src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java
index beec91c..dd1b01a 100644
--- a/src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java
+++ b/src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java
@@ -211,6 +211,9 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService {
             criteria.and("pictime").lte(endTime);
         }
         criteria.and("vehicle_plate_hphm").is(locusOrbitQueryParams.getPlateNumber());
+        // 坐标值不能为空
+        criteria.and("longitude").ne(null);
+        criteria.and("latitude").ne(null);
 
         Query query = Query.query(criteria);
         query.fields().include("id");
diff --git a/src/main/java/com/objecteye/service/impl/UploadFileServiceImpl.java b/src/main/java/com/objecteye/service/impl/UploadFileServiceImpl.java
index 41e48ae..a22be6a 100644
--- a/src/main/java/com/objecteye/service/impl/UploadFileServiceImpl.java
+++ b/src/main/java/com/objecteye/service/impl/UploadFileServiceImpl.java
@@ -43,7 +43,7 @@ public class UploadFileServiceImpl implements IUploadFileService {
         if (fileName == null || "".equals(fileName)) {
             throw new CustomXException("文件名不能不能为空", "201");
         }
-        String picPath = storePath + File.separator + fileName;
+        String picPath = storePath + fileName;
         File newFile = new File(picPath);
         multipartFile.transferTo(newFile);
 
@@ -56,7 +56,7 @@ public class UploadFileServiceImpl implements IUploadFileService {
             captureTime = Long.parseLong(fileNameMsg[1]);
             String[] position = fileNameMsg[2].split("_");
             latitude = position[0];
-            longitude = position[1];
+            longitude = position[1].substring(0, position[1].lastIndexOf("."));
         }
 
         String body = GlobalUtil.httpExecute(url, newFile);
diff --git a/src/main/java/com/objecteye/utils/RelationMappingUtil.java b/src/main/java/com/objecteye/utils/RelationMappingUtil.java
index c6afe0b..9dd6b12 100644
--- a/src/main/java/com/objecteye/utils/RelationMappingUtil.java
+++ b/src/main/java/com/objecteye/utils/RelationMappingUtil.java
@@ -57,7 +57,7 @@ public class RelationMappingUtil {
             case 7:
                 return "新能源白绿色";
             default:
-                return "检测失败";
+                return "";
         }
     }
 
--
libgit2 0.21.4