From 0210a7678e3dc60279dd770e5d3071e5494c851d Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 23 十月 2023 15:41:19 +0800
Subject: [PATCH] 围栏滚动数据
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 103 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 78 insertions(+), 25 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 20ea073..04f03c5 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
@@ -16,10 +16,7 @@
import com.ruoyi.sy.domain.ArdAccessFence;
import com.ruoyi.sy.domain.ArdOilWall;
import com.ruoyi.sy.domain.ArdSyCarLock;
-import com.ruoyi.sy.service.impl.ArdOilWallServiceImpl;
-import com.ruoyi.sy.service.impl.ArdSyCarDayServiceImpl;
-import com.ruoyi.sy.service.impl.ArdSyCarLockServiceImpl;
-import com.ruoyi.sy.service.impl.ArdSyCarServiceImpl;
+import com.ruoyi.sy.service.impl.*;
import com.ruoyi.utils.gps.GeoTools;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -81,42 +78,98 @@
String carId = (String)gpsMap.get("carId");
((ArdSyCarDayServiceImpl)SpringUtils.getBean("ardSyCarDayServiceImpl")).insertArdSyCarDay(carId);//鏂板杞﹁締涓婃姤鏃堕棿
Map<String,Object> result = ((ArdSyCarServiceImpl)SpringUtils.getBean("ardSyCarServiceImpl")).getArdSyCarAndDeptByCarId(carId);//鏌ヨ杞﹁締鍙婇儴闂�
-// log.error("---------------------"+result);
if(result != null){
- //娓呮筏瀹氫綅
+ //娓呮筏鍏ユ爮寮�濮�----------
String lng = (String) gpsMap.get("lng");//鑾峰彇缁忓害
String lat = (String) gpsMap.get("lat");//鑾峰彇绾害
String carName = (String) gpsMap.get("carName");//鑾峰彇杞︾墝鍙�
String time = (String) gpsMap.get("result");//瀹氫綅鏃堕棿
String deptNum = (String) result.get("deptId");//鑾峰彇閮ㄩ棬ID
String deptName = (String) result.get("deptName");//鑾峰彇閮ㄩ棬鍚嶇О
+// String carId = "13";
+// String lng = "124.74695492384757";
+// String lat = "46.09510768522894";
+// String carName = "榛慐21397";//鑾峰彇杞︾墝鍙�
+// String time = "20231019161815";//瀹氫綅鏃堕棿
+// String deptNum = "100";//鑾峰彇閮ㄩ棬ID
+// String deptName = "鍘傜骇";//鑾峰彇閮ㄩ棬鍚嶇О
//瀹氫箟2缁寸┖闂�
Point2D.Double point = new Point2D.Double(Double.parseDouble(lng), Double.parseDouble(lat));
List<Point2D.Double> pts = new ArrayList<Point2D.Double>();
- //鍖归厤鍏ㄩ儴鍥存爮
- List<ArdOilWall> ardOilWalls = ((ArdOilWallServiceImpl)SpringUtils.getBean("ArdOilWallServiceImpl")).all();
- for (int i = 0; i < ardOilWalls.size(); i++) {
- pts.clear();
- ArdOilWall ardOilWall = ardOilWalls.get(i);
- String[] coord = ardOilWall.getCoord().split(",");
- for (int j = 0; j < coord.length; j = j + 3) {
- pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j+1])));
+ //鏌ヨ瀹氫綅娌硅溅琛ㄤ腑鏄惁鏈夎杞﹁締
+ ArdAccessFence ardAccessFence = ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).queryAccess(carId);
+ //濡傛灉娌℃湁璇存槑杞﹁締鏈繘鍏ヨ娌圭偣锛岄渶瑕佸尮閰嶆墍鏈夎娌圭偣鍥存爮
+ if(ardAccessFence==null){
+ //鍖归厤鍏ㄩ儴瑁呮补鐐瑰洿鏍�
+ List<ArdOilWall> ardOilWalls = ((ArdOilWallServiceImpl)SpringUtils.getBean("ArdOilWallServiceImpl")).accessAll();
+ for (int i = 0; i < ardOilWalls.size(); i++) {
+ pts.clear();
+ ArdOilWall ardOilWall = ardOilWalls.get(i);
+ String[] coord = ardOilWall.getCoord().split(",");
+ for (int j = 0; j < coord.length; j = j + 3) {
+ pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j+1])));
+ }
+ if(GeoTools.IsPtInPoly(point, pts)){
+ //杩涘叆浜嗗洿鏍忓叆搴�
+ ArdAccessFence ardAccessFence1 = new ArdAccessFence();
+ ardAccessFence1.setId(String.valueOf(UUID.randomUUID()));
+ ardAccessFence1.setCarId(carId);
+ ardAccessFence1.setCarName(carName);
+ ardAccessFence1.setDeptId(deptNum);
+ ardAccessFence1.setDeptName(deptName);
+ ardAccessFence1.setIntoShipment("杩涘叆瑁呮补鐐�");
+ ardAccessFence1.setIntoShipmentTime(time);
+ ardAccessFence1.setLng(lng);
+ ardAccessFence1.setLat(lat);
+ ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).access(ardAccessFence1);
+ break;
+ }
}
- if(GeoTools.IsPtInPoly(point, pts)){
- //杩涘叆浜嗗洿鏍忓叆搴�
- ArdAccessFence ardAccessFence = new ArdAccessFence();
- ardAccessFence.setId(String.valueOf(UUID.randomUUID()));
- ardAccessFence.setCarId(carId);
- ardAccessFence.setCarName(carName);
- ardAccessFence.setDeptId(deptNum);
- ardAccessFence.setDeptName(deptName);
- ardAccessFence.setIntoShipment("杩涘叆瑁呮补鐐�");
- ardAccessFence.setIntoShipmentTime(time);
+ }else {
+ String unload = ardAccessFence.getIntoUnloadId();
+ //濡傛灉unload涓虹┖锛屽垽鏂槸鍚﹁繘鍏ュ嵏娌圭偣
+ if(unload==null){
+ //鏌ヨ鍏ㄩ儴鍗告补鐐�
+ List<ArdOilWall> ardOilWalls = ((ArdOilWallServiceImpl) SpringUtils.getBean("ArdOilWallServiceImpl")).uploadAll();
+ for (int i = 0; i < ardOilWalls.size(); i++) {
+ pts.clear();
+ ArdOilWall ardOilWall = ardOilWalls.get(i);
+ String[] coord = ardOilWall.getCoord().split(",");
+ for (int j = 0; j < coord.length; j = j + 3) {
+ pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j + 1])));
+ }
+ if (GeoTools.IsPtInPoly(point, pts)) {
+ //杩涘叆鍗告补鐐�,瀛樺叆鍗告补鐐瑰洿鏍廔D
+ ardAccessFence.setIntoUnloadId(ardOilWall.getId());
+ ardAccessFence.setIntoUnloadTime(time);
+ break;
+ }
+ }
ardAccessFence.setLng(lng);
ardAccessFence.setLat(lat);
- ((ArdSyCarLockServiceImpl)SpringUtils.getBean("ArdSyCarLockServiceImpl")).access(ardAccessFence);
+ ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
+ }else {
+ //濡傛灉unload鏈夊�硷紝鍒欑户缁垽鏂槸鍚﹀嚭浜嗗嵏娌圭偣锛屽尮閰嶅嵏娌圭偣鐨勫敮涓�ID
+ ArdOilWall ardOilWall = ((ArdOilWallServiceImpl) SpringUtils.getBean("ArdOilWallServiceImpl")).one(unload);
+ pts.clear();
+ String[] coord = ardOilWall.getCoord().split(",");
+ for (int j = 0; j < coord.length; j = j + 3) {
+ pts.add(new Point2D.Double(Double.parseDouble(coord[j]), Double.parseDouble(coord[j + 1])));
+ }
+ if (!GeoTools.IsPtInPoly(point, pts)) {
+ //寮�鍑轰簡鍗告补鐐瑰洿鏍忥紝鍒犻櫎璇ユ潯杞﹁締鏁版嵁
+ ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).delAccess(carId);
+ }else {
+ //鏈紑鍑哄嵏娌圭偣锛屾洿鏂扮粡绾害淇濆瓨
+ ardAccessFence.setLng(lng);
+ ardAccessFence.setLat(lat);
+ ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
+ }
}
+
}
+ //娓呮筏鍏ユ爮缁撴潫------------
+
gpsMap.putAll(result);
String ancestors = (String) gpsMap.get("ancestors");//鑾峰彇鐖剁骇閮ㄩ棬
String[] ancestorsArray = ancestors.split(",");
--
Gitblit v1.9.3