java/ZhaoYangChuXing.git

parent: c4d88d65 | 补丁 | 提交 | show whitespace

Pu Zhibing

2024-11-25 8f329481c1122ae2d2fe37f76898654a487c9b88

修改bug

8个文件已修改

	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java	37 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java	34 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -323,6 +323,8 @@

                // 结束服务时查询轨迹，计算距离
                Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
                double sum = 0;
                try {
                String tid = gdFalconUtil.selectTerminal(driver.getPhone());
                String result = gdFalconUtil.selectTrack(tid, orderPrivateCar.getTrackId(),1);

@@ -353,9 +355,7 @@
                    points.addAll(point);
                }

                System.out.println("轨迹坐标点=====:"+points);
                String toLonLat = "";
                double sum = 0;
                List<OrderPosition> orderPositions = new ArrayList<>();
                for (Object o : points) {
                    String s = JSONObject.toJSONString(o);
@@ -383,7 +383,6 @@
                            GlobalCoordinates source = new GlobalCoordinates(Double.valueOf(from[1]), Double.valueOf(from[0]));
                            GlobalCoordinates target = new GlobalCoordinates(Double.valueOf(to[1]), Double.valueOf(to[0]));
                            double WGS84 = getDistanceMeter(source, target, Ellipsoid.WGS84);
                            System.err.println("WGS84坐标系计算结果："+WGS84 + "米");
                            sum += WGS84;
                        }
                        toLonLat = fromLonLat;
@@ -402,22 +401,26 @@
                out.write(JSON.toJSONString(orderPositions));
                out.flush();
                out.close();
    
                }catch (Exception e){
                    e.printStackTrace();
                    System.err.println("查询高德轨迹出错，使用本地轨迹计算");
                    List<OrderPosition> list = orderPositionService.queryPosition(orderId, 1);
                    String fromLonLat = "";
                    for (OrderPosition orderPosition : list) {
                        String toLonLat = orderPosition.getLon() + "," + orderPosition.getLat();
                        if(StringUtils.hasLength(fromLonLat) && StringUtils.hasLength(toLonLat)){
                            String[] from = fromLonLat.split(",");
                            String[] to = toLonLat.split(",");
                            GlobalCoordinates source = new GlobalCoordinates(Double.valueOf(from[1]), Double.valueOf(from[0]));
                            GlobalCoordinates target = new GlobalCoordinates(Double.valueOf(to[1]), Double.valueOf(to[0]));
                            double WGS84 = getDistanceMeter(source, target, Ellipsoid.WGS84);
                            sum += WGS84;
                        }
                        fromLonLat = toLonLat;
                    }
                }
                orderPrivateCar.setMileage(sum);
                orderPrivateCar.setIsAbnormal(0);
    
                //获取预估里程，使用预估里程作为行驶里程计算金额
//                String origins = orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat();
//                String destination = orderPrivateCar.getGetoffLon() + "," + orderPrivateCar.getGetoffLat();
//                Map<String, String> distance = gdMapElectricFenceUtil.getDistance(origins, destination, 1);
//                Double distance1 = Double.valueOf(distance.get("distance"));
//                if(distance1 - sum > 1000){
//                    orderPrivateCar.setMileage(distance1);
//                    orderPrivateCar.setIsAbnormal(1);
//                }else{
//                    orderPrivateCar.setMileage(sum);
//                    orderPrivateCar.setIsAbnormal(0);
//                }
                break;
        }
        this.updateById(orderPrivateCar);

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java

@@ -93,7 +93,7 @@
            JSONObject data = jsonObject.getJSONObject("data");
            String status = data.getString("status");

            gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "创建电子围栏");
//            gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "创建电子围栏");

