Administrator
2023-10-26 d772fedd4df8eecb78085c112e4939d29ba1b665
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -125,7 +125,7 @@
                    if(out == null){
                        //车辆未开出装油点
                        String into = ardAccessFence.getIntoShipmentId();
                        ArdOilWall ardOilWall = ((ArdOilWallServiceImpl) SpringUtils.getBean("ArdOilWallServiceImpl")).one(into);
                        ArdOilWall ardOilWall = SpringUtils.getBean(ArdOilWallService.class).one(into);
                        pts.clear();
                        String[] coord = ardOilWall.getCoord().split(",");
                        for (int j = 0; j < coord.length; j = j + 3) {
@@ -138,14 +138,14 @@
                        }
                        ardAccessFence.setLng(lng);
                        ardAccessFence.setLat(lat);
                        ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
                        SpringUtils.getBean(ArdAccessFenceService.class).updAccess(ardAccessFence);
                    }else {
                        //车辆已经开出装油点,判断是否进入卸油点
                        String unload = ardAccessFence.getIntoUnloadId();
                        //如果unload为空,判断是否进入卸油点
                        if (unload == null) {
                            //车辆未进入卸油点
                            List<ArdOilWall> ardOilWalls = ((ArdOilWallServiceImpl) SpringUtils.getBean("ArdOilWallServiceImpl")).uploadAll();
                            List<ArdOilWall> ardOilWalls = SpringUtils.getBean(ArdOilWallService.class).uploadAll();
                            //是否在路上
                            Boolean isRoad = true;
                            for (int i = 0; i < ardOilWalls.size(); i++) {