Merge remote-tracking branch 'origin/dev' into dev

“mitao”

2026-01-30 3a321564f4f20bdb3b8099fe0687c16e3a10c235

Merge remote-tracking branch 'origin/dev' into dev

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/HomeController.java

@@ -472,6 +472,7 @@
    @ResponseBody
    @PostMapping("/getAllOrder")
    public Object getAllOrder(){
        Map<String, Object> datas = new HashMap<>();
        List<TOrderPrivateCar> orderPrivateCars = itOrderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>().eq("isDelete", 1).in("state", Arrays.asList(8, 9)));
        List list = new ArrayList<>();
        for(TOrderPrivateCar t : orderPrivateCars){
@@ -481,8 +482,11 @@
            }
            map.put("lon", t.getStartLon());
            map.put("lat", t.getStartLat());
            map.put("type", 1);
            list.add(map);
        }
        datas.put("order1", list);
        list = new ArrayList<>();
        List<TOrderTaxi> tOrderTaxis = tOrderTaxiService.selectList(new EntityWrapper<TOrderTaxi>().eq("isDelete", 1).in("state", Arrays.asList(8, 9)));
        for(TOrderTaxi t : tOrderTaxis){
            Map<String, Object> map = new HashMap<>();
@@ -491,8 +495,11 @@
            }
            map.put("lon", t.getStartLon());
            map.put("lat", t.getStartLat());
            map.put("type", 2);
            list.add(map);
        }
        datas.put("order2", list);
        list = new ArrayList<>();
        List<TOrderCrossCity> tOrderCrossCities = itOrderCrossCityService.selectList(new EntityWrapper<TOrderCrossCity>().eq("isDelete", 1).in("state", Arrays.asList(8, 9)));
        for (TOrderCrossCity t : tOrderCrossCities) {
            Map<String, Object> map = new HashMap<>();
@@ -501,8 +508,11 @@
            }
            map.put("lon", t.getStartLon());
            map.put("lat", t.getStartLat());
            map.put("type", 3);
            list.add(map);
        }
        datas.put("order3", list);
        list = new ArrayList<>();
        List<AppOrderRide> appOrderRides = iAppOrderRideService.selectList(new EntityWrapper<AppOrderRide>().in("state", Arrays.asList(5)));
        for (AppOrderRide t : appOrderRides) {
            Map<String, Object> map = new HashMap<>();
@@ -511,9 +521,11 @@
            }
            map.put("lon", t.getStartLon());
            map.put("lat", t.getStartLat());
            map.put("type", 4);
            list.add(map);
        }
        return list;
        datas.put("order4", list);
        return datas;
    }



 ManagementQYTTravel/guns-admin/src/main/webapp/static/home.js

@@ -448,44 +448,105 @@
            uid: uid
        },
        success: function (res) {
            var style = [{
                url: 'https://a.amap.com/jsapi_demos/static/images/mass0.png',
                anchor: new AMap.Pixel(6, 6),
                size: new AMap.Size(11, 11)
            }, {
                url: 'https://a.amap.com/jsapi_demos/static/images/mass1.png',
                anchor: new AMap.Pixel(4, 4),
                size: new AMap.Size(7, 7)
            }, {
                url: 'https://a.amap.com/jsapi_demos/static/images/mass2.png',
                anchor: new AMap.Pixel(3, 3),
                size: new AMap.Size(5, 5)
            }];
            var order1 = res.order1;
            if(null != order1){
                var style = [{
                    url: 'https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/fadc5482-7d35-40f6-b97e-d1b6d5507fa1.png',
                    anchor: new AMap.Pixel(6, 6),
                    size: new AMap.Size(11, 11)
                }];

            var mass = new AMap.MassMarks(citys, {
                opacity: 0.8,
                zIndex: 111,
                cursor: 'pointer',
                style: style
            });

            var marker = new AMap.Marker({content: ' ', map: map_});

            mass.on('mouseover', function (e) {

                marker.setPosition(e.data.lnglat);
                marker.setLabel({content: e.data.name})
            });

            var data = [];
            for(var i in res){
                var obj = {
                    lnglat: [res[i].lon, res[i].lat]
                var mass = new AMap.MassMarks(citys, {
                    opacity: 0.8,
                    zIndex: 111,
                    cursor: 'pointer',
                    style: style
                });
                var data = [];
                for(var i in order1){
                    var obj = {
                        lnglat: [order1[i].lon, order1[i].lat]
                    }
                    data.push(obj);
                }
                data.push(obj);
                mass.setData(data);
                mass.setMap(map_);
            }
            mass.setData(data);
            mass.setMap(map_);

            var order2 = res.order2;
            if(null != order2){
                var style = [{
                    url: 'https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/fadc5482-7d35-40f6-b97e-d1b6d5507fa1.png',
                    anchor: new AMap.Pixel(6, 6),
                    size: new AMap.Size(11, 11)
                }];

                var mass = new AMap.MassMarks(citys, {
                    opacity: 0.8,
                    zIndex: 111,
                    cursor: 'pointer',
                    style: style
                });
                var data = [];
                for(var i in order2){
                    var obj = {
                        lnglat: [order2[i].lon, order2[i].lat]
                    }
                    data.push(obj);
                }
                mass.setData(data);
                mass.setMap(map_);
            }

            var order3 = res.order3;
            if(null != order3){
                var style = [{
                    url: 'https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/d378ada8-39a3-46e1-8df5-d9f802c41199.png',
                    anchor: new AMap.Pixel(6, 6),
                    size: new AMap.Size(11, 11)
                }];

                var mass = new AMap.MassMarks(citys, {
                    opacity: 0.8,
                    zIndex: 111,
                    cursor: 'pointer',
                    style: style
                });
                var data = [];
                for(var i in order3){
                    var obj = {
                        lnglat: [order3[i].lon, order3[i].lat]
                    }
                    data.push(obj);
                }
                mass.setData(data);
                mass.setMap(map_);
            }

            var order4 = res.order4;
            if(null != order4){
                var style = [{
                    url: 'https://traffic.qytzt.cn/v1/AUTH_d8bef0a04db511f0b79d01a3e2b7587e/qyt20250702/imgs/management/59840356-c8ea-40ae-ab31-d2256d6a386e.png',
                    anchor: new AMap.Pixel(6, 6),
                    size: new AMap.Size(11, 11)
                }];

                var mass = new AMap.MassMarks(citys, {
                    opacity: 0.8,
                    zIndex: 111,
                    cursor: 'pointer',
                    style: style
                });
                var data = [];
                for(var i in order4){
                    var obj = {
                        lnglat: [order4[i].lon, order4[i].lat]
                    }
                    data.push(obj);
                }
                mass.setData(data);
                mass.setMap(map_);
            }
        }
    });
}