轨迹提交(西藏)

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

@@ -108,8 +108,8 @@ public class InterfaceAPI {
                     }
                 }
                 skTrailCf.setAddress(esHbDpQueryJbxxResult.getOrai());
-                skTrailCf.setDate(DateUtil.getTimeTz(esHbDpQueryJbxxResult.getStti()));
-                skTrailCf.setTime(DateUtil.getTimeStamp(DateUtil.getTimeTz(esHbDpQueryJbxxResult.getStti())));
+                skTrailCf.setDate(esHbDpQueryJbxxResult.getStti());
+                skTrailCf.setTime(DateUtil.getTimeStamp(esHbDpQueryJbxxResult.getStti()));
                 skTrailCf.setObjecttype("jcgj");
                 skTrailCf.setObjectname("机场轨迹");
                 skTrailCf.setObjectvalue(zjhm);
@@ -126,7 +126,7 @@ public class InterfaceAPI {
                 }
                 skTrailDd.setAddress(esHbDpQueryJbxxResult.getDeai());
                 skTrailDd.setDate(esHbDpQueryJbxxResult.getEntm());
-                skTrailDd.setTime(DateUtil.getTimeStamp(DateUtil.getTimeTz(esHbDpQueryJbxxResult.getEntm())));
+                skTrailDd.setTime(DateUtil.getTimeStamp(esHbDpQueryJbxxResult.getEntm()));
                 skTrailDd.setObjecttype("jcgj");
                 skTrailDd.setObjectname("机场轨迹");
                 skTrailDd.setObjectvalue(zjhm);
@@ -616,54 +616,54 @@ public class InterfaceAPI {
         System.out.println(searchResult);
         System.out.println("民航订票ES查询=========");
         //获取sku列表
-        if (searchResult != null) {
+        if(null !=  searchResult){
             List<SearchResult.Hit<EsHbDpQueryJbxx, Void>> hits = searchResult.getHits(EsHbDpQueryJbxx.class);
             for (SearchResult.Hit<EsHbDpQueryJbxx, Void> hit : hits) {
                 EsHbDpQueryJbxx source = hit.source;
-                String stti = source.getStti();//始发时间
-                if (stti != null && !"".equals(stti)) {
+                String stti = source.getStti();//开始发时间
+                if(stti!=null && !"".equals(stti)){
                     source.setStti(utczString(stti));
                 }
                 String entm = source.getEntm();//到达时间
-                if (entm != null && !"".equals(entm)) {
+                if(entm!=null && !"".equals(entm)){
                     source.setEntm(utczString(entm));
                 }
                 String birt = source.getBirt();//出生时间
-                if (birt != null && !"".equals(birt)) {
+                if(birt!=null && !"".equals(birt)){
                     source.setBirt(utczString(birt));
                 }
                 String sexc = source.getSexc();//性别
-                if (sexc != null && !"".equals(sexc)) {
-                    if ("1".equals(sexc)) {
+                if(sexc!=null && !"".equals(sexc)){
+                    if("1".equals(sexc)){
                         source.setSexc("男");
-                    } else if ("2".equals(sexc)) {
+                    }else if("2".equals(sexc)){
                         source.setSexc("女");
-                    } else {
+                    }else {
                         source.setSexc("其他");
                     }
                 }
                 String deai = source.getDeai();//目的机场
-                if (deai != null && !"".equals(deai)) {
-                    String nameBycode = sysDictitemMapper.getNameBycodeXz("CODE_XZES_JCDM", deai);
+                if(deai!=null && !"".equals(deai)){
+                    String nameBycode = sysDictitemMapper.getNameBycodeXz("CODE_XZES_JCDM",deai);
                     source.setDeai(nameBycode);
                 }
                 String orai = source.getOrai();
-                if (orai != null && !"".equals(orai)) {
-                    String nameBycode = sysDictitemMapper.getNameBycodeXz("CODE_XZES_JCDM", orai);
+                if(orai!=null && !"".equals(orai)){
+                    String nameBycode = sysDictitemMapper.getNameBycodeXz("CODE_XZES_JCDM",orai);
                     source.setOrai(nameBycode);
                 }
                 MhxxEsVoList.add(source);
             }
             esHbMhxxEsResult.setMhxx(MhxxEsVoList);
-            // 获取总数（原来的）searchResult.getTotal()  报异常
+            //  获取总数（原来的）searchResult.getTotal()  报异常
             Long total = searchResult.getJsonObject().getAsJsonObject("hits")
                     .get("total").getAsLong();
             esHbMhxxEsResult.setTotal(total);
-            // 取记录个数并计算出总页数
+            //取记录个数并计算出总页数
             long totalPage = (total + paramVo.getPageSize() - 1) / paramVo.getPageSize();
             esHbMhxxEsResult.setTotalPages(totalPage);
             return esHbMhxxEsResult;
-        } else {
+        }else {
             return esHbMhxxEsResult;
         }
     }
@@ -877,13 +877,13 @@ public class InterfaceAPI {
         List<String> years = new ArrayList<>();
         try {
             //时间为空处理
-            if (org.apache.commons.lang3.StringUtils.isEmpty(kssj) && org.apache.commons.lang3.StringUtils.isEmpty(jssj)) {
+            if (StringUtils.isEmpty(kssj) && StringUtils.isEmpty(jssj)) {
                 int curYear = Calendar.getInstance().get(Calendar.YEAR);
                 years.add(String.valueOf(curYear));
                 return years;
-            } else if (org.apache.commons.lang3.StringUtils.isEmpty(kssj)) {
+            } else if (StringUtils.isEmpty(kssj)) {
                 kssj = jssj;
-            } else if (org.apache.commons.lang3.StringUtils.isEmpty(jssj)) {
+            } else if (StringUtils.isEmpty(jssj)) {
                 jssj = kssj;
             }
             //获取开始年份、结束年份