From d772fedd4df8eecb78085c112e4939d29ba1b665 Mon Sep 17 00:00:00 2001
From: Administrator <ard@qq.com>
Date: 星期四, 26 十月 2023 09:58:46 +0800
Subject: [PATCH] 修改报错
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 139 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 127 insertions(+), 12 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 674d023..630efeb 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
@@ -13,14 +13,18 @@
import com.gps31.push.netty.client.TcpClient;
import com.gps31.push.util.MapUtil;
import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.sy.service.impl.ArdSyCarServiceImpl;
+import com.ruoyi.sy.domain.ArdAccessFence;
+import com.ruoyi.sy.domain.ArdOilWall;
+import com.ruoyi.sy.domain.ArdSyCarLock;
+import com.ruoyi.sy.service.ArdAccessFenceService;
+import com.ruoyi.sy.service.ArdOilWallService;
+import com.ruoyi.sy.service.impl.*;
+import com.ruoyi.utils.gps.GeoTools;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.awt.geom.Point2D;
+import java.util.*;
/**
* <p>Description: </p>
@@ -71,11 +75,123 @@
Map<String,Object> gpsMap = pushMsg.getJsonMap();
/*String carName = MapUtil.getStrVal(gpsMap, "carName","");//鑾峰彇杞︾墝鍙�
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- System.out.println(sdf.format(new Date()));
- log.error(String.format(" ---->鏀跺埌瀹氫綅鏁版嵁:%s",JSON.toJSONString(gpsMap)));*/
+ System.out.println(sdf.format(new Date()));*/
+// log.error(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){
+ //娓呮筏鍏ユ爮寮�濮�----------
+ String lng = (String) gpsMap.get("lng").toString();//鑾峰彇缁忓害
+ String lat = (String) gpsMap.get("lat").toString();//鑾峰彇绾害
+ String carName = (String) gpsMap.get("carName");//鑾峰彇杞︾墝鍙�
+ String time = (String) gpsMap.get("result");//瀹氫綅鏃堕棿
+ String deptNum = (String) result.get("deptId").toString();//鑾峰彇閮ㄩ棬ID
+ String deptName = (String) result.get("deptName");//鑾峰彇閮ㄩ棬鍚嶇О
+ //瀹氫箟2缁寸┖闂�
+ Point2D.Double point = new Point2D.Double(Double.parseDouble(lng), Double.parseDouble(lat));
+ List<Point2D.Double> pts = new ArrayList<Point2D.Double>();
+ //鏌ヨ瀹氫綅娌硅溅琛ㄤ腑鏄惁鏈夎杞﹁締
+ ArdAccessFence ardAccessFence = SpringUtils.getBean(ArdAccessFenceService.class).queryAccess(carId);
+ //濡傛灉娌℃湁璇存槑杞﹁締鏈繘鍏ヨ娌圭偣锛岄渶瑕佸尮閰嶆墍鏈夎娌圭偣鍥存爮
+ if(ardAccessFence==null){
+ //杞﹁締鏈繘鍏ヨ娌圭偣
+ List<ArdOilWall> ardOilWalls = SpringUtils.getBean(ArdOilWallService.class).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.setIntoShipmentId(ardOilWall.getId());
+ ardAccessFence1.setIntoShipmentTime(time);
+ ardAccessFence1.setLng(lng);
+ ardAccessFence1.setLat(lat);
+ ((ArdAccessFenceServiceImpl)SpringUtils.getBean("ArdAccessFenceServiceImpl")).access(ardAccessFence1);
+ break;
+ }
+ }
+ }else {
+ String out = ardAccessFence.getOutShipmentId();
+ if(out == null){
+ //杞﹁締鏈紑鍑鸿娌圭偣
+ String into = ardAccessFence.getIntoShipmentId();
+ ArdOilWall ardOilWall = SpringUtils.getBean(ArdOilWallService.class).one(into);
+ 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)) {
+ //杞﹁締寮�鍑鸿娌圭偣
+ ardAccessFence.setOutShipmentId(into);
+ ardAccessFence.setOutShipmentTime(time);
+ }
+ ardAccessFence.setLng(lng);
+ ardAccessFence.setLat(lat);
+ SpringUtils.getBean(ArdAccessFenceService.class).updAccess(ardAccessFence);
+ }else {
+ //杞﹁締宸茬粡寮�鍑鸿娌圭偣锛屽垽鏂槸鍚﹁繘鍏ュ嵏娌圭偣
+ String unload = ardAccessFence.getIntoUnloadId();
+ //濡傛灉unload涓虹┖锛屽垽鏂槸鍚﹁繘鍏ュ嵏娌圭偣
+ if (unload == null) {
+ //杞﹁締鏈繘鍏ュ嵏娌圭偣
+ List<ArdOilWall> ardOilWalls = SpringUtils.getBean(ArdOilWallService.class).uploadAll();
+ //鏄惁鍦ㄨ矾涓�
+ Boolean isRoad = true;
+ 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);
+ ardAccessFence.setLng(lng);
+ ardAccessFence.setLat(lat);
+ ((ArdAccessFenceServiceImpl) SpringUtils.getBean("ArdAccessFenceServiceImpl")).updAccess(ardAccessFence);
+ //宸茬粡杩涘叆鍗告补鐐癸紝涓嶅湪璺笂涓嶉渶瑕佸仠杞︽姤璀�
+ isRoad = false;
+ break;
+ }
+ }
+ if(isRoad){
+ //濡傛灉鍦ㄨ矾涓婇渶瑕佽褰曟瘡娆″潗鏍囦笌涓婃鏄惁鐩稿悓锛屽鏋滀竴鏍锋洿鏂板仠鐣欐椂闂�
+ }
+ }else {
+ //杞﹁締宸茬粡杩涘叆鍗告补鐐癸紝鍒ゆ柇鏄惁宸茬粡寮�鍑哄嵏娌圭偣
+ 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(",");
@@ -117,14 +233,13 @@
if(PositionContainer.getUserPositionMap().size() != 0){
for(String userId : PositionContainer.getUserPositionMap().keySet()){
Map<String,Map<String,Object>> carIdCarMap = PositionContainer.getUserPositionMap().get(userId);
- if(carIdCarMap.keySet().contains(carId)){
- PositionContainer.getUserPositionMap().get(userId).put(carId,gpsMap);
+ if(carIdCarMap != null){
+ if(carIdCarMap.keySet().contains(carId)){
+ PositionContainer.getUserPositionMap().get(userId).put(carId,gpsMap);
+ }
}
}
}
-
-
-
}
/**
*
--
Gitblit v1.9.3