Commit 747271c1432d13fba7513fd52017d25c8e2c454b

Authored by Liu Haoyu
1 parent 21d68d52

功能处理;

src/main/java/com/objecteye/service/impl/LocusOrbitServiceImpl.java
@@ -211,6 +211,9 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService { @@ -211,6 +211,9 @@ public class LocusOrbitServiceImpl implements ILocusOrbitService {
211 criteria.and("pictime").lte(endTime); 211 criteria.and("pictime").lte(endTime);
212 } 212 }
213 criteria.and("vehicle_plate_hphm").is(locusOrbitQueryParams.getPlateNumber()); 213 criteria.and("vehicle_plate_hphm").is(locusOrbitQueryParams.getPlateNumber());
  214 + // 坐标值不能为空
  215 + criteria.and("longitude").ne(null);
  216 + criteria.and("latitude").ne(null);
214 217
215 Query query = Query.query(criteria); 218 Query query = Query.query(criteria);
216 query.fields().include("id"); 219 query.fields().include("id");
src/main/java/com/objecteye/service/impl/UploadFileServiceImpl.java
@@ -43,7 +43,7 @@ public class UploadFileServiceImpl implements IUploadFileService { @@ -43,7 +43,7 @@ public class UploadFileServiceImpl implements IUploadFileService {
43 if (fileName == null || "".equals(fileName)) { 43 if (fileName == null || "".equals(fileName)) {
44 throw new CustomXException("文件名不能不能为空", "201"); 44 throw new CustomXException("文件名不能不能为空", "201");
45 } 45 }
46 - String picPath = storePath + File.separator + fileName; 46 + String picPath = storePath + fileName;
47 File newFile = new File(picPath); 47 File newFile = new File(picPath);
48 multipartFile.transferTo(newFile); 48 multipartFile.transferTo(newFile);
49 49
@@ -56,7 +56,7 @@ public class UploadFileServiceImpl implements IUploadFileService { @@ -56,7 +56,7 @@ public class UploadFileServiceImpl implements IUploadFileService {
56 captureTime = Long.parseLong(fileNameMsg[1]); 56 captureTime = Long.parseLong(fileNameMsg[1]);
57 String[] position = fileNameMsg[2].split("_"); 57 String[] position = fileNameMsg[2].split("_");
58 latitude = position[0]; 58 latitude = position[0];
59 - longitude = position[1]; 59 + longitude = position[1].substring(0, position[1].lastIndexOf("."));
60 } 60 }
61 61
62 String body = GlobalUtil.httpExecute(url, newFile); 62 String body = GlobalUtil.httpExecute(url, newFile);
src/main/java/com/objecteye/utils/RelationMappingUtil.java
@@ -57,7 +57,7 @@ public class RelationMappingUtil { @@ -57,7 +57,7 @@ public class RelationMappingUtil {
57 case 7: 57 case 7:
58 return "新能源白绿色"; 58 return "新能源白绿色";
59 default: 59 default:
60 - return "检测失败"; 60 + return "";
61 } 61 }
62 } 62 }
63 63