From 05b1265492fdbf5d53d54ef1a09a5d42e60d01d3 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 21 十月 2023 16:59:28 +0800
Subject: [PATCH] 装油表修改
---
ard-work/src/main/java/com/ruoyi/sy/gps31/PushClientImplPosition.java | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 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 aa2e1b2..20ea073 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,19 @@
import com.gps31.push.netty.client.TcpClient;
import com.gps31.push.util.MapUtil;
import com.ruoyi.common.utils.spring.SpringUtils;
+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.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 +76,47 @@
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);//鏌ヨ杞﹁締鍙婇儴闂�
+// 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");//鑾峰彇閮ㄩ棬鍚嶇О
+ //瀹氫箟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])));
+ }
+ 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);
+ ardAccessFence.setLng(lng);
+ ardAccessFence.setLat(lat);
+ ((ArdSyCarLockServiceImpl)SpringUtils.getBean("ArdSyCarLockServiceImpl")).access(ardAccessFence);
+ }
+ }
gpsMap.putAll(result);
String ancestors = (String) gpsMap.get("ancestors");//鑾峰彇鐖剁骇閮ㄩ棬
String[] ancestorsArray = ancestors.split(",");
@@ -113,6 +154,17 @@
}
}
}
+ //瀛樺叆鐢ㄦ埛瀹瑰櫒
+ if(PositionContainer.getUserPositionMap().size() != 0){
+ for(String userId : PositionContainer.getUserPositionMap().keySet()){
+ Map<String,Map<String,Object>> carIdCarMap = PositionContainer.getUserPositionMap().get(userId);
+ if(carIdCarMap != null){
+ if(carIdCarMap.keySet().contains(carId)){
+ PositionContainer.getUserPositionMap().get(userId).put(carId,gpsMap);
+ }
+ }
+ }
+ }
}
/**
*
--
Gitblit v1.9.3