From b894ac8fee88a741de4ce07c41c4bd529a66ff53 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:35 +0800
Subject: [PATCH] 车辆图片
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 71b2c3e..bb6911b 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
@@ -90,6 +90,8 @@
String time = (String) gpsMap.get("result");//瀹氫綅鏃堕棿
String deptNum = (String) result.get("deptId").toString();//鑾峰彇閮ㄩ棬ID
String deptName = (String) result.get("deptName");//鑾峰彇閮ㄩ棬鍚嶇О
+ String carModel = (String) result.get("carModel");//鑾峰彇杞﹁締妯″瀷
+ String drct = (String) gpsMap.get("drct");//鑾峰彇杞﹁締妯″瀷
//瀹氫箟2缁寸┖闂�
Point2D.Double point = new Point2D.Double(Double.parseDouble(lng), Double.parseDouble(lat));
List<Point2D.Double> pts = new ArrayList<Point2D.Double>();
@@ -121,6 +123,9 @@
ardAccessFence1.setLat(lat);
ardAccessFence1.setLastTime(time);
ardAccessFence1.setNowWallName(ardOilWall.getName());
+ ardAccessFence1.setCarModel(carModel);
+ ardAccessFence1.setIsWarning(0);
+ ardAccessFence1.setDrct(drct);
((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).access(ardAccessFence1);
break;
}
@@ -200,6 +205,7 @@
}
}
if(isRoad){
+ ardAccessFence.setNowWallName(null);
//濡傛灉鍦ㄨ矾涓婂垽鏂潗鏍囨槸鍚︿笌涓婃涓�鏍�
if(ardAccessFence.getLng().equals(lng) && ardAccessFence.getLat().equals(lat)){
//濡傛灉鍧愭爣涓�鏍锋椂闂寸浉鍑�
@@ -207,11 +213,11 @@
Date nowTime = sdf.parse(time);
Date lastTime = sdf.parse(ardAccessFence.getLastTime());
Long diff = (nowTime.getTime() - lastTime.getTime())/1000;
- List<ArdAccessNum> list = ((ArdAccessNumServiceImpl) SpringUtils.getBean("ArdAccessNumServiceImpl")).queryNum();
- if(list.size()>0){
- int alarm = list.get(0).getAlarm();
+ ArdAccessNum list = ((ArdAccessNumServiceImpl) SpringUtils.getBean("ArdAccessNumServiceImpl")).queryNum();
+ if(list==null){
+ int alarm = list.getAlarm();
if(diff>=alarm){
- ardAccessFence.setIsWarning("1");
+ ardAccessFence.setIsWarning(1);
ardAccessFence.setAlarmLat(lat);
ardAccessFence.setAlarmLng(lng);
((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
--
Gitblit v1.9.3