轨迹调整提交(西藏)

service/publicapi/src/main/java/com/founder/publicapi/controller/SkInterface/InterfaceAPI.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.founder.commonutils.model.newPublicEntity.SkTrail;
 
 import com.founder.commonutils.model.newPublicEntity.xzEntity.*;
+import com.founder.commonutils.model.newPublicEntity.ztypEntity.KshHdExcelImport;
 import com.founder.commonutils.model.vo.response.SkTrailVO;
 import com.founder.commonutils.util.DateUtil;
 import com.founder.publicapi.mapper.mysqlMapper.SysDictitemMapper;
@@ -96,7 +97,11 @@ public class InterfaceAPI {
         }
         List<SkTrail> points = new ArrayList<>();// 返回数据与前端一致
         if (mhxx.size() > 0) {
-            for (EsHbDpQueryJbxx esHbDpQueryJbxxResult : mhxx) {
+            // 根据getStti()始发时间去重
+            List<EsHbDpQueryJbxx> listMhxxTarget1Distinct = mhxx.stream()
+                    .collect(Collectors.collectingAndThen(Collectors.toCollection(
+                            () -> new TreeSet<>(Comparator.comparing(EsHbDpQueryJbxx::getStti))), ArrayList::new));
+            for (EsHbDpQueryJbxx esHbDpQueryJbxxResult : listMhxxTarget1Distinct) {
                 // 出发地
                 SkTrail skTrailCf = new SkTrail();
                 // 经纬度处理
@@ -183,7 +188,11 @@ public class InterfaceAPI {
             System.out.println("ES火车查询异常" + e.getMessage());
         }
         if (listTrain.size() > 0) {
-            for (EsTrainQuery esTrainQueryResult : listTrain) {
+            // 根据getStti()始发时间去重
+            List<EsTrainQuery> listTrainxxTarget1Distinct = listTrain.stream()
+                    .collect(Collectors.collectingAndThen(Collectors.toCollection(
+                            () -> new TreeSet<>(Comparator.comparing(EsTrainQuery::getFitm))), ArrayList::new));
+            for (EsTrainQuery esTrainQueryResult : listTrainxxTarget1Distinct) {
                 // 出发地
                 SkTrail skTrailCf = new SkTrail();
                 // 经纬度处理
@@ -194,8 +203,8 @@ public class InterfaceAPI {
                         skTrailCf.setY(xycf[0]);
                     }
                 }
-                skTrailCf.setDate(DateUtil.getTimeTz(esTrainQueryResult.getFitm()));
-                skTrailCf.setTime(DateUtil.getTimeStamp(DateUtil.getTimeTz(esTrainQueryResult.getFitm())));
+                skTrailCf.setDate(esTrainQueryResult.getFitm());
+                skTrailCf.setTime(DateUtil.getTimeStamp(esTrainQueryResult.getFitm()));
                 skTrailCf.setAddress(esTrainQueryResult.getFrsa());
                 skTrailCf.setObjecttype("hcgj");
                 skTrailCf.setObjectname("火车轨迹");
@@ -204,8 +213,8 @@ public class InterfaceAPI {
                 points.add(skTrailCf);
                 // 目的地
                 SkTrail skTrailDd = new SkTrail();
-                skTrailDd.setDate(DateUtil.getTimeTz(esTrainQueryResult.getLatm()));
-                skTrailDd.setTime(DateUtil.getTimeStamp(DateUtil.getTimeTz(esTrainQueryResult.getLatm())));
+                skTrailDd.setDate(esTrainQueryResult.getLatm());
+                skTrailDd.setTime(DateUtil.getTimeStamp(esTrainQueryResult.getLatm()));
                 if(StringUtils.isNotBlank(esTrainQueryResult.getDloc())) {
                     String xydd[] = esTrainQueryResult.getDloc().split(",");
                     if (xydd.length > 0) {