轨迹调整提交(西藏)

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

@@ -101,7 +101,8 @@ public class InterfaceAPI {
             List<EsHbDpQueryJbxx> listMhxxTarget1Distinct = mhxx.stream()
                     .collect(Collectors.collectingAndThen(Collectors.toCollection(
                             () -> new TreeSet<>(Comparator.comparing(EsHbDpQueryJbxx::getStti))), ArrayList::new));
-            for (EsHbDpQueryJbxx esHbDpQueryJbxxResult : listMhxxTarget1Distinct) {
+            List<EsHbDpQueryJbxx>  listMhxxTarget1Sort = listMhxxTarget1Distinct.stream().sorted(Comparator.comparing(EsHbDpQueryJbxx::getStti).reversed()).collect(Collectors.toList());
+            for (EsHbDpQueryJbxx esHbDpQueryJbxxResult : listMhxxTarget1Sort) {
                 // 出发地
                 SkTrail skTrailCf = new SkTrail();
                 // 经纬度处理
@@ -192,7 +193,8 @@ public class InterfaceAPI {
             List<EsTrainQuery> listTrainxxTarget1Distinct = listTrain.stream()
                     .collect(Collectors.collectingAndThen(Collectors.toCollection(
                             () -> new TreeSet<>(Comparator.comparing(EsTrainQuery::getFitm))), ArrayList::new));
-            for (EsTrainQuery esTrainQueryResult : listTrainxxTarget1Distinct) {
+            List<EsTrainQuery>  listTrainxxTarget1Sort = listTrainxxTarget1Distinct.stream().sorted(Comparator.comparing(EsTrainQuery::getFitm).reversed()).collect(Collectors.toList());
+            for (EsTrainQuery esTrainQueryResult : listTrainxxTarget1Sort) {
                 // 出发地
                 SkTrail skTrailCf = new SkTrail();
                 // 经纬度处理
@@ -203,8 +205,8 @@ public class InterfaceAPI {
                         skTrailCf.setY(xycf[0]);
                     }
                 }
-                skTrailCf.setDate(esTrainQueryResult.getFitm());
-                skTrailCf.setTime(DateUtil.getTimeStamp(esTrainQueryResult.getFitm()));
+                skTrailCf.setDate(DateUtil.getTimeTz(esTrainQueryResult.getFitm()));
+                skTrailCf.setTime(DateUtil.getTimeStamp(DateUtil.getTimeTz(esTrainQueryResult.getFitm())));
                 skTrailCf.setAddress(esTrainQueryResult.getFrsa());
                 skTrailCf.setObjecttype("hcgj");
                 skTrailCf.setObjectname("火车轨迹");
@@ -213,8 +215,8 @@ public class InterfaceAPI {
                 points.add(skTrailCf);
                 // 目的地
                 SkTrail skTrailDd = new SkTrail();
-                skTrailDd.setDate(esTrainQueryResult.getLatm());
-                skTrailDd.setTime(DateUtil.getTimeStamp(esTrainQueryResult.getLatm()));
+                skTrailDd.setDate(DateUtil.getTimeTz(esTrainQueryResult.getLatm()));
+                skTrailDd.setTime(DateUtil.getTimeStamp(DateUtil.getTimeTz(esTrainQueryResult.getLatm())));
                 if(StringUtils.isNotBlank(esTrainQueryResult.getDloc())) {
                     String xydd[] = esTrainQueryResult.getDloc().split(",");
                     if (xydd.length > 0) {