From d0ca32aff1c7f4642dbf815c22a3a1c9667097a3 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: Tue, 05 Dec 2023 10:43:18 +0800
Subject: [PATCH] 清淤

---
 ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java b/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
index 764b72d..41e9316 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java
+++ b/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 @@
                                 }
                             }
                         }
-                    }
+//                    }
                 }
                 //清淤结束------------
 

--
Gitblit v1.9.3