attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
dzl 2025-05-13 17:39:42 +08:00
commit f62356cd4f
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeTrackingServiceImpl.java
View File

@ -86,14 +86,17 @@ public class EbikeTrackingServiceImpl implements EbikeTrackingService {
fluxQuery.add(" |> pivot(rowKey: [\"_time\"], columnKey: [\"_field\"], valueColumn: \"_value\")"); fluxQuery.add(" |> pivot(rowKey: [\"_time\"], columnKey: [\"_field\"], valueColumn: \"_value\")");
QueryApi queryApi = influxDBClient.getQueryApi(); QueryApi queryApi = influxDBClient.getQueryApi();
List<EbikeTracking> points = queryApi.query(fluxQuery.toString(), EbikeTracking.class); List<EbikeTracking> points = queryApi.query(fluxQuery.toString(), EbikeTracking.class);
return points.stream().filter(point -> !CoordinateUtil.outOfChina(point.getLongitude(), point.getLatitude())).map(point -> { return points.stream().map(point -> {
EbikeTrackingDto ebikeTrackingDto = new EbikeTrackingDto(); EbikeTrackingDto ebikeTrackingDto = new EbikeTrackingDto();
BeanUtils.copyProperties(point, ebikeTrackingDto); BeanUtils.copyProperties(point, ebikeTrackingDto);
Instant _time = point.get_time(); Instant _time = point.get_time();
ebikeTrackingDto.setTime(ConvertUtil.instantToDatetime(_time)); ebikeTrackingDto.setTime(ConvertUtil.instantToDatetime(_time));
double[] gcj02 = CoordinateUtil.WGS84ToGCJ02(point.getLongitude(), point.getLatitude()); // GPS入库的时候已经转为GCJ02坐标系
ebikeTrackingDto.setLngGCJ02(gcj02[0]); ebikeTrackingDto.setLngGCJ02(point.getLongitude());
ebikeTrackingDto.setLatGCJ02(gcj02[1]); ebikeTrackingDto.setLatGCJ02(point.getLatitude());
//double[] gcj02 = CoordinateUtil.WGS84ToGCJ02(point.getLongitude(), point.getLatitude());
//ebikeTrackingDto.setLngGCJ02(gcj02[0]);
//ebikeTrackingDto.setLatGCJ02(gcj02[1]);
return ebikeTrackingDto; return ebikeTrackingDto;
}).toList(); }).toList();
}else{ }else{

6
ebike-orders/pom.xml
View File

@ -30,6 +30,12 @@
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${boot.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.mybatis-flex</groupId> <groupId>com.mybatis-flex</groupId>
<artifactId>mybatis-flex-spring-boot3-starter</artifactId> <artifactId>mybatis-flex-spring-boot3-starter</artifactId>