chenfangchao 2 years ago
parent
commit
f93ce5e532

+ 3 - 0
beidou-analysis/src/main/java/cn/com/taiji/service/impl/BeidouAnalySisServiceImpl.java

@@ -47,6 +47,7 @@ public class BeidouAnalySisServiceImpl implements BeidouAnalySisService {
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         boolQueryBuilder.filter(QueryBuilders.rangeQuery("sendTime").gte(query.getStartTime()).lte(query.getEndTime()));
+        searchSourceBuilder.size(1000000);
         searchSourceBuilder.query(boolQueryBuilder);
         searchRequest.source(searchSourceBuilder);
         try {
@@ -68,6 +69,7 @@ public class BeidouAnalySisServiceImpl implements BeidouAnalySisService {
         BoolQueryBuilder fusionBoolQueryBuilder = QueryBuilders.boolQuery();
         SearchSourceBuilder fusionSearchSourceBuilder = new SearchSourceBuilder();
         boolQueryBuilder.filter(QueryBuilders.rangeQuery("mergeTime").gte(query.getStartTime()).lte(query.getEndTime()));
+        fusionSearchSourceBuilder.size(1000000);
         fusionSearchSourceBuilder.query(fusionBoolQueryBuilder);
         fusionSearchRequest.source(fusionSearchSourceBuilder);
         try {
@@ -114,6 +116,7 @@ public class BeidouAnalySisServiceImpl implements BeidouAnalySisService {
         //导出融合数据
         SearchRequest exportFusionSearchRequest = new SearchRequest(EsIndexConstants.INDEX_SEAT_REALTIMETRAJECTORY + time);
         SearchSourceBuilder exportSearchSourceBuilder = new SearchSourceBuilder();
+        exportSearchSourceBuilder.size(1000000);
         exportSearchSourceBuilder.query(QueryBuilders.termsQuery("mergeTime",result));
         exportFusionSearchRequest.source(exportSearchSourceBuilder);
         List<ExportVo> data = new ArrayList<>();

+ 1 - 1
hlx-one-fusion-analysis/pom.xml

@@ -32,7 +32,7 @@
                 <version>2.1.1.RELEASE</version>
                 <configuration>
                     <fork>true</fork> <!-- 如果没有该配置,devtools不会生效 -->
-                    <mainClass>cn.com.taiji.BeidouAnalySisApplication</mainClass>
+                    <mainClass>cn.com.taiji.HlxOneLevelApplication</mainClass>
                 </configuration>
                 <executions>
                     <execution>

+ 3 - 0
hlx-one-fusion-analysis/src/main/java/cn/com/taiji/service/HlxOneLevelServiceImpl.java

@@ -46,6 +46,7 @@ public class HlxOneLevelServiceImpl implements HlxOneLevelService{
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         boolQueryBuilder.filter(QueryBuilders.rangeQuery("time").gte(query.getStartTime()).lte(query.getEndTime()));
+        searchSourceBuilder.size(1000000);
         searchSourceBuilder.query(boolQueryBuilder);
         searchRequest.source(searchSourceBuilder);
         try {
@@ -67,6 +68,7 @@ public class HlxOneLevelServiceImpl implements HlxOneLevelService{
         BoolQueryBuilder fusionBoolQueryBuilder = QueryBuilders.boolQuery();
         SearchSourceBuilder fusionSearchSourceBuilder = new SearchSourceBuilder();
         boolQueryBuilder.filter(QueryBuilders.rangeQuery("mergeTime").gte(query.getStartTime()).lte(query.getEndTime()));
+        fusionSearchSourceBuilder.size(1000000);
         fusionSearchSourceBuilder.query(fusionBoolQueryBuilder);
         fusionSearchRequest.source(fusionSearchSourceBuilder);
         try {
@@ -113,6 +115,7 @@ public class HlxOneLevelServiceImpl implements HlxOneLevelService{
         //导出融合数据
         SearchRequest exportFusionSearchRequest = new SearchRequest(EsIndexConstants.INDEX_SEAT_REALTIMETRAJECTORY + time);
         SearchSourceBuilder exportSearchSourceBuilder = new SearchSourceBuilder();
+        exportSearchSourceBuilder.size(1000000);
         exportSearchSourceBuilder.query(QueryBuilders.termsQuery("mergeTime",result));
         exportFusionSearchRequest.source(exportSearchSourceBuilder);
         List<ExportVo> data = new ArrayList<>();

+ 0 - 2
pom.xml

@@ -54,8 +54,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>

+ 1 - 1
simulation-track/pom.xml

@@ -57,7 +57,7 @@
                 <version>2.1.1.RELEASE</version>
                 <configuration>
                     <fork>true</fork> <!-- 如果没有该配置,devtools不会生效 -->
-                    <mainClass>cn.com.taiji.BeidouAnalySisApplication</mainClass>
+                    <mainClass>cn.com.taiji.SimulationTrackApplication</mainClass>
                 </configuration>
                 <executions>
                     <execution>

+ 2 - 2
simulation-track/src/main/java/cn/com/taiji/service/impl/SimulationTrackImpl.java

@@ -54,8 +54,8 @@ public class SimulationTrackImpl implements SimulationTrackService {
             beidouShipTrackDTO.setSpeed(1D);
             beidouShipTrackDTO.setKwh(1);
             beidouShipTrackDTO.setShipName("模拟北斗船舶");
-            beidouShipTrackDTO.setLatitude(location.getLat());
-            beidouShipTrackDTO.setLongitude(location.getLog());
+            beidouShipTrackDTO.setLatitude(location.getLat() * 1000000);
+            beidouShipTrackDTO.setLongitude(location.getLog() * 1000000);
             String data = JSONUtil.toJsonStr(beidouShipTrackDTO);
             kafkaTemplate.send(TopicConstants.BEIDOU_TOPIC,data);
         }

+ 1 - 1
tianao-analysis/pom.xml

@@ -45,7 +45,7 @@
                 <version>2.1.1.RELEASE</version>
                 <configuration>
                     <fork>true</fork> <!-- 如果没有该配置,devtools不会生效 -->
-                    <mainClass>cn.com.taiji.BeidouAnalySisApplication</mainClass>
+                    <mainClass>cn.com.taiji.TianaoAnalySisApplication</mainClass>
                 </configuration>
                 <executions>
                     <execution>

+ 3 - 0
tianao-analysis/src/main/java/cn/com/taiji/service/impl/TianaoServiceImpl.java

@@ -48,6 +48,7 @@ public class TianaoServiceImpl implements TianaoService {
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
         SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
         boolQueryBuilder.filter(QueryBuilders.rangeQuery("fusionTime").gte(query.getStartTime()).lte(query.getEndTime()));
+        searchSourceBuilder.size(1000000);
         searchSourceBuilder.query(boolQueryBuilder);
         searchRequest.source(searchSourceBuilder);
         try {
@@ -69,6 +70,7 @@ public class TianaoServiceImpl implements TianaoService {
         BoolQueryBuilder fusionBoolQueryBuilder = QueryBuilders.boolQuery();
         SearchSourceBuilder fusionSearchSourceBuilder = new SearchSourceBuilder();
         boolQueryBuilder.filter(QueryBuilders.rangeQuery("mergeTime").gte(query.getStartTime()).lte(query.getEndTime()));
+        fusionSearchSourceBuilder.size(1000000);
         fusionSearchSourceBuilder.query(fusionBoolQueryBuilder);
         fusionSearchRequest.source(fusionSearchSourceBuilder);
         try {
@@ -115,6 +117,7 @@ public class TianaoServiceImpl implements TianaoService {
         //导出融合数据
         SearchRequest exportFusionSearchRequest = new SearchRequest(EsIndexConstants.INDEX_SEAT_REALTIMETRAJECTORY + time);
         SearchSourceBuilder exportSearchSourceBuilder = new SearchSourceBuilder();
+        exportSearchSourceBuilder.size(1000000);
         exportSearchSourceBuilder.query(QueryBuilders.termsQuery("mergeTime",result));
         exportFusionSearchRequest.source(exportSearchSourceBuilder);
         List<ExportVo> data = new ArrayList<>();