清淤

aijinhui

2023-11-07 a8fa8c5473d8bd4dc509d9f4b0bb370f443d15ad

 ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java

@@ -131,6 +131,38 @@
                        }
                    }
                }else {
                    //判断是否为手动添加车辆
                    if(ardAccessFence.getIsAlarm()==0){
                        ardAccessFence.setLng(lng);
                        ardAccessFence.setLat(lat);
                        ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
                    }else if(ardAccessFence.getIsAlarm() == 1){
                        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 = ((ArdAccessNumServiceImpl) SpringUtils.getBean("ArdAccessNumServiceImpl")).queryNum();
                            if(list==null){
                                int alarm = list.getAlarm();
                                if(diff>=alarm){
                                    ardAccessFence.setIsWarning(1);
                                    ardAccessFence.setAlarmLat(lat);
                                    ardAccessFence.setAlarmLng(lng);
                                    ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
                                }
                            }
                        }else {
                            //如果不一样更新坐标
                            ardAccessFence.setLat(lat);
                            ardAccessFence.setLng(lng);
                            ardAccessFence.setLastTime(time);
                            ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
                        }
                    }else {
                    //如果车辆有数据判断是否有进入围栏ID，如果没有更新或赋值经纬度，判断是否进入围栏
                    if(ardAccessFence.getIntoShipmentId()==null){
                        ardAccessFence.setLng(lng);
@@ -253,7 +285,8 @@
                        }
                    }
                }
                //清淤入栏结束------------
                }
                //清淤结束------------

                gpsMap.putAll(result);
                String ancestors = (String) gpsMap.get("ancestors");//获取父级部门