aijinhui
2023-12-05 d0ca32aff1c7f4642dbf815c22a3a1c9667097a3
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -84,7 +84,7 @@
            ((ArdSyCarDayServiceImpl)SpringUtils.getBean("ardSyCarDayServiceImpl")).insertArdSyCarDay(carId);//新增车辆上报时间
            Map<String,Object> result = ((ArdSyCarServiceImpl)SpringUtils.getBean("ardSyCarServiceImpl")).getArdSyCarAndDeptByCarId(carId);//查询车辆及部门
            if(result != null){
                if("30".equals(carId)){
//                if("30".equals(carId)){
                    //清淤开始----------
                    String lng = (String) gpsMap.get("lng").toString();//获取经度
                    String lat = (String) gpsMap.get("lat").toString();//获取纬度
@@ -113,6 +113,8 @@
                    ArdAccessFence ardAccessFence = ardAccessFenceService.queryAccess(carId);
                    //查询所有装油点围栏
                    List<ArdOilWall> ardOilWalls = ardOilWallService.accessAll();
                    //日期格式
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                    //车速标记
                    Boolean stop = true;
                    //判断车速
@@ -169,8 +171,6 @@
                            ardAccessFence.setNowWallName(null);
                            //如果在路上判断坐标是否与上次一样
                            if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
                                //如果坐标一样时间相减
                                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                                Date nowTime = sdf.parse(time);
                                Date lastTime = sdf.parse(ardAccessFence.getLastTime());
                                Long diff = (nowTime.getTime() - lastTime.getTime())/1000;
@@ -286,8 +286,7 @@
                                            ardAccessFence.setNowWallName(null);
                                            //如果在路上判断坐标是否与上次一样
                                            if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
                                                //如果坐标一样时间相减
                                                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                                                //如果坐标一样相减
                                                Date nowTime = sdf.parse(time);
                                                Date lastTime = sdf.parse(ardAccessFence.getLastTime());
                                                Long diff = (nowTime.getTime() - lastTime.getTime())/1000;
@@ -333,7 +332,7 @@
                                }
                            }
                        }
                    }
//                    }
                }
                //清淤结束------------