//            if(status.equals("0")){//创建成功
//                GDFence gdFence = new GDFence();
@@ -153,7 +153,7 @@
        JSONObject jsonObject = JSON.parseObject(forObject);
        JSONObject data = jsonObject.getJSONObject("data");

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");

        if(ToolUtil.isNotEmpty(center)){//圆形电子围栏
            JSONArray rs_list = data.getJSONArray("rs_list");
@@ -192,7 +192,7 @@
        JSONArray rs_list = data.getJSONArray("rs_list");
        jsonArray.addAll(rs_list);

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");

        //判断是否有分页
        int total_record = data.getIntValue("total_record");
@@ -285,7 +285,7 @@
        String s = restTemplate.patchForObject(url, formEntity, String.class);
        System.out.println(s);

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "更新电子围栏");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "更新电子围栏");
    }


@@ -323,7 +323,7 @@
        }
        System.out.println("检测：" + forObject);

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/status", "电子围栏监控");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/status", "电子围栏监控");
        return ids;
    }

@@ -337,7 +337,7 @@
        restTemplate.delete("https://restapi.amap.com/v4/geofence/meta?key={1}&gid={2}", key, gid);
        System.out.println("删除：" );

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "删除电子围栏");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "删除电子围栏");

        return true;
    }
@@ -357,7 +357,7 @@
        JSONObject jsonObject = JSON.parseObject(forObject);
        String status = jsonObject.getString("status");

        gdInterfaceService.saveData("https://restapi.amap.com/v3/distance", "查询两点间的距离");
//        gdInterfaceService.saveData("https://restapi.amap.com/v3/distance", "查询两点间的距离");

        if(status.equals("1")){
            JSONArray results = jsonObject.getJSONArray("results");
@@ -387,7 +387,7 @@
        JSONObject jsonObject = JSON.parseObject(forObject);
        String status = jsonObject.getString("status");

        gdInterfaceService.saveData("https://restapi.amap.com/v3/direction/driving", "获取路径规划");
//        gdInterfaceService.saveData("https://restapi.amap.com/v3/direction/driving", "获取路径规划");

        if(status.equals("1")){
            JSONObject route = jsonObject.getJSONObject("route");

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java

@@ -62,7 +62,7 @@
        String status = jsonObject.getString("status");
        List<String> list = new ArrayList<>();

        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");
//        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");

        if(status.equals("1")){
            JSONArray geocodes = jsonObject.getJSONArray("geocodes");
@@ -90,7 +90,7 @@
        JSONObject jsonObject = JSON.parseObject(forObject);
        Map<String, String> map = new HashMap<>();

        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/regeo", "经纬度转行政区域");
//        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/regeo", "经纬度转行政区域");

        if(jsonObject.getString("status").equals("1")){
            JSONObject regeocode = jsonObject.getJSONObject("regeocode");

 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushMinistryOfTransportUtil.java

@@ -1,6 +1,8 @@
package com.stylefeng.guns.modular.system.util;


import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -438,7 +440,7 @@
        Double Speed = 0D;
        if(orderPositions != null && orderPositions.size() > 1){
            Map<String, String> distance = gdMapElectricFenceUtil.getDistance(orderPositions.get(orderPositions.size() - 1).getLon() + "," + orderPositions.get(orderPositions.size() - 1).getLat(),
                    orderPositions.get(orderPositions.size() - 0).getLon() + "," + orderPositions.get(orderPositions.size() - 0).getLat(), 0);
                    orderPositions.get(orderPositions.size() - 1).getLon() + "," + orderPositions.get(orderPositions.size() - 1).getLat(), 0);
            Speed = distance != null ? Double.valueOf(distance.get("distance")) / 1000 : 0D;
        }
        Integer state = 4;
@@ -478,13 +480,18 @@
        header.put("Accept", "*/*");
        header.put("Accept-Encoding", "gzip");
        header.put("Accept-Charset", "utf-8");
        String result = null;
        try {
            result = httpClientUtil.pushHttpRequset("POST", path + "ministryOfTransport/positionDriver", map, header,"form").toString();
            HttpRequest post = HttpUtil.createPost(path + "ministryOfTransport/positionDriver");
            post.header("Connection", "keep-alive");
            post.header("Content-Type", "application/x-www-form-urlencoded");
            post.header("Accept", "*/*");
            post.header("Accept-Encoding", "gzip");
            post.header("Accept-Charset", "utf-8");
            post.body(JSON.toJSONString(map));
            post.execute();
        } catch (Exception e) {
            e.printStackTrace();
        }
        System.err.println("-----------------------------驾驶员定位信息------------------------：" + result);
    }


@@ -508,7 +515,7 @@
        Double Speed = 0D;
        if(orderPositions != null && orderPositions.size() > 1){
            Map<String, String> distance = gdMapElectricFenceUtil.getDistance(orderPositions.get(orderPositions.size() - 1).getLon() + "," + orderPositions.get(orderPositions.size() - 1).getLat(),
                    orderPositions.get(orderPositions.size() - 0).getLon() + "," + orderPositions.get(orderPositions.size() - 0).getLat(), 0);
                    orderPositions.get(orderPositions.size() - 1).getLon() + "," + orderPositions.get(orderPositions.size() - 1).getLat(), 0);
            Speed = distance != null ? Double.valueOf(distance.get("distance")) / 1000 : 0D;
        }
        Integer state = 4;
@@ -542,19 +549,18 @@
        jsonObject.put("OrderId", orderNum);//订单编号（非营运状态下填"0"）
        Map<String, Object> map = new HashMap<>();
        map.put("positionVehicle", jsonObject.toJSONString());
        Map<String, String> header = new HashMap<>();
        header.put("Connection", "keep-alive");
        header.put("Content-Type", "application/x-www-form-urlencoded");
        header.put("Accept", "*/*");
        header.put("Accept-Encoding", "gzip");
        header.put("Accept-Charset", "utf-8");
        String result = null;
        try {
            result = httpClientUtil.pushHttpRequset("POST", path + "ministryOfTransport/positionVehicle", map, header,"form").toString();
            HttpRequest post = HttpUtil.createPost(path + "ministryOfTransport/positionVehicle");
            post.header("Connection", "keep-alive");
            post.header("Content-Type", "application/x-www-form-urlencoded");
            post.header("Accept", "*/*");
            post.header("Accept-Encoding", "gzip");
            post.header("Accept-Charset", "utf-8");
            post.body(JSON.toJSONString(map));
            post.execute();
        } catch (Exception e) {
            e.printStackTrace();
        }
        System.err.println("----------------------------车辆定位信息---------------------------：" + result);
    }



 DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java

