aijinhui
2023-12-13 98d0a71132915ab20f6d4ade6164a21aa16001ba
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
@@ -78,13 +78,13 @@
            /*String carName = MapUtil.getStrVal(gpsMap, "carName","");//获取车牌号
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            System.out.println(sdf.format(new Date()));*/
            log.info(String.format("   ---->收到定位数据:%s",JSON.toJSONString(gpsMap)));
//            log.info(String.format("   ---->收到定位数据:%s",JSON.toJSONString(gpsMap)));
            String carId = (String)gpsMap.get("carId");
            ((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();//获取纬度
@@ -95,7 +95,7 @@
                    String carModel = (String) result.get("carModel");//获取车辆模型
                    Integer drct = (Integer) gpsMap.get("drct");//获取车辆模型
                    Integer speed = (Integer) gpsMap.get("speed");
                    log.info("carId:"+carId+"lng:"+lng+"lat:"+lat);
//                    log.info("carId:"+carId+"lng:"+lng+"lat:"+lat);
                    //定义2维空间
                    Point2D.Double point = new Point2D.Double(Double.parseDouble(lng), Double.parseDouble(lat));
                    List<Point2D.Double> pts = new ArrayList<Point2D.Double>();
@@ -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,20 +286,24 @@
                                            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;
                                                ArdAccessNum list = accessNumService.queryNum();
                                                if(list==null){
                                                    int alarm = list.getAlarm();
                                                    if(diff>=alarm){
                                                        ardAccessFence.setIsWarning(1);
                                                        ardAccessFence.setAlarmLat(lat);
                                                        ardAccessFence.setAlarmLng(lng);
                                                        ardAccessFenceService.updAccess(ardAccessFence);
                                                if(ardAccessFence.getLastTime()!=null){
                                                    //如果坐标一样相减
                                                    Date nowTime = sdf.parse(time);
                                                    Date lastTime = sdf.parse(ardAccessFence.getLastTime());
                                                    Long diff = (nowTime.getTime() - lastTime.getTime())/1000;
                                                    ArdAccessNum list = accessNumService.queryNum();
                                                    if(list==null){
                                                        int alarm = list.getAlarm();
                                                        if(diff>=alarm){
                                                            ardAccessFence.setIsWarning(1);
                                                            ardAccessFence.setAlarmLat(lat);
                                                            ardAccessFence.setAlarmLng(lng);
                                                            ardAccessFenceService.updAccess(ardAccessFence);
                                                        }
                                                    }
                                                }else {
                                                    ardAccessFence.setLastTime(time);
                                                    ardAccessFenceService.updAccess(ardAccessFence);
                                                }
                                            }else {
                                                //如果不一样更新坐标
@@ -333,7 +337,7 @@
                                }
                            }
                        }
                    }
//                    }
                }
                //清淤结束------------