aijinhui
2023-10-31 e0c71e43f22a81c57720c7ab3595564c5a8e3aee
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -121,11 +121,14 @@
                        }
                    }
                }else {
                    //如果车辆有数据判断是否有进入围栏ID,如果没有更新或赋值经纬度,判断是否进入围栏
                    //如果有进入围栏ID,判断是否开出装油点
                    String out = ardAccessFence.getOutShipmentId();
                    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 +141,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++) {
@@ -169,6 +172,8 @@
                            }
                            if(isRoad){
                                //如果在路上需要记录每次坐标与上次是否相同,如果一样更新停留时间
                            }
                        }else {
                            //车辆已经进入卸油点,判断是否已经开出卸油点