@@ -12,6 +12,8 @@
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpEntity;
@@ -36,6 +38,8 @@
 */
@Component
public class PushUtil {
    
    private Logger log = LoggerFactory.getLogger(PushUtil.class);

    @Autowired
    private RestTemplate internalRestTemplate;
@@ -99,7 +103,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }

@@ -133,7 +137,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }

@@ -280,7 +284,7 @@
        //计算预计距离和剩余时间
        String value = redisUtil.getValue("DRIVER" + String.valueOf(driverId));
        if(null == value || "".equals(value)){
            System.err.println("司机没有上传位置信息");
//            System.err.println("司机没有上传位置信息");
            return;
        }

@@ -362,7 +366,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }

@@ -432,7 +436,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }

@@ -469,7 +473,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }


 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapElectricFenceUtil.java

@@ -93,7 +93,7 @@
            JSONObject data = jsonObject.getJSONObject("data");
            String status = data.getString("status");

            gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "创建电子围栏");
//            gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "创建电子围栏");

//            if(status.equals("0")){//创建成功
//                GDFence gdFence = new GDFence();
@@ -153,7 +153,7 @@
        JSONObject jsonObject = JSON.parseObject(forObject);
        JSONObject data = jsonObject.getJSONObject("data");

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");

        if(ToolUtil.isNotEmpty(center)){//圆形电子围栏
            JSONArray rs_list = data.getJSONArray("rs_list");
@@ -192,7 +192,7 @@
        JSONArray rs_list = data.getJSONArray("rs_list");
        jsonArray.addAll(rs_list);

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");

        //判断是否有分页
        int total_record = data.getIntValue("total_record");
@@ -285,7 +285,7 @@
        String s = restTemplate.patchForObject(url, formEntity, String.class);
        System.out.println(s);

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "更新电子围栏");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "更新电子围栏");
    }


