From e6d027eb78f32fec9a9788976f694a85fa3b768a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 12:03:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing

---
 ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
index d7f3ada..9ae9199 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -202,29 +202,27 @@
      * @param orderDetailId
      * @return
      */
+    public static String URL = "https://yingyan.baidu.com/api/v3/track/gettrack?";
+
+    public static String AK = "WQhfsluNzEeUHUxoH4jc4JiCQOXw4Mnx";
     @ResponseBody
     @RequestMapping(value = "/getOrderTrack", method = RequestMethod.POST)
     public ResultUtil getOrderTrack(String orderDetailId){
         if(ToolUtil.isNotEmpty(orderDetailId)){
             try {
-//                List<TOrderPosition> list = tOrderPositionService.selectList(new EntityWrapper<TOrderPosition>().eq("orderType", 2).eq("orderId", orderDetailId).orderBy("insertTime"));
-                /*if(list.size() == 0){
-                    return ResultUtil.error("该订单没有运行轨迹");
-                }*/
-                //将数据存储到文件中
-                File file = new File(filePath + orderDetailId + "_2.txt");
-                if(!file.exists()){
-                    return ResultUtil.success(new ArrayList<>());
-                }
-                //读取文件(字符流)
-                BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
-                //循环取出数据
-                String str = null;
-                StringBuffer sb = new StringBuffer();
-                while ((str = in.readLine()) != null) {
-                    sb.append(str);
-                }
-                List<TOrderPosition> list = JSONArray.parseArray(sb.toString(), TOrderPosition.class);
+                TOrderTaxi tOrderTaxi = tOrderTaxiService.selectById(orderDetailId);
+                TDriver tDriver = driverService.selectById(tOrderTaxi.getDriverId());
+                SearchHttpAK ta = new SearchHttpAK();
+                Map params = new LinkedHashMap<String, String>();
+                params.put("ak", AK);
+                params.put("entity_name", tDriver.getPhone());
+                params.put("service_id", "241187");
+                long start = tOrderTaxi.getStartServiceTime().getTime() / 1000L;
+                long end = tOrderTaxi.getEndServiceTime().getTime() / 1000L;
+                params.put("start_time", start+"");
+                params.put("end_time", end+"");
+                String s = ta.requestGetAK(URL, params);
+                List<TOrderPositionBaiDu> list = JSONArray.parseArray(s.toString(), TOrderPositionBaiDu.class);
                 resultUtil = ResultUtil.success(list);
             }catch (Exception e){
                 e.printStackTrace();

--
Gitblit v1.7.1