@@ -323,7 +323,7 @@
        }
        System.out.println("检测：" + forObject);

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/status", "电子围栏监控");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/status", "电子围栏监控");
        return ids;
    }

@@ -337,7 +337,7 @@
        restTemplate.delete("https://restapi.amap.com/v4/geofence/meta?key={1}&gid={2}", key, gid);
        System.out.println("删除：" );

        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "删除电子围栏");
//        gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "删除电子围栏");

        return true;
    }
@@ -358,7 +358,7 @@
        JSONObject jsonObject = JSON.parseObject(forObject);
        String status = jsonObject.getString("status");

        gdInterfaceService.saveData("https://restapi.amap.com/v3/distance", "查询两点间的距离");
//        gdInterfaceService.saveData("https://restapi.amap.com/v3/distance", "查询两点间的距离");

        if(status.equals("1")){
            JSONArray results = jsonObject.getJSONArray("results");
@@ -388,7 +388,7 @@
        JSONObject jsonObject = JSON.parseObject(forObject);
        String status = jsonObject.getString("status");

        gdInterfaceService.saveData("https://restapi.amap.com/v3/direction/driving", "获取路径规划");
//        gdInterfaceService.saveData("https://restapi.amap.com/v3/direction/driving", "获取路径规划");

        if(status.equals("1")){
            JSONObject route = jsonObject.getJSONObject("route");

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GDMapGeocodingUtil.java

@@ -62,7 +62,7 @@
        String status = jsonObject.getString("status");
        List<String> list = new ArrayList<>();

        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");
//        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");

        if(status.equals("1")){
            JSONArray geocodes = jsonObject.getJSONArray("geocodes");
@@ -86,7 +86,7 @@
        String status = jsonObject.getString("status");
        List<String> list = new ArrayList<>();

        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");
//        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");

        if(status.equals("1")){
            JSONArray geocodes = jsonObject.getJSONArray("geocodes");
@@ -115,7 +115,7 @@
        JSONObject jsonObject = JSON.parseObject(forObject);
        Map<String, String> map = new HashMap<>();

        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/regeo", "经纬度转行政区域");
//        gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/regeo", "经纬度转行政区域");

        if(jsonObject.getString("status").equals("1")){
            JSONObject regeocode = jsonObject.getJSONObject("regeocode");

 UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/PushUtil.java

@@ -8,6 +8,8 @@
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
@@ -27,6 +29,8 @@
 */
@Component
public class PushUtil {
    
    private Logger log = LoggerFactory.getLogger(PushUtil.class);

    @Autowired
    private RestTemplate internalRestTemplate;
@@ -86,7 +90,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }

@@ -121,7 +125,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }

@@ -290,7 +294,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }

@@ -320,7 +324,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }

@@ -357,7 +361,7 @@
        String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
        JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
        if(jsonObject1.getIntValue("code") != 200){
            System.err.println(jsonObject1.getString("msg"));
            log.error(jsonObject1.getString("msg"));
        }
    }

			@@ -323,6 +323,8 @@

			// 结束服务时查询轨迹，计算距离
			Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
			double sum = 0;
			try {
			String tid = gdFalconUtil.selectTerminal(driver.getPhone());
			String result = gdFalconUtil.selectTrack(tid, orderPrivateCar.getTrackId(),1);

			@@ -353,9 +355,7 @@
			points.addAll(point);
			}

			System.out.println("轨迹坐标点=====:"+points);
			String toLonLat = "";
			double sum = 0;
			List<OrderPosition> orderPositions = new ArrayList<>();
			for (Object o : points) {
			String s = JSONObject.toJSONString(o);
			@@ -383,7 +383,6 @@
			GlobalCoordinates source = new GlobalCoordinates(Double.valueOf(from[1]), Double.valueOf(from[0]));
			GlobalCoordinates target = new GlobalCoordinates(Double.valueOf(to[1]), Double.valueOf(to[0]));
			double WGS84 = getDistanceMeter(source, target, Ellipsoid.WGS84);
			System.err.println("WGS84坐标系计算结果："+WGS84 + "米");
			sum += WGS84;
			}
			toLonLat = fromLonLat;
			@@ -402,22 +401,26 @@
			out.write(JSON.toJSONString(orderPositions));
			out.flush();
			out.close();

			}catch (Exception e){
			e.printStackTrace();
			System.err.println("查询高德轨迹出错，使用本地轨迹计算");
			List<OrderPosition> list = orderPositionService.queryPosition(orderId, 1);
			String fromLonLat = "";
			for (OrderPosition orderPosition : list) {
			String toLonLat = orderPosition.getLon() + "," + orderPosition.getLat();
			if(StringUtils.hasLength(fromLonLat) && StringUtils.hasLength(toLonLat)){
			String[] from = fromLonLat.split(",");
			String[] to = toLonLat.split(",");
			GlobalCoordinates source = new GlobalCoordinates(Double.valueOf(from[1]), Double.valueOf(from[0]));
			GlobalCoordinates target = new GlobalCoordinates(Double.valueOf(to[1]), Double.valueOf(to[0]));
			double WGS84 = getDistanceMeter(source, target, Ellipsoid.WGS84);
			sum += WGS84;
			}
			fromLonLat = toLonLat;
			}
			}
			orderPrivateCar.setMileage(sum);
			orderPrivateCar.setIsAbnormal(0);

			//获取预估里程，使用预估里程作为行驶里程计算金额
			// String origins = orderPrivateCar.getStartLon() + "," + orderPrivateCar.getStartLat();
			// String destination = orderPrivateCar.getGetoffLon() + "," + orderPrivateCar.getGetoffLat();
			// Map<String, String> distance = gdMapElectricFenceUtil.getDistance(origins, destination, 1);
			// Double distance1 = Double.valueOf(distance.get("distance"));
			// if(distance1 - sum > 1000){
			// orderPrivateCar.setMileage(distance1);
			// orderPrivateCar.setIsAbnormal(1);
			// }else{
			// orderPrivateCar.setMileage(sum);
			// orderPrivateCar.setIsAbnormal(0);
			// }
			break;
			}
			this.updateById(orderPrivateCar);

			@@ -93,7 +93,7 @@
			JSONObject data = jsonObject.getJSONObject("data");
			String status = data.getString("status");

			gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "创建电子围栏");
			// gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "创建电子围栏");

			// if(status.equals("0")){//创建成功
			// GDFence gdFence = new GDFence();
			@@ -153,7 +153,7 @@
			JSONObject jsonObject = JSON.parseObject(forObject);
			JSONObject data = jsonObject.getJSONObject("data");

			gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");
			// gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");

			if(ToolUtil.isNotEmpty(center)){//圆形电子围栏
			JSONArray rs_list = data.getJSONArray("rs_list");
			@@ -192,7 +192,7 @@
			JSONArray rs_list = data.getJSONArray("rs_list");
			jsonArray.addAll(rs_list);

			gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");
			// gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "查询电子围栏");

			//判断是否有分页
			int total_record = data.getIntValue("total_record");
			@@ -285,7 +285,7 @@
			String s = restTemplate.patchForObject(url, formEntity, String.class);
			System.out.println(s);

			gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "更新电子围栏");
			// gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "更新电子围栏");
			}


			@@ -323,7 +323,7 @@
			}
			System.out.println("检测：" + forObject);

			gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/status", "电子围栏监控");
			// gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/status", "电子围栏监控");
			return ids;
			}

			@@ -337,7 +337,7 @@
			restTemplate.delete("https://restapi.amap.com/v4/geofence/meta?key={1}&gid={2}", key, gid);
			System.out.println("删除：" );

			gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "删除电子围栏");
			// gdInterfaceService.saveData("https://restapi.amap.com/v4/geofence/meta", "删除电子围栏");

			return true;
			}
			@@ -357,7 +357,7 @@
			JSONObject jsonObject = JSON.parseObject(forObject);
			String status = jsonObject.getString("status");

			gdInterfaceService.saveData("https://restapi.amap.com/v3/distance", "查询两点间的距离");
			// gdInterfaceService.saveData("https://restapi.amap.com/v3/distance", "查询两点间的距离");

			if(status.equals("1")){
			JSONArray results = jsonObject.getJSONArray("results");
			@@ -387,7 +387,7 @@
			JSONObject jsonObject = JSON.parseObject(forObject);
			String status = jsonObject.getString("status");

			gdInterfaceService.saveData("https://restapi.amap.com/v3/direction/driving", "获取路径规划");
			// gdInterfaceService.saveData("https://restapi.amap.com/v3/direction/driving", "获取路径规划");

			if(status.equals("1")){
			JSONObject route = jsonObject.getJSONObject("route");

			@@ -62,7 +62,7 @@
			String status = jsonObject.getString("status");
			List<String> list = new ArrayList<>();

			gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");
			// gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/geo", "行政区域转经纬度");

			if(status.equals("1")){
			JSONArray geocodes = jsonObject.getJSONArray("geocodes");
			@@ -90,7 +90,7 @@
			JSONObject jsonObject = JSON.parseObject(forObject);
			Map<String, String> map = new HashMap<>();

			gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/regeo", "经纬度转行政区域");
			// gdInterfaceService.saveData("https://restapi.amap.com/v3/geocode/regeo", "经纬度转行政区域");

			if(jsonObject.getString("status").equals("1")){
			JSONObject regeocode = jsonObject.getJSONObject("regeocode");

			@@ -1,6 +1,8 @@
			package com.stylefeng.guns.modular.system.util;


			import cn.hutool.http.HttpRequest;
			import cn.hutool.http.HttpUtil;
			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.mapper.EntityWrapper;
			@@ -438,7 +440,7 @@
			Double Speed = 0D;
			if(orderPositions != null && orderPositions.size() > 1){
			Map<String, String> distance = gdMapElectricFenceUtil.getDistance(orderPositions.get(orderPositions.size() - 1).getLon() + "," + orderPositions.get(orderPositions.size() - 1).getLat(),
			orderPositions.get(orderPositions.size() - 0).getLon() + "," + orderPositions.get(orderPositions.size() - 0).getLat(), 0);
			orderPositions.get(orderPositions.size() - 1).getLon() + "," + orderPositions.get(orderPositions.size() - 1).getLat(), 0);
			Speed = distance != null ? Double.valueOf(distance.get("distance")) / 1000 : 0D;
			}
			Integer state = 4;
			@@ -478,13 +480,18 @@
			header.put("Accept", "/");
			header.put("Accept-Encoding", "gzip");
			header.put("Accept-Charset", "utf-8");
			String result = null;
			try {
			result = httpClientUtil.pushHttpRequset("POST", path + "ministryOfTransport/positionDriver", map, header,"form").toString();
			HttpRequest post = HttpUtil.createPost(path + "ministryOfTransport/positionDriver");
			post.header("Connection", "keep-alive");
			post.header("Content-Type", "application/x-www-form-urlencoded");
			post.header("Accept", "/");
			post.header("Accept-Encoding", "gzip");
			post.header("Accept-Charset", "utf-8");
			post.body(JSON.toJSONString(map));
			post.execute();
			} catch (Exception e) {
			e.printStackTrace();
			}
			System.err.println("-----------------------------驾驶员定位信息------------------------：" + result);
			}


			@@ -508,7 +515,7 @@
			Double Speed = 0D;
			if(orderPositions != null && orderPositions.size() > 1){
			Map<String, String> distance = gdMapElectricFenceUtil.getDistance(orderPositions.get(orderPositions.size() - 1).getLon() + "," + orderPositions.get(orderPositions.size() - 1).getLat(),
			orderPositions.get(orderPositions.size() - 0).getLon() + "," + orderPositions.get(orderPositions.size() - 0).getLat(), 0);
			orderPositions.get(orderPositions.size() - 1).getLon() + "," + orderPositions.get(orderPositions.size() - 1).getLat(), 0);
			Speed = distance != null ? Double.valueOf(distance.get("distance")) / 1000 : 0D;
			}
			Integer state = 4;
			@@ -542,19 +549,18 @@
			jsonObject.put("OrderId", orderNum);//订单编号（非营运状态下填"0"）
			Map<String, Object> map = new HashMap<>();
			map.put("positionVehicle", jsonObject.toJSONString());
			Map<String, String> header = new HashMap<>();
			header.put("Connection", "keep-alive");
			header.put("Content-Type", "application/x-www-form-urlencoded");
			header.put("Accept", "/");
			header.put("Accept-Encoding", "gzip");
			header.put("Accept-Charset", "utf-8");
			String result = null;
			try {
			result = httpClientUtil.pushHttpRequset("POST", path + "ministryOfTransport/positionVehicle", map, header,"form").toString();
			HttpRequest post = HttpUtil.createPost(path + "ministryOfTransport/positionVehicle");
			post.header("Connection", "keep-alive");
			post.header("Content-Type", "application/x-www-form-urlencoded");
			post.header("Accept", "/");
			post.header("Accept-Encoding", "gzip");
			post.header("Accept-Charset", "utf-8");
			post.body(JSON.toJSONString(map));
			post.execute();
			} catch (Exception e) {
			e.printStackTrace();
			}
			System.err.println("----------------------------车辆定位信息---------------------------：" + result);
			}

			@@ -12,6 +12,8 @@
			import com.stylefeng.guns.modular.system.model.OrderPosition;
			import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
			import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.http.HttpEntity;
			@@ -36,6 +38,8 @@
			*/
			@Component
			public class PushUtil {

			private Logger log = LoggerFactory.getLogger(PushUtil.class);

			@Autowired
			private RestTemplate internalRestTemplate;
			@@ -99,7 +103,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}

			@@ -133,7 +137,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}

			@@ -280,7 +284,7 @@
			//计算预计距离和剩余时间
			String value = redisUtil.getValue("DRIVER" + String.valueOf(driverId));
			if(null == value \|\| "".equals(value)){
			System.err.println("司机没有上传位置信息");
			// System.err.println("司机没有上传位置信息");
			return;
			}

			@@ -362,7 +366,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}

			@@ -432,7 +436,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}

			@@ -469,7 +473,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}

			@@ -8,6 +8,8 @@
			import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
			import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
			import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.http.HttpEntity;
			import org.springframework.http.HttpHeaders;
			@@ -27,6 +29,8 @@
			*/
			@Component
			public class PushUtil {

			private Logger log = LoggerFactory.getLogger(PushUtil.class);

			@Autowired
			private RestTemplate internalRestTemplate;
			@@ -86,7 +90,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}

			@@ -121,7 +125,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}

			@@ -290,7 +294,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}

			@@ -320,7 +324,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}

			@@ -357,7 +361,7 @@
			String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
			JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
			if(jsonObject1.getIntValue("code") != 200){
			System.err.println(jsonObject1.getString("msg"));
			log.error(jsonObject1.getString("msg"));
			}
			}